diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile index 9a169516c20..3dc82049b8e 100644 --- a/build/docker/debian/Dockerfile +++ b/build/docker/debian/Dockerfile @@ -113,12 +113,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ neko-dev \ libneko0 -RUN apt-get update && apt-get install -y --no-install-recommends \ +# Node.js dependencies - THRIFT-4064 says it must be >= 4.x +RUN curl -sL https://deb.nodesource.com/setup_4.x | bash - +RUN apt-get install -y --no-install-recommends \ `# Node.js dependencies` \ - nodejs \ - nodejs-dev \ - nodejs-legacy \ - npm + nodejs RUN apt-get update && apt-get install -y --no-install-recommends \ `# CSharp dependencies` \ diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile index b6cebb3ea20..525a9f54ea1 100644 --- a/build/docker/ubuntu/Dockerfile +++ b/build/docker/ubuntu/Dockerfile @@ -131,11 +131,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ neko-dev \ libneko0 -RUN apt-get update && apt-get install -y --no-install-recommends \ +# Node.js dependencies - THRIFT-4064 says it must be >= 4.x +RUN curl -sL https://deb.nodesource.com/setup_4.x | bash - +RUN apt-get install -y --no-install-recommends \ `# Node.js dependencies` \ - nodejs \ - nodejs-dev \ - nodejs-legacy + nodejs RUN apt-get update && apt-get install -y --no-install-recommends \ `# CSharp dependencies` \ @@ -183,9 +183,6 @@ RUN mkdir -p /usr/lib/haxe && \ haxelib setup /usr/lib/haxe/lib && \ haxelib install hxcpp -# Node.js -RUN curl -sSL https://www.npmjs.com/install.sh | sh - # D RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \ dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \ diff --git a/package.json b/package.json index d5276415948..5e02eb5a6a3 100644 --- a/package.json +++ b/package.json @@ -32,20 +32,22 @@ }, "main": "./lib/nodejs/lib/thrift", "engines": { - "node": ">= 0.2.4" + "node": ">= 0.12.0" }, "dependencies": { - "node-int64": "~0.3.0", - "q": "1.0.x", - "ws": "~0.4.32" + "node-int64": "^0.4.0", + "q": "^1.0.0", + "ws": "^1.0.0" }, "devDependencies": { "buffer-equals": "^1.0.3", + "bufferutil": "~2.0.0", "commander": "2.1.x", "connect": "2.7.x", "istanbul": "^0.3.5", "run-browser": "^2.0.1", - "tape": "~3.5.0" + "tape": "~3.5.0", + "utf-8-validate": "~3.0.0" }, "scripts": { "cover": "lib/nodejs/test/testAll.sh COVER",