Merge 12d935a into 4115e9d

sass · Apr 21, 2021 · 32bf001 · 32bf001
2 parents 4115e9d + 12d935a
commit 32bf001
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -19,6 +19,7 @@ jobs:
           - 12
           - 14
           - 15
+          - 16
 
         include:
           - node: 10
@@ -29,6 +30,8 @@ jobs:
             alpine: "3.10"
           - node: 15
             alpine: "3.10"
+          - node: 16
+            alpine: "3.10"
 
     steps:
       - name: Install Alpine build tools

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,6 +18,7 @@ jobs:
           - 12
           - 14
           - 15
+          - 16
 
         include:
           - node: 10
@@ -36,6 +37,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
@@ -18,6 +18,7 @@ jobs:
           - 12
           - 14
           - 15
+          - 16
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -18,6 +18,7 @@ jobs:
           - 12
           - 14
           - 15
+          - 16
 
         include:
           - node: 10
@@ -28,6 +29,8 @@ jobs:
             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,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 16 | 5.1+                        | 93
 Node 15 | 5.0+                        | 88
 Node 14 | 4.14+                       | 83
 Node 13 | 4.13+, <5.0                 | 79

diff --git a/appveyor.yml b/appveyor.yml
@@ -45,6 +45,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
@@ -124,6 +127,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,7 +28,7 @@
         }
       },
       'xcode_settings': {
-        'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+        'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
         'CLANG_CXX_LIBRARY': 'libc++',
         'OTHER_LDFLAGS': [],
         'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
@@ -81,7 +81,7 @@
         }],
         ['OS!="win"', {
           'cflags_cc+': [
-            '-std=c++0x'
+            '-std=c++14'
           ]
         }]
       ]

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": "5.1.0",
   "libsass": "3.5.5",
   "description": "Wrapper around libsass",
   "license": "MIT",

diff --git a/src/libsass.gyp b/src/libsass.gyp
@@ -78,7 +78,7 @@
       'conditions': [
         ['OS=="mac"', {
           'xcode_settings': {
-            'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
+            'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
             'CLANG_CXX_LIBRARY': 'libc++',
             'OTHER_LDFLAGS': [],
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
@@ -105,7 +105,7 @@
         }],
         ['OS!="win"', {
           'cflags_cc+': [
-            '-std=c++0x'
+            '-std=c++14'
           ]
         }]
       ]