From 5a4a48a4a45f41d66d55e2103496e886ec7ee5f1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 21 Apr 2020 18:26:25 -0400 Subject: [PATCH] feat: Add Node 14 support --- .travis.yml | 12 +++++++++--- README.md | 1 + appveyor.yml | 6 ++++++ lib/extensions.js | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bfa408e2..8541217e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,18 @@ env: jobs: include: - stage: test - node_js: "node" + node_js: "14" os: linux before_script: npm run lint || exit 1; after_success: npm run-script coverage; - stage: platform-test - node_js: "node" + node_js: "14" + os: osx + - stage: platform-test + node_js: "13" + os: linux + - stage: platform-test + node_js: "13" os: osx - stage: platform-test node_js: "12" @@ -87,7 +93,7 @@ before_install: - echo $TRAVIS_NODE_VERSION - npm config set python `which python` - if [ $TRAVIS_OS_NAME == "linux" ]; then - if [[ $(node -v) =~ v1[23] ]]; then + if [[ $(node -v) =~ v1[234] ]]; then export CC="gcc-6"; export CXX="g++-6"; export LINK="gcc-6"; diff --git a/README.md b/README.md index 1fbea16f7..aac88e139 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ NodeJS | Minimum node-sass version | Node Module --------|--------------------------|------------ +Node 14 | 4.14+ | 83 Node 13 | 4.13+ | 79 Node 12 | 4.12+ | 72 Node 11 | 4.10+ | 67 diff --git a/appveyor.yml b/appveyor.yml index 077c65a3d..96f90fe4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -79,6 +79,9 @@ - nodejs_version: 13 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 14 + GYP_MSVS_VERSION: 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 install: # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs @@ -179,6 +182,9 @@ - nodejs_version: 13 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 14 + GYP_MSVS_VERSION: 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 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 1e344c40e..eec0ee229 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -79,6 +79,7 @@ function getHumanNodeVersion(abi) { case 67: return 'Node.js 11.x'; case 72: return 'Node.js 12.x'; case 79: return 'Node.js 13.x'; + case 83: return 'Node.js 14.x'; default: return false; } }