Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
-
uses: actions/checkout@v3
-
uses: actions/setup-node@v3
uses: actions/setup-node@v6
with:
node-version: '20.10.0'
node-version: '24'
cache: npm
cache-dependency-path: client/package-lock.json
-
Expand Down
2 changes: 1 addition & 1 deletion client/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
24
2 changes: 1 addition & 1 deletion client/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ['@vue/cli-plugin-babel/preset'],
presets: [['@babel/preset-env', { targets: { node: 'current' } }]],
};
9,733 changes: 1,908 additions & 7,825 deletions client/package-lock.json

Large diffs are not rendered by default.

19 changes: 6 additions & 13 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dive-dsa",
"version": "1.11.48",
"version": "1.11.49",
"author": {
"name": "Kitware, Inc.",
"email": "Bryon.Lewis@kitware.com"
Expand All @@ -17,12 +17,12 @@
"dev": "vite",
"serve": "vite",
"build:web": "vite build",
"build:package": "vue-cli-service build --target lib --name DIVE-DSA platform/web-girder/main.ts",
"build:lib": "rollup -c",
"build:cli": "tsc -b tsconfig.cli.json && tsc-alias -p tsconfig.cli.json",
"lint": "vue-cli-service lint src/ dive-common/ platform/",
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.vue src/ dive-common/ platform/",
"lint:fix": "eslint --fix --ext .js,.jsx,.ts,.tsx,.vue src/ dive-common/ platform/",
"lint:templates": "vtc --workspace . --srcDir src/",
"test": "vue-cli-service test:unit src/ dive-common/ platform/"
"test": "jest src/ dive-common/ platform/"
},
"resolutions": {
"@types/babel__traverse": "7.18.2"
Expand Down Expand Up @@ -58,6 +58,8 @@
"vuex": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.29.7",
"@babel/preset-env": "^7.29.7",
"@types/axios": "^0.14.0",
"@types/body-parser": "^1.19.0",
"@types/color-hash": "^1.0.0",
Expand Down Expand Up @@ -85,11 +87,6 @@
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@vitejs/plugin-vue2": "^2.3.4",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-plugin-unit-jest": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/compiler-sfc": "^3.2.20",
"@vue/eslint-config-airbnb": "^7.0.1",
"@vue/eslint-config-typescript": "^12.0.0",
Expand Down Expand Up @@ -122,18 +119,14 @@
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-vue": "^6.0.0",
"sass": "^1.93.2",
"sass-loader": "^8.0.2",
"tailwindcss": "^3.3.6",
"ts-jest": "^27.0.4",
"tsc-alias": "^1.2.0",
"tslib": "^2.6.2",
"typescript": "~4.3.5",
"vite": "^6.3.5",
"vue-cli-plugin-vuetify": "^2.4.3",
"vue-jest": "^3.0.7",
"vue-template-compiler": "^2.7.0",
"vuetify-loader": "^1.7.3",
"worker-loader": "^3.0.8",
"xml-js": "^1.6.11",
"yargs": "^16.1.0"
},
Expand Down
60 changes: 0 additions & 60 deletions client/vue.config.js

This file was deleted.

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:20 AS client-builder
FROM node:24 AS client-builder
WORKDIR /app
SHELL ["/bin/bash", "-c"]

Expand Down
Loading