From 7171a1211403f0f446e0707f5599fb2ffb511521 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 13 Oct 2015 14:04:23 -0400 Subject: [PATCH 1/2] Revert "[node] pin to Node.js v4.1 until #2597 is resolved" This reverts commit d1029d0fac12f678c9ecd68a603231ed036b4fbd. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 415c2e33d2f..d9e0cdb179d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ matrix: apt: packages: [ 'lib32stdc++6' ] - os: linux - env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4.1 + env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4 addons: apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] @@ -79,7 +79,7 @@ matrix: - os: osx osx_image: xcode7 compiler: clang - env: FLAVOR=node NODE_VERSION=4.1 + env: FLAVOR=node NODE_VERSION=4 - os: osx osx_image: xcode7 compiler: clang From 966397d00ee7cf4061b2cf30336bcdf3f95d0be0 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 13 Oct 2015 14:19:19 -0400 Subject: [PATCH 2/2] [node] update dependencies --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e5d78541118..3cbdf27fe51 100644 --- a/package.json +++ b/package.json @@ -18,17 +18,17 @@ } ], "dependencies": { - "nan": "^2.0.9", - "node-pre-gyp": "^0.6.11" + "nan": "^2.1.0", + "node-pre-gyp": "^0.6.12" }, "bundledDependencies": [ "node-pre-gyp" ], "devDependencies": { - "aws-sdk": "^2.1.47", + "aws-sdk": "^2.2.9", "mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#9b3df7ea2751d076abf31015e20d5f3137cd10f6", - "request": "^2.61.0", - "tape": "^4.2.0" + "request": "^2.65.0", + "tape": "^4.2.1" }, "scripts": { "install": "node-pre-gyp install --fallback-to-build=false || make node",