From 1550d94ec7cd502ba1117f2a98e04ff8c25c2762 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Apr 2022 12:32:54 -0400 Subject: [PATCH 1/4] feat: Node 18 support --- .github/workflows/alpine.yml | 1 + .github/workflows/linux.yml | 5 +++++ .github/workflows/macos.yml | 1 + .github/workflows/windows.yml | 3 +++ README.md | 1 + appveyor.yml | 4 ++++ lib/extensions.js | 1 + package.json | 2 +- 8 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 2681f40d3..83d74aaef 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -19,6 +19,7 @@ jobs: # Node 16 and 17 are perma-red for the tests right now # - 16 # - 17 + # - 18 steps: - name: Install Alpine build tools diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 822fda14d..049204c35 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,6 +17,7 @@ jobs: - 14 - 16 - 17 + - 18 include: - node: 14 @@ -31,6 +32,10 @@ jobs: gcc: "gcc-8" gpp: "g++-8" os: ubuntu-18.04 + - node: 18 + gcc: "gcc-8" + gpp: "g++-8" + os: ubuntu-18.04 steps: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a88065864..e3cdf64be 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,6 +17,7 @@ jobs: - 14 - 16 - 17 + - 18 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 41dea8f93..6f507f1a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,6 +17,7 @@ jobs: - 14 - 16 - 17 + - 18 architecture: - x64 @@ -29,6 +30,8 @@ jobs: os: windows-2019 - node: 17 os: windows-2019 + - node: 18 + os: windows-2019 steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index e80b14094..1b5563f58 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 18 | 8.0+ | 108 Node 17 | 7.0+ | 102 Node 16 | 6.0+ | 93 Node 15 | 5.0+, <7.0 | 88 diff --git a/appveyor.yml b/appveyor.yml index a7b3a0565..162ea62ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,6 +42,10 @@ - nodejs_version: 17 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 + install: # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs diff --git a/lib/extensions.js b/lib/extensions.js index fcfffdc19..24b212e9b 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -82,6 +82,7 @@ function getHumanNodeVersion(abi) { case 88: return 'Node.js 15.x'; case 93: return 'Node.js 16.x'; case 102: return 'Node.js 17.x'; + case 108: return 'Node.js 18.x'; default: return false; } } diff --git a/package.json b/package.json index 424970f79..35b2d726a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-sass", - "version": "7.0.1", + "version": "8.0.0", "libsass": "3.5.5", "description": "Wrapper around libsass", "license": "MIT", From 6a7ad68d9737b06dd25284eafc380b7d5b83899a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Apr 2022 14:17:46 -0400 Subject: [PATCH 2/4] fix: Exclude Windows Node 18 x86 --- .github/workflows/windows.yml | 7 +++++++ appveyor.yml | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6f507f1a8..39f322602 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,6 +32,13 @@ jobs: os: windows-2019 - node: 18 os: windows-2019 + # Due to a v8 issue, 32-bit Node.js isn't available for the initial release + # https://nodejs.org/en/blog/announcements/v18-release-announce/#toolchain-and-compiler-upgrades + exclude: + - node: 18 + os: windows-2019 + architecture: x86 + steps: - uses: actions/checkout@v3 diff --git a/appveyor.yml b/appveyor.yml index 162ea62ed..ca4381220 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,9 +42,10 @@ - nodejs_version: 17 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 + # Due to a v8 issue, 32-bit Node.js isn't available for the initial release https://nodejs.org/en/blog/announcements/v18-release-announce/#toolchain-and-compiler-upgrades + # - nodejs_version: 18 + # GYP_MSVS_VERSION: 2019 + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 install: From 8b41e0100a9dda430261a594988ca44ead813713 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Apr 2022 14:24:24 -0400 Subject: [PATCH 3/4] chore: try Ubuntu 20.04 for libc err --- .github/workflows/linux.yml | 2 +- .github/workflows/windows.yml | 7 ------- appveyor.yml | 7 +++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 049204c35..e91076edd 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -35,7 +35,7 @@ jobs: - node: 18 gcc: "gcc-8" gpp: "g++-8" - os: ubuntu-18.04 + os: ubuntu-20.04 steps: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 39f322602..6f507f1a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,13 +32,6 @@ jobs: os: windows-2019 - node: 18 os: windows-2019 - # Due to a v8 issue, 32-bit Node.js isn't available for the initial release - # https://nodejs.org/en/blog/announcements/v18-release-announce/#toolchain-and-compiler-upgrades - exclude: - - node: 18 - os: windows-2019 - architecture: x86 - steps: - uses: actions/checkout@v3 diff --git a/appveyor.yml b/appveyor.yml index ca4381220..162ea62ed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,10 +42,9 @@ - nodejs_version: 17 GYP_MSVS_VERSION: 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - # Due to a v8 issue, 32-bit Node.js isn't available for the initial release https://nodejs.org/en/blog/announcements/v18-release-announce/#toolchain-and-compiler-upgrades - # - nodejs_version: 18 - # 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 install: From e1bf44706fd36ed3136d1b9ef2f37aa49b9ad9f7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 3 Jun 2022 20:32:16 -0400 Subject: [PATCH 4/4] feat: drop EOL Node 17 --- .github/workflows/alpine.yml | 3 +-- .github/workflows/linux.yml | 5 ----- .github/workflows/macos.yml | 1 - .github/workflows/windows.yml | 3 --- README.md | 2 +- appveyor.yml | 3 --- 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 83d74aaef..5c2c9065b 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -16,9 +16,8 @@ jobs: matrix: node: - 14 - # Node 16 and 17 are perma-red for the tests right now + # Node 16 and 18 are perma-red for the tests right now # - 16 - # - 17 # - 18 steps: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e91076edd..e4f8457f6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,6 @@ jobs: node: - 14 - 16 - - 17 - 18 include: @@ -28,10 +27,6 @@ jobs: gcc: "gcc-8" gpp: "g++-8" os: ubuntu-18.04 - - node: 17 - gcc: "gcc-8" - gpp: "g++-8" - os: ubuntu-18.04 - node: 18 gcc: "gcc-8" gpp: "g++-8" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e3cdf64be..49e041351 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,7 +16,6 @@ jobs: node: - 14 - 16 - - 17 - 18 steps: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6f507f1a8..97f796fec 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,7 +16,6 @@ jobs: node: - 14 - 16 - - 17 - 18 architecture: @@ -28,8 +27,6 @@ jobs: os: windows-2019 - node: 16 os: windows-2019 - - node: 17 - os: windows-2019 - node: 18 os: windows-2019 diff --git a/README.md b/README.md index 1b5563f58..73d64ed23 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Below is a quick guide for minimum and maximum supported versions of node-sass: NodeJS | Supported node-sass version | Node Module --------|-----------------------------|------------ Node 18 | 8.0+ | 108 -Node 17 | 7.0+ | 102 +Node 17 | 7.0+, <8.0 | 102 Node 16 | 6.0+ | 93 Node 15 | 5.0+, <7.0 | 88 Node 14 | 4.14+ | 83 diff --git a/appveyor.yml b/appveyor.yml index 162ea62ed..80bace49f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,9 +39,6 @@ - nodejs_version: 16 GYP_MSVS_VERSION: 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - nodejs_version: 17 - 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