From f9f056612f9fedf231b670a8f1eb85e57d07a0b1 Mon Sep 17 00:00:00 2001 From: Lucas Duailibe Date: Sun, 26 Nov 2017 23:14:45 -0300 Subject: [PATCH] Update flow to 0.59.0 (#3238) --- package.json | 4 +-- scripts/build/rollup.parser.config.js | 9 ++++++ .../fetch/__snapshots__/jsfmt.spec.js.snap | 24 +++++++-------- tests/flow/fetch/headers.js | 6 ++-- tests/flow/fetch/urlsearchparams.js | 6 ++-- .../__snapshots__/jsfmt.spec.js.snap | 4 --- tests/flow/interface/test.js | 2 -- tests/flow_class_field/jsfmt.spec.js | 2 +- .../newline/__snapshots__/jsfmt.spec.js.snap | 6 ++-- yarn.lock | 30 +++++++++---------- 10 files changed, 49 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index 42866be3..69ca9cce 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "emoji-regex": "6.5.1", "escape-string-regexp": "1.0.5", "esutils": "2.0.2", - "flow-parser": "0.51.1", + "flow-parser": "0.59.0", "get-stream": "3.0.0", "globby": "6.1.0", "graphql": "0.10.5", @@ -72,7 +72,7 @@ "rollup-plugin-node-builtins": "2.0.0", "rollup-plugin-node-globals": "1.1.0", "rollup-plugin-node-resolve": "2.0.0", - "rollup-plugin-replace": "1.1.1", + "rollup-plugin-replace": "1.2.1", "shelljs": "0.7.8", "strip-ansi": "4.0.0", "sw-toolbox": "3.6.0", diff --git a/scripts/build/rollup.parser.config.js b/scripts/build/rollup.parser.config.js index aa66579f..71f387fe 100644 --- a/scripts/build/rollup.parser.config.js +++ b/scripts/build/rollup.parser.config.js @@ -18,6 +18,15 @@ export default Object.assign(baseConfig, { include: "node_modules/typescript-eslint-parser/parser.js" }) : {}, + // In flow-parser 0.59.0 there's a dynamic require: `require(s8)` which not + // supported by rollup-plugin-commonjs, so we have to replace the variable + // by its value before bundling. + parser === "flow" + ? replace({ + "require(s8)": 'require("fs")', + include: "node_modules/flow-parser/flow_parser.js" + }) + : {}, json(), resolve({ preferBuiltins: true }), commonjs(), diff --git a/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap b/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap index 9524085a..0a863f7c 100644 --- a/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap @@ -58,15 +58,15 @@ exports[`headers.js 1`] = ` const a = new Headers("'Content-Type': 'image/jpeg'"); // not correct const b = new Headers(['Content-Type', 'image/jpeg']); // not correct -const c = new Headers({'Content-Type', 'image/jpeg'}); // correct +const c = new Headers({'Content-Type': 'image/jpeg'}); // correct const d = new Headers(c); // correct const e: Headers = new Headers(); // correct e.append('Content-Type', 'image/jpeg'); // correct e.append('Content-Type'); // not correct -e.append({'Content-Type', 'image/jpeg'}); // not correct +e.append({'Content-Type': 'image/jpeg'}); // not correct e.set('Content-Type', 'image/jpeg'); // correct e.set('Content-Type'); // not correct -e.set({'Content-Type', 'image/jpeg'}); // not correct +e.set({'Content-Type': 'image/jpeg'}); // not correct const f: Headers = e.append('Content-Type', 'image/jpeg'); // not correct @@ -91,15 +91,15 @@ e.forEach(() => {}, {}); // correct const a = new Headers("'Content-Type': 'image/jpeg'"); // not correct const b = new Headers(["Content-Type", "image/jpeg"]); // not correct -const c = new Headers({ "Content-Type", "image/jpeg" }); // correct +const c = new Headers({ "Content-Type": "image/jpeg" }); // correct const d = new Headers(c); // correct const e: Headers = new Headers(); // correct e.append("Content-Type", "image/jpeg"); // correct e.append("Content-Type"); // not correct -e.append({ "Content-Type", "image/jpeg" }); // not correct +e.append({ "Content-Type": "image/jpeg" }); // not correct e.set("Content-Type", "image/jpeg"); // correct e.set("Content-Type"); // not correct -e.set({ "Content-Type", "image/jpeg" }); // not correct +e.set({ "Content-Type": "image/jpeg" }); // not correct const f: Headers = e.append("Content-Type", "image/jpeg"); // not correct @@ -351,15 +351,15 @@ exports[`urlsearchparams.js 1`] = ` const a = new URLSearchParams("key1=value1"); // correct const b = new URLSearchParams(['key1', 'value1']); // not correct -const c = new URLSearchParams({'key1', 'value1'}); // not correct +const c = new URLSearchParams({'key1': 'value1'}); // not correct const d = new URLSearchParams(c); // correct const e: URLSearchParams = new URLSearchParams(); // correct e.append('key1', 'value1'); // correct e.append('key1'); // not correct -e.append({'key1', 'value1'}); // not correct +e.append({'key1': 'value1'}); // not correct e.set('key1', 'value1'); // correct e.set('key1'); // not correct -e.set({'key1', 'value1'}); // not correct +e.set({'key1': 'value1'}); // not correct const f: URLSearchParams = e.append('key1', 'value1'); // not correct @@ -385,15 +385,15 @@ e.forEach(() => {}, {}); // correct const a = new URLSearchParams("key1=value1"); // correct const b = new URLSearchParams(["key1", "value1"]); // not correct -const c = new URLSearchParams({ "key1", "value1" }); // not correct +const c = new URLSearchParams({ key1: "value1" }); // not correct const d = new URLSearchParams(c); // correct const e: URLSearchParams = new URLSearchParams(); // correct e.append("key1", "value1"); // correct e.append("key1"); // not correct -e.append({ "key1", "value1" }); // not correct +e.append({ key1: "value1" }); // not correct e.set("key1", "value1"); // correct e.set("key1"); // not correct -e.set({ "key1", "value1" }); // not correct +e.set({ key1: "value1" }); // not correct const f: URLSearchParams = e.append("key1", "value1"); // not correct diff --git a/tests/flow/fetch/headers.js b/tests/flow/fetch/headers.js index d58f97d5..522f41be 100644 --- a/tests/flow/fetch/headers.js +++ b/tests/flow/fetch/headers.js @@ -2,15 +2,15 @@ const a = new Headers("'Content-Type': 'image/jpeg'"); // not correct const b = new Headers(['Content-Type', 'image/jpeg']); // not correct -const c = new Headers({'Content-Type', 'image/jpeg'}); // correct +const c = new Headers({'Content-Type': 'image/jpeg'}); // correct const d = new Headers(c); // correct const e: Headers = new Headers(); // correct e.append('Content-Type', 'image/jpeg'); // correct e.append('Content-Type'); // not correct -e.append({'Content-Type', 'image/jpeg'}); // not correct +e.append({'Content-Type': 'image/jpeg'}); // not correct e.set('Content-Type', 'image/jpeg'); // correct e.set('Content-Type'); // not correct -e.set({'Content-Type', 'image/jpeg'}); // not correct +e.set({'Content-Type': 'image/jpeg'}); // not correct const f: Headers = e.append('Content-Type', 'image/jpeg'); // not correct diff --git a/tests/flow/fetch/urlsearchparams.js b/tests/flow/fetch/urlsearchparams.js index c3973b0b..1560a2b0 100644 --- a/tests/flow/fetch/urlsearchparams.js +++ b/tests/flow/fetch/urlsearchparams.js @@ -2,15 +2,15 @@ const a = new URLSearchParams("key1=value1"); // correct const b = new URLSearchParams(['key1', 'value1']); // not correct -const c = new URLSearchParams({'key1', 'value1'}); // not correct +const c = new URLSearchParams({'key1': 'value1'}); // not correct const d = new URLSearchParams(c); // correct const e: URLSearchParams = new URLSearchParams(); // correct e.append('key1', 'value1'); // correct e.append('key1'); // not correct -e.append({'key1', 'value1'}); // not correct +e.append({'key1': 'value1'}); // not correct e.set('key1', 'value1'); // correct e.set('key1'); // not correct -e.set({'key1', 'value1'}); // not correct +e.set({'key1': 'value1'}); // not correct const f: URLSearchParams = e.append('key1', 'value1'); // not correct diff --git a/tests/flow/interface/__snapshots__/jsfmt.spec.js.snap b/tests/flow/interface/__snapshots__/jsfmt.spec.js.snap index dec814f2..87cf40a8 100644 --- a/tests/flow/interface/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/interface/__snapshots__/jsfmt.spec.js.snap @@ -74,8 +74,6 @@ var k: K = { x: "", y: "" }; // error: x should be number (k.y: string); declare class C { x: number } -declare class D extends C, Other { } // error: multiple extends -//declare class E implements I { } // parse error interface A { y: Y } interface A_ { x: X } @@ -97,8 +95,6 @@ var k: K = { x: "", y: "" }; // error: x should be number (k.y: string); declare class C { x: number } -declare class D extends C, Other {} // error: multiple extends -//declare class E implements I { } // parse error interface A { y: Y } interface A_ { x: X } diff --git a/tests/flow/interface/test.js b/tests/flow/interface/test.js index 1b071ece..058f6247 100644 --- a/tests/flow/interface/test.js +++ b/tests/flow/interface/test.js @@ -8,8 +8,6 @@ var k: K = { x: "", y: "" }; // error: x should be number (k.y: string); declare class C { x: number } -declare class D extends C, Other { } // error: multiple extends -//declare class E implements I { } // parse error interface A { y: Y } interface A_ { x: X } diff --git a/tests/flow_class_field/jsfmt.spec.js b/tests/flow_class_field/jsfmt.spec.js index 1840e9d3..f974ed6c 100644 --- a/tests/flow_class_field/jsfmt.spec.js +++ b/tests/flow_class_field/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, null, ["babylon"]); +run_spec(__dirname, { parser: "babylon" }); diff --git a/tests/newline/__snapshots__/jsfmt.spec.js.snap b/tests/newline/__snapshots__/jsfmt.spec.js.snap index 50be9785..3f0f4aeb 100644 --- a/tests/newline/__snapshots__/jsfmt.spec.js.snap +++ b/tests/newline/__snapshots__/jsfmt.spec.js.snap @@ -3,13 +3,15 @@ exports[`backslash_2028.js 1`] = ` 1;/*a*///b
/*c*/2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1; /*a*/ //b
/*c*/2 +1; /*a*/ //b +/*c*/ 2; `; exports[`backslash_2029.js 1`] = ` 1;/*a*///b
/*c*/2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1; /*a*/ //b
/*c*/2 +1; /*a*/ //b +/*c*/ 2; `; diff --git a/yarn.lock b/yarn.lock index 0d3a8a3c..7e4276f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1768,9 +1768,9 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -flow-parser@0.51.1: - version "0.51.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.51.1.tgz#145d3bdce13857a72ec72938a9a700b534055b32" +flow-parser@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.59.0.tgz#f6ebcae61ffa187e420999d40ce0a801f39b2635" for-in@^1.0.1: version "1.0.2" @@ -2885,12 +2885,6 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" -magic-string@^0.15.2: - version "0.15.2" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.15.2.tgz#0681d7388741bbc3addaa65060992624c6c09e9c" - dependencies: - vlq "^0.2.1" - magic-string@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.16.0.tgz#970ebb0da7193301285fb1aa650f39bdd81eb45a" @@ -2903,6 +2897,12 @@ magic-string@^0.19.0: dependencies: vlq "^0.2.1" +magic-string@^0.22.4: + version "0.22.4" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff" + dependencies: + vlq "^0.2.1" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -3888,15 +3888,15 @@ rollup-plugin-node-resolve@2.0.0: builtin-modules "^1.1.0" resolve "^1.1.6" -rollup-plugin-replace@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-1.1.1.tgz#396315ded050a6ce43b9518a886a3f60efb1ea33" +rollup-plugin-replace@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-1.2.1.tgz#6307ee15f223aa1fd3207cd3c08052468f180daf" dependencies: - magic-string "^0.15.2" + magic-string "^0.22.4" minimatch "^3.0.2" - rollup-pluginutils "^1.5.0" + rollup-pluginutils "^2.0.1" -rollup-pluginutils@^1.5.0, rollup-pluginutils@^1.5.2: +rollup-pluginutils@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" dependencies: