Skip to content

Commit 7b79523

Browse files
authored
Node 18 electron fix (#1470)
* cli build fix * update to node 18+, electron builder update * update versions
1 parent 8dc4960 commit 7b79523

File tree

8 files changed

+404
-2135
lines changed

8 files changed

+404
-2135
lines changed

.github/workflows/blank.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
-
2222
uses: actions/setup-node@v2
2323
with:
24-
node-version: '16.14.2'
24+
node-version: '18.18.0'
2525
-
2626
name: Get yarn cache directory path
2727
id: yarn-cache-dir-path

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
# "ref" specifies the branch to check out.
2323
# "github.event.release.target_commitish" is a global variable and specifies the branch the release targeted
2424
ref: ${{ github.event.release.target_commitish }}
25-
- name: Use Node 16
25+
- name: Use Node 18
2626
uses: actions/setup-node@v3
2727
with:
28-
node-version: '16.14.2'
28+
node-version: '18.18.0'
2929
# Specifies the registry, this field is required!
3030
registry-url: https://registry.npmjs.org/
3131
- run: yarn install --frozen-lockfile

client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"rollup": "^2.59.0",
125125
"rollup-plugin-cleaner": "^1.0.0",
126126
"rollup-plugin-scss": "^3.0.0",
127-
"rollup-plugin-typescript2": "^0.30.0",
127+
"rollup-plugin-typescript2": "^0.31.0",
128128
"rollup-plugin-vue": "^6.0.0",
129129
"sass": "~1.32.6",
130130
"sass-loader": "^8.0.2",
@@ -133,7 +133,7 @@
133133
"tsc-alias": "^1.2.0",
134134
"tslib": "^2.6.2",
135135
"typescript": "~4.3.5",
136-
"vue-cli-plugin-electron-builder": "^2.1.1",
136+
"vue-cli-plugin-electron-builder": "^v3.0.0-alpha.4",
137137
"vue-cli-plugin-vuetify": "^2.4.3",
138138
"vue-jest": "^3.0.7",
139139
"vue-template-compiler": "^2.7.16",

client/tsconfig.rollup.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
"compilerOptions": {
44
"target": "ES2018",
55
"module": "es2020",
6-
"outDir": "./lib/",
7-
"declaration": false,
8-
"declarationDir": "./lib/types",
9-
6+
"outDir": "./lib/",
107
},
118
}

client/vue.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ module.exports = {
6565
// https://github.com/nklayman/vue-cli-plugin-electron-builder/pull/1088
6666
rendererProcessFile: 'platform/desktop/main.ts',
6767
// https://www.electron.build/configuration/configuration
68+
customFileProtocol: './',
6869
builderOptions: {
6970
appId: 'com.kitware.viame',
7071
productName: 'DIVE-Desktop',
@@ -83,7 +84,7 @@ module.exports = {
8384
extraMetadata: {
8485
// https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/188
8586
// https://github.com/electron-userland/electron-builder/issues/2592
86-
main: 'background.js',
87+
main: 'index.js',
8788
name: 'DIVE-Desktop'
8889
},
8990
linux: {

client/yarn.lock

+353-2,083
Large diffs are not rendered by default.

docker/girder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ========================
22
# == CLIENT BUILD STAGE ==
33
# ========================
4-
FROM node:16 as client-builder
4+
FROM node:18 as client-builder
55
WORKDIR /app
66

77
# Install dependencies

server/poetry.lock

+42-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)