Skip to content

Commit

Permalink
chore: fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
wainola committed Sep 28, 2023
2 parents 74c9649 + fbb8d88 commit a8861d0
Show file tree
Hide file tree
Showing 6 changed files with 746 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: ${{ steps.release.outputs.releases_created }}

- name: Install yarn
run: yarn set version classic
run: yarn set version stable
if: ${{ steps.release.outputs.releases_created }}

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sdk-manager.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Wallet Manager to NPM
name: Publish SDK Manager to NPM

on:
push:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
if: ${{ steps.release.outputs.releases_created }}

- name: Install yarn
run: yarn set version classic
run: yarn set version stable
if: ${{ steps.release.outputs.releases_created }}

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wallet-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
if: ${{ steps.release.outputs.releases_created }}

- name: Install yarn
run: yarn set version classic
run: yarn set version stable
if: ${{ steps.release.outputs.releases_created }}

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/widget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
if: ${{ steps.release.outputs.releases_created }}

- name: Install yarn
run: yarn set version classic
run: yarn set version stable
if: ${{ steps.release.outputs.releases_created }}

- name: Install dependencies
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@
"node": ">=16.0.0"
},
"devDependencies": {
"@babel/core": "^7.22.20",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-lit": "^1.9.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-wc": "^2.0.2",
"prettier": "^3.0.3",
"typescript": "^5.2.2"
},
Expand Down
Loading

0 comments on commit a8861d0

Please sign in to comment.