From fd816b1349506fb40c4229e470c0ef5c32de1e80 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Fri, 11 Mar 2016 05:59:47 -0800 Subject: [PATCH] Update node-haste and replace fast-path with node-haste's version to fix Windows compatibility Summary:This is the last bits needed to fix Windows compatibility on master, most of the work was done in node-haste. **Test plan** Run npm test Run the packager using Windows and Mac cc cpojer davidaurelio Closes https://github.com/facebook/react-native/pull/6260 Reviewed By: dmmiller, bestander Differential Revision: D3005397 Pulled By: davidaurelio fb-gh-sync-id: e16847808ebfa8b234315b2093dba204c9c1e869 shipit-source-id: e16847808ebfa8b234315b2093dba204c9c1e869 --- npm-shrinkwrap.json | 160 ++++++++++++++++--------------- package.json | 5 +- packager/react-packager/index.js | 2 +- 3 files changed, 85 insertions(+), 82 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b04506d19..b321fab57 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -142,15 +142,15 @@ "from": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz" }, - "recast": { - "version": "0.10.33", - "from": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz" - }, "regenerator": { "version": "0.8.40", "from": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz", "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz" + }, + "recast": { + "version": "0.10.33", + "from": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz" } } }, @@ -2191,11 +2191,6 @@ "from": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz" }, - "fast-path": { - "version": "1.1.0", - "from": "fast-path@*", - "resolved": "https://registry.npmjs.org/fast-path/-/fast-path-1.1.0.tgz" - }, "fbjs": { "version": "0.7.2", "from": "fbjs@0.7.2", @@ -3555,16 +3550,6 @@ } } }, - "abbrev": { - "version": "1.0.7", - "from": "abbrev@1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" - }, - "ansi": { - "version": "0.3.0", - "from": "ansi@~0.3.0", - "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz" - }, "ansi-regex": { "version": "2.0.0", "from": "ansi-regex@^2.0.0", @@ -3590,31 +3575,36 @@ "from": "assert-plus@^0.1.5", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" }, - "async": { - "version": "1.5.0", - "from": "async@^1.4.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" + "ansi": { + "version": "0.3.0", + "from": "ansi@~0.3.0", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz" }, "aws-sign2": { "version": "0.6.0", "from": "aws-sign2@~0.6.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, + "async": { + "version": "1.5.0", + "from": "async@^1.4.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" + }, "balanced-match": { "version": "0.2.1", "from": "balanced-match@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz" }, - "boom": { - "version": "2.10.1", - "from": "boom@^2.8.x", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" - }, "block-stream": { "version": "0.0.8", "from": "block-stream@*", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz" }, + "boom": { + "version": "2.10.1", + "from": "boom@^2.8.x", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + }, "brace-expansion": { "version": "1.1.1", "from": "brace-expansion@>=1.0.0 <2.0.0", @@ -3660,36 +3650,36 @@ "from": "ctype@0.5.3", "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz" }, - "delayed-stream": { - "version": "1.0.0", - "from": "delayed-stream@~1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + "debug": { + "version": "0.7.4", + "from": "debug@~0.7.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" }, "deep-extend": { "version": "0.2.11", "from": "deep-extend@~0.2.5", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz" }, + "delayed-stream": { + "version": "1.0.0", + "from": "delayed-stream@~1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + }, "delegates": { "version": "0.1.0", "from": "delegates@^0.1.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz" }, - "debug": { - "version": "0.7.4", - "from": "debug@~0.7.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz" + "extend": { + "version": "3.0.0", + "from": "extend@~3.0.0", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", "from": "escape-string-regexp@^1.0.2", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, - "extend": { - "version": "3.0.0", - "from": "extend@~3.0.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" - }, "forever-agent": { "version": "0.6.1", "from": "forever-agent@~0.6.1", @@ -3710,20 +3700,20 @@ "from": "gauge@~1.2.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz" }, - "generate-object-property": { - "version": "1.2.0", - "from": "generate-object-property@^1.1.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" + "generate-function": { + "version": "2.0.0", + "from": "generate-function@^2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" }, "graceful-fs": { "version": "4.1.2", "from": "graceful-fs@4.1", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" }, - "generate-function": { - "version": "2.0.0", - "from": "generate-function@^2.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + "generate-object-property": { + "version": "1.2.0", + "from": "generate-object-property@^1.1.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" }, "graceful-readlink": { "version": "1.0.1", @@ -3745,16 +3735,16 @@ "from": "has-unicode@^1.0.0", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz" }, - "hoek": { - "version": "2.16.3", - "from": "hoek@2.x.x", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" - }, "hawk": { "version": "3.1.0", "from": "hawk@~3.1.0", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz" }, + "hoek": { + "version": "2.16.3", + "from": "hoek@2.x.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + }, "http-signature": { "version": "0.11.0", "from": "http-signature@~0.11.0", @@ -3765,6 +3755,11 @@ "from": "inherits@*", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, + "abbrev": { + "version": "1.0.7", + "from": "abbrev@1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + }, "ini": { "version": "1.3.4", "from": "ini@~1.3.0", @@ -3780,31 +3775,31 @@ "from": "is-property@^1.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" }, - "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "isstream": { "version": "0.1.2", "from": "isstream@~0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, "json-stringify-safe": { "version": "5.0.1", "from": "json-stringify-safe@~5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, - "jsonpointer": { - "version": "2.0.0", - "from": "jsonpointer@2.0.0", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" - }, "lodash._basetostring": { "version": "3.0.1", "from": "lodash._basetostring@^3.0.0", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz" }, + "jsonpointer": { + "version": "2.0.0", + "from": "jsonpointer@2.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" + }, "lodash._createpadding": { "version": "3.6.1", "from": "lodash._createpadding@^3.0.0", @@ -3815,16 +3810,16 @@ "from": "lodash.pad@^3.0.0", "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz" }, - "lodash.padleft": { - "version": "3.1.1", - "from": "lodash.padleft@^3.0.0", - "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz" - }, "lodash.padright": { "version": "3.1.1", "from": "lodash.padright@^3.0.0", "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz" }, + "lodash.padleft": { + "version": "3.1.1", + "from": "lodash.padleft@^3.0.0", + "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz" + }, "lodash.repeat": { "version": "3.0.1", "from": "lodash.repeat@^3.0.0", @@ -3890,16 +3885,16 @@ "from": "qs@~5.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" }, - "request": { - "version": "2.65.0", - "from": "request@2.x", - "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz" - }, "readable-stream": { "version": "1.1.13", "from": "readable-stream@^1.1.13", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" }, + "request": { + "version": "2.65.0", + "from": "request@2.x", + "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz" + }, "semver": { "version": "5.0.3", "from": "semver@~5.0.1", @@ -4343,6 +4338,11 @@ "from": "diff@>=2.1.1 <3.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz" }, + "fast-path": { + "version": "1.1.0", + "from": "fast-path@*", + "resolved": "https://registry.npmjs.org/fast-path/-/fast-path-1.1.0.tgz" + }, "graceful-fs": { "version": "4.1.3", "from": "graceful-fs@>=4.1.3 <5.0.0", @@ -5599,10 +5599,14 @@ } }, "node-haste": { - "version": "2.4.0", - "from": "node-haste@2.4.0", - "resolved": "https://registry.npmjs.org/node-haste/-/node-haste-2.4.0.tgz", + "version": "2.8.0", + "from": "node-haste@>=2.8.0 <2.9.0", "dependencies": { + "denodeify": { + "version": "1.2.1", + "from": "denodeify@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz" + }, "graceful-fs": { "version": "4.1.3", "from": "graceful-fs@>=4.1.3 <5.0.0", diff --git a/package.json b/package.json index b1b8080c7..abe31667e 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "unmockedModulePathPatterns": [ "promise", "source-map", - "fast-path", + "node-haste/lib/fastpath", "fbjs" ] }, @@ -142,7 +142,6 @@ "connect": "^2.8.3", "debug": "^2.2.0", "event-target-shim": "^1.0.5", - "fast-path": "^1.1.0", "fbjs": "^0.7.2", "fbjs-scripts": "^0.4.0", "graceful-fs": "^4.1.2", @@ -156,7 +155,7 @@ "mkdirp": "^0.5.1", "module-deps": "^3.9.1", "node-fetch": "^1.3.3", - "node-haste": "~2.4.0", + "node-haste": "~2.8.0", "opn": "^3.0.2", "optimist": "^0.6.1", "progress": "^1.1.8", diff --git a/packager/react-packager/index.js b/packager/react-packager/index.js index dce805c8b..49848eded 100644 --- a/packager/react-packager/index.js +++ b/packager/react-packager/index.js @@ -10,7 +10,7 @@ require('../babelRegisterOnly')([/react-packager\/src/]); -require('fast-path').replace(); +require('node-haste/lib/fastpath').replace(); useGracefulFs(); var debug = require('debug');