From 6b610995be4eba44eb51cc1a96c9bb4b6e9b8496 Mon Sep 17 00:00:00 2001 From: Konstantin Raev Date: Wed, 9 Mar 2016 06:08:22 -0800 Subject: [PATCH] Fixes to flow after trunk was broken Reviewed By: mkonicek Differential Revision: D3029511 fb-gh-sync-id: c7ac945de1676ad03136c83cbcb5a75f5a0b82b6 shipit-source-id: c7ac945de1676ad03136c83cbcb5a75f5a0b82b6 --- .flowconfig | 3 ++ npm-shrinkwrap.json | 122 ++++++++++++++++++++++---------------------- package.json | 2 +- scripts/e2e-test.sh | 3 -- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.flowconfig b/.flowconfig index 7bf00c596..f3270cc7f 100644 --- a/.flowconfig +++ b/.flowconfig @@ -55,6 +55,9 @@ .*/node_modules/builtin-modules/builtin-modules.json .*/node_modules/binary-extensions/binary-extensions.json .*/node_modules/url-regex/tlds.json +.*/node_modules/joi/.*\.json +.*/build/.*\.json +.*/\.buckd/.* [include] diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 830a3defa..72b94ae6a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -142,16 +142,16 @@ "from": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz" }, - "js-tokens": { - "version": "1.0.1", - "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" }, + "js-tokens": { + "version": "1.0.1", + "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" + }, "regenerator": { "version": "0.8.40", "from": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz", @@ -2167,9 +2167,9 @@ } }, "flow-bin": { - "version": "0.22.1", - "from": "flow-bin@latest", - "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.22.1.tgz", + "version": "0.22.0", + "from": "flow-bin@0.22.0", + "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.22.0.tgz", "dependencies": { "bin-wrapper": { "version": "2.1.3", @@ -2193,7 +2193,7 @@ "dependencies": { "concat-stream": { "version": "1.5.1", - "from": "concat-stream@>=1.4.6 <2.0.0", + "from": "concat-stream@>=1.4.7 <2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz", "dependencies": { "typedarray": { @@ -2330,7 +2330,7 @@ }, "is-absolute": { "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", + "from": "is-absolute@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", "dependencies": { "is-relative": { @@ -2417,7 +2417,7 @@ "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "ansi-regex@>=0.2.1 <0.3.0", + "from": "ansi-regex@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } @@ -2429,7 +2429,7 @@ "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "ansi-regex@>=0.2.1 <0.3.0", + "from": "ansi-regex@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } @@ -2508,7 +2508,7 @@ }, "is-absolute": { "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", + "from": "is-absolute@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", "dependencies": { "is-relative": { @@ -2585,7 +2585,7 @@ }, "is-absolute": { "version": "0.1.7", - "from": "is-absolute@>=0.1.7 <0.2.0", + "from": "is-absolute@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", "dependencies": { "is-relative": { @@ -3224,7 +3224,7 @@ "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "ansi-regex@>=0.2.1 <0.3.0", + "from": "ansi-regex@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } @@ -3236,7 +3236,7 @@ "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "ansi-regex@>=0.2.1 <0.3.0", + "from": "ansi-regex@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } @@ -3250,7 +3250,7 @@ }, "lpad-align": { "version": "1.1.0", - "from": "lpad-align@>=1.0.0 <2.0.0", + "from": "lpad-align@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.0.tgz", "dependencies": { "lpad": { @@ -3539,16 +3539,16 @@ "from": "boom@^2.8.x", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, - "caseless": { - "version": "0.11.0", - "from": "caseless@~0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" - }, "brace-expansion": { "version": "1.1.1", "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz" }, + "caseless": { + "version": "0.11.0", + "from": "caseless@~0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + }, "chalk": { "version": "1.1.1", "from": "chalk@^1.1.1", @@ -3569,16 +3569,16 @@ "from": "concat-map@0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" }, - "core-util-is": { - "version": "1.0.1", - "from": "core-util-is@~1.0.0", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, "cryptiles": { "version": "2.0.5", "from": "cryptiles@2.x.x", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" }, + "core-util-is": { + "version": "1.0.1", + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" + }, "ctype": { "version": "0.5.3", "from": "ctype@0.5.3", @@ -3639,16 +3639,16 @@ "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-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-fs": { + "version": "4.1.2", + "from": "graceful-fs@4.1", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" + }, "graceful-readlink": { "version": "1.0.1", "from": "graceful-readlink@>= 1.0.0", @@ -3689,16 +3689,16 @@ "from": "ini@~1.3.0", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" }, - "is-my-json-valid": { - "version": "2.12.2", - "from": "is-my-json-valid@^2.12.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz" - }, "inherits": { "version": "2.0.1", "from": "inherits@*", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, + "is-my-json-valid": { + "version": "2.12.2", + "from": "is-my-json-valid@^2.12.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz" + }, "is-property": { "version": "1.0.2", "from": "is-property@^1.0.0", @@ -3709,16 +3709,16 @@ "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" - }, "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" }, + "isstream": { + "version": "0.1.2", + "from": "isstream@~0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + }, "jsonpointer": { "version": "2.0.0", "from": "jsonpointer@2.0.0", @@ -3759,16 +3759,16 @@ "from": "mime-db@~1.19.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz" }, - "mime-types": { - "version": "2.1.7", - "from": "mime-types@~2.1.7", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz" - }, "minimist": { "version": "0.0.8", "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" }, + "mime-types": { + "version": "2.1.7", + "from": "mime-types@~2.1.7", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz" + }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.3.0 <0.4.0||>=0.4.0 <0.5.0||>=0.5.0 <0.6.0", @@ -3804,16 +3804,16 @@ "from": "pinkie@^1.0.0", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz" }, - "pinkie-promise": { - "version": "1.0.0", - "from": "pinkie-promise@^1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz" - }, "qs": { "version": "5.2.0", "from": "qs@~5.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" }, + "pinkie-promise": { + "version": "1.0.0", + "from": "pinkie-promise@^1.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz" + }, "readable-stream": { "version": "1.1.13", "from": "readable-stream@^1.1.13", @@ -3844,20 +3844,15 @@ "from": "stringstream@~0.0.4", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" }, - "strip-ansi": { - "version": "3.0.0", - "from": "strip-ansi@^3.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" - }, "strip-json-comments": { "version": "0.1.3", "from": "strip-json-comments@0.1.x", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, - "tar": { - "version": "2.2.1", - "from": "tar@~2.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" + "strip-ansi": { + "version": "3.0.0", + "from": "strip-ansi@^3.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz" }, "supports-color": { "version": "2.0.0", @@ -3879,6 +3874,11 @@ "from": "uid-number@0.0.3", "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz" }, + "tar": { + "version": "2.2.1", + "from": "tar@~2.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" + }, "wrappy": { "version": "1.0.1", "from": "wrappy@>=1.0.0 <2.0.0", diff --git a/package.json b/package.json index 9d926ceca..474912460 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "babel-eslint": "^5.0.0", "eslint": "^2.2.0", "eslint-plugin-react": "^4.1.0", - "flow-bin": "^0.22.0", + "flow-bin": "0.22.0", "jest-cli": "0.9.0-fb2", "portfinder": "0.4.0", "react": "^0.14.5" diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh index 7417ec49b..d9cdbb51c 100755 --- a/scripts/e2e-test.sh +++ b/scripts/e2e-test.sh @@ -77,9 +77,6 @@ npm install -g react-native-cli react-native init EndToEndTest cd EndToEndTest -npm install --g flow-bin@0.22.0 -flow --retries 10 - case $1 in "--packager"*) echo "Running a basic packager test"