Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit bc78b22

Browse files
xzyferxzyfer
authored
Merge pull request #2633 from xzyfer/node-12
Add support for Node 12
2 parents 0f86a0a + 12c0052 commit bc78b22

8 files changed

Lines changed: 45 additions & 26 deletions

File tree

‎.travis.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ jobs:
1717
- stage: platform-test
1818
node_js: "node"
1919
os: osx
20+
- stage: platform-test
21+
node_js: "11"
22+
os: linux
23+
- stage: platform-test
24+
node_js: "11"
25+
os: osx
2026
- stage: platform-test
2127
node_js: "10"
2228
os: linux
@@ -30,28 +36,28 @@ jobs:
3036
node_js: "9"
3137
os: osx
3238
- stage: platform-test
33-
node_js: "7"
39+
node_js: "8"
3440
os: linux
3541
- stage: platform-test
36-
node_js: "7"
42+
node_js: "8"
3743
os: osx
3844
- stage: platform-test
39-
node_js: "lts/carbon"
45+
node_js: "7"
4046
os: linux
4147
- stage: platform-test
42-
node_js: "lts/carbon"
48+
node_js: "7"
4349
os: osx
4450
- stage: platform-test
45-
node_js: "lts/boron"
51+
node_js: "6"
4652
os: linux
4753
- stage: platform-test
48-
node_js: "lts/boron"
54+
node_js: "6"
4955
os: osx
5056
- stage: platform-test
51-
node_js: "lts/argon"
57+
node_js: "4"
5258
os: linux
5359
- stage: platform-test
54-
node_js: "lts/argon"
60+
node_js: "4"
5561
os: osx
5662
- stage: platform-test
5763
node_js: "0.12"
@@ -74,7 +80,7 @@ before_install:
7480
- echo $TRAVIS_NODE_VERSION
7581
- npm config set python `which python`
7682
- if [ $TRAVIS_OS_NAME == "linux" ]; then
77-
if [[ $(node -v) =~ v1[01] ]]; then
83+
if [[ $(node -v) =~ v[1-9][0-9] ]]; then
7884
export CC="gcc-4.9";
7985
export CXX="g++-4.9";
8086
export LINK="gcc-4.9";

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v4.12.0
2+
3+
https://github.com/sass/node-sass/releases/tag/v4.12.0
4+
15
## v4.11.0
26

37
https://github.com/sass/node-sass/releases/tag/v4.11.0

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
NodeJS | Minimum node-sass version | Node Module
66
--------|--------------------------|------------
7+
Node 12 | 4.12+ | 72
78
Node 11 | 4.10+ | 67
89
Node 10 | 4.9+ | 64
910
Node 8 | 4.5.3+ | 57

‎appveyor.yml‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,18 @@
6868
GYP_MSVS_VERSION: 2015
6969
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
7070
- nodejs_version: 10
71-
GYP_MSVS_VERSION: 2015
72-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
71+
GYP_MSVS_VERSION: 2017
72+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
7373
- nodejs_version: 11
74-
GYP_MSVS_VERSION: 2015
75-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
74+
GYP_MSVS_VERSION: 2017
75+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
76+
- nodejs_version: 12
77+
GYP_MSVS_VERSION: 2017
78+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
7679

7780
install:
78-
- ps: Install-Product node $env:nodejs_version $env:platform
81+
# https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
82+
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
7983
- node --version
8084
- npm --version
8185
- npm install
@@ -161,14 +165,18 @@
161165
GYP_MSVS_VERSION: 2015
162166
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
163167
- nodejs_version: 10
164-
GYP_MSVS_VERSION: 2015
165-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
168+
GYP_MSVS_VERSION: 2017
169+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
166170
- nodejs_version: 11
167-
GYP_MSVS_VERSION: 2015
168-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
169-
171+
GYP_MSVS_VERSION: 2017
172+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
173+
- nodejs_version: 12
174+
GYP_MSVS_VERSION: 2017
175+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
176+
170177
install:
171-
- ps: Install-Product node $env:nodejs_version $env:platform
178+
# https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
179+
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
172180
- node --version
173181
- npm --version
174182
- npm install

‎binding.gyp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
}
2929
},
3030
'xcode_settings': {
31-
'OTHER_CPLUSPLUSFLAGS': [
32-
'-std=c++11'
33-
],
31+
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
32+
'CLANG_CXX_LIBRARY': 'libc++',
3433
'OTHER_LDFLAGS': [],
3534
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
3635
'MACOSX_DEPLOYMENT_TARGET': '10.7'

‎lib/extensions.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ function getHumanNodeVersion(abi) {
7777
case 59: return 'Node.js 9.x';
7878
case 64: return 'Node.js 10.x';
7979
case 67: return 'Node.js 11.x';
80+
case 72: return 'Node.js 12.x';
8081
default: return false;
8182
}
8283
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"lodash": "^4.17.11",
6464
"meow": "^3.7.0",
6565
"mkdirp": "^0.5.1",
66-
"nan": "^2.10.0",
66+
"nan": "^2.13.2",
6767
"node-gyp": "^3.8.0",
6868
"npmlog": "^4.0.0",
6969
"request": "^2.88.0",

‎src/create_string.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
char* create_string(Nan::MaybeLocal<v8::Value> maybevalue) {
77
v8::Local<v8::Value> value;
8-
8+
99
if (maybevalue.ToLocal(&value)) {
1010
if (value->IsNull() || !value->IsString()) {
1111
return 0;
@@ -14,7 +14,7 @@ char* create_string(Nan::MaybeLocal<v8::Value> maybevalue) {
1414
return 0;
1515
}
1616

17-
v8::String::Utf8Value string(value);
17+
Nan::Utf8String string(value);
1818
char *str = (char *)malloc(string.length() + 1);
1919
strcpy(str, *string);
2020
return str;

0 commit comments

Comments
 (0)