From 84255e166a8dfd88ca5a456796aaec1d9344d361 Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Fri, 16 Aug 2024 11:16:57 +0100 Subject: [PATCH 1/3] SDK-3357: Add node 22 to matrix and set as default --- .github/workflows/ci.yml | 6 +++--- .github/workflows/e2e-node.yml | 2 +- .nvmrc | 2 +- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c60f513..516d36f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: matrix: # We test against different OSes, because the build toolchain has OS-specific dependencies. os: ["ubuntu-latest", "windows-latest", "macos-latest"] - node-version: ["20.x", "18.x"] + node-version: ["22.x", "20.x", "18.x"] steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -30,7 +30,7 @@ jobs: - run: npm run test # Upload coverage for sonarcube (only matching OS and one node version required) - uses: actions/upload-artifact@v4 - if: ${{ matrix.node-version == '20.x' }} + if: ${{ matrix.node-version == '22.x' }} with: name: code-coverage-${{ matrix.os }}-${{matrix.node-version}} path: coverage/ @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - uses: actions/download-artifact@v4 with: - name: code-coverage-ubuntu-latest-20.x + name: code-coverage-ubuntu-latest-22.x path: coverage/ - uses: SonarSource/sonarcloud-github-action@v2 env: diff --git a/.github/workflows/e2e-node.yml b/.github/workflows/e2e-node.yml index bb7352b..40138a6 100644 --- a/.github/workflows/e2e-node.yml +++ b/.github/workflows/e2e-node.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - node-version: ["20.x", "18.x"] + node-version: ["22.x", "20.x", "18.x"] # PodSpaces doesn't support error descriptions yet. environment-name: ["ESS Dev-2-3"] experimental: [false] diff --git a/.nvmrc b/.nvmrc index 209e3ef..2bd5a0a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 +22 diff --git a/README.md b/README.md index 348b042..8d4b31c 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ and `String.prototype.endsWith`. ## Node.js Support Our JavaScript Client Libraries track Node.js [LTS -releases](https://nodejs.org/en/about/releases/), and support 18.x and 20.x. +releases](https://nodejs.org/en/about/releases/), and support 18.x, 20.x, and 22.x. # Installation diff --git a/package-lock.json b/package-lock.json index 7e74094..2926030 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "typescript": "^5.5.4" }, "engines": { - "node": "^18.0.0 || ^20.0.0" + "node": "^18.0.0 || ^20.0.0 || ^22.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index d17477e..34c025d 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,6 @@ "typescript": "^5.5.4" }, "engines": { - "node": "^18.0.0 || ^20.0.0" + "node": "^18.0.0 || ^20.0.0 || ^22.0.0" } } From d57ce7b22bf33f51ae243a41294156e80eaf27b4 Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Fri, 16 Aug 2024 11:47:25 +0100 Subject: [PATCH 2/3] Fix rollup and add docs link --- README.md | 3 +-- package.json | 2 +- rollup.config.mjs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8d4b31c..d7c9f9d 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,7 @@ and `String.prototype.endsWith`. ## Node.js Support -Our JavaScript Client Libraries track Node.js [LTS -releases](https://nodejs.org/en/about/releases/), and support 18.x, 20.x, and 22.x. +See [Inrupt’s Javascript Client libraries documentation](https://docs.inrupt.com/developer-tools/javascript/client-libraries/#node-js-support). # Installation diff --git a/package.json b/package.json index 34c025d..01b1108 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ "@inrupt/internal-test-env": "^3.2.1", "@inrupt/jest-jsdom-polyfills": "^3.2.1", "@inrupt/solid-client-authn-node": "^2.2.4", + "@playwright/test": "^1.46.0", "@typescript-eslint/eslint-plugin": "^7.17.0", "@typhonjs-typedoc/ts-lib-docs": "^2023.7.12", - "@playwright/test": "^1.46.0", "dotenv": "^16.4.5", "eslint": "^8.57.0", "eslint-config-next": "^14.2.5", diff --git a/rollup.config.mjs b/rollup.config.mjs index 471dd0f..738d0dd 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -1,4 +1,4 @@ -import pkg from "./package.json" assert { type: "json" }; +import pkg from "./package.json" with { type: "json" }; import sharedConfig from "@inrupt/base-rollup-config"; const config = sharedConfig(pkg); From 1ce3f68f6391d7f939876c6593e971bd649bdbff Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Fri, 16 Aug 2024 13:04:05 +0100 Subject: [PATCH 3/3] Text change to readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d7c9f9d..114c06f 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ and `String.prototype.endsWith`. ## Node.js Support -See [Inrupt’s Javascript Client libraries documentation](https://docs.inrupt.com/developer-tools/javascript/client-libraries/#node-js-support). +See [Inrupt Solid Javascript Client +Libraries](https://docs.inrupt.com/developer-tools/javascript/client-libraries/#node-js-support). # Installation