Skip to content

Commit

Permalink
Merge pull request #2778 from evidence-dev/node-22
Browse files Browse the repository at this point in the history
NodeJS v22 support
  • Loading branch information
archiewood authored Nov 14, 2024
2 parents 4cf365c + 08923de commit 4ff8faa
Show file tree
Hide file tree
Showing 15 changed files with 124 additions and 96 deletions.
7 changes: 7 additions & 0 deletions .changeset/fair-monkeys-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@evidence-dev/evidence': patch
'@evidence-dev/plugin-connector': patch
'@evidence-dev/sdk': patch
---

Support Node 22: bump echarts and vite
6 changes: 6 additions & 0 deletions .changeset/perfect-guests-sparkle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@evidence-dev/component-utilities': patch
'@evidence-dev/core-components': patch
---

Node 22 support
5 changes: 5 additions & 0 deletions .changeset/thick-pianos-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'evidence-vscode': patch
---

support for Node v22
4 changes: 3 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ jobs:
matrix:
project: ${{ fromJson(needs.find-e2e-test-projects.outputs.e2e-test-projects) }}
os: [ubuntu-latest, macOS-latest, windows-latest]
node-version: [18, 20]
node-version: [18, 20, 22]

# When not on main, exclude non-latest node version and macOS/Windows
isMain:
- ${{ github.base_ref == 'main' }}
exclude:
- isMain: false
node-version: 18
- isMain: false
node-version: 20
- isMain: false
os: macOS-latest
- isMain: false
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ jobs:
fail-fast: false

matrix:
node-version: [18, 20]
node-version: [18, 20, 22]
os: [ubuntu-latest, macOS-latest, windows-latest]

isMain:
- ${{ github.base_ref == 'main' }}
exclude:
- isMain: false
node-version: 18
- isMain: false
node-version: 20
- isMain: false
os: macOS-latest

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"chroma-js": "^2.4.2",
"debounce": "^1.2.1",
"downloadjs": "1.4.7",
"echarts": "5.4.3",
"echarts": "5.5.1",
"echarts-stat": "1.2.0",
"eslint": "8.45.0",
"eslint-config-prettier": "^8.10.0",
Expand Down Expand Up @@ -67,7 +67,7 @@
"unified": "9.1.0",
"unist-util-visit": "4.1.2",
"uvu": "0.5.2",
"vite": "5.4.6"
"vite": "5.4.11"
},
"scripts": {
"release": "run-s package:core-components build:tailwind build:evidence build:plugin-connector && pnpm changeset publish",
Expand Down
4 changes: 2 additions & 2 deletions packages/evidence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@evidence-dev/tailwind": "workspace:*",
"@sveltejs/kit": "2.5.4",
"svelte": "4.2.19",
"vite": "5.4.6"
"vite": "5.4.11"
},
"dependencies": {
"@evidence-dev/plugin-connector": "workspace:*",
Expand All @@ -62,7 +62,7 @@
"tailwindcss": "^3.3.1",
"typescript": "5.4.2",
"unist-util-visit": "4.1.2",
"vite": "5.4.6"
"vite": "5.4.11"
},
"engines": {
"node": ">=18"
Expand Down
6 changes: 3 additions & 3 deletions packages/extension/src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function isSupportedNodeVersion(nodeVersion: string): boolean {
const minMajorVersion = 18;

// Maximum version of NodeJS required for Evidence:
const maxMajorVersion = 20;
const maxMajorVersion = 22;

// check node version
if (nodeVersion && nodeVersion.startsWith('v')) {
Expand Down Expand Up @@ -101,8 +101,8 @@ export async function promptToInstallNodeJsAndRestart(currentVersion: string | u

const downloadNodeNotification = await window.showErrorMessage(
currentVersion
? `Evidence requires NodeJS v18 or v20 - your NodeJS version is ${currentVersion}`
: `Evidence requires NodeJS v18 or v20`,
? `Evidence requires NodeJS v18, v20, or v22 - your NodeJS version is ${currentVersion}`
: `Evidence requires NodeJS v18, v20, or v22`,
{ title: downloadNodeJs }
);

Expand Down
2 changes: 1 addition & 1 deletion packages/lib/component-utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@uwdata/mosaic-sql": "^0.3.2",
"debounce": "^1.2.1",
"downloadjs": "1.4.7",
"echarts": "5.4.3",
"echarts": "5.5.1",
"ssf": "^0.11.2",
"svelte": "4.2.19"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/plugin-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"svelte": "4.2.19",
"svelte-preprocess": "^5.1.3",
"sveltekit-autoimport": "1.8.0",
"vite": "5.4.6",
"vite": "5.4.11",
"yaml": "^2.3.4",
"zod": "^3.21.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"recast": "^0.23.4",
"svelte-sequential-preprocessor": "^2.0.1",
"sveltekit-autoimport": "^1.7.1",
"vite": "5.4.6",
"vite": "5.4.11",
"vitest": "^1.1.3",
"yaml": "^2.3.4",
"zod": "^3.22.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/core-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"cmdk-sv": "^0.0.12",
"codemirror": "^6.0.1",
"date-fns": "^3.6.0",
"echarts": "5.4.3",
"echarts": "5.5.1",
"echarts-stat": "1.2.0",
"export-to-csv": "0.2.1",
"leaflet": "^1.9.4",
Expand Down Expand Up @@ -117,7 +117,7 @@
"tailwindcss": "^3.4.3",
"tslib": "^2.6.2",
"typescript": "5.4.2",
"vite": "5.4.6",
"vite": "5.4.11",
"vitest": "^2.0.5"
},
"overrides": {
Expand Down
Loading

0 comments on commit 4ff8faa

Please sign in to comment.