From 91c20f7fbe22f68480820fcf322e7e099b22d82e Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Thu, 27 Dec 2018 08:05:19 -0500 Subject: [PATCH] Rename "babylon" with "babel" (#5647) --- CONTRIBUTING.md | 2 +- docs/api.md | 8 +- docs/configuration.md | 2 +- docs/options.md | 4 +- src/common/internal-plugins.js | 7 +- src/common/parser-create-error.js | 2 +- src/language-html/syntax-vue.js | 4 +- src/language-html/utils.js | 2 +- src/language-js/index.js | 6 +- src/language-js/parser-babylon.js | 41 ++++--- src/language-js/printer-estree.js | 8 +- src/language-markdown/embed.js | 2 +- src/main/comments.js | 2 +- src/main/core-options.js | 8 +- src/main/core.js | 2 +- src/main/options.js | 4 +- src/main/range-util.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 6 +- tests/arrow-call/jsfmt.spec.js | 6 +- tests/arrows/__snapshots__/jsfmt.spec.js.snap | 40 +++---- tests/arrows/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/arrows_bind/jsfmt.spec.js | 2 +- .../babylon/__snapshots__/jsfmt.spec.js.snap | 2 +- .../babylon/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/async/top-level-await/jsfmt.spec.js | 2 +- .../big-int/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/big-int/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/binary_math/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 20 ++-- tests/bind_expressions/jsfmt.spec.js | 4 +- .../classes/__snapshots__/jsfmt.spec.js.snap | 16 +-- tests/classes/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/classes/top-level-super/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 8 +- tests/classes_private_fields/jsfmt.spec.js | 4 +- .../comments/__snapshots__/jsfmt.spec.js.snap | 58 ++++----- tests/comments/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/comments_jsx_same_line/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- .../comments_pipeline_own_line/jsfmt.spec.js | 2 +- tests/cursor/__snapshots__/jsfmt.spec.js.snap | 44 +++---- tests/cursor/jsfmt.spec.js | 10 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/decorator_comments/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 14 +-- tests/decorators/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/decorators_export/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/destructuring/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 14 +-- tests/directives/jsfmt.spec.js | 2 +- tests/do/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/do/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/dynamic_import/jsfmt.spec.js | 2 +- tests/empty/__snapshots__/jsfmt.spec.js.snap | 8 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/empty_paren_comment/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 6 +- tests/end_of_line/jsfmt.spec.js | 6 +- .../__snapshots__/jsfmt.spec.js.snap | 20 ++-- tests/es6modules/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/export_extension/jsfmt.spec.js | 2 +- .../exports/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/exports/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/expression_statement/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/first_argument_expansion/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 8 +- tests/flow/async_iteration/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 58 ++++----- tests/flow/declare_export/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow/def_site_variance/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 14 +-- tests/flow/dictionary/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- .../flow-typed/jsfmt.spec.js | 4 +- tests/flow/es_declare_module/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- .../jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 12 +- .../getters_and_setters_enabled/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 8 +- tests/flow/more_annot/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 20 ++-- tests/flow/new_spread/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 10 +- tests/flow/object-method/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 12 +- tests/flow/predicates-abstract/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 24 ++-- tests/flow/predicates-declared/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 12 +- tests/flow/predicates-inferred/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 10 +- tests/flow/predicates-parsing/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 58 ++++----- tests/flow/refinements/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow/type-printer/types.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow/typeapp_perf/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_annotation/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_class_field/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 14 +-- .../__snapshots__/jsfmt.spec.js.snap | 4 +- .../flow_comments/babylon_only/jsfmt.spec.js | 2 +- tests/flow_comments/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_export/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 12 +- tests/flow_function_parentheses/jsfmt.spec.js | 6 +- .../__snapshots__/jsfmt.spec.js.snap | 32 ++--- tests/flow_generic/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_interface_types/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_internal_slot/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_intersection/jsfmt.spec.js | 2 +- .../flow_jsx/__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow_jsx/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_maybe/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow_method/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_mixins/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_object_inexact/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow_type_cast/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 20 ++-- tests/flow_type_declarations/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_type_parameters/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_type_spread/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_typeapp_call/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/flow_union/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/flow_variance/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/function_first_param/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 18 +-- tests/functional_composition/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/import_meta/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/import_then/jsfmt.spec.js | 2 +- .../js/__snapshots__/jsfmt.spec.js.snap | 12 +- tests/insert-pragma/js/jsfmt.spec.js | 2 +- .../js_empty/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/js_empty/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx-attr-element/jsfmt.spec.js | 2 +- tests/jsx-do/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx-do/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/jsx-newlines/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx-split-attrs/jsfmt.spec.js | 2 +- tests/jsx/__snapshots__/jsfmt.spec.js.snap | 112 +++++++++--------- tests/jsx/jsfmt.spec.js | 8 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/jsx_escape/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx_fragment/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx_ignore/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/jsx_namespace/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/jsx_spread/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/line_suffix_boundary/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/literal-numeric-separator/jsfmt.spec.js | 2 +- .../literal/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/literal/jsfmt.spec.js | 4 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/multiparser_js_css/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 16 +-- tests/multiparser_js_graphql/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/multiparser_js_html/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 12 +- tests/multiparser_js_markdown/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- .../no-semi-babylon-extensions/jsfmt.spec.js | 4 +- .../no-semi/__snapshots__/jsfmt.spec.js.snap | 44 +++---- tests/no-semi/flow-interfaces.js | 6 +- tests/no-semi/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 6 +- tests/non-strict/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/nullish_coalescing/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 6 +- tests/object-prop-break-in/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/object_property_comment/jsfmt.spec.js | 2 +- .../objects/__snapshots__/jsfmt.spec.js.snap | 10 +- tests/objects/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/optional_catch_binding/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/optional_chaining/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/pipeline_operator/jsfmt.spec.js | 2 +- tests/regex/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/regex/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/require-amd/jsfmt.spec.js | 2 +- .../js/__snapshots__/jsfmt.spec.js.snap | 8 +- tests/require-pragma/js/jsfmt.spec.js | 2 +- tests/rest/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/rest/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/return-outside-function/jsfmt.spec.js | 2 +- .../shebang/__snapshots__/jsfmt.spec.js.snap | 4 +- tests/shebang/jsfmt.spec.js | 2 +- tests/spread/__snapshots__/jsfmt.spec.js.snap | 2 +- tests/spread/jsfmt.spec.js | 2 +- .../template/__snapshots__/jsfmt.spec.js.snap | 16 +-- tests/template/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 2 +- tests/throw_expressions/jsfmt.spec.js | 2 +- .../unicode/__snapshots__/jsfmt.spec.js.snap | 6 +- tests/unicode/jsfmt.spec.js | 2 +- .../__snapshots__/jsfmt.spec.js.snap | 4 +- tests/variable_declarator/jsfmt.spec.js | 2 +- tests/yield/__snapshots__/jsfmt.spec.js.snap | 4 +- tests/yield/jsfmt.spec.js | 2 +- .../__snapshots__/deprecated-parser.js.snap | 7 +- .../__snapshots__/early-exit.js.snap | 8 +- .../__tests__/__snapshots__/file-info.js.snap | 12 +- .../__snapshots__/help-options.js.snap | 4 +- .../__snapshots__/infer-parser.js.snap | 4 +- .../__tests__/__snapshots__/schema.js.snap | 2 +- .../__snapshots__/support-info.js.snap | 33 +++--- tests_integration/__tests__/arg-parsing.js | 2 +- tests_integration/__tests__/check.js | 4 +- tests_integration/__tests__/config-invalid.js | 4 +- tests_integration/__tests__/cursor-offset.js | 4 +- tests_integration/__tests__/debug-check.js | 2 +- .../__tests__/debug-print-doc.js | 8 +- .../__tests__/deprecated-parser.js | 9 +- tests_integration/__tests__/file-info.js | 16 +-- tests_integration/__tests__/list-different.js | 4 +- .../__tests__/multiple-patterns.js | 2 +- tests_integration/__tests__/parser-api.js | 3 +- tests_integration/__tests__/syntax-error.js | 2 +- .../__tests__/with-parser-inference.js | 2 +- .../custom-parsers/custom-rename-parser.js | 2 +- website/playground/codeSamples.js | 2 +- website/playground/markdown.js | 2 +- website/playground/util.js | 2 +- website/static/worker.js | 8 +- 271 files changed, 792 insertions(+), 772 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f0eabcc..90f8c9a6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ Here's what you need to know about the tests: - The tests use [Jest snapshots](https://facebook.github.io/jest/docs/en/snapshot-testing.html). - You can make changes and run `jest -u` (or `yarn test -u`) to update the snapshots. Then run `git diff` to take a look at what changed. Always update the snapshots when opening a PR. - You can run `AST_COMPARE=1 jest` for a more robust test run. That formats each file, re-parses it, and compares the new AST with the original one and makes sure they are semantically equivalent. -- Each test folder has a `jsfmt.spec.js` that runs the tests. For JavaScript files, generally you can just put `run_spec(__dirname, ["babylon", "flow", "typescript"]);` there. This will verify that the output using each parser is the same. You can also pass options as the third argument, like this: `run_spec(__dirname, ["babylon"], { trailingComma: "es5" });` +- Each test folder has a `jsfmt.spec.js` that runs the tests. For JavaScript files, generally you can just put `run_spec(__dirname, ["babel", "flow", "typescript"]);` there. This will verify that the output using each parser is the same. You can also pass options as the third argument, like this: `run_spec(__dirname, ["babel"], { trailingComma: "es5" });` - `tests/flow/` contains the Flow test suite, and is not supposed to be edited by hand. To update it, clone the Flow repo next to the Prettier repo and run: `node scripts/sync-flow-tests.js ../flow/tests/`. - If you would like to debug prettier locally, you can either debug it in node or the browser. The easiest way to debug it in the browser is to run the interactive `docs` REPL locally. The easiest way to debug it in node, is to create a local test file and run it in an editor like VS Code. diff --git a/docs/api.md b/docs/api.md index ff4835f6..6705dc3d 100644 --- a/docs/api.md +++ b/docs/api.md @@ -12,7 +12,7 @@ const prettier = require("prettier"); `format` is used to format text using Prettier. [Options](options.md) may be provided to override the defaults. ```js -prettier.format("foo ( );", { semi: false, parser: "babylon" }); +prettier.format("foo ( );", { semi: false, parser: "babel" }); // -> "foo()" ``` @@ -27,7 +27,7 @@ prettier.format("foo ( );", { semi: false, parser: "babylon" }); The `cursorOffset` option should be provided, to specify where the cursor is. This option cannot be used with `rangeStart` and `rangeEnd`. ```js -prettier.formatWithCursor(" 1", { cursorOffset: 2, parser: "babylon" }); +prettier.formatWithCursor(" 1", { cursorOffset: 2, parser: "babel" }); // -> { formatted: '1;\n', cursorOffset: 1 } ``` @@ -130,8 +130,8 @@ Prettier's built-in parsers are exposed as properties on the `parsers` argument. ```js prettier.format("lodash ( )", { - parser(text, { babylon }) { - const ast = babylon(text); + parser(text, { babel }) { + const ast = babel(text); ast.program.body[0].expression.callee.name = "_"; return ast; } diff --git a/docs/configuration.md b/docs/configuration.md index add92f63..aaf45590 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -108,7 +108,7 @@ For example, to get Prettier to format its own `.prettierrc` file, you can do: } ``` -You can also switch to the `flow` parser instead of the default `babylon` for .js files: +You can also switch to the `flow` parser instead of the default `babel` for .js files: ```json { diff --git a/docs/options.md b/docs/options.md index 34fbd02f..5218b0fb 100644 --- a/docs/options.md +++ b/docs/options.md @@ -176,11 +176,11 @@ Specify which parser to use. Prettier automatically infers the parser from the input file path, so you shouldn't have to change this setting. -Both the `babylon` and `flow` parsers support the same set of JavaScript features (including Flow type annotations). They might differ in some edge cases, so if you run into one of those you can try `flow` instead of `babylon`. +Both the `babel` and `flow` parsers support the same set of JavaScript features (including Flow type annotations). They might differ in some edge cases, so if you run into one of those you can try `flow` instead of `babel`. Valid options: -- `"babylon"` (via [@babel/parser](https://github.com/babel/babel/tree/master/packages/babel-parser)) +- `"babel"` (via [@babel/parser](https://github.com/babel/babel/tree/master/packages/babel-parser)) _Named `"babylon"` until v1.16.0_ - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser)) - `"typescript"` (via [typescript-estree](https://github.com/JamesHenry/typescript-estree)) _First available in v1.4.0_ - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_ diff --git a/src/common/internal-plugins.js b/src/common/internal-plugins.js index 9be225ec..03ecc18d 100644 --- a/src/common/internal-plugins.js +++ b/src/common/internal-plugins.js @@ -10,9 +10,12 @@ module.exports = [ require("../language-js"), { parsers: { - // JS - Babylon + // JS - Babel + get babel() { + return eval("require")("../language-js/parser-babylon").parsers.babel; + }, get babylon() { - return eval("require")("../language-js/parser-babylon").parsers.babylon; + return eval("require")("../language-js/parser-babylon").parsers.babel; }, get json() { return eval("require")("../language-js/parser-babylon").parsers.json; diff --git a/src/common/parser-create-error.js b/src/common/parser-create-error.js index 13aaabfa..d96df606 100644 --- a/src/common/parser-create-error.js +++ b/src/common/parser-create-error.js @@ -1,7 +1,7 @@ "use strict"; function createError(message, loc) { - // Construct an error similar to the ones thrown by Babylon. + // Construct an error similar to the ones thrown by Babel. const error = new SyntaxError( message + " (" + loc.start.line + ":" + loc.start.column + ")" ); diff --git a/src/language-html/syntax-vue.js b/src/language-html/syntax-vue.js index eb869854..b6cf0b02 100644 --- a/src/language-html/syntax-vue.js +++ b/src/language-html/syntax-vue.js @@ -15,7 +15,7 @@ function printVueFor(value, textToDoc) { return concat([ group( textToDoc(`function _(${left}) {}`, { - parser: "babylon", + parser: "babel", __isVueForBindingLeft: true }) ), @@ -61,7 +61,7 @@ function parseVueFor(value) { function printVueSlotScope(value, textToDoc) { return textToDoc(`function _(${value}) {}`, { - parser: "babylon", + parser: "babel", __isVueSlotScope: true }); } diff --git a/src/language-html/utils.js b/src/language-html/utils.js index ecbf5a13..35b0d8a5 100644 --- a/src/language-html/utils.js +++ b/src/language-html/utils.js @@ -361,7 +361,7 @@ function inferScriptParser(node) { node.attrMap.type === "text/babel" || node.attrMap.type === "application/javascript" ) { - return "babylon"; + return "babel"; } if ( diff --git a/src/language-js/index.js b/src/language-js/index.js index b0777731..b227e358 100644 --- a/src/language-js/index.js +++ b/src/language-js/index.js @@ -9,7 +9,7 @@ const languages = [ createLanguage(require("linguist-languages/data/javascript"), { override: { since: "0.0.0", - parsers: ["babylon", "flow"], + parsers: ["babel", "flow"], vscodeLanguageIds: ["javascript"] }, extend: { @@ -20,7 +20,7 @@ const languages = [ override: { name: "Flow", since: "0.0.0", - parsers: ["babylon", "flow"], + parsers: ["babel", "flow"], vscodeLanguageIds: ["javascript"], aliases: [], @@ -31,7 +31,7 @@ const languages = [ createLanguage(require("linguist-languages/data/jsx"), { override: { since: "0.0.0", - parsers: ["babylon", "flow"], + parsers: ["babel", "flow"], vscodeLanguageIds: ["javascriptreact"] } }), diff --git a/src/language-js/parser-babylon.js b/src/language-js/parser-babylon.js index 4f515036..fe246e45 100644 --- a/src/language-js/parser-babylon.js +++ b/src/language-js/parser-babylon.js @@ -1,11 +1,14 @@ "use strict"; +// This file is currently named parser-babylon.js to maintain backwards compatibility. +// However, it should be named parser-babel.js in the next major release. + const createError = require("../common/parser-create-error"); const hasPragma = require("./pragma").hasPragma; const locFns = require("./loc"); const postprocess = require("./postprocess"); -function babylonOptions(extraOptions, extraPlugins) { +function babelOptions(extraOptions, extraPlugins) { return Object.assign( { sourceType: "module", @@ -45,25 +48,22 @@ function babylonOptions(extraOptions, extraPlugins) { function createParse(parseMethod) { return (text, parsers, opts) => { // Inline the require to avoid loading all the JS if we don't use it - const babylon = require("@babel/parser"); + const babel = require("@babel/parser"); const combinations = [ - babylonOptions({ strictMode: true }, ["decorators-legacy"]), - babylonOptions({ strictMode: false }, ["decorators-legacy"]), - babylonOptions({ strictMode: true }, [ + babelOptions({ strictMode: true }, ["decorators-legacy"]), + babelOptions({ strictMode: false }, ["decorators-legacy"]), + babelOptions({ strictMode: true }, [ ["decorators", { decoratorsBeforeExport: false }] ]), - babylonOptions({ strictMode: false }, [ + babelOptions({ strictMode: false }, [ ["decorators", { decoratorsBeforeExport: false }] ]) ]; let ast; try { - ast = tryCombinations( - babylon[parseMethod].bind(null, text), - combinations - ); + ast = tryCombinations(babel[parseMethod].bind(null, text), combinations); } catch (error) { throw createError( // babel error prints (l:c) with cols that are zero indexed @@ -166,24 +166,23 @@ function assertJsonNode(node, parent) { } } -const babylon = Object.assign( - { parse, astFormat: "estree", hasPragma }, - locFns -); -const babylonExpression = Object.assign({}, babylon, { +const babel = Object.assign({ parse, astFormat: "estree", hasPragma }, locFns); +const babelExpression = Object.assign({}, babel, { parse: parseExpression }); // Export as a plugin so we can reuse the same bundle for UMD loading module.exports = { parsers: { - babylon, - json: Object.assign({}, babylonExpression, { + babel, + // aliased to keep backwards compatibility + babylon: babel, + json: Object.assign({}, babelExpression, { hasPragma() { return true; } }), - json5: babylonExpression, + json5: babelExpression, "json-stringify": Object.assign( { parse: parseJson, @@ -192,10 +191,10 @@ module.exports = { locFns ), /** @internal */ - __js_expression: babylonExpression, + __js_expression: babelExpression, /** for vue filter */ - __vue_expression: babylonExpression, + __vue_expression: babelExpression, /** for vue event binding to handle semicolon */ - __vue_event_binding: babylon + __vue_event_binding: babel } }; diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js index a13ff786..65eabd6f 100644 --- a/src/language-js/printer-estree.js +++ b/src/language-js/printer-estree.js @@ -1849,7 +1849,7 @@ function printPathNoParens(path, options, print, args) { case "ForOfStatement": case "ForAwaitStatement": { - // Babylon 7 removed ForAwaitStatement in favor of ForOfStatement + // Babel 7 removed ForAwaitStatement in favor of ForOfStatement // with `"await": true`: // https://github.com/estree/estree/pull/138 const isAwait = n.type === "ForAwaitStatement" || n.await; @@ -2999,7 +2999,7 @@ function printPathNoParens(path, options, print, args) { // a type annotation comment. // // Note that we're able to use the normal whitespace regex here because the Flow parser has - // already deemed this AST node to be a type cast. Only the Babylon parser needs the + // already deemed this AST node to be a type cast. Only the Babel parser needs the // non-line-break whitespace regex, which is why hasFlowShorthandAnnotationComment() is // implemented differently. const commentSyntax = @@ -4426,7 +4426,7 @@ function getFlowVariance(path) { return null; } - // Babylon 7.0 currently uses variance node type, and flow should + // Babel 7.0 currently uses variance node type, and flow should // follow suit soon: // https://github.com/babel/babel/issues/4722 const variance = path.variance.kind || path.variance; @@ -6011,7 +6011,7 @@ function classChildNeedsASIProtection(node) { case "TSAbstractMethodDefinition": // TypeScript case "ClassMethod": case "ClassPrivateMethod": { - // Babylon + // Babel const isAsync = node.value ? node.value.async : node.async; const isGenerator = node.value ? node.value.generator : node.generator; if (isAsync || node.kind === "get" || node.kind === "set") { diff --git a/src/language-markdown/embed.js b/src/language-markdown/embed.js index 846318ba..bd533913 100644 --- a/src/language-markdown/embed.js +++ b/src/language-markdown/embed.js @@ -55,7 +55,7 @@ function embed(path, print, textToDoc, options) { // MDX switch (node.type) { case "importExport": - return textToDoc(node.value, { parser: "babylon" }); + return textToDoc(node.value, { parser: "babel" }); case "jsx": return textToDoc(node.value, { parser: "__js_expression" }); } diff --git a/src/main/comments.js b/src/main/comments.js index e32146e3..4d49f4f7 100644 --- a/src/main/comments.js +++ b/src/main/comments.js @@ -364,7 +364,7 @@ function findExpressionIndexForComment(quasis, comment, options) { function getQuasiRange(expr) { if (expr.start !== undefined) { - // Babylon + // Babel return { start: expr.start, end: expr.end }; } // Flow diff --git a/src/main/core-options.js b/src/main/core-options.js index 1f466910..a1f3f2d8 100644 --- a/src/main/core-options.js +++ b/src/main/core-options.js @@ -123,7 +123,13 @@ const options = { typeof value === "string" || typeof value === "function", choices: [ { value: "flow", description: "Flow" }, - { value: "babylon", description: "JavaScript" }, + { + value: "babylon", + description: "JavaScript", + deprecated: "1.16.0", + redirect: "babel" + }, + { value: "babel", since: "1.16.0", description: "JavaScript" }, { value: "typescript", since: "1.4.0", description: "TypeScript" }, { value: "css", since: "1.7.1", description: "CSS" }, { diff --git a/src/main/core.js b/src/main/core.js index a70e41f6..556f0a3a 100644 --- a/src/main/core.js +++ b/src/main/core.js @@ -392,7 +392,7 @@ module.exports = { // Doesn't handle shebang for now formatDoc(doc, opts) { const debug = printDocToDebug(doc); - opts = normalizeOptions(Object.assign({}, opts, { parser: "babylon" })); + opts = normalizeOptions(Object.assign({}, opts, { parser: "babel" })); return format(debug, opts).formatted; }, diff --git a/src/main/options.js b/src/main/options.js index 8e72bf03..cb87e858 100644 --- a/src/main/options.js +++ b/src/main/options.js @@ -39,11 +39,11 @@ function normalize(options, opts) { if (!rawOptions.filepath) { const logger = opts.logger || console; logger.warn( - "No parser and no filepath given, using 'babylon' the parser now " + + "No parser and no filepath given, using 'babel' the parser now " + "but this will throw an error in the future. " + "Please specify a parser or a filepath so one can be inferred." ); - rawOptions.parser = "babylon"; + rawOptions.parser = "babel"; } else { rawOptions.parser = inferParser(rawOptions.filepath, rawOptions.plugins); if (!rawOptions.parser) { diff --git a/src/main/range-util.js b/src/main/range-util.js index 94e90d39..ac80f89b 100644 --- a/src/main/range-util.js +++ b/src/main/range-util.js @@ -136,7 +136,7 @@ function isSourceElement(opts, node) { ]; switch (opts.parser) { case "flow": - case "babylon": + case "babel": case "typescript": return jsSourceElements.indexOf(node.type) > -1; case "json": diff --git a/tests/arrow-call/__snapshots__/jsfmt.spec.js.snap b/tests/arrow-call/__snapshots__/jsfmt.spec.js.snap index 9849dfa5..95b30dca 100644 --- a/tests/arrow-call/__snapshots__/jsfmt.spec.js.snap +++ b/tests/arrow-call/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`arrow_call.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -112,7 +112,7 @@ promise.then(result => exports[`arrow_call.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 trailingComma: "all" | printWidth @@ -224,7 +224,7 @@ promise.then(result => exports[`arrow_call.js 3`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/arrow-call/jsfmt.spec.js b/tests/arrow-call/jsfmt.spec.js index 93724d9b..3f8b48a0 100644 --- a/tests/arrow-call/jsfmt.spec.js +++ b/tests/arrow-call/jsfmt.spec.js @@ -1,7 +1,7 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); -run_spec(__dirname, ["babylon", "flow", "typescript"], { +run_spec(__dirname, ["babel", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"], { trailingComma: "all" }); -run_spec(__dirname, ["babylon", "flow", "typescript"], { +run_spec(__dirname, ["babel", "flow", "typescript"], { arrowParens: "always" }); diff --git a/tests/arrows/__snapshots__/jsfmt.spec.js.snap b/tests/arrows/__snapshots__/jsfmt.spec.js.snap index cc6bc758..19caf038 100644 --- a/tests/arrows/__snapshots__/jsfmt.spec.js.snap +++ b/tests/arrows/__snapshots__/jsfmt.spec.js.snap @@ -3,7 +3,7 @@ exports[`arrow_function_expression.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -87,7 +87,7 @@ a = b => { exports[`arrow_function_expression.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -171,7 +171,7 @@ a = (b) => { exports[`block_like.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -186,7 +186,7 @@ a = () => ({} = this); exports[`block_like.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -201,7 +201,7 @@ a = () => ({} = this); exports[`call.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -382,7 +382,7 @@ fooooooooooooooooooooooooooooooooooooooooooooooooooo(action => next => exports[`call.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -563,7 +563,7 @@ fooooooooooooooooooooooooooooooooooooooooooooooooooo((action) => (next) => exports[`comment.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -636,7 +636,7 @@ export const bem = block => exports[`comment.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -709,7 +709,7 @@ export const bem = (block) => exports[`currying.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -756,7 +756,7 @@ const middleware = options => (req, res, next) => { exports[`currying.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -803,7 +803,7 @@ const middleware = (options) => (req, res, next) => { exports[`long-call-no-args.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -821,7 +821,7 @@ veryLongCall( exports[`long-call-no-args.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -839,7 +839,7 @@ veryLongCall( exports[`long-contents.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -863,7 +863,7 @@ const foo = () => { exports[`long-contents.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -887,7 +887,7 @@ const foo = () => { exports[`parens.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -935,7 +935,7 @@ foo(a => b, d); exports[`parens.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -983,7 +983,7 @@ foo((a) => b, d); exports[`short_body.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -1008,7 +1008,7 @@ const initializeSnapshotState = ( exports[`short_body.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -1033,7 +1033,7 @@ const initializeSnapshotState = ( exports[`type_params.js 1`] = ` ====================================options===================================== arrowParens: "avoid" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -1048,7 +1048,7 @@ printWidth: 80 exports[`type_params.js 2`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/arrows/jsfmt.spec.js b/tests/arrows/jsfmt.spec.js index 964f2ab9..d8f3a83a 100644 --- a/tests/arrows/jsfmt.spec.js +++ b/tests/arrows/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["babylon", "typescript"], { arrowParens: "avoid" }); -run_spec(__dirname, ["babylon", "typescript"], { arrowParens: "always" }); +run_spec(__dirname, ["babel", "typescript"], { arrowParens: "avoid" }); +run_spec(__dirname, ["babel", "typescript"], { arrowParens: "always" }); diff --git a/tests/arrows_bind/__snapshots__/jsfmt.spec.js.snap b/tests/arrows_bind/__snapshots__/jsfmt.spec.js.snap index 2b7cb57d..2aef3fed 100644 --- a/tests/arrows_bind/__snapshots__/jsfmt.spec.js.snap +++ b/tests/arrows_bind/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`arrows-bind.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/arrows_bind/jsfmt.spec.js b/tests/arrows_bind/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/arrows_bind/jsfmt.spec.js +++ b/tests/arrows_bind/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/assignment_expression/babylon/__snapshots__/jsfmt.spec.js.snap b/tests/assignment_expression/babylon/__snapshots__/jsfmt.spec.js.snap index c987462d..b956f2be 100644 --- a/tests/assignment_expression/babylon/__snapshots__/jsfmt.spec.js.snap +++ b/tests/assignment_expression/babylon/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`logical-assignment.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/assignment_expression/babylon/jsfmt.spec.js b/tests/assignment_expression/babylon/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/assignment_expression/babylon/jsfmt.spec.js +++ b/tests/assignment_expression/babylon/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/async/top-level-await/__snapshots__/jsfmt.spec.js.snap b/tests/async/top-level-await/__snapshots__/jsfmt.spec.js.snap index 4467fb0f..8fe23059 100644 --- a/tests/async/top-level-await/__snapshots__/jsfmt.spec.js.snap +++ b/tests/async/top-level-await/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`example.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/async/top-level-await/jsfmt.spec.js b/tests/async/top-level-await/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/async/top-level-await/jsfmt.spec.js +++ b/tests/async/top-level-await/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/big-int/__snapshots__/jsfmt.spec.js.snap b/tests/big-int/__snapshots__/jsfmt.spec.js.snap index 8fb7f32e..69dededd 100644 --- a/tests/big-int/__snapshots__/jsfmt.spec.js.snap +++ b/tests/big-int/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`literal.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/big-int/jsfmt.spec.js b/tests/big-int/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/big-int/jsfmt.spec.js +++ b/tests/big-int/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/binary_math/__snapshots__/jsfmt.spec.js.snap b/tests/binary_math/__snapshots__/jsfmt.spec.js.snap index af0e2be6..26365f8e 100644 --- a/tests/binary_math/__snapshots__/jsfmt.spec.js.snap +++ b/tests/binary_math/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`parens.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/binary_math/jsfmt.spec.js b/tests/binary_math/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/binary_math/jsfmt.spec.js +++ b/tests/binary_math/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/bind_expressions/__snapshots__/jsfmt.spec.js.snap b/tests/bind_expressions/__snapshots__/jsfmt.spec.js.snap index dbb18b3b..41da7ebf 100644 --- a/tests/bind_expressions/__snapshots__/jsfmt.spec.js.snap +++ b/tests/bind_expressions/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`await.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -22,7 +22,7 @@ const doBothThings = async () => { exports[`await.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -43,7 +43,7 @@ const doBothThings = async () => { exports[`bind_parens.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -115,7 +115,7 @@ b.c::d.e; exports[`bind_parens.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -188,7 +188,7 @@ b.c::d.e exports[`long_name_method.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -218,7 +218,7 @@ class X { exports[`long_name_method.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -249,7 +249,7 @@ class X { exports[`method_chain.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -295,7 +295,7 @@ function test(observable) { exports[`method_chain.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -342,7 +342,7 @@ function test(observable) { exports[`short_name_method.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -371,7 +371,7 @@ class X { exports[`short_name_method.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth diff --git a/tests/bind_expressions/jsfmt.spec.js b/tests/bind_expressions/jsfmt.spec.js index 0d784420..c5f2d2b9 100644 --- a/tests/bind_expressions/jsfmt.spec.js +++ b/tests/bind_expressions/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["babylon"]); -run_spec(__dirname, ["babylon"], { semi: false }); +run_spec(__dirname, ["babel"]); +run_spec(__dirname, ["babel"], { semi: false }); diff --git a/tests/classes/__snapshots__/jsfmt.spec.js.snap b/tests/classes/__snapshots__/jsfmt.spec.js.snap index de48ef92..02c20513 100644 --- a/tests/classes/__snapshots__/jsfmt.spec.js.snap +++ b/tests/classes/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`binary.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -22,7 +22,7 @@ printWidth: 80 exports[`break.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -107,7 +107,7 @@ export class VisTimelineComponent2 exports[`call.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -121,7 +121,7 @@ printWidth: 80 exports[`empty.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -159,7 +159,7 @@ class A { exports[`member.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -175,7 +175,7 @@ printWidth: 80 exports[`method.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -205,7 +205,7 @@ class C { exports[`property.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -253,7 +253,7 @@ class B { exports[`ternary.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/classes/jsfmt.spec.js b/tests/classes/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/classes/jsfmt.spec.js +++ b/tests/classes/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/classes/top-level-super/__snapshots__/jsfmt.spec.js.snap b/tests/classes/top-level-super/__snapshots__/jsfmt.spec.js.snap index a36e5147..e92c99de 100644 --- a/tests/classes/top-level-super/__snapshots__/jsfmt.spec.js.snap +++ b/tests/classes/top-level-super/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`example.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/classes/top-level-super/jsfmt.spec.js b/tests/classes/top-level-super/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/classes/top-level-super/jsfmt.spec.js +++ b/tests/classes/top-level-super/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/classes_private_fields/__snapshots__/jsfmt.spec.js.snap b/tests/classes_private_fields/__snapshots__/jsfmt.spec.js.snap index 9b5e5de4..0bdfc09b 100644 --- a/tests/classes_private_fields/__snapshots__/jsfmt.spec.js.snap +++ b/tests/classes_private_fields/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`private_fields.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -118,7 +118,7 @@ class E { exports[`private_fields.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -235,7 +235,7 @@ class E { exports[`with_comments.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -261,7 +261,7 @@ class A { exports[`with_comments.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth diff --git a/tests/classes_private_fields/jsfmt.spec.js b/tests/classes_private_fields/jsfmt.spec.js index 0d784420..c5f2d2b9 100644 --- a/tests/classes_private_fields/jsfmt.spec.js +++ b/tests/classes_private_fields/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["babylon"]); -run_spec(__dirname, ["babylon"], { semi: false }); +run_spec(__dirname, ["babel"]); +run_spec(__dirname, ["babel"], { semi: false }); diff --git a/tests/comments/__snapshots__/jsfmt.spec.js.snap b/tests/comments/__snapshots__/jsfmt.spec.js.snap index 797489d7..b8e23fbd 100644 --- a/tests/comments/__snapshots__/jsfmt.spec.js.snap +++ b/tests/comments/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`assignment-pattern.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -27,7 +27,7 @@ let { exports[`before-comma.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -51,7 +51,7 @@ const foo = { exports[`binary-expressions.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -205,7 +205,7 @@ function bitwiseXor() { exports[`blank.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -259,7 +259,7 @@ printWidth: 80 exports[`break-continue-statements.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -293,7 +293,7 @@ loop: for (;;) { exports[`call_comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -325,7 +325,7 @@ React.render( exports[`closure-compiler-type-cast.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -379,7 +379,7 @@ var newArray = /** @type {array} */ (numberOrString.map(x => x)); exports[`dangling.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -421,7 +421,7 @@ export /* dangling */{}; exports[`dangling_array.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -443,7 +443,7 @@ expect(() => {}).toTriggerReadyStateChanges([ exports[`dangling_for.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -464,7 +464,7 @@ for (;;); exports[`dynamic_imports.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -490,7 +490,7 @@ import("something" /* Hello */ + "else"); exports[`export.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -538,7 +538,7 @@ export { exports[`first-line.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -554,7 +554,7 @@ b; exports[`flow_union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -604,7 +604,7 @@ type UploadState = exports[`function-declaration.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -738,7 +738,7 @@ function foo() { exports[`if.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -886,7 +886,7 @@ if (14) { exports[`issues.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1117,7 +1117,7 @@ foo( exports[`jsx.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1358,7 +1358,7 @@ onClick={() => {}}> exports[`last-arg.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1550,7 +1550,7 @@ class Foo { exports[`preserve-new-line-last.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1604,7 +1604,7 @@ function name() { exports[`return-statement.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1866,7 +1866,7 @@ function inlineComment() { exports[`single-star-jsdoc.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1938,7 +1938,7 @@ if (true) { exports[`switch.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2025,7 +2025,7 @@ switch (foo) { exports[`template-literal.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2063,7 +2063,7 @@ d //comment exports[`trailing_space.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2085,7 +2085,7 @@ printWidth: 80 exports[`trailing-jsdocs.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2146,7 +2146,7 @@ const CONNECTION_STATUS = (exports.CONNECTION_STATUS = { exports[`try.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2185,7 +2185,7 @@ try { exports[`variable_declarator.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2335,7 +2335,7 @@ const foo = 123; exports[`while.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/comments/jsfmt.spec.js b/tests/comments/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/comments/jsfmt.spec.js +++ b/tests/comments/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/comments_jsx_same_line/__snapshots__/jsfmt.spec.js.snap b/tests/comments_jsx_same_line/__snapshots__/jsfmt.spec.js.snap index fe91d3d1..c52d390c 100644 --- a/tests/comments_jsx_same_line/__snapshots__/jsfmt.spec.js.snap +++ b/tests/comments_jsx_same_line/__snapshots__/jsfmt.spec.js.snap @@ -3,7 +3,7 @@ exports[`jsx_same_line.js 1`] = ` ====================================options===================================== jsxBracketSameLine: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/comments_jsx_same_line/jsfmt.spec.js b/tests/comments_jsx_same_line/jsfmt.spec.js index 5ac58ec7..478e472a 100644 --- a/tests/comments_jsx_same_line/jsfmt.spec.js +++ b/tests/comments_jsx_same_line/jsfmt.spec.js @@ -1,3 +1,3 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"], { +run_spec(__dirname, ["flow", "babel", "typescript"], { jsxBracketSameLine: true }); diff --git a/tests/comments_pipeline_own_line/__snapshots__/jsfmt.spec.js.snap b/tests/comments_pipeline_own_line/__snapshots__/jsfmt.spec.js.snap index c43bd606..11403636 100644 --- a/tests/comments_pipeline_own_line/__snapshots__/jsfmt.spec.js.snap +++ b/tests/comments_pipeline_own_line/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`pipeline_own_line.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/comments_pipeline_own_line/jsfmt.spec.js b/tests/comments_pipeline_own_line/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/comments_pipeline_own_line/jsfmt.spec.js +++ b/tests/comments_pipeline_own_line/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/cursor/__snapshots__/jsfmt.spec.js.snap b/tests/cursor/__snapshots__/jsfmt.spec.js.snap index 389c1990..88b0cc2d 100644 --- a/tests/cursor/__snapshots__/jsfmt.spec.js.snap +++ b/tests/cursor/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comments-1.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -22,7 +22,7 @@ function ehllooo() { exports[`comments-2.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -41,7 +41,7 @@ const y = 5; exports[`comments-3.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -59,7 +59,7 @@ const y = 5; exports[`comments-4.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -79,7 +79,7 @@ const y = 5; exports[`cursor-0.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -95,7 +95,7 @@ printWidth: 80 exports[`cursor-1.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -111,7 +111,7 @@ printWidth: 80 exports[`cursor-2.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -126,7 +126,7 @@ foo<|>(bar); exports[`cursor-3.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -144,7 +144,7 @@ printWidth: 80 exports[`cursor-4.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -166,7 +166,7 @@ const y = 5; exports[`cursor-5.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -180,7 +180,7 @@ const /* h<|>i */ y = 5; exports[`cursor-6.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -194,7 +194,7 @@ const y /* h<|>i */ = 5; exports[`cursor-7.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -213,7 +213,7 @@ const z = 9; exports[`cursor-8.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -226,7 +226,7 @@ func<|>tion banana() {} exports[`cursor-9.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -239,7 +239,7 @@ thisWillBeFormatted<|>(2, 3); exports[`cursor-10.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -258,7 +258,7 @@ const y = 5; exports[`file-start-with-comment-1.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -274,7 +274,7 @@ haha(); exports[`file-start-with-comment-2.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -290,7 +290,7 @@ haha()<|>; exports[`range-0.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -312,7 +312,7 @@ thisWontBeFormatted ( 1 ,3) exports[`range-1.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -334,7 +334,7 @@ thisWontBeFormatted ( 1 ,3) exports[`range-2.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -356,7 +356,7 @@ thisWontBeFormatted ( 1 ,3) exports[`range-3.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== @@ -378,7 +378,7 @@ thisWontBeFormatted <|> ( 1 ,3) exports[`range-4.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript", "flow"] +parsers: ["babel", "typescript", "flow"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/cursor/jsfmt.spec.js b/tests/cursor/jsfmt.spec.js index 00163ce1..a0d2415d 100644 --- a/tests/cursor/jsfmt.spec.js +++ b/tests/cursor/jsfmt.spec.js @@ -1,10 +1,10 @@ -run_spec(__dirname, ["babylon", "typescript", "flow"]); +run_spec(__dirname, ["babel", "typescript", "flow"]); const prettier = require("prettier/local"); test("translates cursor correctly in basic case", () => { expect( - prettier.formatWithCursor(" 1", { parser: "babylon", cursorOffset: 2 }) + prettier.formatWithCursor(" 1", { parser: "babel", cursorOffset: 2 }) ).toEqual({ formatted: "1;\n", cursorOffset: 1 @@ -14,7 +14,7 @@ test("translates cursor correctly in basic case", () => { test("positions cursor relative to closest node, not SourceElement", () => { const code = "return 15"; expect( - prettier.formatWithCursor(code, { parser: "babylon", cursorOffset: 15 }) + prettier.formatWithCursor(code, { parser: "babel", cursorOffset: 15 }) ).toEqual({ formatted: "return 15;\n", cursorOffset: 7 @@ -24,7 +24,7 @@ test("positions cursor relative to closest node, not SourceElement", () => { test("keeps cursor inside formatted node", () => { const code = "return 15"; expect( - prettier.formatWithCursor(code, { parser: "babylon", cursorOffset: 14 }) + prettier.formatWithCursor(code, { parser: "babel", cursorOffset: 14 }) ).toEqual({ formatted: "return 15;\n", cursorOffset: 7 @@ -37,7 +37,7 @@ foo('bar', cb => { console.log('stuff') })`; expect( - prettier.formatWithCursor(code, { parser: "babylon", cursorOffset: 24 }) + prettier.formatWithCursor(code, { parser: "babel", cursorOffset: 24 }) ).toEqual({ formatted: `foo("bar", cb => { console.log("stuff"); diff --git a/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap b/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap index e5d30d7c..97f79975 100644 --- a/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap +++ b/tests/decorator_comments/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comments.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/decorator_comments/jsfmt.spec.js b/tests/decorator_comments/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/decorator_comments/jsfmt.spec.js +++ b/tests/decorator_comments/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/decorators/__snapshots__/jsfmt.spec.js.snap b/tests/decorators/__snapshots__/jsfmt.spec.js.snap index 95f63d9e..3d6e4df5 100644 --- a/tests/decorators/__snapshots__/jsfmt.spec.js.snap +++ b/tests/decorators/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`classes.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -49,7 +49,7 @@ const foo = exports[`comments.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -120,7 +120,7 @@ export class Bar {} exports[`methods.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -152,7 +152,7 @@ class Yo { exports[`mobx.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -246,7 +246,7 @@ class OrderLine { exports[`multiline.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -268,7 +268,7 @@ class Foo { exports[`multiple.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -313,7 +313,7 @@ const foo = { exports[`redux.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/decorators/jsfmt.spec.js b/tests/decorators/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/decorators/jsfmt.spec.js +++ b/tests/decorators/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/decorators_export/__snapshots__/jsfmt.spec.js.snap b/tests/decorators_export/__snapshots__/jsfmt.spec.js.snap index c7198953..a9159bc4 100644 --- a/tests/decorators_export/__snapshots__/jsfmt.spec.js.snap +++ b/tests/decorators_export/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`after_export.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -24,7 +24,7 @@ class {} exports[`before_export.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/decorators_export/jsfmt.spec.js b/tests/decorators_export/jsfmt.spec.js index 108aa9fe..d8894cd8 100644 --- a/tests/decorators_export/jsfmt.spec.js +++ b/tests/decorators_export/jsfmt.spec.js @@ -1,2 +1,2 @@ // TypeScript and Flow don't accept decorator after export -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/destructuring/__snapshots__/jsfmt.spec.js.snap index 2226aa73..221ddd29 100644 --- a/tests/destructuring/__snapshots__/jsfmt.spec.js.snap +++ b/tests/destructuring/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`destructuring.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/destructuring/jsfmt.spec.js b/tests/destructuring/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/destructuring/jsfmt.spec.js +++ b/tests/destructuring/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/directives/__snapshots__/jsfmt.spec.js.snap b/tests/directives/__snapshots__/jsfmt.spec.js.snap index 6c1c3343..3c483dec 100644 --- a/tests/directives/__snapshots__/jsfmt.spec.js.snap +++ b/tests/directives/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`escaped.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -84,7 +84,7 @@ printWidth: 80 exports[`last-line-0.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -97,7 +97,7 @@ printWidth: 80 exports[`last-line-1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -111,7 +111,7 @@ printWidth: 80 exports[`last-line-2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -126,7 +126,7 @@ printWidth: 80 exports[`newline.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -152,7 +152,7 @@ a(); exports[`no-newline.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -168,7 +168,7 @@ a; exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/directives/jsfmt.spec.js b/tests/directives/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/directives/jsfmt.spec.js +++ b/tests/directives/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/do/__snapshots__/jsfmt.spec.js.snap b/tests/do/__snapshots__/jsfmt.spec.js.snap index fc2e756a..9f7315b5 100644 --- a/tests/do/__snapshots__/jsfmt.spec.js.snap +++ b/tests/do/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`do.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/do/jsfmt.spec.js b/tests/do/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/do/jsfmt.spec.js +++ b/tests/do/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/dynamic_import/__snapshots__/jsfmt.spec.js.snap b/tests/dynamic_import/__snapshots__/jsfmt.spec.js.snap index 1c821367..785169c5 100644 --- a/tests/dynamic_import/__snapshots__/jsfmt.spec.js.snap +++ b/tests/dynamic_import/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/dynamic_import/jsfmt.spec.js b/tests/dynamic_import/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/dynamic_import/jsfmt.spec.js +++ b/tests/dynamic_import/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/empty/__snapshots__/jsfmt.spec.js.snap b/tests/empty/__snapshots__/jsfmt.spec.js.snap index ad9dd70e..bdef665e 100644 --- a/tests/empty/__snapshots__/jsfmt.spec.js.snap +++ b/tests/empty/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`empty 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] +parsers: ["flow", "babel", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] printWidth: 80 | printWidth =====================================input====================================== @@ -14,7 +14,7 @@ printWidth: 80 exports[`newline 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] +parsers: ["flow", "babel", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] printWidth: 80 | printWidth =====================================input====================================== @@ -27,7 +27,7 @@ printWidth: 80 exports[`space 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] +parsers: ["flow", "babel", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] printWidth: 80 | printWidth =====================================input====================================== @@ -40,7 +40,7 @@ printWidth: 80 exports[`space-newline 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] +parsers: ["flow", "babel", "typescript", "css", "less", "scss", "json", "json5", "json-stringify", "graphql", "markdown", "mdx", "vue", "yaml", "html", "angular"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap b/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap index 16b94bf7..4c499cfc 100644 --- a/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap +++ b/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`class.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -27,7 +27,7 @@ class x { exports[`empty_paren_comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/empty_paren_comment/jsfmt.spec.js b/tests/empty_paren_comment/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/empty_paren_comment/jsfmt.spec.js +++ b/tests/empty_paren_comment/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/end_of_line/__snapshots__/jsfmt.spec.js.snap b/tests/end_of_line/__snapshots__/jsfmt.spec.js.snap index abb1ade6..d26abd57 100644 --- a/tests/end_of_line/__snapshots__/jsfmt.spec.js.snap +++ b/tests/end_of_line/__snapshots__/jsfmt.spec.js.snap @@ -3,7 +3,7 @@ exports[`example.js 1`] = ` ====================================options===================================== endOfLine: "cr" -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -22,7 +22,7 @@ function f() { exports[`example.js 2`] = ` ====================================options===================================== endOfLine: "crlf" -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -41,7 +41,7 @@ function f() { exports[`example.js 3`] = ` ====================================options===================================== endOfLine: "lf" -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/end_of_line/jsfmt.spec.js b/tests/end_of_line/jsfmt.spec.js index e4898ce3..7aa8fd2f 100644 --- a/tests/end_of_line/jsfmt.spec.js +++ b/tests/end_of_line/jsfmt.spec.js @@ -1,3 +1,3 @@ -run_spec(__dirname, ["babylon"], { endOfLine: "cr" }); -run_spec(__dirname, ["babylon"], { endOfLine: "crlf" }); -run_spec(__dirname, ["babylon"], { endOfLine: "lf" }); +run_spec(__dirname, ["babel"], { endOfLine: "cr" }); +run_spec(__dirname, ["babel"], { endOfLine: "crlf" }); +run_spec(__dirname, ["babel"], { endOfLine: "lf" }); diff --git a/tests/es6modules/__snapshots__/jsfmt.spec.js.snap b/tests/es6modules/__snapshots__/jsfmt.spec.js.snap index 3dbb7065..44ea1bf0 100644 --- a/tests/es6modules/__snapshots__/jsfmt.spec.js.snap +++ b/tests/es6modules/__snapshots__/jsfmt.spec.js.snap @@ -16,7 +16,7 @@ export default () => {}; exports[`export_default_arrow_expression.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -44,7 +44,7 @@ export default foo(); exports[`export_default_call_expression.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -72,7 +72,7 @@ export default class Foo {} exports[`export_default_class_declaration.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -100,7 +100,7 @@ export default (class foobar {}); exports[`export_default_class_expression.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -128,7 +128,7 @@ export default function() {} exports[`export_default_function_declaration.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -156,7 +156,7 @@ export default async function foo() {} exports[`export_default_function_declaration_async.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -184,7 +184,7 @@ export default function f() {} exports[`export_default_function_declaration_named.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -212,7 +212,7 @@ export default (function() {}); exports[`export_default_function_expression.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -240,7 +240,7 @@ export default (function f() {}); exports[`export_default_function_expression_named.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -268,7 +268,7 @@ export default new Foo(); exports[`export_default_new_expression.js 2`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/es6modules/jsfmt.spec.js b/tests/es6modules/jsfmt.spec.js index a9ad6f98..9d2f08ad 100644 --- a/tests/es6modules/jsfmt.spec.js +++ b/tests/es6modules/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname, ["flow"]); -// FIXME export_default_function_declaration_async.js flow != babylon output -run_spec(__dirname, ["babylon", "typescript"]); +// FIXME export_default_function_declaration_async.js flow != babel output +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/export_extension/__snapshots__/jsfmt.spec.js.snap b/tests/export_extension/__snapshots__/jsfmt.spec.js.snap index df3444b7..bdc199f0 100644 --- a/tests/export_extension/__snapshots__/jsfmt.spec.js.snap +++ b/tests/export_extension/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`export.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/export_extension/jsfmt.spec.js b/tests/export_extension/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/export_extension/jsfmt.spec.js +++ b/tests/export_extension/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/exports/__snapshots__/jsfmt.spec.js.snap b/tests/exports/__snapshots__/jsfmt.spec.js.snap index b2210ba5..e7115ba9 100644 --- a/tests/exports/__snapshots__/jsfmt.spec.js.snap +++ b/tests/exports/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/exports/jsfmt.spec.js b/tests/exports/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/exports/jsfmt.spec.js +++ b/tests/exports/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/expression_statement/__snapshots__/jsfmt.spec.js.snap b/tests/expression_statement/__snapshots__/jsfmt.spec.js.snap index 10925104..484f2248 100644 --- a/tests/expression_statement/__snapshots__/jsfmt.spec.js.snap +++ b/tests/expression_statement/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`no_regression.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -18,7 +18,7 @@ printWidth: 80 exports[`use_strict.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/expression_statement/jsfmt.spec.js b/tests/expression_statement/jsfmt.spec.js index c0e8f2eb..eb85eda6 100755 --- a/tests/expression_statement/jsfmt.spec.js +++ b/tests/expression_statement/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/first_argument_expansion/__snapshots__/jsfmt.spec.js.snap b/tests/first_argument_expansion/__snapshots__/jsfmt.spec.js.snap index f7637e9c..831f2a41 100644 --- a/tests/first_argument_expansion/__snapshots__/jsfmt.spec.js.snap +++ b/tests/first_argument_expansion/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/first_argument_expansion/jsfmt.spec.js b/tests/first_argument_expansion/jsfmt.spec.js index c0e8f2eb..eb85eda6 100644 --- a/tests/first_argument_expansion/jsfmt.spec.js +++ b/tests/first_argument_expansion/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/flow/async_iteration/__snapshots__/jsfmt.spec.js.snap b/tests/flow/async_iteration/__snapshots__/jsfmt.spec.js.snap index eb98e725..de4d111e 100644 --- a/tests/flow/async_iteration/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/async_iteration/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`delegate_yield.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -66,7 +66,7 @@ async function* delegate_return() { exports[`generator.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -128,7 +128,7 @@ async function f() { exports[`return.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -186,7 +186,7 @@ refuse_return() exports[`throw.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/async_iteration/jsfmt.spec.js b/tests/flow/async_iteration/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/async_iteration/jsfmt.spec.js +++ b/tests/flow/async_iteration/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap b/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap index 117a9e6e..30e9e385 100644 --- a/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`B.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -20,7 +20,7 @@ exports.numberValue = 42; exports[`C.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -34,7 +34,7 @@ printWidth: 80 exports[`CommonJS_Clobbering_Class.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -98,7 +98,7 @@ module.exports = Test; exports[`CommonJS_Clobbering_Lit.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -134,7 +134,7 @@ module.exports = { exports[`CommonJS_Named.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -166,7 +166,7 @@ exports.numberValue5 = 5; exports[`ES6_Default_AnonFunction1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -190,7 +190,7 @@ declare export default () => number; exports[`ES6_Default_AnonFunction2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -214,7 +214,7 @@ declare export default () => number; exports[`ES6_Default_NamedClass1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -252,7 +252,7 @@ declare export function getAFoo(): FooImpl; exports[`ES6_Default_NamedClass2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -278,7 +278,7 @@ declare export default class Foo { exports[`ES6_Default_NamedFunction1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -302,7 +302,7 @@ declare export default function foo(): number; exports[`ES6_Default_NamedFunction2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -326,7 +326,7 @@ declare export default function foo(): number; exports[`ES6_DefaultAndNamed.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -346,7 +346,7 @@ declare export var str: string; exports[`ES6_ExportAllFrom_Intermediary1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -370,7 +370,7 @@ declare export * from "ES6_ExportAllFrom_Source1" exports[`ES6_ExportAllFrom_Intermediary2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -394,7 +394,7 @@ declare export * from "ES6_ExportAllFrom_Source2" exports[`ES6_ExportAllFrom_Source1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -418,7 +418,7 @@ declare export var numberValue1: number; exports[`ES6_ExportAllFrom_Source2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -442,7 +442,7 @@ declare export var numberValue2: number; exports[`ES6_ExportAllFromMulti.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -462,7 +462,7 @@ declare export * from "./ES6_ExportAllFrom_Source2" exports[`ES6_ExportFrom_Intermediary1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -492,7 +492,7 @@ declare export { exports[`ES6_ExportFrom_Intermediary2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -522,7 +522,7 @@ declare export { exports[`ES6_ExportFrom_Source1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -548,7 +548,7 @@ declare export var numberValue2: number; exports[`ES6_ExportFrom_Source2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -574,7 +574,7 @@ declare export var numberValue2: number; exports[`ES6_Named1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -630,7 +630,7 @@ declare export var varDeclNumber2: number; exports[`ES6_Named2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -682,7 +682,7 @@ declare export var varDeclNumber4: number; exports[`ProvidesModuleA.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -714,7 +714,7 @@ exports.stringValue = "str"; exports[`ProvidesModuleCJSDefault.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -742,7 +742,7 @@ module.exports = { exports[`ProvidesModuleD.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -762,7 +762,7 @@ printWidth: 80 exports[`ProvidesModuleES6Default.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -794,7 +794,7 @@ export default { exports[`SideEffects.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -808,7 +808,7 @@ printWidth: 80 exports[`es6modules.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/declare_export/jsfmt.spec.js b/tests/flow/declare_export/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/declare_export/jsfmt.spec.js +++ b/tests/flow/declare_export/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/def_site_variance/__snapshots__/jsfmt.spec.js.snap b/tests/flow/def_site_variance/__snapshots__/jsfmt.spec.js.snap index 655c36f1..f0d64bdb 100644 --- a/tests/flow/def_site_variance/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/def_site_variance/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/def_site_variance/jsfmt.spec.js b/tests/flow/def_site_variance/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/def_site_variance/jsfmt.spec.js +++ b/tests/flow/def_site_variance/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap b/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap index 3acddf29..bb54b9a0 100644 --- a/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`any.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -24,7 +24,7 @@ const val: string = dict[k]; // error: number incompatible with string exports[`compatible.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -68,7 +68,7 @@ function foo2(x: { exports[`dictionary.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -676,7 +676,7 @@ function subtype_optional_c_to_dict(x: { p?: C }): { [k: string]: B } { exports[`incompatible.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -806,7 +806,7 @@ function foo8(x: { [key: string]: number }) { exports[`issue-1745.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -868,7 +868,7 @@ class B { exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -900,7 +900,7 @@ module.exports = o; exports[`test_client.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/dictionary/jsfmt.spec.js b/tests/flow/dictionary/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/dictionary/jsfmt.spec.js +++ b/tests/flow/dictionary/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/es_declare_module/__snapshots__/jsfmt.spec.js.snap b/tests/flow/es_declare_module/__snapshots__/jsfmt.spec.js.snap index 316c9545..453bb9e7 100644 --- a/tests/flow/es_declare_module/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/es_declare_module/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`es_declare_module.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js b/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js index 794843c4..5247f4ca 100644 --- a/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js +++ b/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js @@ -1,5 +1,5 @@ run_spec(__dirname, ["flow"]); // TODO: While the tests render the same, Flow is dropping the line breaks -// between each declaration while Babylon preserves them. -//run_spec(__dirname, null, ["babylon"]); +// between each declaration while babel preserves them. +//run_spec(__dirname, null, ["babel"]); diff --git a/tests/flow/es_declare_module/jsfmt.spec.js b/tests/flow/es_declare_module/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/es_declare_module/jsfmt.spec.js +++ b/tests/flow/es_declare_module/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap b/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap index 6e78726f..4974d7ad 100644 --- a/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`getters_and_setters.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/getters_and_setters_disabled/jsfmt.spec.js b/tests/flow/getters_and_setters_disabled/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/getters_and_setters_disabled/jsfmt.spec.js +++ b/tests/flow/getters_and_setters_disabled/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap b/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap index 805a34be..9d117c1a 100644 --- a/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`class.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -150,7 +150,7 @@ foo.propOverriddenWithSetter = 123; // Error number ~> string exports[`declare_class.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -256,7 +256,7 @@ foo.propOverriddenWithSetter = 123; // Error number ~> string exports[`object.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -412,7 +412,7 @@ var testExampleOrOrderOfGetterAndSetterReordered: number = exports[`object_type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -531,7 +531,7 @@ function test(obj: T) { exports[`react.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -583,7 +583,7 @@ const Example = React.createClass({ exports[`variance.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/getters_and_setters_enabled/jsfmt.spec.js b/tests/flow/getters_and_setters_enabled/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/getters_and_setters_enabled/jsfmt.spec.js +++ b/tests/flow/getters_and_setters_enabled/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/more_annot/__snapshots__/jsfmt.spec.js.snap b/tests/flow/more_annot/__snapshots__/jsfmt.spec.js.snap index 88f1f6b8..b8cf9daf 100644 --- a/tests/flow/more_annot/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/more_annot/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`client_object.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -20,7 +20,7 @@ var a: number = o.w.z.y; exports[`object.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -50,7 +50,7 @@ module.exports = o3; exports[`proto.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -76,7 +76,7 @@ var o2: Foo = new Foo(); exports[`super.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/more_annot/jsfmt.spec.js b/tests/flow/more_annot/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/more_annot/jsfmt.spec.js +++ b/tests/flow/more_annot/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/new_spread/__snapshots__/jsfmt.spec.js.snap b/tests/flow/new_spread/__snapshots__/jsfmt.spec.js.snap index df99d9fb..6aa4c218 100644 --- a/tests/flow/new_spread/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/new_spread/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -208,7 +208,7 @@ declare var o13: O13; exports[`type_any.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -246,7 +246,7 @@ var o3: O3 = (0: mixed); // ok exports[`type_contra.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -284,7 +284,7 @@ declare var o2: O2; exports[`type_dict.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -372,7 +372,7 @@ declare var o12: { ...{| [string]: T |}, ...{| [string]: U |} }; exports[`type_generic.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -390,7 +390,7 @@ declare function spread(a: A, b: B): { ...A, ...B }; exports[`type_instance.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -430,7 +430,7 @@ declare var o2: O2; exports[`type_intersection.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -498,7 +498,7 @@ declare var o5: O5; exports[`type_intersection_optional.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -640,7 +640,7 @@ declare var o21: { ...{| p: T |} & { q: U } }; exports[`type_optional.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -712,7 +712,7 @@ declare var p: { ...{| p?: T |}, ...{| p?: U |} }; exports[`type_union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/new_spread/jsfmt.spec.js b/tests/flow/new_spread/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/new_spread/jsfmt.spec.js +++ b/tests/flow/new_spread/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap b/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap index 2378ee29..b5980b1d 100644 --- a/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`id.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -20,7 +20,7 @@ module.exports = id; exports[`subtype.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -46,7 +46,7 @@ function subtypeCheck(x: Interface): ObjectType { exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -82,7 +82,7 @@ module.exports = id(methodCaller); exports[`test2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -128,7 +128,7 @@ b.f(); // error, property \`p\` not found exports[`test3.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/object-method/jsfmt.spec.js b/tests/flow/object-method/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/object-method/jsfmt.spec.js +++ b/tests/flow/object-method/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/predicates-abstract/__snapshots__/jsfmt.spec.js.snap b/tests/flow/predicates-abstract/__snapshots__/jsfmt.spec.js.snap index 6c762544..9b39c291 100644 --- a/tests/flow/predicates-abstract/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/predicates-abstract/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`filter.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -43,7 +43,7 @@ function is_string(x): %checks { exports[`filter-union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -91,7 +91,7 @@ declare var ab: Array; exports[`refine.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -198,7 +198,7 @@ function is_string_and_number(x, y): %checks { exports[`sanity-filter.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -256,7 +256,7 @@ function is_string_regular(x): boolean { exports[`sanity-filter-union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -304,7 +304,7 @@ declare var ab: Array; exports[`sanity-refine.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/predicates-abstract/jsfmt.spec.js b/tests/flow/predicates-abstract/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/predicates-abstract/jsfmt.spec.js +++ b/tests/flow/predicates-abstract/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap b/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap index b63de549..6b91439c 100644 --- a/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`function-bind.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -95,7 +95,7 @@ if (m.bind(this)(x)) { exports[`function-union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -142,7 +142,7 @@ function foo(x: number | string | Array): number { exports[`is-string-decl.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -190,7 +190,7 @@ function foo(x: string | Array): string { exports[`logical-or.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -248,7 +248,7 @@ Number(dollars) || 0; exports[`object-invariant.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -307,7 +307,7 @@ function f(_this: { m: ?Meeting }): string { exports[`orig-string-tag-check.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -342,7 +342,7 @@ function foo(x: string | Array): string { exports[`sanity-fall-through.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -380,7 +380,7 @@ function foo(s: Array): string { exports[`sanity-invalid-calls.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -429,7 +429,7 @@ function foo(s: Array): string { exports[`sanity-is-string-bug.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -471,7 +471,7 @@ function bar(x: string | Array): string { exports[`sanity-parameter-mismatch.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -503,7 +503,7 @@ foo(3, 3); exports[`sanity-pred-with-body.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -546,7 +546,7 @@ function foo(x: string | Array): string { exports[`sanity-return-type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/predicates-declared/jsfmt.spec.js b/tests/flow/predicates-declared/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/predicates-declared/jsfmt.spec.js +++ b/tests/flow/predicates-declared/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/predicates-inferred/__snapshots__/jsfmt.spec.js.snap b/tests/flow/predicates-inferred/__snapshots__/jsfmt.spec.js.snap index 2f8aa346..312cca25 100644 --- a/tests/flow/predicates-inferred/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/predicates-inferred/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`sanity.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -68,7 +68,7 @@ function bak(z: string | number): number { exports[`sanity-multi-params.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -108,7 +108,7 @@ function foo(x: string | Array): string { exports[`sanity-ordering.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -156,7 +156,7 @@ function dotAccess(head, create) { exports[`sanity-unbound-var.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -202,7 +202,7 @@ function foo(x: string | Array): string { exports[`simple-predicate-func.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -360,7 +360,7 @@ declare function from_two_strings(x: string, y: string): void; exports[`simple-predicate-func-post.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/predicates-inferred/jsfmt.spec.js b/tests/flow/predicates-inferred/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/predicates-inferred/jsfmt.spec.js +++ b/tests/flow/predicates-inferred/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/predicates-parsing/__snapshots__/jsfmt.spec.js.snap b/tests/flow/predicates-parsing/__snapshots__/jsfmt.spec.js.snap index 8ae39da8..8c51232a 100644 --- a/tests/flow/predicates-parsing/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/predicates-parsing/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`fail-0.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -24,7 +24,7 @@ declare function f2(x: mixed): boolean %checks; exports[`fail-1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -46,7 +46,7 @@ function f6(x: mixed): %checks(x !== null) {} exports[`fail-2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -70,7 +70,7 @@ var a2 = (x: mixed): %checks(x !== null) => { exports[`fail-3.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -98,7 +98,7 @@ var a2 = (x: mixed): %checks(x !== null) => x !== null; exports[`pass.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/predicates-parsing/jsfmt.spec.js b/tests/flow/predicates-parsing/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/predicates-parsing/jsfmt.spec.js +++ b/tests/flow/predicates-parsing/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap b/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap index 7970ce59..b6cd798b 100644 --- a/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`assignment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -80,7 +80,7 @@ function bar2(x: Bar) { exports[`ast_node.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -114,7 +114,7 @@ export type ASTNode = Node1 | Node2; exports[`bool.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -218,7 +218,7 @@ let tests = [ exports[`computed_string_literal.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -268,7 +268,7 @@ function testLiteralProperty(a: A) { exports[`cond_prop.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -382,7 +382,7 @@ let tests = [ exports[`constants.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -402,7 +402,7 @@ export const ERROR: "ERROR" = "ERROR"; exports[`eq.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -465,7 +465,7 @@ let tests = [ exports[`exists.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -507,7 +507,7 @@ function foo2(x: ?Class): string { exports[`func_call.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -543,7 +543,7 @@ let tests = [ exports[`hasOwnProperty.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -597,7 +597,7 @@ function bar(x: Object) { exports[`heap_defassign.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -777,7 +777,7 @@ function def_assign_setprop_nohavoc(obj: Obj, obj2: Obj2) { exports[`lib.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -795,7 +795,7 @@ declare var BAZ: { stuff?: (x: number) => void } | void; exports[`missing-property-cond.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -943,7 +943,7 @@ function foo9() { exports[`mixed.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1197,7 +1197,7 @@ function arr0(x: mixed) { exports[`node1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1211,7 +1211,7 @@ module.exports = "Node1"; exports[`not.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1327,7 +1327,7 @@ let tests = [ exports[`null.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1359,7 +1359,7 @@ function null_bogus_comparison() { exports[`number.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1613,7 +1613,7 @@ let tests = [ exports[`property.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1792,7 +1792,7 @@ function c3( exports[`refinements.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -1962,7 +1962,7 @@ function global_in_conditional2(x: number) { exports[`string.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2242,7 +2242,7 @@ let tests = [ exports[`super_member.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2307,7 +2307,7 @@ class C extends A { exports[`switch.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -2429,7 +2429,7 @@ function corge(text: string | number | Array): string { exports[`tagged_union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -3006,7 +3006,7 @@ let tests = [ exports[`tagged_union_import.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -3064,7 +3064,7 @@ function handleStatus(status: Success | Error) { exports[`typeof.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -3204,7 +3204,7 @@ function testInvalidTemplateLiteral(x: string | number) { exports[`undef.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -3376,7 +3376,7 @@ function undef_bogus_comparison() { exports[`union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -3430,7 +3430,7 @@ function baz(x: ?thing) { exports[`void.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/refinements/jsfmt.spec.js b/tests/flow/refinements/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/refinements/jsfmt.spec.js +++ b/tests/flow/refinements/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap index 01ab3815..c58eb6ff 100644 --- a/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap @@ -63,7 +63,7 @@ printWidth: 80 'use strict'; /* - * Flow types for the Babylon AST. + * Flow types for the Babel AST. */ // Abstract types. Something must extend these. @@ -5110,7 +5110,7 @@ export type JSXSpreadAttribute = { "use strict"; /* - * Flow types for the Babylon AST. + * Flow types for the Babel AST. */ // Abstract types. Something must extend these. diff --git a/tests/flow/type-printer/types.js b/tests/flow/type-printer/types.js index 4f7e499e..37f2346c 100644 --- a/tests/flow/type-printer/types.js +++ b/tests/flow/type-printer/types.js @@ -5,7 +5,7 @@ 'use strict'; /* - * Flow types for the Babylon AST. + * Flow types for the Babel AST. */ // Abstract types. Something must extend these. diff --git a/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap b/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap index 6c90e797..c5914ef1 100644 --- a/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test1.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -54,7 +54,7 @@ declare var b: B; exports[`test2.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow/typeapp_perf/jsfmt.spec.js b/tests/flow/typeapp_perf/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow/typeapp_perf/jsfmt.spec.js +++ b/tests/flow/typeapp_perf/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_annotation/__snapshots__/jsfmt.spec.js.snap b/tests/flow_annotation/__snapshots__/jsfmt.spec.js.snap index 2e11dd51..979c45cf 100644 --- a/tests/flow_annotation/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_annotation/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`array_of_functions.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_annotation/jsfmt.spec.js b/tests/flow_annotation/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_annotation/jsfmt.spec.js +++ b/tests/flow_annotation/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_class_field/__snapshots__/jsfmt.spec.js.snap b/tests/flow_class_field/__snapshots__/jsfmt.spec.js.snap index ba093493..acd9574c 100644 --- a/tests/flow_class_field/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_class_field/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`override.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_class_field/jsfmt.spec.js b/tests/flow_class_field/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/flow_class_field/jsfmt.spec.js +++ b/tests/flow_class_field/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap index 342bdaed..06886cef 100644 --- a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`arrow.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -32,7 +32,7 @@ const run = (cmd /*: string */) /*: Promise */ => {}; exports[`class.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -54,7 +54,7 @@ class A { exports[`functions.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -68,7 +68,7 @@ function foo(bar /*: T[] */, baz /*: T */) /*: S */ {} exports[`generics.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -102,7 +102,7 @@ foo/*:: */(); exports[`let.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -118,7 +118,7 @@ let foo /*: string */ = "a"; exports[`object_type_annotation.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -157,7 +157,7 @@ type Props = { exports[`type_annotations.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_comments/babylon_only/__snapshots__/jsfmt.spec.js.snap b/tests/flow_comments/babylon_only/__snapshots__/jsfmt.spec.js.snap index b66329cd..732887c0 100644 --- a/tests/flow_comments/babylon_only/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_comments/babylon_only/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`class_with_generics.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -36,7 +36,7 @@ class Component extends React.Component /*:: */ { exports[`functions.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_comments/babylon_only/jsfmt.spec.js b/tests/flow_comments/babylon_only/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/flow_comments/babylon_only/jsfmt.spec.js +++ b/tests/flow_comments/babylon_only/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/flow_comments/jsfmt.spec.js b/tests/flow_comments/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_comments/jsfmt.spec.js +++ b/tests/flow_comments/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_export/__snapshots__/jsfmt.spec.js.snap b/tests/flow_export/__snapshots__/jsfmt.spec.js.snap index 5a6d2f5b..fbdb1fdf 100644 --- a/tests/flow_export/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_export/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_export/jsfmt.spec.js b/tests/flow_export/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_export/jsfmt.spec.js +++ b/tests/flow_export/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap b/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap index d85e7116..2f55d3b3 100644 --- a/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`single.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -26,7 +26,7 @@ const selectorByPath: Path => SomethingSelector< exports[`single.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -52,7 +52,7 @@ const selectorByPath: Path => SomethingSelector< exports[`single.js 3`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -76,7 +76,7 @@ const selectorByPath: (Path) => SomethingSelector< exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -212,7 +212,7 @@ type T = ??(() => A) | B; exports[`test.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -350,7 +350,7 @@ type T = ??(() => A) | B; exports[`test.js 3`] = ` ====================================options===================================== arrowParens: "always" -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_function_parentheses/jsfmt.spec.js b/tests/flow_function_parentheses/jsfmt.spec.js index d0170fda..f610834e 100644 --- a/tests/flow_function_parentheses/jsfmt.spec.js +++ b/tests/flow_function_parentheses/jsfmt.spec.js @@ -1,3 +1,3 @@ -run_spec(__dirname, ["flow", "babylon"]); -run_spec(__dirname, ["flow", "babylon"], { trailingComma: "all" }); -run_spec(__dirname, ["flow", "babylon"], { arrowParens: "always" }); +run_spec(__dirname, ["flow", "babel"]); +run_spec(__dirname, ["flow", "babel"], { trailingComma: "all" }); +run_spec(__dirname, ["flow", "babel"], { arrowParens: "always" }); diff --git a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap index 75d670e0..d228e0d1 100644 --- a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`break.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -36,7 +36,7 @@ var X = { exports[`break.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -71,7 +71,7 @@ var X = { exports[`generic.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -87,7 +87,7 @@ const a = 1; exports[`generic.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -104,7 +104,7 @@ const a = 1; exports[`interface.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -124,7 +124,7 @@ interface B { exports[`interface.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -145,7 +145,7 @@ interface B { exports[`nullable.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -175,7 +175,7 @@ function foo(): Promise {} exports[`nullable.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -206,7 +206,7 @@ function foo(): Promise {} exports[`single-identifier.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -220,7 +220,7 @@ const longVariableName: Array = this.foo.bar.baz.collider.body.vertices. exports[`single-identifier.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -235,7 +235,7 @@ const longVariableName: Array = this.foo.bar.baz.collider.body.vertices. exports[`trailing.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -261,7 +261,7 @@ type State = { exports[`trailing.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -288,7 +288,7 @@ type State = { exports[`type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -306,7 +306,7 @@ type H = { A: string, B: number }; exports[`type.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth @@ -325,7 +325,7 @@ type H = { A: string, B: number }; exports[`union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -345,7 +345,7 @@ type Foo = Promise< exports[`union.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth diff --git a/tests/flow_generic/jsfmt.spec.js b/tests/flow_generic/jsfmt.spec.js index 425bb9ff..381dfaee 100644 --- a/tests/flow_generic/jsfmt.spec.js +++ b/tests/flow_generic/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["flow", "babylon"]); -run_spec(__dirname, ["flow", "babylon"], { trailingComma: "all" }); +run_spec(__dirname, ["flow", "babel"]); +run_spec(__dirname, ["flow", "babel"], { trailingComma: "all" }); diff --git a/tests/flow_interface_types/__snapshots__/jsfmt.spec.js.snap b/tests/flow_interface_types/__snapshots__/jsfmt.spec.js.snap index 9c64fae1..2773fef7 100644 --- a/tests/flow_interface_types/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_interface_types/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`interface_types.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_interface_types/jsfmt.spec.js b/tests/flow_interface_types/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_interface_types/jsfmt.spec.js +++ b/tests/flow_interface_types/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_internal_slot/__snapshots__/jsfmt.spec.js.snap b/tests/flow_internal_slot/__snapshots__/jsfmt.spec.js.snap index 7073356f..4053367a 100644 --- a/tests/flow_internal_slot/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_internal_slot/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`internal_slot.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_internal_slot/jsfmt.spec.js b/tests/flow_internal_slot/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_internal_slot/jsfmt.spec.js +++ b/tests/flow_internal_slot/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap b/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap index fe3c0875..64450ffa 100644 --- a/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`intersection.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_intersection/jsfmt.spec.js b/tests/flow_intersection/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_intersection/jsfmt.spec.js +++ b/tests/flow_intersection/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_jsx/__snapshots__/jsfmt.spec.js.snap b/tests/flow_jsx/__snapshots__/jsfmt.spec.js.snap index dae44c5d..969566c7 100644 --- a/tests/flow_jsx/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_jsx/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`func_inside_attr.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -16,7 +16,7 @@ printWidth: 80 exports[`return_type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_jsx/jsfmt.spec.js b/tests/flow_jsx/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_jsx/jsfmt.spec.js +++ b/tests/flow_jsx/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_maybe/__snapshots__/jsfmt.spec.js.snap b/tests/flow_maybe/__snapshots__/jsfmt.spec.js.snap index b43212cc..06890321 100644 --- a/tests/flow_maybe/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_maybe/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`maybe_return.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_maybe/jsfmt.spec.js b/tests/flow_maybe/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_maybe/jsfmt.spec.js +++ b/tests/flow_maybe/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_method/__snapshots__/jsfmt.spec.js.snap b/tests/flow_method/__snapshots__/jsfmt.spec.js.snap index 0582f838..4b389255 100644 --- a/tests/flow_method/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_method/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -26,7 +26,7 @@ type Foo = { exports[`method.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_method/jsfmt.spec.js b/tests/flow_method/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_method/jsfmt.spec.js +++ b/tests/flow_method/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_mixins/__snapshots__/jsfmt.spec.js.snap b/tests/flow_mixins/__snapshots__/jsfmt.spec.js.snap index 0db5522f..c33d4e32 100644 --- a/tests/flow_mixins/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_mixins/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`type.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow"] +parsers: ["babel", "flow"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_mixins/jsfmt.spec.js b/tests/flow_mixins/jsfmt.spec.js index bffb7a54..e3b2b302 100644 --- a/tests/flow_mixins/jsfmt.spec.js +++ b/tests/flow_mixins/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow"]); +run_spec(__dirname, ["babel", "flow"]); diff --git a/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap b/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap index 07d39416..78a9ad70 100644 --- a/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "es5" | printWidth diff --git a/tests/flow_object_inexact/jsfmt.spec.js b/tests/flow_object_inexact/jsfmt.spec.js index 21de2395..797cbe54 100644 --- a/tests/flow_object_inexact/jsfmt.spec.js +++ b/tests/flow_object_inexact/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"], { trailingComma: "es5" }); +run_spec(__dirname, ["flow", "babel"], { trailingComma: "es5" }); diff --git a/tests/flow_type_cast/__snapshots__/jsfmt.spec.js.snap b/tests/flow_type_cast/__snapshots__/jsfmt.spec.js.snap index 65ce2667..0f6e2964 100644 --- a/tests/flow_type_cast/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_type_cast/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`expression.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -22,7 +22,7 @@ const foo = ((1 ? 2 : 3): number); exports[`statement.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_type_cast/jsfmt.spec.js b/tests/flow_type_cast/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_type_cast/jsfmt.spec.js +++ b/tests/flow_type_cast/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_type_declarations/__snapshots__/jsfmt.spec.js.snap b/tests/flow_type_declarations/__snapshots__/jsfmt.spec.js.snap index 8cf0541e..47ee13df 100644 --- a/tests/flow_type_declarations/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_type_declarations/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`declare_export.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -16,7 +16,7 @@ declare export default 5; exports[`declare_export.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 semi: false | printWidth @@ -31,7 +31,7 @@ declare export default 5 exports[`declare_type.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -45,7 +45,7 @@ declare type A = string; exports[`declare_type.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 semi: false | printWidth @@ -60,7 +60,7 @@ declare type A = string exports[`declare_var.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -74,7 +74,7 @@ declare var bool: React$PropType$Primitive; exports[`declare_var.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 semi: false | printWidth @@ -89,7 +89,7 @@ declare var bool: React$PropType$Primitive exports[`long.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -117,7 +117,7 @@ type SomeOtherLongLongLongLongLongLongLongLongLongLongLongLongLongLongKey = Some exports[`long.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 semi: false | printWidth @@ -146,7 +146,7 @@ type SomeOtherLongLongLongLongLongLongLongLongLongLongLongLongLongLongKey = Some exports[`opaque.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -186,7 +186,7 @@ opaque type overloads = ((x: string) => number) & ((x: number) => string); exports[`opaque.js 2`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 semi: false | printWidth diff --git a/tests/flow_type_declarations/jsfmt.spec.js b/tests/flow_type_declarations/jsfmt.spec.js index c5f8baf6..2f93d987 100644 --- a/tests/flow_type_declarations/jsfmt.spec.js +++ b/tests/flow_type_declarations/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["flow", "babylon"]); -run_spec(__dirname, ["flow", "babylon"], { semi: false }); +run_spec(__dirname, ["flow", "babel"]); +run_spec(__dirname, ["flow", "babel"], { semi: false }); diff --git a/tests/flow_type_parameters/__snapshots__/jsfmt.spec.js.snap b/tests/flow_type_parameters/__snapshots__/jsfmt.spec.js.snap index b9c3f9e8..17903e02 100644 --- a/tests/flow_type_parameters/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_type_parameters/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`empty_generic_break.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_type_parameters/jsfmt.spec.js b/tests/flow_type_parameters/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_type_parameters/jsfmt.spec.js +++ b/tests/flow_type_parameters/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_type_spread/__snapshots__/jsfmt.spec.js.snap b/tests/flow_type_spread/__snapshots__/jsfmt.spec.js.snap index 50e38d02..02b13db0 100644 --- a/tests/flow_type_spread/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_type_spread/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comments.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_type_spread/jsfmt.spec.js b/tests/flow_type_spread/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_type_spread/jsfmt.spec.js +++ b/tests/flow_type_spread/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_typeapp_call/__snapshots__/jsfmt.spec.js.snap b/tests/flow_typeapp_call/__snapshots__/jsfmt.spec.js.snap index 3f226d11..353c4465 100644 --- a/tests/flow_typeapp_call/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_typeapp_call/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`typeapp_call.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_typeapp_call/jsfmt.spec.js b/tests/flow_typeapp_call/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_typeapp_call/jsfmt.spec.js +++ b/tests/flow_typeapp_call/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_union/__snapshots__/jsfmt.spec.js.snap b/tests/flow_union/__snapshots__/jsfmt.spec.js.snap index 39a4eeb6..e577c294 100644 --- a/tests/flow_union/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_union/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -24,7 +24,7 @@ const myValue = (callcallcallcallcallcall( exports[`union.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_union/jsfmt.spec.js b/tests/flow_union/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_union/jsfmt.spec.js +++ b/tests/flow_union/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/flow_variance/__snapshots__/jsfmt.spec.js.snap b/tests/flow_variance/__snapshots__/jsfmt.spec.js.snap index 91037f31..e5e083b5 100644 --- a/tests/flow_variance/__snapshots__/jsfmt.spec.js.snap +++ b/tests/flow_variance/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`variance.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/flow_variance/jsfmt.spec.js b/tests/flow_variance/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/flow_variance/jsfmt.spec.js +++ b/tests/flow_variance/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap b/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap index a4cce452..11cb59dc 100644 --- a/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap +++ b/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`function_expression.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/function_first_param/jsfmt.spec.js b/tests/function_first_param/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/function_first_param/jsfmt.spec.js +++ b/tests/function_first_param/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap b/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap index e75d5381..3cda2fd0 100644 --- a/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap +++ b/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`functional_compose.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -117,7 +117,7 @@ this.subscriptions.add( exports[`lodash_flow.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -167,7 +167,7 @@ foo(6); exports[`lodash_flow_right.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -217,7 +217,7 @@ foo(6); exports[`ramda_compose.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -318,7 +318,7 @@ followersForUser("JOE").then(followers => console.log("Followers:", followers)); exports[`ramda_pipe.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -386,7 +386,7 @@ var followersForUser = R.pipeP( exports[`redux_compose.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -423,7 +423,7 @@ const store = createStore( exports[`redux_connect.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -441,7 +441,7 @@ const ArtistInput = connect( exports[`reselect_createselector.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -477,7 +477,7 @@ const resolve = createSelector( exports[`rxjs_pipe.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/functional_composition/jsfmt.spec.js b/tests/functional_composition/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/functional_composition/jsfmt.spec.js +++ b/tests/functional_composition/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/import_meta/__snapshots__/jsfmt.spec.js.snap b/tests/import_meta/__snapshots__/jsfmt.spec.js.snap index c0a6e50e..b84fa1a9 100644 --- a/tests/import_meta/__snapshots__/jsfmt.spec.js.snap +++ b/tests/import_meta/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`import_meta.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/import_meta/jsfmt.spec.js b/tests/import_meta/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/import_meta/jsfmt.spec.js +++ b/tests/import_meta/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/import_then/__snapshots__/jsfmt.spec.js.snap b/tests/import_then/__snapshots__/jsfmt.spec.js.snap index 135fa57d..d8f52eff 100644 --- a/tests/import_then/__snapshots__/jsfmt.spec.js.snap +++ b/tests/import_then/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`long.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -27,7 +27,7 @@ import("myreallylongdynamicallyloadedmodulenamemyreallylongdynamicallyloadedmodu exports[`then.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/import_then/jsfmt.spec.js b/tests/import_then/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/import_then/jsfmt.spec.js +++ b/tests/import_then/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap b/tests/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap index d0989d7a..0a17746e 100644 --- a/tests/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap +++ b/tests/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap @@ -3,7 +3,7 @@ exports[`module-with-late-docblock.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -35,7 +35,7 @@ const fruit = "tomatoes"; exports[`module-with-multiple-same-pragma.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -57,7 +57,7 @@ printWidth: 80 exports[`module-with-pragma.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -90,7 +90,7 @@ function foo(bar) { exports[`module-without-docblock.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -111,7 +111,7 @@ function foo(bar) { exports[`module-without-pragma.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -143,7 +143,7 @@ function foo(bar) { exports[`trailing-spaces-first-line.js 1`] = ` ====================================options===================================== insertPragma: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/insert-pragma/js/jsfmt.spec.js b/tests/insert-pragma/js/jsfmt.spec.js index 4f802b63..d1ed3d6a 100644 --- a/tests/insert-pragma/js/jsfmt.spec.js +++ b/tests/insert-pragma/js/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"], { insertPragma: true }); +run_spec(__dirname, ["flow", "babel", "typescript"], { insertPragma: true }); diff --git a/tests/js_empty/__snapshots__/jsfmt.spec.js.snap b/tests/js_empty/__snapshots__/jsfmt.spec.js.snap index d332621d..9c42bd2a 100644 --- a/tests/js_empty/__snapshots__/jsfmt.spec.js.snap +++ b/tests/js_empty/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`semicolon.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/js_empty/jsfmt.spec.js b/tests/js_empty/jsfmt.spec.js index c0e8f2eb..eb85eda6 100644 --- a/tests/js_empty/jsfmt.spec.js +++ b/tests/js_empty/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap index 30834a7b..15d5cb9e 100644 --- a/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`attr-element.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx-attr-element/jsfmt.spec.js b/tests/jsx-attr-element/jsfmt.spec.js index ad02d22b..6de1218a 100644 --- a/tests/jsx-attr-element/jsfmt.spec.js +++ b/tests/jsx-attr-element/jsfmt.spec.js @@ -1,2 +1,2 @@ // Flow and TypeScript don't support JSX elements as attribute values -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/jsx-do/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-do/__snapshots__/jsfmt.spec.js.snap index 03e58da4..af16933b 100644 --- a/tests/jsx-do/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx-do/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`do.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx-do/jsfmt.spec.js b/tests/jsx-do/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/jsx-do/jsfmt.spec.js +++ b/tests/jsx-do/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap index b7f248a4..0ceb219f 100644 --- a/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -165,7 +165,7 @@ regression_extra_newline_2 = ( exports[`windows.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx-newlines/jsfmt.spec.js b/tests/jsx-newlines/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/jsx-newlines/jsfmt.spec.js +++ b/tests/jsx-newlines/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap index cc360acd..d0596afc 100644 --- a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx-split-attrs/jsfmt.spec.js b/tests/jsx-split-attrs/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/jsx-split-attrs/jsfmt.spec.js +++ b/tests/jsx-split-attrs/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/__snapshots__/jsfmt.spec.js.snap index dc293337..bfd21026 100644 --- a/tests/jsx/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx/__snapshots__/jsfmt.spec.js.snap @@ -3,7 +3,7 @@ exports[`array-iter.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -81,7 +81,7 @@ const TodoList = ({ todos }) => ( exports[`array-iter.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -159,7 +159,7 @@ const TodoList = ({ todos }) => ( exports[`array-iter.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -237,7 +237,7 @@ const TodoList = ({ todos }) => ( exports[`array-iter.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -315,7 +315,7 @@ const TodoList = ({ todos }) => ( exports[`attr-comments.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -391,7 +391,7 @@ singleQuote: false exports[`attr-comments.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -467,7 +467,7 @@ singleQuote: false exports[`attr-comments.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -543,7 +543,7 @@ singleQuote: true exports[`attr-comments.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -619,7 +619,7 @@ singleQuote: true exports[`conditional-expression.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -907,7 +907,7 @@ cable ? ( exports[`conditional-expression.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -1195,7 +1195,7 @@ cable ? ( exports[`conditional-expression.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -1483,7 +1483,7 @@ cable ? ( exports[`conditional-expression.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -1771,7 +1771,7 @@ cable ? ( exports[`expression.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -2059,7 +2059,7 @@ singleQuote: false exports[`expression.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -2347,7 +2347,7 @@ singleQuote: false exports[`expression.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -2635,7 +2635,7 @@ singleQuote: true exports[`expression.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -2923,7 +2923,7 @@ singleQuote: true exports[`flow_fix_me.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -2947,7 +2947,7 @@ const aDiv = ( exports[`flow_fix_me.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -2971,7 +2971,7 @@ const aDiv = ( exports[`flow_fix_me.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -2995,7 +2995,7 @@ const aDiv = ( exports[`flow_fix_me.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3019,7 +3019,7 @@ const aDiv = ( exports[`html_escape.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3039,7 +3039,7 @@ export default () => ; exports[`html_escape.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3059,7 +3059,7 @@ export default () => ; exports[`html_escape.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3079,7 +3079,7 @@ export default () => ; exports[`html_escape.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3099,7 +3099,7 @@ export default () => ; exports[`hug.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3181,7 +3181,7 @@ singleQuote: false exports[`hug.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3263,7 +3263,7 @@ singleQuote: false exports[`hug.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3345,7 +3345,7 @@ singleQuote: true exports[`hug.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3427,7 +3427,7 @@ singleQuote: true exports[`logical-expression.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3505,7 +3505,7 @@ singleQuote: false exports[`logical-expression.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3583,7 +3583,7 @@ singleQuote: false exports[`logical-expression.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3661,7 +3661,7 @@ singleQuote: true exports[`logical-expression.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3739,7 +3739,7 @@ singleQuote: true exports[`object-property.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3779,7 +3779,7 @@ const tabs = [ exports[`object-property.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3819,7 +3819,7 @@ const tabs = [ exports[`object-property.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3859,7 +3859,7 @@ const tabs = [ exports[`object-property.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -3899,7 +3899,7 @@ const tabs = [ exports[`open-break.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3943,7 +3943,7 @@ onClick={() => { exports[`open-break.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -3987,7 +3987,7 @@ onClick={() => { exports[`open-break.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4031,7 +4031,7 @@ onClick={() => { exports[`open-break.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4075,7 +4075,7 @@ onClick={() => { exports[`parens.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4113,7 +4113,7 @@ a = [ exports[`parens.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4151,7 +4151,7 @@ a = [ exports[`parens.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4189,7 +4189,7 @@ a = [ exports[`parens.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4227,7 +4227,7 @@ a = [ exports[`quotes.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4317,7 +4317,7 @@ singleQuote: false exports[`quotes.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4407,7 +4407,7 @@ singleQuote: false exports[`quotes.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4497,7 +4497,7 @@ singleQuote: true exports[`quotes.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4587,7 +4587,7 @@ singleQuote: true exports[`return-statement.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4701,7 +4701,7 @@ class BreakingClass extends React.component { exports[`return-statement.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -4815,7 +4815,7 @@ class BreakingClass extends React.component { exports[`return-statement.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -4929,7 +4929,7 @@ class BreakingClass extends React.component { exports[`return-statement.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -5043,7 +5043,7 @@ class BreakingClass extends React.component { exports[`spacing.js 1`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -5083,7 +5083,7 @@ const Labels = { exports[`spacing.js 2`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: false | printWidth @@ -5123,7 +5123,7 @@ const Labels = { exports[`spacing.js 3`] = ` ====================================options===================================== jsxSingleQuote: false -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth @@ -5163,7 +5163,7 @@ const Labels = { exports[`spacing.js 4`] = ` ====================================options===================================== jsxSingleQuote: true -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 singleQuote: true | printWidth diff --git a/tests/jsx/jsfmt.spec.js b/tests/jsx/jsfmt.spec.js index 687ad179..1f6f2c02 100644 --- a/tests/jsx/jsfmt.spec.js +++ b/tests/jsx/jsfmt.spec.js @@ -1,16 +1,16 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"], { +run_spec(__dirname, ["flow", "babel", "typescript"], { singleQuote: false, jsxSingleQuote: false }); -run_spec(__dirname, ["flow", "babylon", "typescript"], { +run_spec(__dirname, ["flow", "babel", "typescript"], { singleQuote: false, jsxSingleQuote: true }); -run_spec(__dirname, ["flow", "babylon", "typescript"], { +run_spec(__dirname, ["flow", "babel", "typescript"], { singleQuote: true, jsxSingleQuote: false }); -run_spec(__dirname, ["flow", "babylon", "typescript"], { +run_spec(__dirname, ["flow", "babel", "typescript"], { singleQuote: true, jsxSingleQuote: true }); diff --git a/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap index a329158d..b43f585d 100644 --- a/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap @@ -16,7 +16,7 @@ printWidth: 80 exports[`escape.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -64,7 +64,7 @@ raw_amp = foo & bar; exports[`nbsp.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx_escape/jsfmt.spec.js b/tests/jsx_escape/jsfmt.spec.js index 9b6baf68..52f49c4f 100644 --- a/tests/jsx_escape/jsfmt.spec.js +++ b/tests/jsx_escape/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname, ["flow"]); -// FIXME nbsp.js flow != babylon output, waiting for: https://github.com/babel/babylon/pull/344 -run_spec(__dirname, ["babylon"]); +// FIXME nbsp.js flow != babel output, waiting for: https://github.com/babel/babylon/pull/344 +run_spec(__dirname, ["babel"]); diff --git a/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap index f60dcfec..7091ec5e 100644 --- a/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`fragment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx_fragment/jsfmt.spec.js b/tests/jsx_fragment/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/jsx_fragment/jsfmt.spec.js +++ b/tests/jsx_fragment/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap index d578c872..0c728eed 100644 --- a/tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`jsx_ignore.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx_ignore/jsfmt.spec.js b/tests/jsx_ignore/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/jsx_ignore/jsfmt.spec.js +++ b/tests/jsx_ignore/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap index f7705c80..11d7ffcf 100644 --- a/tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`jsx_namespaced_name.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx_namespace/jsfmt.spec.js b/tests/jsx_namespace/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/jsx_namespace/jsfmt.spec.js +++ b/tests/jsx_namespace/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap index 4c46d78e..03f389b1 100644 --- a/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap +++ b/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`attribute.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -67,7 +67,7 @@ printWidth: 80 exports[`child.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/jsx_spread/jsfmt.spec.js b/tests/jsx_spread/jsfmt.spec.js index c0e8f2eb..eb85eda6 100644 --- a/tests/jsx_spread/jsfmt.spec.js +++ b/tests/jsx_spread/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap b/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap index 044a9a0a..583f31c1 100644 --- a/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap +++ b/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`boundary.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/line_suffix_boundary/jsfmt.spec.js b/tests/line_suffix_boundary/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/line_suffix_boundary/jsfmt.spec.js +++ b/tests/line_suffix_boundary/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/literal-numeric-separator/__snapshots__/jsfmt.spec.js.snap b/tests/literal-numeric-separator/__snapshots__/jsfmt.spec.js.snap index 7720a871..d00ba802 100644 --- a/tests/literal-numeric-separator/__snapshots__/jsfmt.spec.js.snap +++ b/tests/literal-numeric-separator/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/literal-numeric-separator/jsfmt.spec.js b/tests/literal-numeric-separator/jsfmt.spec.js index c0e8f2eb..eb85eda6 100644 --- a/tests/literal-numeric-separator/jsfmt.spec.js +++ b/tests/literal-numeric-separator/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/literal/__snapshots__/jsfmt.spec.js.snap b/tests/literal/__snapshots__/jsfmt.spec.js.snap index 27dccf3b..23a824b6 100644 --- a/tests/literal/__snapshots__/jsfmt.spec.js.snap +++ b/tests/literal/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`number.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/literal/jsfmt.spec.js b/tests/literal/jsfmt.spec.js index e6c04be8..d1f25e54 100644 --- a/tests/literal/jsfmt.spec.js +++ b/tests/literal/jsfmt.spec.js @@ -1,2 +1,2 @@ -// flow-parser@0.38.0 fails to parse `1.e1`, so use babylon here. -run_spec(__dirname, ["babylon", "typescript"]); +// flow-parser@0.38.0 fails to parse `1.e1`, so use babel here. +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap index f00a9463..5358044a 100644 --- a/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap +++ b/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`styled-components.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/multiparser_js_css/jsfmt.spec.js b/tests/multiparser_js_css/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/multiparser_js_css/jsfmt.spec.js +++ b/tests/multiparser_js_css/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap index 9f2cae69..59018321 100644 --- a/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap +++ b/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comment-tag.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -32,7 +32,7 @@ const query = /* GraphQL */ \` exports[`definitions.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -62,7 +62,7 @@ graphql\` exports[`escape.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -156,7 +156,7 @@ gql\` exports[`expressions.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -206,7 +206,7 @@ const veryLongVariableNameToMakeTheLineBreak = graphql( exports[`graphql.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -236,7 +236,7 @@ graphql( exports[`graphql-tag.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -569,7 +569,7 @@ gql\` exports[`invalid.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -625,7 +625,7 @@ gql\` exports[`react-relay.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/multiparser_js_graphql/jsfmt.spec.js b/tests/multiparser_js_graphql/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/multiparser_js_graphql/jsfmt.spec.js +++ b/tests/multiparser_js_graphql/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap index 98f22416..0503fddd 100644 --- a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap +++ b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`lit-html.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow", "typescript"] +parsers: ["babel", "flow", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/multiparser_js_html/jsfmt.spec.js b/tests/multiparser_js_html/jsfmt.spec.js index c0e8f2eb..eb85eda6 100644 --- a/tests/multiparser_js_html/jsfmt.spec.js +++ b/tests/multiparser_js_html/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow", "typescript"]); +run_spec(__dirname, ["babel", "flow", "typescript"]); diff --git a/tests/multiparser_js_markdown/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_markdown/__snapshots__/jsfmt.spec.js.snap index d1a70ee1..d31a1e7a 100644 --- a/tests/multiparser_js_markdown/__snapshots__/jsfmt.spec.js.snap +++ b/tests/multiparser_js_markdown/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`0-indent.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth @@ -56,7 +56,7 @@ text3 exports[`codeblock.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth @@ -87,7 +87,7 @@ markdown\\\` exports[`escape.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth @@ -126,7 +126,7 @@ markdown\` exports[`issue-5021.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth @@ -210,7 +210,7 @@ text3 exports[`markdown.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth @@ -271,7 +271,7 @@ export default function ReadMe() { exports[`single-line.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 proseWrap: "always" | printWidth diff --git a/tests/multiparser_js_markdown/jsfmt.spec.js b/tests/multiparser_js_markdown/jsfmt.spec.js index eee701ac..8d0573ea 100644 --- a/tests/multiparser_js_markdown/jsfmt.spec.js +++ b/tests/multiparser_js_markdown/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"], { proseWrap: "always" }); +run_spec(__dirname, ["babel"], { proseWrap: "always" }); diff --git a/tests/no-semi-babylon-extensions/__snapshots__/jsfmt.spec.js.snap b/tests/no-semi-babylon-extensions/__snapshots__/jsfmt.spec.js.snap index 177fc5c1..0aab889f 100644 --- a/tests/no-semi-babylon-extensions/__snapshots__/jsfmt.spec.js.snap +++ b/tests/no-semi-babylon-extensions/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`no-semi.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -36,7 +36,7 @@ class A { exports[`no-semi.js 2`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth diff --git a/tests/no-semi-babylon-extensions/jsfmt.spec.js b/tests/no-semi-babylon-extensions/jsfmt.spec.js index 0d784420..c5f2d2b9 100644 --- a/tests/no-semi-babylon-extensions/jsfmt.spec.js +++ b/tests/no-semi-babylon-extensions/jsfmt.spec.js @@ -1,2 +1,2 @@ -run_spec(__dirname, ["babylon"]); -run_spec(__dirname, ["babylon"], { semi: false }); +run_spec(__dirname, ["babel"]); +run_spec(__dirname, ["babel"], { semi: false }); diff --git a/tests/no-semi/__snapshots__/jsfmt.spec.js.snap b/tests/no-semi/__snapshots__/jsfmt.spec.js.snap index e9be8d69..bd77217c 100644 --- a/tests/no-semi/__snapshots__/jsfmt.spec.js.snap +++ b/tests/no-semi/__snapshots__/jsfmt.spec.js.snap @@ -71,7 +71,7 @@ x exports[`comments.js 3`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -116,7 +116,7 @@ declare class A { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -129,7 +129,7 @@ declare interface C { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -142,7 +142,7 @@ interface E { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -155,7 +155,7 @@ declare class A { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -167,7 +167,7 @@ declare interface C { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -179,7 +179,7 @@ interface E { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -202,7 +202,7 @@ declare class A { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -215,7 +215,7 @@ declare interface C { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -228,7 +228,7 @@ interface E { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -241,7 +241,7 @@ declare class A { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -253,7 +253,7 @@ declare interface C { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -265,7 +265,7 @@ interface E { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -277,7 +277,7 @@ interface E { exports[`flow-interfaces.js 3`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -288,7 +288,7 @@ declare class A { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -301,7 +301,7 @@ declare interface C { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -314,7 +314,7 @@ interface E { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -327,7 +327,7 @@ declare class A { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -339,7 +339,7 @@ declare interface C { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -351,7 +351,7 @@ interface E { two: { three: string } | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } @@ -420,7 +420,7 @@ var c = a.e exports[`issue2006.js 3`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth @@ -1150,7 +1150,7 @@ aReallyLongLine012345678901234567890123456789012345678901234567890123456789 * exports[`no-semi.js 3`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 semi: false | printWidth diff --git a/tests/no-semi/flow-interfaces.js b/tests/no-semi/flow-interfaces.js index d3124db3..307cdaee 100644 --- a/tests/no-semi/flow-interfaces.js +++ b/tests/no-semi/flow-interfaces.js @@ -4,7 +4,7 @@ declare class A { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare class B { // one: boolean // two: { three: string } @@ -17,7 +17,7 @@ declare interface C { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // declare interface D { // one: boolean // two: { three: string } @@ -30,7 +30,7 @@ interface E { | number; } -// NOTE: Flow and Babylon both fail to apply ASI here +// NOTE: Flow and Babel both fail to apply ASI here // interface F { // one: boolean // two: { three: string } diff --git a/tests/no-semi/jsfmt.spec.js b/tests/no-semi/jsfmt.spec.js index a18f7ff1..4adcd58f 100644 --- a/tests/no-semi/jsfmt.spec.js +++ b/tests/no-semi/jsfmt.spec.js @@ -1,3 +1,3 @@ run_spec(__dirname, ["flow"]); run_spec(__dirname, ["flow"], { semi: false }); -run_spec(__dirname, ["babylon"], { semi: false }); +run_spec(__dirname, ["babel"], { semi: false }); diff --git a/tests/non-strict/__snapshots__/jsfmt.spec.js.snap b/tests/non-strict/__snapshots__/jsfmt.spec.js.snap index 79203391..08ef177f 100644 --- a/tests/non-strict/__snapshots__/jsfmt.spec.js.snap +++ b/tests/non-strict/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`argument-name-clash.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -18,7 +18,7 @@ function f(a, a) { exports[`keywords.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -46,7 +46,7 @@ function myFunction() { exports[`octal-number.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/non-strict/jsfmt.spec.js b/tests/non-strict/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/non-strict/jsfmt.spec.js +++ b/tests/non-strict/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/nullish_coalescing/__snapshots__/jsfmt.spec.js.snap b/tests/nullish_coalescing/__snapshots__/jsfmt.spec.js.snap index c22a9072..0fc3d0e7 100644 --- a/tests/nullish_coalescing/__snapshots__/jsfmt.spec.js.snap +++ b/tests/nullish_coalescing/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`nullish_coalesing_operator.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow"] +parsers: ["babel", "flow"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/nullish_coalescing/jsfmt.spec.js b/tests/nullish_coalescing/jsfmt.spec.js index bffb7a54..e3b2b302 100644 --- a/tests/nullish_coalescing/jsfmt.spec.js +++ b/tests/nullish_coalescing/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow"]); +run_spec(__dirname, ["babel", "flow"]); diff --git a/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap b/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap index 69d32f2d..a3a99407 100644 --- a/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap +++ b/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -26,7 +26,7 @@ function foo() { exports[`long-value.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -45,7 +45,7 @@ const x = { exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/object-prop-break-in/jsfmt.spec.js b/tests/object-prop-break-in/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/object-prop-break-in/jsfmt.spec.js +++ b/tests/object-prop-break-in/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap b/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap index ded25c6a..c2d63ec9 100644 --- a/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap +++ b/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`after-key.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -28,7 +28,7 @@ let a = { exports[`comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/object_property_comment/jsfmt.spec.js b/tests/object_property_comment/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/object_property_comment/jsfmt.spec.js +++ b/tests/object_property_comment/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/objects/__snapshots__/jsfmt.spec.js.snap b/tests/objects/__snapshots__/jsfmt.spec.js.snap index 05c0bd9c..63c7a592 100644 --- a/tests/objects/__snapshots__/jsfmt.spec.js.snap +++ b/tests/objects/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`expand.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -26,7 +26,7 @@ const Component2 = ({ props }) => Test; exports[`expression.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -56,7 +56,7 @@ a = () => ({}.x); exports[`method.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -70,7 +70,7 @@ a = { f() {} }; exports[`range.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -108,7 +108,7 @@ group( exports[`right_break.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/objects/jsfmt.spec.js b/tests/objects/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/objects/jsfmt.spec.js +++ b/tests/objects/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/optional_catch_binding/__snapshots__/jsfmt.spec.js.snap b/tests/optional_catch_binding/__snapshots__/jsfmt.spec.js.snap index 1c82d2f2..3bd79e2e 100644 --- a/tests/optional_catch_binding/__snapshots__/jsfmt.spec.js.snap +++ b/tests/optional_catch_binding/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`optional_catch_binding.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/optional_catch_binding/jsfmt.spec.js b/tests/optional_catch_binding/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/optional_catch_binding/jsfmt.spec.js +++ b/tests/optional_catch_binding/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/optional_chaining/__snapshots__/jsfmt.spec.js.snap b/tests/optional_chaining/__snapshots__/jsfmt.spec.js.snap index a30087ea..58b70e4f 100644 --- a/tests/optional_chaining/__snapshots__/jsfmt.spec.js.snap +++ b/tests/optional_chaining/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`chaining.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "flow"] +parsers: ["babel", "flow"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/optional_chaining/jsfmt.spec.js b/tests/optional_chaining/jsfmt.spec.js index bffb7a54..e3b2b302 100644 --- a/tests/optional_chaining/jsfmt.spec.js +++ b/tests/optional_chaining/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "flow"]); +run_spec(__dirname, ["babel", "flow"]); diff --git a/tests/pipeline_operator/__snapshots__/jsfmt.spec.js.snap b/tests/pipeline_operator/__snapshots__/jsfmt.spec.js.snap index e6937bb8..6c255a5c 100644 --- a/tests/pipeline_operator/__snapshots__/jsfmt.spec.js.snap +++ b/tests/pipeline_operator/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`pipeline_operator.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/pipeline_operator/jsfmt.spec.js b/tests/pipeline_operator/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/pipeline_operator/jsfmt.spec.js +++ b/tests/pipeline_operator/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/regex/__snapshots__/jsfmt.spec.js.snap b/tests/regex/__snapshots__/jsfmt.spec.js.snap index 9797889c..50add330 100644 --- a/tests/regex/__snapshots__/jsfmt.spec.js.snap +++ b/tests/regex/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`test.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/regex/jsfmt.spec.js b/tests/regex/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/regex/jsfmt.spec.js +++ b/tests/regex/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/require-amd/__snapshots__/jsfmt.spec.js.snap b/tests/require-amd/__snapshots__/jsfmt.spec.js.snap index c4ae6a56..0eaf9602 100644 --- a/tests/require-amd/__snapshots__/jsfmt.spec.js.snap +++ b/tests/require-amd/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`require.js 1`] = ` ====================================options===================================== -parsers: ["flow", "typescript", "babylon"] +parsers: ["flow", "typescript", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/require-amd/jsfmt.spec.js b/tests/require-amd/jsfmt.spec.js index a17d3649..f268e6d0 100644 --- a/tests/require-amd/jsfmt.spec.js +++ b/tests/require-amd/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "typescript", "babylon"]); +run_spec(__dirname, ["flow", "typescript", "babel"]); diff --git a/tests/require-pragma/js/__snapshots__/jsfmt.spec.js.snap b/tests/require-pragma/js/__snapshots__/jsfmt.spec.js.snap index c9014a2c..74f4f56f 100644 --- a/tests/require-pragma/js/__snapshots__/jsfmt.spec.js.snap +++ b/tests/require-pragma/js/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`module-with-pragma.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 requirePragma: true | printWidth @@ -37,7 +37,7 @@ function foo(bar) { exports[`module-without-pragma.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 requirePragma: true | printWidth @@ -76,7 +76,7 @@ function foo(bar) exports[`range-with-pragma.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 requirePragma: true | printWidth @@ -97,7 +97,7 @@ var test = true; exports[`range-without-pragma.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 requirePragma: true | printWidth diff --git a/tests/require-pragma/js/jsfmt.spec.js b/tests/require-pragma/js/jsfmt.spec.js index 9351e117..24a4a994 100644 --- a/tests/require-pragma/js/jsfmt.spec.js +++ b/tests/require-pragma/js/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"], { requirePragma: true }); +run_spec(__dirname, ["flow", "babel", "typescript"], { requirePragma: true }); diff --git a/tests/rest/__snapshots__/jsfmt.spec.js.snap b/tests/rest/__snapshots__/jsfmt.spec.js.snap index 777bd9d3..51e15c88 100644 --- a/tests/rest/__snapshots__/jsfmt.spec.js.snap +++ b/tests/rest/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`trailing-commas.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 trailingComma: "all" | printWidth diff --git a/tests/rest/jsfmt.spec.js b/tests/rest/jsfmt.spec.js index c5bada5a..092e6179 100644 --- a/tests/rest/jsfmt.spec.js +++ b/tests/rest/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"], { trailingComma: "all" }); +run_spec(__dirname, ["flow", "babel"], { trailingComma: "all" }); diff --git a/tests/return-outside-function/__snapshots__/jsfmt.spec.js.snap b/tests/return-outside-function/__snapshots__/jsfmt.spec.js.snap index 611bfc45..e14f196c 100644 --- a/tests/return-outside-function/__snapshots__/jsfmt.spec.js.snap +++ b/tests/return-outside-function/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`return-outside-function.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/return-outside-function/jsfmt.spec.js b/tests/return-outside-function/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/return-outside-function/jsfmt.spec.js +++ b/tests/return-outside-function/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests/shebang/__snapshots__/jsfmt.spec.js.snap b/tests/shebang/__snapshots__/jsfmt.spec.js.snap index 508f4f56..62ccab29 100644 --- a/tests/shebang/__snapshots__/jsfmt.spec.js.snap +++ b/tests/shebang/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`shebang.js 1`] = ` ====================================options===================================== -parsers: ["flow", "typescript", "babylon"] +parsers: ["flow", "typescript", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -18,7 +18,7 @@ function a() {} exports[`shebang-newline.js 1`] = ` ====================================options===================================== -parsers: ["flow", "typescript", "babylon"] +parsers: ["flow", "typescript", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/shebang/jsfmt.spec.js b/tests/shebang/jsfmt.spec.js index a17d3649..f268e6d0 100644 --- a/tests/shebang/jsfmt.spec.js +++ b/tests/shebang/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "typescript", "babylon"]); +run_spec(__dirname, ["flow", "typescript", "babel"]); diff --git a/tests/spread/__snapshots__/jsfmt.spec.js.snap b/tests/spread/__snapshots__/jsfmt.spec.js.snap index 01f9b224..e0907d20 100644 --- a/tests/spread/__snapshots__/jsfmt.spec.js.snap +++ b/tests/spread/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`spread.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/spread/jsfmt.spec.js b/tests/spread/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/spread/jsfmt.spec.js +++ b/tests/spread/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/template/__snapshots__/jsfmt.spec.js.snap b/tests/template/__snapshots__/jsfmt.spec.js.snap index 8fd4c040..6e513373 100644 --- a/tests/template/__snapshots__/jsfmt.spec.js.snap +++ b/tests/template/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`arrow.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -28,7 +28,7 @@ printWidth: 80 exports[`call.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -64,7 +64,7 @@ new Error(formatErrorMessage\` exports[`comment.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -103,7 +103,7 @@ g exports[`faulty-locations.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -143,7 +143,7 @@ var x = { exports[`graphql.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -189,7 +189,7 @@ module.exports = Relay.createContainer( exports[`indent.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -242,7 +242,7 @@ line n + n exports[`inline.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== @@ -366,7 +366,7 @@ editTitle += \`\${iconHTML({ class: "reply-to-glyph" })}\`; exports[`parenthesis.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon"] +parsers: ["flow", "babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/template/jsfmt.spec.js b/tests/template/jsfmt.spec.js index c1ba82f4..fbfa6501 100644 --- a/tests/template/jsfmt.spec.js +++ b/tests/template/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon"]); +run_spec(__dirname, ["flow", "babel"]); diff --git a/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap b/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap index 35e13c4c..ba99382a 100644 --- a/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap +++ b/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`throw_expression.js 1`] = ` ====================================options===================================== -parsers: ["babylon"] +parsers: ["babel"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/throw_expressions/jsfmt.spec.js b/tests/throw_expressions/jsfmt.spec.js index 968651cd..8382edde 100644 --- a/tests/throw_expressions/jsfmt.spec.js +++ b/tests/throw_expressions/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon"]); +run_spec(__dirname, ["babel"]); diff --git a/tests/unicode/__snapshots__/jsfmt.spec.js.snap b/tests/unicode/__snapshots__/jsfmt.spec.js.snap index 82c2cc8b..f588d23b 100644 --- a/tests/unicode/__snapshots__/jsfmt.spec.js.snap +++ b/tests/unicode/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`combining-characters.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -20,7 +20,7 @@ const x = ["ÁÀĀÉÈĒẸE̩Ẹ́É̩Ẹ̀È̩Ẹ̄Ē̩ÍÌĪÓÒŌỌO̩Ọ́ exports[`keys.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -34,7 +34,7 @@ printWidth: 80 exports[`nbsp-jsx.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/unicode/jsfmt.spec.js b/tests/unicode/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/unicode/jsfmt.spec.js +++ b/tests/unicode/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap b/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap index 137ef74a..280225a2 100644 --- a/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap +++ b/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`multiple.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -61,7 +61,7 @@ var templateTagsMapping = { exports[`string.js 1`] = ` ====================================options===================================== -parsers: ["flow", "babylon", "typescript"] +parsers: ["flow", "babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/variable_declarator/jsfmt.spec.js b/tests/variable_declarator/jsfmt.spec.js index aeb016da..71f32a0e 100644 --- a/tests/variable_declarator/jsfmt.spec.js +++ b/tests/variable_declarator/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["flow", "babylon", "typescript"]); +run_spec(__dirname, ["flow", "babel", "typescript"]); diff --git a/tests/yield/__snapshots__/jsfmt.spec.js.snap b/tests/yield/__snapshots__/jsfmt.spec.js.snap index 4bd377f1..78a36fd2 100644 --- a/tests/yield/__snapshots__/jsfmt.spec.js.snap +++ b/tests/yield/__snapshots__/jsfmt.spec.js.snap @@ -2,7 +2,7 @@ exports[`arrow.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== @@ -24,7 +24,7 @@ function* f() { exports[`conditional.js 1`] = ` ====================================options===================================== -parsers: ["babylon", "typescript"] +parsers: ["babel", "typescript"] printWidth: 80 | printWidth =====================================input====================================== diff --git a/tests/yield/jsfmt.spec.js b/tests/yield/jsfmt.spec.js index 4ef9b45f..858ac91a 100644 --- a/tests/yield/jsfmt.spec.js +++ b/tests/yield/jsfmt.spec.js @@ -1 +1 @@ -run_spec(__dirname, ["babylon", "typescript"]); +run_spec(__dirname, ["babel", "typescript"]); diff --git a/tests_integration/__tests__/__snapshots__/deprecated-parser.js.snap b/tests_integration/__tests__/__snapshots__/deprecated-parser.js.snap index 5eda05a7..464381bb 100644 --- a/tests_integration/__tests__/__snapshots__/deprecated-parser.js.snap +++ b/tests_integration/__tests__/__snapshots__/deprecated-parser.js.snap @@ -1,6 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`API format with deprecated parser should work 1`] = ` +exports[`API format with deprecated parser (babylon) should work 1`] = ` +"{ parser: \\"babylon\\" } is deprecated; we now treat it as { parser: \\"babel\\" }. +" +`; + +exports[`API format with deprecated parser (postcss) should work 1`] = ` "{ parser: \\"postcss\\" } is deprecated; we now treat it as { parser: \\"css\\" }. " `; diff --git a/tests_integration/__tests__/__snapshots__/early-exit.js.snap b/tests_integration/__tests__/__snapshots__/early-exit.js.snap index 0469048d..a6f103c1 100644 --- a/tests_integration/__tests__/__snapshots__/early-exit.js.snap +++ b/tests_integration/__tests__/__snapshots__/early-exit.js.snap @@ -72,7 +72,7 @@ Format options: Defaults to false. --jsx-single-quote Use single quotes in JSX. Defaults to false. - --parser + --parser Which parser to use. --print-width The line length where Prettier will try wrap. Defaults to 80. @@ -162,14 +162,14 @@ exports[`show warning with --help not-found (typo) (stderr) 1`] = ` `; exports[`show warning with --help not-found (typo) (stdout) 1`] = ` -"--parser +"--parser Which parser to use. Valid options: flow Flow - babylon JavaScript + babel JavaScript typescript TypeScript css CSS less Less @@ -220,7 +220,7 @@ Format options: Defaults to false. --jsx-single-quote Use single quotes in JSX. Defaults to false. - --parser + --parser Which parser to use. --print-width The line length where Prettier will try wrap. Defaults to 80. diff --git a/tests_integration/__tests__/__snapshots__/file-info.js.snap b/tests_integration/__tests__/__snapshots__/file-info.js.snap index b1946701..f87d4c5f 100644 --- a/tests_integration/__tests__/__snapshots__/file-info.js.snap +++ b/tests_integration/__tests__/__snapshots__/file-info.js.snap @@ -3,7 +3,7 @@ exports[`extracts file-info for a file in not_node_modules (stderr) 1`] = `""`; exports[`extracts file-info for a file in not_node_modules (stdout) 1`] = ` -"{ \\"ignored\\": false, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": false, \\"inferredParser\\": \\"babel\\" } " `; @@ -13,7 +13,7 @@ exports[`extracts file-info for a file in not_node_modules (write) 1`] = `Array exports[`extracts file-info for a js file (stderr) 1`] = `""`; exports[`extracts file-info for a js file (stdout) 1`] = ` -"{ \\"ignored\\": false, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": false, \\"inferredParser\\": \\"babel\\" } " `; @@ -43,7 +43,7 @@ exports[`extracts file-info for a markdown file (write) 1`] = `Array []`; exports[`extracts file-info with ignored=false for a file in node_modules when --with-node-modules provided (stderr) 1`] = `""`; exports[`extracts file-info with ignored=false for a file in node_modules when --with-node-modules provided (stdout) 1`] = ` -"{ \\"ignored\\": false, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": false, \\"inferredParser\\": \\"babel\\" } " `; @@ -53,7 +53,7 @@ exports[`extracts file-info with ignored=false for a file in node_modules when - exports[`extracts file-info with ignored=true for a file in .prettierignore (stderr) 1`] = `""`; exports[`extracts file-info with ignored=true for a file in .prettierignore (stdout) 1`] = ` -"{ \\"ignored\\": true, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": true, \\"inferredParser\\": \\"babel\\" } " `; @@ -63,7 +63,7 @@ exports[`extracts file-info with ignored=true for a file in .prettierignore (wri exports[`extracts file-info with ignored=true for a file in a hand-picked .prettierignore (stderr) 1`] = `""`; exports[`extracts file-info with ignored=true for a file in a hand-picked .prettierignore (stdout) 1`] = ` -"{ \\"ignored\\": true, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": true, \\"inferredParser\\": \\"babel\\" } " `; @@ -113,7 +113,7 @@ exports[`extracts file-info with inferredParser=null for file.foo (write) 1`] = exports[`extracts file-info with with ignored=true for a file in node_modules (stderr) 1`] = `""`; exports[`extracts file-info with with ignored=true for a file in node_modules (stdout) 1`] = ` -"{ \\"ignored\\": true, \\"inferredParser\\": \\"babylon\\" } +"{ \\"ignored\\": true, \\"inferredParser\\": \\"babel\\" } " `; diff --git a/tests_integration/__tests__/__snapshots__/help-options.js.snap b/tests_integration/__tests__/__snapshots__/help-options.js.snap index 7299b94a..f2998b4d 100644 --- a/tests_integration/__tests__/__snapshots__/help-options.js.snap +++ b/tests_integration/__tests__/__snapshots__/help-options.js.snap @@ -332,14 +332,14 @@ exports[`show detailed usage with --help no-semi (write) 1`] = `Array []`; exports[`show detailed usage with --help parser (stderr) 1`] = `""`; exports[`show detailed usage with --help parser (stdout) 1`] = ` -"--parser +"--parser Which parser to use. Valid options: flow Flow - babylon JavaScript + babel JavaScript typescript TypeScript css CSS less Less diff --git a/tests_integration/__tests__/__snapshots__/infer-parser.js.snap b/tests_integration/__tests__/__snapshots__/infer-parser.js.snap index aad888cd..376bb6a1 100644 --- a/tests_integration/__tests__/__snapshots__/infer-parser.js.snap +++ b/tests_integration/__tests__/__snapshots__/infer-parser.js.snap @@ -118,13 +118,13 @@ exports[`--write with unknown path and no parser specific file (stderr) 1`] = ` exports[`API with no path and no parser prettier.check 1`] = ` Array [ - "No parser and no filepath given, using 'babylon' the parser now but this will throw an error in the future. Please specify a parser or a filepath so one can be inferred.", + "No parser and no filepath given, using 'babel' the parser now but this will throw an error in the future. Please specify a parser or a filepath so one can be inferred.", ] `; exports[`API with no path and no parser prettier.format 1`] = ` Array [ - "No parser and no filepath given, using 'babylon' the parser now but this will throw an error in the future. Please specify a parser or a filepath so one can be inferred.", + "No parser and no filepath given, using 'babel' the parser now but this will throw an error in the future. Please specify a parser or a filepath so one can be inferred.", ] `; diff --git a/tests_integration/__tests__/__snapshots__/schema.js.snap b/tests_integration/__tests__/__snapshots__/schema.js.snap index 9b08104b..d002d832 100644 --- a/tests_integration/__tests__/__snapshots__/schema.js.snap +++ b/tests_integration/__tests__/__snapshots__/schema.js.snap @@ -131,7 +131,7 @@ This option cannot be used with --range-start and --range-end.", Object { "description": "JavaScript", "enum": Array [ - "babylon", + "babel", ], }, Object { diff --git a/tests_integration/__tests__/__snapshots__/support-info.js.snap b/tests_integration/__tests__/__snapshots__/support-info.js.snap index 7c444ae2..ac3a87ea 100644 --- a/tests_integration/__tests__/__snapshots__/support-info.js.snap +++ b/tests_integration/__tests__/__snapshots__/support-info.js.snap @@ -67,15 +67,15 @@ exports[`API getSupportInfo() with version 0.0.0 1`] = ` Object { "languages": Object { "Flow": Array [ - "babylon", + "babel", "flow", ], "JSX": Array [ - "babylon", + "babel", "flow", ], "JavaScript": Array [ - "babylon", + "babel", "flow", ], }, @@ -137,14 +137,14 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = ` + \\"postcss\\", + ], \\"Flow\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], \\"JSX\\": Array [ @@ -10,24 +13,51 @@ ], \\"JavaScript\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], + \\"Less\\": Array [ @@ -232,7 +232,7 @@ exports[`API getSupportInfo() with version 1.4.0 -> 1.5.0 1`] = ` @@ -5,10 +5,19 @@ ], \\"Flow\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], + \\"GraphQL\\": Array [ @@ -245,7 +245,7 @@ exports[`API getSupportInfo() with version 1.4.0 -> 1.5.0 1`] = ` + \\"json\\", + ], \\"JSX\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], \\"JavaScript\\": Array [ @@ -277,12 +277,12 @@ exports[`API getSupportInfo() with version 1.5.0 -> 1.7.1 1`] = ` + \\"css\\", ], \\"Flow\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], @@ -23,17 +23,17 @@ \\"JavaScript\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], \\"Less\\": Array [ @@ -422,7 +422,7 @@ exports[`API getSupportInfo() with version 1.8.2 -> undefined 1`] = ` \\"css\\", ], \\"Flow\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], \\"GraphQL\\": Array [ @@ -444,7 +444,7 @@ exports[`API getSupportInfo() with version 1.8.2 -> undefined 1`] = ` + \\"json5\\", + ], \\"JSX\\": Array [ - \\"babylon\\", + \\"babel\\", \\"flow\\", ], \\"JavaScript\\": Array [ @@ -533,7 +533,8 @@ exports[`API getSupportInfo() with version 1.8.2 -> undefined 1`] = ` \\"parser\\": Object { \\"choices\\": Array [ \\"flow\\", - \\"babylon\\", +- \\"babylon\\", ++ \\"babel\\", \\"typescript\\", \\"css\\", \\"less\\", @@ -624,7 +625,7 @@ exports[`CLI --support-info (stdout) 1`] = ` \\"interpreters\\": [\\"node\\", \\"nodejs\\"], \\"linguistLanguageId\\": 183, \\"name\\": \\"JavaScript\\", - \\"parsers\\": [\\"babylon\\", \\"flow\\"], + \\"parsers\\": [\\"babel\\", \\"flow\\"], \\"since\\": \\"0.0.0\\", \\"tmScope\\": \\"source.js\\", \\"type\\": \\"programming\\", @@ -641,7 +642,7 @@ exports[`CLI --support-info (stdout) 1`] = ` \\"interpreters\\": [\\"node\\"], \\"linguistLanguageId\\": 183, \\"name\\": \\"Flow\\", - \\"parsers\\": [\\"babylon\\", \\"flow\\"], + \\"parsers\\": [\\"babel\\", \\"flow\\"], \\"since\\": \\"0.0.0\\", \\"tmScope\\": \\"source.js\\", \\"type\\": \\"programming\\", @@ -655,7 +656,7 @@ exports[`CLI --support-info (stdout) 1`] = ` \\"group\\": \\"JavaScript\\", \\"linguistLanguageId\\": 178, \\"name\\": \\"JSX\\", - \\"parsers\\": [\\"babylon\\", \\"flow\\"], + \\"parsers\\": [\\"babel\\", \\"flow\\"], \\"since\\": \\"0.0.0\\", \\"tmScope\\": \\"source.js.jsx\\", \\"type\\": \\"programming\\", @@ -1084,7 +1085,7 @@ exports[`CLI --support-info (stdout) 1`] = ` \\"category\\": \\"Global\\", \\"choices\\": [ { \\"description\\": \\"Flow\\", \\"value\\": \\"flow\\" }, - { \\"description\\": \\"JavaScript\\", \\"value\\": \\"babylon\\" }, + { \\"description\\": \\"JavaScript\\", \\"since\\": \\"1.16.0\\", \\"value\\": \\"babel\\" }, { \\"description\\": \\"TypeScript\\", \\"since\\": \\"1.4.0\\", diff --git a/tests_integration/__tests__/arg-parsing.js b/tests_integration/__tests__/arg-parsing.js index 0ea8ba3d..936663ab 100644 --- a/tests_integration/__tests__/arg-parsing.js +++ b/tests_integration/__tests__/arg-parsing.js @@ -71,7 +71,7 @@ describe("deprecated option values are warned", () => { describe("allow overriding flags", () => { runPrettier( "cli/arg-parsing", - ["--tab-width=1", "--tab-width=3", "--parser=babylon"], + ["--tab-width=1", "--tab-width=3", "--parser=babel"], { input: "function a() { b }" } ).test({ stdout: "function a() {\n b;\n}\n", diff --git a/tests_integration/__tests__/check.js b/tests_integration/__tests__/check.js index 76a540d8..10601eb8 100644 --- a/tests_integration/__tests__/check.js +++ b/tests_integration/__tests__/check.js @@ -3,7 +3,7 @@ const runPrettier = require("../runPrettier"); describe("checks stdin with --check", () => { - runPrettier("cli/with-shebang", ["--check", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["--check", "--parser", "babel"], { input: "0" }).test({ stdout: "(stdin)\n", @@ -13,7 +13,7 @@ describe("checks stdin with --check", () => { }); describe("checks stdin with -c (alias for --check)", () => { - runPrettier("cli/with-shebang", ["-c", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["-c", "--parser", "babel"], { input: "0" }).test({ stdout: "(stdin)\n", diff --git a/tests_integration/__tests__/config-invalid.js b/tests_integration/__tests__/config-invalid.js index f9b0d6a3..3049e50e 100644 --- a/tests_integration/__tests__/config-invalid.js +++ b/tests_integration/__tests__/config-invalid.js @@ -56,7 +56,7 @@ describe("show warning with unknown option", () => { "--config", "option/unknown", "--parser", - "babylon" + "babel" ]).test({ status: 0 }); @@ -67,7 +67,7 @@ describe("show warning with kebab-case option key", () => { "--config", "option/kebab-case", "--parser", - "babylon" + "babel" ]).test({ status: 0 }); diff --git a/tests_integration/__tests__/cursor-offset.js b/tests_integration/__tests__/cursor-offset.js index 072aefc6..58a04cdd 100644 --- a/tests_integration/__tests__/cursor-offset.js +++ b/tests_integration/__tests__/cursor-offset.js @@ -3,7 +3,7 @@ const runPrettier = require("../runPrettier"); describe("write cursorOffset to stderr with --cursor-offset ", () => { - runPrettier("cli", ["--cursor-offset", "2", "--parser", "babylon"], { + runPrettier("cli", ["--cursor-offset", "2", "--parser", "babel"], { input: " 1" }).test({ status: 0 @@ -11,7 +11,7 @@ describe("write cursorOffset to stderr with --cursor-offset ", () => { }); describe("cursorOffset should not be affected by full-width character", () => { - runPrettier("cli", ["--cursor-offset", "21", "--parser", "babylon"], { + runPrettier("cli", ["--cursor-offset", "21", "--parser", "babel"], { input: `const x = ["中文", "中文", "中文", "中文", "中文", "中文", "中文", "中文", "中文", "中文", "中文"];` // ^ offset = 21 ^ width = 80 }).test({ diff --git a/tests_integration/__tests__/debug-check.js b/tests_integration/__tests__/debug-check.js index a7b2ed6b..f6336f97 100644 --- a/tests_integration/__tests__/debug-check.js +++ b/tests_integration/__tests__/debug-check.js @@ -11,7 +11,7 @@ describe("doesn't crash when --debug-check is passed", () => { }); describe("checks stdin with --debug-check", () => { - runPrettier("cli/with-shebang", ["--debug-check", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["--debug-check", "--parser", "babel"], { input: "0" }).test({ stdout: "(stdin)\n", diff --git a/tests_integration/__tests__/debug-print-doc.js b/tests_integration/__tests__/debug-print-doc.js index 2078fa59..b994c079 100644 --- a/tests_integration/__tests__/debug-print-doc.js +++ b/tests_integration/__tests__/debug-print-doc.js @@ -3,11 +3,9 @@ const runPrettier = require("../runPrettier"); describe("prints doc with --debug-print-doc", () => { - runPrettier( - "cli/with-shebang", - ["--debug-print-doc", "--parser", "babylon"], - { input: "0" } - ).test({ + runPrettier("cli/with-shebang", ["--debug-print-doc", "--parser", "babel"], { + input: "0" + }).test({ stdout: '["0", ";", hardline, breakParent];\n', stderr: "", status: 0 diff --git a/tests_integration/__tests__/deprecated-parser.js b/tests_integration/__tests__/deprecated-parser.js index 79ee1ef2..5c305d8c 100644 --- a/tests_integration/__tests__/deprecated-parser.js +++ b/tests_integration/__tests__/deprecated-parser.js @@ -18,9 +18,16 @@ afterAll(() => { jest.restoreAllMocks(); }); -test("API format with deprecated parser should work", () => { +test("API format with deprecated parser (postcss) should work", () => { expect(() => prettier.format("body { color: #131313; }", { parser: "postcss" }) ).not.toThrowError(); expect(warnings).toMatchSnapshot(); }); + +test("API format with deprecated parser (babylon) should work", () => { + expect(() => + prettier.format("hello_world( )", { parser: "babylon" }) + ).not.toThrowError(); + expect(warnings).toMatchSnapshot(); +}); diff --git a/tests_integration/__tests__/file-info.js b/tests_integration/__tests__/file-info.js index 3d271049..ac7c32ca 100644 --- a/tests_integration/__tests__/file-info.js +++ b/tests_integration/__tests__/file-info.js @@ -142,7 +142,7 @@ test("API getFileInfo with ignorePath", () => { expect(prettier.getFileInfo(file)).resolves.toMatchObject({ ignored: false, - inferredParser: "babylon" + inferredParser: "babel" }); expect( @@ -151,7 +151,7 @@ test("API getFileInfo with ignorePath", () => { }) ).resolves.toMatchObject({ ignored: true, - inferredParser: "babylon" + inferredParser: "babel" }); }); @@ -165,7 +165,7 @@ test("API getFileInfo.sync with ignorePath", () => { expect(prettier.getFileInfo.sync(file)).toMatchObject({ ignored: false, - inferredParser: "babylon" + inferredParser: "babel" }); expect( @@ -174,7 +174,7 @@ test("API getFileInfo.sync with ignorePath", () => { }) ).toMatchObject({ ignored: true, - inferredParser: "babylon" + inferredParser: "babel" }); }); @@ -218,7 +218,7 @@ test("API getFileInfo with withNodeModules", () => { ); expect(prettier.getFileInfo(file)).resolves.toMatchObject({ ignored: true, - inferredParser: "babylon" + inferredParser: "babel" }); expect( prettier.getFileInfo(file, { @@ -226,7 +226,7 @@ test("API getFileInfo with withNodeModules", () => { }) ).resolves.toMatchObject({ ignored: false, - inferredParser: "babylon" + inferredParser: "babel" }); }); @@ -235,7 +235,7 @@ describe("extracts file-info for a JS file with no extension but a standard sheb prettier.getFileInfo.sync("tests_integration/cli/shebang/node-shebang") ).toMatchObject({ ignored: false, - inferredParser: "babylon" + inferredParser: "babel" }); }); @@ -244,7 +244,7 @@ describe("extracts file-info for a JS file with no extension but an env-based sh prettier.getFileInfo.sync("tests_integration/cli/shebang/env-node-shebang") ).toMatchObject({ ignored: false, - inferredParser: "babylon" + inferredParser: "babel" }); }); diff --git a/tests_integration/__tests__/list-different.js b/tests_integration/__tests__/list-different.js index 792abdf9..93427eea 100644 --- a/tests_integration/__tests__/list-different.js +++ b/tests_integration/__tests__/list-different.js @@ -3,7 +3,7 @@ const runPrettier = require("../runPrettier"); describe("checks stdin with --list-different", () => { - runPrettier("cli/with-shebang", ["--list-different", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["--list-different", "--parser", "babel"], { input: "0" }).test({ stdout: "(stdin)\n", @@ -13,7 +13,7 @@ describe("checks stdin with --list-different", () => { }); describe("checks stdin with -l (alias for --list-different)", () => { - runPrettier("cli/with-shebang", ["-l", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["-l", "--parser", "babel"], { input: "0" }).test({ stdout: "(stdin)\n", diff --git a/tests_integration/__tests__/multiple-patterns.js b/tests_integration/__tests__/multiple-patterns.js index aba8439a..008c3952 100644 --- a/tests_integration/__tests__/multiple-patterns.js +++ b/tests_integration/__tests__/multiple-patterns.js @@ -65,7 +65,7 @@ describe("multiple patterns by with ignore pattern, doesn't ignore node_modules describe("no errors on empty patterns", () => { // --parser is mandatory if no filepath is passed - runPrettier("cli/multiple-patterns", ["--parser", "babylon"]).test({ + runPrettier("cli/multiple-patterns", ["--parser", "babel"]).test({ status: 0 }); }); diff --git a/tests_integration/__tests__/parser-api.js b/tests_integration/__tests__/parser-api.js index e3af8b12..4739b340 100644 --- a/tests_integration/__tests__/parser-api.js +++ b/tests_integration/__tests__/parser-api.js @@ -20,8 +20,9 @@ test("allows custom parser provided as object", () => { test("allows usage of prettier's supported parsers", () => { const output = prettier.format("foo ( )", { parser(text, parsers) { + expect(typeof parsers.babel).toEqual("function"); expect(typeof parsers.babylon).toEqual("function"); - const ast = parsers.babylon(text); + const ast = parsers.babel(text); ast.program.body[0].expression.callee.name = "bar"; return ast; } diff --git a/tests_integration/__tests__/syntax-error.js b/tests_integration/__tests__/syntax-error.js index ee256ca8..6413d5d6 100644 --- a/tests_integration/__tests__/syntax-error.js +++ b/tests_integration/__tests__/syntax-error.js @@ -3,7 +3,7 @@ const runPrettier = require("../runPrettier"); describe("exits with non-zero code when input has a syntax error", () => { - runPrettier("cli/with-shebang", ["--stdin", "--parser", "babylon"], { + runPrettier("cli/with-shebang", ["--stdin", "--parser", "babel"], { input: "a.2" }).test({ status: 2 diff --git a/tests_integration/__tests__/with-parser-inference.js b/tests_integration/__tests__/with-parser-inference.js index dc8f4458..9bc773e5 100644 --- a/tests_integration/__tests__/with-parser-inference.js +++ b/tests_integration/__tests__/with-parser-inference.js @@ -28,7 +28,7 @@ describe("infers parser from filename", () => { ).toEqual("{}\n"); }); - test("babylon from Jakefile", () => { + test("babel from Jakefile", () => { expect( prettier.format("let foo = ( x = 1 ) => x", { filepath: "x/y/Jakefile" }) ).toEqual("let foo = (x = 1) => x;\n"); diff --git a/tests_integration/custom-parsers/custom-rename-parser.js b/tests_integration/custom-parsers/custom-rename-parser.js index f507622f..958629c5 100644 --- a/tests_integration/custom-parsers/custom-rename-parser.js +++ b/tests_integration/custom-parsers/custom-rename-parser.js @@ -1,7 +1,7 @@ "use strict"; module.exports = function(text, parsers) { - const ast = parsers.babylon(text); + const ast = parsers.babel(text); ast.program.body[0].expression.callee.name = "bar"; return ast; }; diff --git a/website/playground/codeSamples.js b/website/playground/codeSamples.js index 22e50acc..866ff8eb 100644 --- a/website/playground/codeSamples.js +++ b/website/playground/codeSamples.js @@ -1,6 +1,6 @@ export default function(parser) { switch (parser) { - case "babylon": + case "babel": return [ 'function HelloWorld({greeting = "hello", greeted = \'"World"\', silent = false, onMouseOver,}) {', "", diff --git a/website/playground/markdown.js b/website/playground/markdown.js index a890b288..5b85c33a 100644 --- a/website/playground/markdown.js +++ b/website/playground/markdown.js @@ -35,7 +35,7 @@ function formatMarkdown( function getMarkdownSyntax(options) { switch (options.parser) { - case "babylon": + case "babel": case "flow": return "jsx"; case "typescript": diff --git a/website/playground/util.js b/website/playground/util.js index f413eb1d..c78ce6e9 100644 --- a/website/playground/util.js +++ b/website/playground/util.js @@ -11,7 +11,7 @@ export function getDefaults(availableOptions, optionNames) { for (const option of availableOptions) { if (optionNames.includes(option.name)) { defaults[option.name] = - option.name === "parser" ? "babylon" : option.default; + option.name === "parser" ? "babel" : option.default; } } return defaults; diff --git a/website/static/worker.js b/website/static/worker.js index 3bdae4ff..96facf1b 100644 --- a/website/static/worker.js +++ b/website/static/worker.js @@ -12,10 +12,10 @@ function importScriptOnce(url) { // this is required to only load parsers when we need them var parsers = { - // JS - Babylon - get babylon() { + // JS - Babel + get babel() { importScriptOnce("lib/parser-babylon.js"); - return prettierPlugins.babylon.parsers.babylon; + return prettierPlugins.babylon.parsers.babel; }, get json() { importScriptOnce("lib/parser-babylon.js"); @@ -200,7 +200,7 @@ function handleMessage(message) { try { response.debug.doc = prettier.__debug.formatDoc( prettier.__debug.printToDoc(message.code, options), - { parser: "babylon", plugins: plugins } + { parser: "babel", plugins: plugins } ); } catch (e) { response.debug.doc = String(e);