Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node 18 electron fix #1470

Merged
merged 3 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/blank.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
-
uses: actions/setup-node@v2
with:
node-version: '16.14.2'
node-version: '18.18.0'
-
name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
# "ref" specifies the branch to check out.
# "github.event.release.target_commitish" is a global variable and specifies the branch the release targeted
ref: ${{ github.event.release.target_commitish }}
- name: Use Node 16
- name: Use Node 18
uses: actions/setup-node@v3
with:
node-version: '16.14.2'
node-version: '18.18.0'
# Specifies the registry, this field is required!
registry-url: https://registry.npmjs.org/
- run: yarn install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"rollup": "^2.59.0",
"rollup-plugin-cleaner": "^1.0.0",
"rollup-plugin-scss": "^3.0.0",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"rollup-plugin-vue": "^6.0.0",
"sass": "~1.32.6",
"sass-loader": "^8.0.2",
Expand All @@ -133,7 +133,7 @@
"tsc-alias": "^1.2.0",
"tslib": "^2.6.2",
"typescript": "~4.3.5",
"vue-cli-plugin-electron-builder": "^2.1.1",
"vue-cli-plugin-electron-builder": "^v3.0.0-alpha.4",
"vue-cli-plugin-vuetify": "^2.4.3",
"vue-jest": "^3.0.7",
"vue-template-compiler": "^2.7.16",
Expand Down
3 changes: 2 additions & 1 deletion client/tsconfig.cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"module": "commonjs",
"outDir": "./bin",
"declaration": true,
"declarationDir": "./bin/types"
"declarationDir": "./bin/types",
"skipLibCheck": true
},
"include": [
"platform/desktop/constants.ts",
Expand Down
5 changes: 1 addition & 4 deletions client/tsconfig.rollup.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"compilerOptions": {
"target": "ES2018",
"module": "es2020",
"outDir": "./lib/",
"declaration": false,
"declarationDir": "./lib/types",

"outDir": "./lib/",
},
}
3 changes: 2 additions & 1 deletion client/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ module.exports = {
// https://github.com/nklayman/vue-cli-plugin-electron-builder/pull/1088
rendererProcessFile: 'platform/desktop/main.ts',
// https://www.electron.build/configuration/configuration
customFileProtocol: './',
builderOptions: {
appId: 'com.kitware.viame',
productName: 'DIVE-Desktop',
Expand All @@ -83,7 +84,7 @@ module.exports = {
extraMetadata: {
// https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/188
// https://github.com/electron-userland/electron-builder/issues/2592
main: 'background.js',
main: 'index.js',
name: 'DIVE-Desktop'
},
linux: {
Expand Down
2,436 changes: 353 additions & 2,083 deletions client/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker/girder.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ========================
# == CLIENT BUILD STAGE ==
# ========================
FROM node:16 as client-builder
FROM node:18 as client-builder
WORKDIR /app

# Install dependencies
Expand Down
83 changes: 42 additions & 41 deletions server/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading