Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 080047d

Browse files
committedDec 4, 2024·
Bump dependencies to latest
Key changes: - Upgrade npm dependencies to their latest - Upgrade python dependencies to their latest - Upgrade Node to 22 as 20 is end-of-life since October 2024 Other supporting changes: - Refactor `assert` with `with` (see nodejs/node#51622) - Centralize python setup via custom action for consistency - Specify bash shell for correct argument handling on Windows using latest npm (npm/cli#6041)
1 parent 5155f93 commit 080047d

File tree

16 files changed

+5079
-3594
lines changed

16 files changed

+5079
-3594
lines changed
 

‎.github/actions/npm-install-dependencies/action.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ runs:
66
using: composite
77
steps:
88
-
9-
name: Run `npm ci` with retries
9+
name: Update Browserslist DB
1010
shell: bash
11+
run: npx update-browserslist-db@latest
12+
working-directory: ${{ inputs.working-directory }}
13+
-
14+
name: Run `npm ci` with retries
15+
shell: bash # Required for correct argument passing (--)
1116
run: npm run install-deps -- --ci
1217
working-directory: ${{ inputs.working-directory }}

‎.github/actions/setup-node/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ runs:
55
name: Setup node
66
uses: actions/setup-node@v4
77
with:
8-
node-version: 20.x
8+
node-version: 22.x
99
# check-latest: true # Newest versions can potentially have undiscovered bugs or regressions
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
runs:
2+
using: composite
3+
steps:
4+
-
5+
name: Set up Python
6+
uses: actions/setup-python@v5
7+
with:
8+
python-version: '3.13'

‎.github/workflows/checks.build.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ jobs:
3030
uses: ./.github/actions/npm-install-dependencies
3131
-
3232
name: Build web
33+
shell: bash # Required for correct argument passing (--)
3334
run: npm run build -- --mode ${{ matrix.mode }}
3435
-
3536
name: Verify web build artifacts
37+
shell: bash # Required for correct argument passing (--)
3638
run: npm run check:verify-build-artifacts -- --web
3739

3840
build-desktop:
@@ -58,15 +60,19 @@ jobs:
5860
uses: ./.github/actions/npm-install-dependencies
5961
-
6062
name: Prebuild desktop
63+
shell: bash # Required for correct argument passing (--)
6164
run: npm run electron:prebuild -- --mode ${{ matrix.mode }}
6265
-
6366
name: Verify unbundled desktop build artifacts
67+
shell: bash # Required for correct argument passing (--)
6468
run: npm run check:verify-build-artifacts -- --electron-unbundled
6569
-
6670
name: Build (bundle and package) desktop application
71+
shell: bash # Required for correct argument passing (--)
6772
run: npm run electron:build -- --publish never
6873
-
6974
name: Verify bundled desktop build artifacts
75+
shell: bash # Required for correct argument passing (--)
7076
run: npm run check:verify-build-artifacts -- --electron-bundled
7177

7278
build-docker:

‎.github/workflows/checks.quality.yaml

+4-8
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,8 @@ jobs:
6363
name: Setup node
6464
uses: ./.github/actions/setup-node
6565
-
66-
name: Set up Python
67-
uses: actions/setup-python@v5
68-
with:
69-
python-version: '3.x'
66+
name: Setup node
67+
uses: ./.github/actions/setup-python
7068
-
7169
name: Install dependencies
7270
run: |
@@ -90,10 +88,8 @@ jobs:
9088
name: Setup node
9189
uses: ./.github/actions/setup-node
9290
-
93-
name: Set up Python
94-
uses: actions/setup-python@v5
95-
with:
96-
python-version: '3.x'
91+
name: Setup node
92+
uses: ./.github/actions/setup-python
9793
-
9894
name: Install dependencies
9995
run: python3 -m pip install -r ./scripts/validate-collections-yaml/requirements.txt

‎.github/workflows/checks.scripts.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
uses: ./.github/actions/npm-install-dependencies
5656
-
5757
name: Run install-deps
58+
shell: bash # Required for correct argument passing (--)
5859
run: ${{ matrix.install-command }}
5960

6061
configure-vscode:
@@ -74,10 +75,8 @@ jobs:
7475
name: Checkout
7576
uses: actions/checkout@v4
7677
-
77-
name: Set up Python
78-
uses: actions/setup-python@v5
79-
with:
80-
python-version: '3.x'
78+
name: Setup node
79+
uses: ./.github/actions/setup-python
8180
-
8281
name: Install VSCode
8382
run: ${{ matrix.os.install-vscode-command }}

‎.github/workflows/release.desktop.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
-
3838
name: Build and publish
3939
run: npm run electron:build -- --publish always
40+
shell: bash # Required for correct argument passing (--)
4041
env:
4142
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4243
EP_GH_IGNORE_TIME: true # Otherwise publishing fails if GitHub release is more than 2 hours old https://github.com/electron-userland/electron-builder/issues/2074

‎.github/workflows/release.site.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
-
9999
name: "App: Verify web build artifacts"
100100
run: npm run check:verify-build-artifacts -- --web
101+
shell: bash # Required for correct argument passing (--)
101102
working-directory: app
102103
-
103104
name: "App: Deploy to S3"

‎cypress.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineConfig } from 'cypress';
22
import ViteConfig from './vite.config';
3-
import cypressDirs from './cypress-dirs.json' assert { type: 'json' };
3+
import cypressDirs from './cypress-dirs.json' with { type: 'json' };
44

55
export default defineConfig({
66
fixturesFolder: `${cypressDirs.base}/fixtures`,

‎electron.vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { mergeConfig, type UserConfig } from 'vite';
33
import { defineConfig, externalizeDepsPlugin } from 'electron-vite';
44
import { getAliases, getClientEnvironmentVariables } from './vite-config-helper';
55
import { createVueConfig } from './vite.config';
6-
import distDirs from './dist-dirs.json' assert { type: 'json' };
6+
import distDirs from './dist-dirs.json' with { type: 'json' };
77

88
const MAIN_ENTRY_FILE = resolvePathFromProjectRoot('src/presentation/electron/main/index.ts');
99
const PRELOAD_ENTRY_FILE = resolvePathFromProjectRoot('src/presentation/electron/preload/index.ts');

‎package-lock.json

+5,011-3,544
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+31-29
Original file line numberDiff line numberDiff line change
@@ -35,54 +35,54 @@
3535
"postuninstall": "electron-builder install-app-deps"
3636
},
3737
"dependencies": {
38-
"@floating-ui/vue": "^1.1.1",
38+
"@floating-ui/vue": "^1.1.5",
3939
"@juggle/resize-observer": "^3.4.0",
40-
"ace-builds": "^1.35.3",
41-
"electron-log": "^5.1.6",
40+
"ace-builds": "^1.36.5",
41+
"electron-log": "^5.2.3",
4242
"electron-progressbar": "^2.2.1",
43-
"electron-updater": "^6.2.1",
43+
"electron-updater": "^6.3.9",
4444
"file-saver": "^2.0.5",
4545
"markdown-it": "^14.1.0",
46-
"vue": "^3.4.32"
46+
"vue": "^3.5.13"
4747
},
4848
"devDependencies": {
4949
"@modyfi/vite-plugin-yaml": "^1.1.0",
50-
"@rushstack/eslint-patch": "^1.10.3",
50+
"@rushstack/eslint-patch": "^1.10.4",
5151
"@types/ace": "^0.0.52",
5252
"@types/file-saver": "^2.0.7",
53-
"@types/markdown-it": "^14.1.1",
53+
"@types/markdown-it": "^14.1.2",
5454
"@typescript-eslint/eslint-plugin": "6.21.0",
5555
"@typescript-eslint/parser": "6.21.0",
56-
"@vitejs/plugin-legacy": "^5.4.1",
57-
"@vitejs/plugin-vue": "^5.0.5",
56+
"@vitejs/plugin-legacy": "^5.4.2",
57+
"@vitejs/plugin-vue": "^5.2.1",
5858
"@vue/eslint-config-airbnb-with-typescript": "^8.0.0",
5959
"@vue/eslint-config-typescript": "12.0.0",
6060
"@vue/test-utils": "^2.4.6",
61-
"autoprefixer": "^10.4.19",
62-
"cypress": "^13.13.1",
63-
"electron": "^31.2.1",
64-
"electron-builder": "^24.13.3",
61+
"autoprefixer": "^10.4.20",
62+
"cypress": "^13.16.0",
63+
"electron": "^33.2.1",
64+
"electron-builder": "^25.1.8",
6565
"electron-devtools-installer": "^3.2.0",
6666
"electron-vite": "^2.3.0",
6767
"eslint": "8.57.0",
68-
"eslint-plugin-cypress": "^3.3.0",
69-
"eslint-plugin-vue": "^9.27.0",
70-
"eslint-plugin-vuejs-accessibility": "^2.4.0",
71-
"jsdom": "^24.1.0",
72-
"markdownlint-cli": "^0.41.0",
73-
"postcss": "^8.4.39",
68+
"eslint-plugin-cypress": "^3.6.0",
69+
"eslint-plugin-vue": "^9.32.0",
70+
"eslint-plugin-vuejs-accessibility": "^2.4.1",
71+
"jsdom": "^25.0.1",
72+
"markdownlint-cli": "^0.43.0",
73+
"postcss": "~8.4.49",
7474
"remark-cli": "^12.0.1",
75-
"remark-lint-no-dead-urls": "^2.0.0",
75+
"remark-lint-no-dead-urls": "^2.0.1",
7676
"remark-preset-lint-consistent": "^6.0.0",
77-
"remark-validate-links": "^13.0.1",
78-
"sass": "~1.79.4",
79-
"start-server-and-test": "^2.0.4",
80-
"terser": "^5.31.3",
81-
"tslib": "^2.6.3",
77+
"remark-validate-links": "^13.0.2",
78+
"sass": "~1.81.0",
79+
"start-server-and-test": "^2.0.8",
80+
"terser": "^5.36.0",
81+
"tslib": "^2.8.1",
8282
"typescript": "~5.5.4",
83-
"vite": "^5.4.8",
84-
"vitest": "^2.0.3",
85-
"vue-tsc": "^2.0.26",
83+
"vite": "^5.4.11",
84+
"vitest": "^2.1.8",
85+
"vue-tsc": "^2.1.10",
8686
"yaml-lint": "^1.7.0"
8787
},
8888
"//devDependencies": {
@@ -91,7 +91,9 @@
9191
"@typescript-eslint/eslint-plugin": "Cannot migrate to v7 because of `@vue/eslint-config-airbnb-with-typescript`, see https://github.com/vuejs/eslint-config-airbnb/issues/63",
9292
"@typescript-eslint/parser": "Cannot migrate to v7 because of `@vue/eslint-config-airbnb-with-typescript`, see https://github.com/vuejs/eslint-config-airbnb/issues/63",
9393
"@vue/eslint-config-typescript": "Cannot migrate to v13 because of `@vue/eslint-config-airbnb-with-typescript`, see https://github.com/vuejs/eslint-config-airbnb/issues/63",
94-
"eslint": "Cannot migrate to v9 `@typescript-eslint/eslint-plugin` (≤ v7), `@typescript-eslint/parser` (≤ v7), `@vue/eslint-config-airbnb-with-typescript@` (≤ v8) requires `eslint` ≤ v8, see https://github.com/vuejs/eslint-config-airbnb/issues/65, https://github.com/typescript-eslint/typescript-eslint/issues/8211"
94+
"eslint": "Cannot migrate to v9 `@typescript-eslint/eslint-plugin` (≤ v7), `@typescript-eslint/parser` (≤ v7), `@vue/eslint-config-airbnb-with-typescript@` (≤ v8) requires `eslint` ≤ v8, see https://github.com/vuejs/eslint-config-airbnb/issues/65, https://github.com/typescript-eslint/typescript-eslint/issues/8211",
95+
"eslint-plugin-cypress": "Cannot migrate to v4 because it requires eslint (≤ v9)",
96+
"vite": "Cannot migrate to v6 due to `@modyfi/vite-plugin-yaml` not supporting it yet"
9597
},
9698
"homepage": "https://privacy.sexy",
9799
"repository": {

‎tests/checks/desktop-runtime-errors/check-desktop-runtime-errors/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { join } from 'node:path';
2-
import distDirs from '@/../dist-dirs.json' assert { type: 'json' };
2+
import distDirs from '@/../dist-dirs.json' with { type: 'json' };
33

44
export const DESKTOP_BUILD_COMMAND = [
55
'npm run electron:prebuild',

‎tests/integration/infrastructure/EnvironmentVariables/Vite/ViteEnvironmentVariables.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, it, expect } from 'vitest';
2-
import packageJson from '@/../package.json' assert { type: 'json' };
2+
import packageJson from '@/../package.json' with { type: 'json' };
33
import type { PropertyKeys } from '@/TypeHelpers';
44
import type { IAppMetadata } from '@/infrastructure/EnvironmentVariables/IAppMetadata';
55
import { ViteEnvironmentVariables } from '@/infrastructure/EnvironmentVariables/Vite/ViteEnvironmentVariables';

‎vite-config-helper.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { resolve, dirname } from 'node:path';
22
import { fileURLToPath } from 'node:url';
33
import { VITE_USER_DEFINED_ENVIRONMENT_KEYS } from './src/infrastructure/EnvironmentVariables/Vite/ViteEnvironmentKeys';
4-
import tsconfigJson from './tsconfig.json' assert { type: 'json' };
5-
import packageJson from './package.json' assert { type: 'json' };
4+
import tsconfigJson from './tsconfig.json' with { type: 'json' };
5+
import packageJson from './package.json' with { type: 'json' };
66

77
type ViteAliasDefinitions = Record<string, string>;
88

‎vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { defineConfig, type UserConfig } from 'vite';
44
import vue from '@vitejs/plugin-vue';
55
import legacy from '@vitejs/plugin-legacy';
66
import ViteYaml from '@modyfi/vite-plugin-yaml';
7-
import distDirs from './dist-dirs.json' assert { type: 'json' };
7+
import distDirs from './dist-dirs.json' with { type: 'json' };
88
import { getAliases, getClientEnvironmentVariables, getSelfDirectoryAbsolutePath } from './vite-config-helper';
99

1010
const WEB_DIRECTORY = resolve(getSelfDirectoryAbsolutePath(), 'src/presentation');

0 commit comments

Comments
 (0)
Please sign in to comment.