Unverified Commit bc78b227 by Michael Mifsud Committed by GitHub

Merge pull request #2633 from xzyfer/node-12

Add support for Node 12
parents 0f86a0ae 12c00522
...@@ -18,6 +18,12 @@ jobs: ...@@ -18,6 +18,12 @@ jobs:
node_js: "node" node_js: "node"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "11"
os: linux
- stage: platform-test
node_js: "11"
os: osx
- stage: platform-test
node_js: "10" node_js: "10"
os: linux os: linux
- stage: platform-test - stage: platform-test
...@@ -30,28 +36,28 @@ jobs: ...@@ -30,28 +36,28 @@ jobs:
node_js: "9" node_js: "9"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "7" node_js: "8"
os: linux os: linux
- stage: platform-test - stage: platform-test
node_js: "7" node_js: "8"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "lts/carbon" node_js: "7"
os: linux os: linux
- stage: platform-test - stage: platform-test
node_js: "lts/carbon" node_js: "7"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "lts/boron" node_js: "6"
os: linux os: linux
- stage: platform-test - stage: platform-test
node_js: "lts/boron" node_js: "6"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "lts/argon" node_js: "4"
os: linux os: linux
- stage: platform-test - stage: platform-test
node_js: "lts/argon" node_js: "4"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "0.12" node_js: "0.12"
...@@ -74,7 +80,7 @@ before_install: ...@@ -74,7 +80,7 @@ before_install:
- echo $TRAVIS_NODE_VERSION - echo $TRAVIS_NODE_VERSION
- npm config set python `which python` - npm config set python `which python`
- if [ $TRAVIS_OS_NAME == "linux" ]; then - if [ $TRAVIS_OS_NAME == "linux" ]; then
if [[ $(node -v) =~ v1[01] ]]; then if [[ $(node -v) =~ v[1-9][0-9] ]]; then
export CC="gcc-4.9"; export CC="gcc-4.9";
export CXX="g++-4.9"; export CXX="g++-4.9";
export LINK="gcc-4.9"; export LINK="gcc-4.9";
......
## v4.12.0
https://github.com/sass/node-sass/releases/tag/v4.12.0
## v4.11.0 ## v4.11.0
https://github.com/sass/node-sass/releases/tag/v4.11.0 https://github.com/sass/node-sass/releases/tag/v4.11.0
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
NodeJS | Minimum node-sass version | Node Module NodeJS | Minimum node-sass version | Node Module
--------|--------------------------|------------ --------|--------------------------|------------
Node 12 | 4.12+ | 72
Node 11 | 4.10+ | 67 Node 11 | 4.10+ | 67
Node 10 | 4.9+ | 64 Node 10 | 4.9+ | 64
Node 8 | 4.5.3+ | 57 Node 8 | 4.5.3+ | 57
......
...@@ -68,14 +68,18 @@ ...@@ -68,14 +68,18 @@
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2015
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- nodejs_version: 10 - nodejs_version: 10
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 11 - nodejs_version: 11
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 12
GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
install: install:
- ps: Install-Product node $env:nodejs_version $env:platform # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
- node --version - node --version
- npm --version - npm --version
- npm install - npm install
...@@ -161,14 +165,18 @@ ...@@ -161,14 +165,18 @@
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2015
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- nodejs_version: 10 - nodejs_version: 10
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 11 - nodejs_version: 11
GYP_MSVS_VERSION: 2015 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 12
GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
install: install:
- ps: Install-Product node $env:nodejs_version $env:platform # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
- node --version - node --version
- npm --version - npm --version
- npm install - npm install
......
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
} }
}, },
'xcode_settings': { 'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
'-std=c++11' 'CLANG_CXX_LIBRARY': 'libc++',
],
'OTHER_LDFLAGS': [], 'OTHER_LDFLAGS': [],
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
'MACOSX_DEPLOYMENT_TARGET': '10.7' 'MACOSX_DEPLOYMENT_TARGET': '10.7'
......
...@@ -77,6 +77,7 @@ function getHumanNodeVersion(abi) { ...@@ -77,6 +77,7 @@ function getHumanNodeVersion(abi) {
case 59: return 'Node.js 9.x'; case 59: return 'Node.js 9.x';
case 64: return 'Node.js 10.x'; case 64: return 'Node.js 10.x';
case 67: return 'Node.js 11.x'; case 67: return 'Node.js 11.x';
case 72: return 'Node.js 12.x';
default: return false; default: return false;
} }
} }
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
"lodash": "^4.17.11", "lodash": "^4.17.11",
"meow": "^3.7.0", "meow": "^3.7.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"nan": "^2.10.0", "nan": "^2.13.2",
"node-gyp": "^3.8.0", "node-gyp": "^3.8.0",
"npmlog": "^4.0.0", "npmlog": "^4.0.0",
"request": "^2.88.0", "request": "^2.88.0",
......
...@@ -14,7 +14,7 @@ char* create_string(Nan::MaybeLocal<v8::Value> maybevalue) { ...@@ -14,7 +14,7 @@ char* create_string(Nan::MaybeLocal<v8::Value> maybevalue) {
return 0; return 0;
} }
v8::String::Utf8Value string(value); Nan::Utf8String string(value);
char *str = (char *)malloc(string.length() + 1); char *str = (char *)malloc(string.length() + 1);
strcpy(str, *string); strcpy(str, *string);
return str; return str;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment