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

SDK-3357: Add node 22 to matrix and set as default #1078

Merged
merged 2 commits into from
Aug 19, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
# Available OS's: https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: ["20.x", "18.x"]
node-version: ["22.x", "20.x", "18.x"]
experimental: [false]
steps:
- uses: actions/checkout@v4
Expand All @@ -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.os == 'ubuntu-latest' && matrix.node-version == '20.x' }}
if: ${{ matrix.os == 'ubuntu-latest' && matrix.node-version == '22.x' }}
with:
name: code-coverage-${{matrix.os}}-${{matrix.node-version}}
path: coverage/
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 22.x
Copy link
Contributor

@NSeydoux NSeydoux Aug 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, the node version is only ever used to build, it's irrelevant to the tests. I suggest we change this to node-version-file: ".nvmrc", to avoid the churn.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #1079

cache: npm
- run: npm ci
- run: npm run build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
node-version: ["18.x", "20.x"]
node-version: ["18.x", "20.x", "22.x"]
environment-name: ["ESS PodSpaces", "ESS Dev-2-2"]
experimental: [false]
include:
- environment-name: "ESS Dev-2-3"
experimental: true
node-version: 20.x
node-version: 22.x
os: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The following changes are pending, and will be applied on the next major release

## Unreleased

### New Features

- Node 22 is now supported

## [3.0.5](https://github.com/inrupt/solid-client-access-grants-js/releases/tag/v3.0.5) - 2024-07-31

### Bugfixes
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ 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.
See [Inrupt Solid Javascript Client
Libraries](https://docs.inrupt.com/developer-tools/javascript/client-libraries/#node-js-support).

# Installation

Expand Down
4 changes: 2 additions & 2 deletions docs/api/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ e.g. ``Map``, ``Set``, ``Promise``, ``Headers``, ``Array.prototype.includes``,
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.
See `Inrupt Solid Javascript Client Libraries
<https://docs.inrupt.com/developer-tools/javascript/client-libraries/#node-js-support>`__.

.. _issues--help:

Expand Down
2 changes: 1 addition & 1 deletion e2e/browser/test-app/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"rdf-namespaces": "^1.9.2"
},
"engines": {
"node": "^18.0.0 || ^20.0.0"
"node": "^18.0.0 || ^20.0.0 || ^22.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
11 changes: 1 addition & 10 deletions rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
// The following is only possible from Node 18 onwards
// import pkg from "./package.json" assert { type: "json" };

// Until we only support Node 18+, this should be used instead
// (see https://rollupjs.org/guide/en/#importing-packagejson)
import { createRequire } from 'node:module';
const require = createRequire(import.meta.url);
const pkg = require('./package.json');
import pkg from "./package.json" with { type: "json" };

import typescript from "rollup-plugin-typescript2";

Expand All @@ -16,8 +9,6 @@ const external = [

const plugins = [
typescript({
// Use our own version of TypeScript, rather than the one bundled with the plugin:
typescript: require("typescript"),
tsconfigOverride: {
compilerOptions: {
module: "esnext",
Expand Down
Loading