Skip to content

Commit

Permalink
Merge pull request #801 from frappe/pr-751-electron-update
Browse files Browse the repository at this point in the history
Electron and Dependencies update
  • Loading branch information
Isaac-GC authored Jan 23, 2024
2 parents 2e5241f + 9f7eedc commit 2ced2e5
Show file tree
Hide file tree
Showing 6 changed files with 1,085 additions and 1,490 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.20.2'
node-version: '18.19.0'

- name: Set yarn version
run: yarn set version 1.22.18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.20.2'
node-version: '18.19.0'

- name: Set yarn version
run: yarn set version 1.22.18
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.20.2'
node-version: '18.19.0'

- name: Checkout Books
uses: actions/checkout@v2
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.14.0'
node-version: '18.19.0'

- name: Checkout Books
uses: actions/checkout@v2
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.14.0'
node-version: '18.19.0'

- name: Checkout Books
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.20.2'
node-version: '18.19.0'

- name: Set yarn version
run: yarn set version 1.22.18
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '16.14.0'
node-version: '18.19.0'

- name: Set yarn version
run: yarn set version 1.22.18
Expand Down
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@codemirror/autocomplete": "^6.4.2",
"@codemirror/lang-vue": "^0.1.1",
"@popperjs/core": "^2.10.2",
"better-sqlite3": "^7.5.3",
"better-sqlite3": "^9.2.2",
"codemirror": "^6.0.1",
"core-js": "^3.19.0",
"electron-store": "^8.0.1",
Expand All @@ -41,6 +41,7 @@
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
"@electron/rebuild": "^3.4.1",
"@lezer/common": "^1.0.0",
"@types/assert": "^1.5.6",
"@types/better-sqlite3": "^7.6.4",
Expand All @@ -56,11 +57,10 @@
"autoprefixer": "^9",
"chokidar": "^3.5.3",
"dotenv": "^16.0.0",
"electron": "18.3.7",
"electron-builder": "^24.4.0",
"electron": "22.3.27",
"electron-builder": "^24.9.1",
"electron-devtools-installer": "^3.2.0",
"electron-rebuild": "^3.2.9",
"electron-updater": "^5.2.1",
"electron-updater": "^6.1.7",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
Expand All @@ -82,6 +82,9 @@
"vue-tsc": "^1.6.5",
"yargs": "^17.7.2"
},
"resolutions": {
"node-abi": "^3.54.0"
},
"prettier": {
"semi": true,
"singleQuote": true,
Expand Down
Loading

0 comments on commit 2ced2e5

Please sign in to comment.