diff --git a/package.json b/package.json index 203ecfe70fd0..f952960ed511 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "lodash": "^4.17.10", "merge-stream": "^1.0.1", "output-file-sync": "^2.0.0", - "prettier": "^1.14.3", + "prettier": "^1.15.1", "pump": "^1.0.2", "rimraf": "^2.4.3", "rollup-plugin-babel": "^4.0.0-beta.0", diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js index 60bceba8149f..84e8975e0140 100644 --- a/packages/babel-parser/src/parser/expression.js +++ b/packages/babel-parser/src/parser/expression.js @@ -332,8 +332,8 @@ export default class ExpressionParser extends LValParser { this.finishNode( node, op === tt.logicalOR || - op === tt.logicalAND || - op === tt.nullishCoalescing + op === tt.logicalAND || + op === tt.nullishCoalescing ? "LogicalExpression" : "BinaryExpression", ); diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js index b19cd78f1bd3..b7203e70e3bd 100644 --- a/packages/babel-parser/src/parser/statement.js +++ b/packages/babel-parser/src/parser/statement.js @@ -619,8 +619,8 @@ export default class StatementParser extends ExpressionParser { const kind = this.state.type.isLoop ? "loop" : this.match(tt._switch) - ? "switch" - : null; + ? "switch" + : null; for (let i = this.state.labels.length - 1; i >= 0; i--) { const label = this.state.labels[i]; if (label.statementStart === node.start) { diff --git a/packages/babel-parser/src/plugins/typescript.js b/packages/babel-parser/src/plugins/typescript.js index 63fd484a8988..b7a296a6d11b 100644 --- a/packages/babel-parser/src/plugins/typescript.js +++ b/packages/babel-parser/src/plugins/typescript.js @@ -597,8 +597,8 @@ export default (superClass: Class): Class => const type = this.match(tt._void) ? "TSVoidKeyword" : this.match(tt._null) - ? "TSNullKeyword" - : keywordTypeFromName(this.state.value); + ? "TSNullKeyword" + : keywordTypeFromName(this.state.value); if (type !== undefined && this.lookahead().type !== tt.dot) { const node: N.TsKeywordType = this.startNode(); this.next(); @@ -691,8 +691,8 @@ export default (superClass: Class): Class => return operator ? this.tsParseTypeOperator(operator) : this.isContextual("infer") - ? this.tsParseInferType() - : this.tsParseArrayTypeOrHigher(); + ? this.tsParseInferType() + : this.tsParseArrayTypeOrHigher(); } tsParseUnionOrIntersectionType( @@ -1381,8 +1381,8 @@ export default (superClass: Class): Class => type === "FunctionDeclaration" ? "TSDeclareFunction" : type === "ClassMethod" - ? "TSDeclareMethod" - : undefined; + ? "TSDeclareMethod" + : undefined; if (bodilessType && !this.match(tt.braceL) && this.isLineTerminator()) { this.finishNode(node, bodilessType); return; diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js index 33a272e7dcf0..a0ee5badf41e 100644 --- a/packages/babel-parser/src/tokenizer/index.js +++ b/packages/babel-parser/src/tokenizer/index.js @@ -881,10 +881,10 @@ export default class Tokenizer extends LocationParser { radix === 16 ? allowedNumericSeparatorSiblings.hex : radix === 10 - ? allowedNumericSeparatorSiblings.dec - : radix === 8 - ? allowedNumericSeparatorSiblings.oct - : allowedNumericSeparatorSiblings.bin; + ? allowedNumericSeparatorSiblings.dec + : radix === 8 + ? allowedNumericSeparatorSiblings.oct + : allowedNumericSeparatorSiblings.bin; let total = 0; diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json index e0e70aa3ae18..85a0456eceff 100644 --- a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json +++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json @@ -1,8 +1,5 @@ { "sourceType": "module", - "plugins": [ - "jsx", - "flow" - ], + "plugins": ["jsx", "flow"], "throws": "Cannot overwrite reserved type _ (2:5)" } diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json index 28a0ef1cd1c1..872ad2f73408 100644 --- a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json +++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json @@ -1,8 +1,5 @@ { "sourceType": "module", - "plugins": [ - "jsx", - "flow" - ], + "plugins": ["jsx", "flow"], "throws": "Cannot overwrite reserved type _ (2:13)" } diff --git a/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json index fe0b9fdeccc4..8a619bce4daf 100644 --- a/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json +++ b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json @@ -1,4 +1,4 @@ { - "sourceType": "script", - "plugins": ["jsx", "flow"] - } + "sourceType": "script", + "plugins": ["jsx", "flow"] +} diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json index 02d8a1c26f30..2ec42ddaf53c 100644 --- a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json +++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json @@ -1,7 +1,4 @@ { - "plugins": [ - "typescript", - ["decorators", { "decoratorsBeforeExport": true }] - ], + "plugins": ["typescript", ["decorators", { "decoratorsBeforeExport": true }]], "throws": "Unexpected token, expected \"(\" (2:0)" } diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json index 714918723f91..6e9dea51e823 100644 --- a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json +++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "typescript", - ["decorators", { "decoratorsBeforeExport": true }] - ] + "plugins": ["typescript", ["decorators", { "decoratorsBeforeExport": true }]] } diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json index 92616d0020b4..15111b29065f 100644 --- a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json +++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json @@ -1,7 +1,5 @@ { "sourceType": "module", - "plugins": [ - "typescript" - ], + "plugins": ["typescript"], "throws": "A required element cannot follow an optional element. (1:17)" -} \ No newline at end of file +} diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json index e2d7f7a6781e..653f8ee82760 100644 --- a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json +++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json @@ -1,7 +1,5 @@ { "sourceType": "module", - "plugins": [ - "typescript" - ], + "plugins": ["typescript"], "throws": "A rest element must be last in a tuple type. (1:8)" -} \ No newline at end of file +} diff --git a/packages/babel-plugin-proposal-decorators/src/transformer.js b/packages/babel-plugin-proposal-decorators/src/transformer.js index 9ed8cd942117..621538c74cd3 100644 --- a/packages/babel-plugin-proposal-decorators/src/transformer.js +++ b/packages/babel-plugin-proposal-decorators/src/transformer.js @@ -82,8 +82,8 @@ function getSingleElementDefinition(path, superRef, classRef, file) { isMethod ? value(node.body, node.params, node.async, node.generator) : node.value - ? value(template.ast`{ return ${node.value} }`) - : prop("value", scope.buildUndefinedNode()), + ? value(template.ast`{ return ${node.value} }`) + : prop("value", scope.buildUndefinedNode()), ].filter(Boolean); return t.objectExpression(properties); diff --git a/packages/babel-preset-env/scripts/build-data.js b/packages/babel-preset-env/scripts/build-data.js index 1f4735d5bbcc..c2cf45bfb408 100644 --- a/packages/babel-preset-env/scripts/build-data.js +++ b/packages/babel-preset-env/scripts/build-data.js @@ -229,13 +229,15 @@ const getLowestImplementedVersion = ({ features }, env) => { return null; } - return envTests.map(str => str.replace(env, "")).reduce((a, b) => { - if (b === unreleasedLabelForEnv) { - return b; - } + return envTests + .map(str => str.replace(env, "")) + .reduce((a, b) => { + if (b === unreleasedLabelForEnv) { + return b; + } - return semver.lt(semver.coerce(a), semver.coerce(b)) ? b : a; - }); + return semver.lt(semver.coerce(a), semver.coerce(b)) ? b : a; + }); }; const generateData = (environments, features) => { diff --git a/packages/babylon/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json b/packages/babylon/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json index 816f0c4579af..a70dd2ba957e 100644 --- a/packages/babylon/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json +++ b/packages/babylon/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json @@ -1,3 +1,3 @@ { "throws": "yield is not allowed in the parameters of an arrow function inside a generator (2:8)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json index 848e79b9dbca..1bb312254c62 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json @@ -1,3 +1,3 @@ { "throws": "invalid use of await inside of an async function (1:16)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json index e2abd7d95537..1eadbc9edb2f 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json @@ -1,3 +1,3 @@ { "throws": "invalid use of await inside of an async function (2:11)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json index 662a80c579c4..f7e1f0a54d38 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json @@ -1,3 +1,3 @@ { "throws": "await is not allowed in the parameters of an arrow function inside an async function (2:23)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json index a38149bc650b..ceaee67ee6b4 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json @@ -1,3 +1,3 @@ { "throws": "Unexpected token, expected \",\" (1:17)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json index 779503d21709..3d590911be50 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json @@ -1,3 +1,3 @@ { "throws": "await is not allowed in the parameters of an arrow function inside an async function (2:7)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json index 52eda98537e7..51430f6aa61b 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json @@ -1,3 +1,3 @@ { "throws": "await is not allowed in the parameters of an arrow function inside an async function (2:13)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json index 7d80be8b1e9e..b260169ecd70 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json @@ -1,3 +1,3 @@ { "throws": "Unexpected token, expected \",\" (2:25)" -} \ No newline at end of file +} diff --git a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters/options.json b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters/options.json index 1a6e14706ad1..f4af75f31164 100644 --- a/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters/options.json +++ b/packages/babylon/test/fixtures/es2017/async-functions/await-inside-parameters/options.json @@ -1,3 +1,3 @@ { "throws": "await is not allowed in async function parameters (1:22)" -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 1abdf1300e9a..024a6f94243b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7734,10 +7734,10 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= -prettier@^1.14.3: - version "1.14.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" - integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg== +prettier@^1.15.1: + version "1.15.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.1.tgz#06c67106afb1b40e74b002353b2079cc7e0e67bf" + integrity sha512-4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA== pretty-format@^23.6.0: version "23.6.0"