From 0648b5a59df693686e745d3690fc73e768200c47 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 27 Oct 2020 01:25:54 -0400 Subject: [PATCH] chore: Add Node 15 support (#2983) --- .github/workflows/alpine.yml | 9 +++++++-- .github/workflows/linux.yml | 7 +++++++ .github/workflows/macos.yml | 1 + .github/workflows/windows.yml | 13 ++++++++++++- README.md | 1 + appveyor.yml | 6 ++++++ lib/extensions.js | 1 + package.json | 3 +-- 8 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index d95a1f53d..adb941a98 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -11,8 +11,6 @@ jobs: runs-on: ubuntu-latest container: image: node:${{ matrix.node }}-alpine${{ matrix.alpine }} - env: - SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true strategy: fail-fast: false matrix: @@ -20,6 +18,8 @@ jobs: - 10 - 12 - 14 + - 15 + include: - node: 10 alpine: "3.9" @@ -27,6 +27,9 @@ jobs: alpine: "3.9" - node: 14 alpine: "3.10" + - node: 15 + alpine: "3.10" + steps: - name: Install Alpine build tools run: apk add --no-cache python make git gcc g++ @@ -35,6 +38,8 @@ jobs: - name: Install packages run: npm install --unsafe-perm + env: + SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true - name: Run tests run: npm test diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2aff8b056..a6320cb04 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,6 +17,8 @@ jobs: - 10 - 12 - 14 + - 15 + include: - node: 10 gcc: "gcc-4.9" @@ -30,6 +32,11 @@ jobs: gcc: "gcc-6" gpp: "g++-6" os: ubuntu-18.04 + - node: 15 + gcc: "gcc-6" + gpp: "g++-6" + os: ubuntu-18.04 + steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5d80a66e2..9cf377924 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,6 +17,7 @@ jobs: - 10 - 12 - 14 + - 15 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4267e3dd3..8b96f8da7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: windows-2016 + runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -17,6 +17,17 @@ jobs: - 10 - 12 - 14 + - 15 + + include: + - node: 10 + os: windows-2016 + - node: 12 + os: windows-2016 + - node: 14 + os: windows-2016 + - node: 15 + os: windows-2019 steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 8a0a3f7aa..639bd3a70 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Below is a quick guide for minimum and maximum support supported version of node NodeJS | Supported node-sass version | Node Module --------|-----------------------------|------------ +Node 15 | 5.0+ | 88 Node 14 | 4.14+ | 83 Node 13 | 4.13+, <5.0 | 79 Node 12 | 4.12+ | 72 diff --git a/appveyor.yml b/appveyor.yml index c83e68fbb..14dcb2713 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,6 +42,9 @@ - nodejs_version: 14 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 15 + 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 @@ -118,6 +121,9 @@ - nodejs_version: 14 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 15 + 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 0a4d2938d..b6f2a5667 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -80,6 +80,7 @@ function getHumanNodeVersion(abi) { case 72: return 'Node.js 12.x'; case 79: return 'Node.js 13.x'; case 83: return 'Node.js 14.x'; + case 88: return 'Node.js 15.x'; default: return false; } } diff --git a/package.json b/package.json index a02bf1bb1..fafe2923d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lint": "eslint bin/node-sass lib scripts test", "test": "mocha test/{*,**/**}.js", "build": "node scripts/build.js --force", - "prepublish": "not-in-install && node scripts/prepublish.js || in-install" + "prepublishOnly ": "scripts/prepublish.js" }, "files": [ "bin", @@ -59,7 +59,6 @@ "gaze": "^1.0.0", "get-stdin": "^4.0.1", "glob": "^7.0.3", - "in-publish": "^2.0.0", "lodash": "^4.17.15", "meow": "^3.7.0", "mkdirp": "^0.5.1",