From bc245b14e3c709a0939723789f1489c9e73cd023 Mon Sep 17 00:00:00 2001 From: Danny van der Knaap Date: Wed, 20 Mar 2024 15:01:55 +0100 Subject: [PATCH 1/2] feat(package): node 21 support --- .github/workflows/alpine.yml | 1 + .github/workflows/linux.yml | 5 ++++- .github/workflows/macos.yml | 1 + .github/workflows/windows.yml | 1 + README.md | 1 + appveyor.yml | 3 +++ lib/extensions.js | 3 ++- 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 7aaf451dc..ef0bf7381 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -19,6 +19,7 @@ jobs: - 18 - 19 - 20 + - 21 steps: - name: Install Alpine build tools diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3f8939cc1..9b94990b2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,7 +30,10 @@ jobs: gcc: "gcc-10" gpp: "g++-10" os: ubuntu-22.04 - + - node: 21 + gcc: "gcc-10" + gpp: "g++-10" + os: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 056e1cf3b..1a6b5d756 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,6 +18,7 @@ jobs: - 18 - 19 - 20 + - 21 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 50528faec..6f673c8e9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,6 +18,7 @@ jobs: - 18 - 19 - 20 + - 21 architecture: - x64 diff --git a/README.md b/README.md index 125dee83f..d82309c15 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Below is a quick guide for minimum and maximum supported versions of node-sass: NodeJS | Supported node-sass version | Node Module --------|-----------------------------|------------ +Node 21 | 9.0+ | 119 Node 20 | 9.0+ | 115 Node 19 | 8.0+ | 111 Node 18 | 8.0+ | 108 diff --git a/appveyor.yml b/appveyor.yml index 17e95edc6..180ed20b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,6 +45,9 @@ - nodejs_version: 20 GYP_MSVS_VERSION: 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + - nodejs_version: 21 + GYP_MSVS_VERSION: 2019 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 install: diff --git a/lib/extensions.js b/lib/extensions.js index 24314b8bd..9873dc807 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -85,6 +85,7 @@ function getHumanNodeVersion(abi) { case 108: return 'Node.js 18.x'; case 111: return 'Node.js 19.x'; case 115: return 'Node.js 20.x'; + case 120: return 'Node.js 21.x'; default: return false; } } @@ -111,7 +112,7 @@ function getHumanEnvironment(env) { } if (!platform) { - platform = 'Unsupported platform (' + parts[0] + ')'; + platform = 'Unsupported platform (' + parts[0] + '/' + process.versions.modules + ')'; } if (!arch) { From 07b7e5fca2c49d7916fcfe6fc042a2a2b7b8b225 Mon Sep 17 00:00:00 2001 From: Danny van der Knaap Date: Wed, 20 Mar 2024 15:46:26 +0100 Subject: [PATCH 2/2] chore(ci): remove node 16 support --- .github/workflows/alpine.yml | 1 - .github/workflows/linux.yml | 4 ---- .github/workflows/macos.yml | 1 - .github/workflows/windows.yml | 1 - appveyor.yml | 3 --- 5 files changed, 10 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index ef0bf7381..801788cbc 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -15,7 +15,6 @@ jobs: fail-fast: false matrix: node: - - 16 - 18 - 19 - 20 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9b94990b2..7dedf844f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,10 +14,6 @@ jobs: fail-fast: false matrix: include: - - node: 16 - gcc: "gcc-8" - gpp: "g++-8" - os: ubuntu-20.04 - node: 18 gcc: "gcc-8" gpp: "g++-8" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1a6b5d756..30cc77c40 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: node: - - 16 - 18 - 19 - 20 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6f673c8e9..3dac56559 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: node: - - 16 - 18 - 19 - 20 diff --git a/appveyor.yml b/appveyor.yml index 180ed20b8..8854fe01b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,9 +33,6 @@ environment: SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true matrix: - - nodejs_version: 16 - GYP_MSVS_VERSION: 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - nodejs_version: 18 GYP_MSVS_VERSION: 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019