Merge 432310f into 4115e9d

sass · May 1, 2021 · e2e637d · e2e637d
2 parents 4115e9d + 432310f
commit e2e637d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 38 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -15,20 +15,20 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 10
           - 12
           - 14
           - 15
+          - 16
 
         include:
-          - node: 10
-            alpine: "3.9"
           - node: 12
             alpine: "3.9"
           - node: 14
             alpine: "3.10"
           - node: 15
             alpine: "3.10"
+          - node: 16
+            alpine: "3.11"
 
     steps:
       - name: Install Alpine build tools

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,16 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 10
           - 12
           - 14
           - 15
+          - 16
 
         include:
-          - node: 10
-            gcc: "gcc-4.9"
-            gpp: "g++-4.9"
-            os: ubuntu-16.04
           - node: 12
             gcc: "gcc-6"
             gpp: "g++-6"
@@ -36,6 +32,11 @@ jobs:
             gcc: "gcc-6"
             gpp: "g++-6"
             os: ubuntu-18.04
+          - node: 16
+            gcc: "gcc-8"
+            gpp: "g++-8"
+            os: ubuntu-18.04
+
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,10 +14,10 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 10
           - 12
           - 14
           - 15
+          - 16
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,20 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 10
           - 12
           - 14
           - 15
+          - 16
 
         include:
-          - node: 10
-            os: windows-2016
           - node: 12
             os: windows-2016
           - node: 14
             os: windows-2016
           - node: 15
             os: windows-2019
+          - node: 16
+            os: windows-2019
 
     steps:
       - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -17,12 +17,13 @@ Below is a quick guide for minimum and maximum support supported version of node
 
 NodeJS  | Supported node-sass version | Node Module
 --------|-----------------------------|------------
+Node 16 | 6.0+                        | 93
 Node 15 | 5.0+                        | 88
 Node 14 | 4.14+                       | 83
 Node 13 | 4.13+, <5.0                 | 79
 Node 12 | 4.12+                       | 72
 Node 11 | 4.10+, <5.0                 | 67
-Node 10 | 4.9+                        | 64
+Node 10 | 4.9+, <6.0                  | 64
 Node 8  | 4.5.3+, <5.0                | 57
 Node <8 | <5.0                        | <57
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -33,9 +33,6 @@
   environment:
     SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
     matrix:
-      - nodejs_version: 10
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       - nodejs_version: 12
         GYP_MSVS_VERSION: 2017
         APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -45,6 +42,9 @@
       - nodejs_version: 15
         GYP_MSVS_VERSION: 2019
         APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      - nodejs_version: 16
+        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
@@ -112,9 +112,6 @@
   environment:
     SKIP_SASS_BINARY_DOWNLOAD_FOR_CI: true
     matrix:
-      - nodejs_version: 10
-        GYP_MSVS_VERSION: 2017
-        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       - nodejs_version: 12
         GYP_MSVS_VERSION: 2017
         APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -124,6 +121,9 @@
       - nodejs_version: 15
         GYP_MSVS_VERSION: 2019
         APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      - nodejs_version: 16
+        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/binding.gyp b/binding.gyp
@@ -28,11 +28,10 @@
         }
       },
       'xcode_settings': {
-        'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
         'CLANG_CXX_LIBRARY': 'libc++',
         'OTHER_LDFLAGS': [],
         'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
-        'MACOSX_DEPLOYMENT_TARGET': '10.7'
+        'MACOSX_DEPLOYMENT_TARGET': '10.11'
       },
       'include_dirs': [
         '<!(node -e "require(\'nan\')")',
@@ -68,21 +67,6 @@
               '<(libsass_library)',
             ],
           }
-        }],
-        ['OS=="win" and MSVS_VERSION == "2015"', {
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'AdditionalOptions': [
-                # disable Thread-Safe "Magic" for local static variables
-                '/Zc:threadSafeInit-',
-              ],
-            },
-          },
-        }],
-        ['OS!="win"', {
-          'cflags_cc+': [
-            '-std=c++0x'
-          ]
         }]
       ]
     }

diff --git a/lib/extensions.js b/lib/extensions.js
@@ -81,6 +81,7 @@ function getHumanNodeVersion(abi) {
     case 79: return 'Node.js 13.x';
     case 83: return 'Node.js 14.x';
     case 88: return 'Node.js 15.x';
+    case 93: return 'Node.js 16.x';
     default: return false;
   }
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-sass",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "libsass": "3.5.5",
   "description": "Wrapper around libsass",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "url": "http://andrew.github.com"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "main": "lib/index.js",
   "nodeSassConfig": {