From c37361ba2ed916346a4104d30dd4b611e720791a Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Sat, 16 Nov 2019 09:05:40 -0600 Subject: [PATCH] Bump prettier@1.19.1 (#10728) --- package.json | 2 +- packages/babel-core/src/index.js | 4 +- packages/babel-core/test/option-manager.js | 25 ++++++-- .../babel-generator/src/generators/types.js | 6 +- packages/babel-generator/src/index.js | 3 +- .../src/index.js | 3 +- packages/babel-node/src/babel-node.js | 5 +- .../src/rest.js | 42 +++++++------ .../src/index.js | 3 +- packages/babel-types/src/index.js | 62 +++++-------------- yarn.lock | 8 +-- 11 files changed, 77 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index 7157e3d57f..15ad863a8f 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "lint-staged": "^9.2.0", "lodash": "^4.17.13", "output-file-sync": "^2.0.0", - "prettier": "^1.17.1", + "prettier": "^1.19.1", "pump": "^3.0.0", "rimraf": "^2.6.3", "rollup": "^1.12.0", diff --git a/packages/babel-core/src/index.js b/packages/babel-core/src/index.js index e7ae7c0edf..888a8096d5 100644 --- a/packages/babel-core/src/index.js +++ b/packages/babel-core/src/index.js @@ -1,9 +1,7 @@ // @flow export { default as File } from "./transformation/file/file"; -export { - default as buildExternalHelpers, -} from "./tools/build-external-helpers"; +export { default as buildExternalHelpers } from "./tools/build-external-helpers"; export { resolvePlugin, resolvePreset } from "./config/files"; export { version } from "../package.json"; diff --git a/packages/babel-core/test/option-manager.js b/packages/babel-core/test/option-manager.js index 8839f1178c..5533d54c46 100644 --- a/packages/babel-core/test/option-manager.js +++ b/packages/babel-core/test/option-manager.js @@ -59,7 +59,10 @@ describe("option-manager", () => { const { calls: calls2, plugin: plugin2 } = makePlugin(); loadOptions({ - plugins: [[plugin1, { arg: 1 }], [plugin2, { arg: 2 }, "some-name"]], + plugins: [ + [plugin1, { arg: 1 }], + [plugin2, { arg: 2 }, "some-name"], + ], }); expect(calls1).toEqual([{ arg: 1 }]); expect(calls2).toEqual([{ arg: 2 }]); @@ -74,7 +77,10 @@ describe("option-manager", () => { plugins: [[plugin1, { arg: 1 }]], env: { test: { - plugins: [[plugin1, { arg: 3 }], [plugin2, { arg: 2 }]], + plugins: [ + [plugin1, { arg: 3 }], + [plugin2, { arg: 2 }], + ], }, }, }); @@ -98,7 +104,10 @@ describe("option-manager", () => { const { calls: calls2, plugin: preset2 } = makePlugin(); loadOptions({ - presets: [[preset1, { arg: 1 }], [preset2, { arg: 2 }, "some-name"]], + presets: [ + [preset1, { arg: 1 }], + [preset2, { arg: 2 }, "some-name"], + ], }); expect(calls1).toEqual([{ arg: 1 }]); expect(calls2).toEqual([{ arg: 2 }]); @@ -112,7 +121,10 @@ describe("option-manager", () => { presets: [[preset1, { arg: 1 }]], env: { test: { - presets: [[preset1, { arg: 3 }], [preset2, { arg: 2 }]], + presets: [ + [preset1, { arg: 3 }], + [preset2, { arg: 2 }], + ], }, }, }); @@ -130,7 +142,10 @@ describe("option-manager", () => { presets: [[preset1, { arg: 1 }]], env: { test: { - presets: [[preset1, { arg: 3 }], [preset2, { arg: 2 }]], + presets: [ + [preset1, { arg: 3 }], + [preset2, { arg: 2 }], + ], }, }, }); diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js index fdd090dd41..fbad28e03b 100644 --- a/packages/babel-generator/src/generators/types.js +++ b/packages/babel-generator/src/generators/types.js @@ -65,9 +65,9 @@ export function ObjectProperty(node: Object) { // shorthand! if ( node.shorthand && - (t.isIdentifier(node.key) && - t.isIdentifier(node.value) && - node.key.name === node.value.name) + t.isIdentifier(node.key) && + t.isIdentifier(node.value) && + node.key.name === node.value.name ) { return; } diff --git a/packages/babel-generator/src/index.js b/packages/babel-generator/src/index.js index 4e7399d4bb..9d288fb0f3 100644 --- a/packages/babel-generator/src/index.js +++ b/packages/babel-generator/src/index.js @@ -70,7 +70,8 @@ function normalizeOptions(code, opts): Format { format.shouldPrintComment || (value => format.comments || - (value.indexOf("@license") >= 0 || value.indexOf("@preserve") >= 0)); + value.indexOf("@license") >= 0 || + value.indexOf("@preserve") >= 0); } if (format.compact === "auto") { diff --git a/packages/babel-helper-create-class-features-plugin/src/index.js b/packages/babel-helper-create-class-features-plugin/src/index.js index 1ed61a1839..57add480d2 100644 --- a/packages/babel-helper-create-class-features-plugin/src/index.js +++ b/packages/babel-helper-create-class-features-plugin/src/index.js @@ -97,7 +97,8 @@ export function createClassFeaturePlugin({ } else { if ( (privateNames.has(name) && - (!privateNames.has(getName) && !privateNames.has(setName))) || + !privateNames.has(getName) && + !privateNames.has(setName)) || (privateNames.has(name) && (privateNames.has(getName) || privateNames.has(setName))) ) { diff --git a/packages/babel-node/src/babel-node.js b/packages/babel-node/src/babel-node.js index 6d6001f96c..4f0a7be101 100755 --- a/packages/babel-node/src/babel-node.js +++ b/packages/babel-node/src/babel-node.js @@ -40,7 +40,10 @@ function getNormalizedV8Flag(arg) { } // These are aliases for node options defined by babel-node. -const aliases = new Map([["-d", "--debug"], ["-gc", "--expose-gc"]]); +const aliases = new Map([ + ["-d", "--debug"], + ["-gc", "--expose-gc"], +]); getV8Flags(function(err, v8Flags) { for (let i = 0; i < babelArgs.length; i++) { diff --git a/packages/babel-plugin-transform-parameters/src/rest.js b/packages/babel-plugin-transform-parameters/src/rest.js index da85c7e5ad..eccd548aec 100644 --- a/packages/babel-plugin-transform-parameters/src/rest.js +++ b/packages/babel-plugin-transform-parameters/src/rest.js @@ -87,26 +87,28 @@ const memberExpressionOptimisationVisitor = { const argsOptEligible = !state.deopted && - !// ex: `args[0] = "whatever"` - ( - (grandparentPath.isAssignmentExpression() && - parentPath.node === grandparentPath.node.left) || - // ex: `[args[0]] = ["whatever"]` - grandparentPath.isLVal() || - // ex: `for (rest[0] in this)` - // ex: `for (rest[0] of this)` - grandparentPath.isForXStatement() || - // ex: `++args[0]` - // ex: `args[0]--` - grandparentPath.isUpdateExpression() || - // ex: `delete args[0]` - grandparentPath.isUnaryExpression({ operator: "delete" }) || - // ex: `args[0]()` - // ex: `new args[0]()` - // ex: `new args[0]` - ((grandparentPath.isCallExpression() || - grandparentPath.isNewExpression()) && - parentPath.node === grandparentPath.node.callee) + !( + // ex: `args[0] = "whatever"` + ( + (grandparentPath.isAssignmentExpression() && + parentPath.node === grandparentPath.node.left) || + // ex: `[args[0]] = ["whatever"]` + grandparentPath.isLVal() || + // ex: `for (rest[0] in this)` + // ex: `for (rest[0] of this)` + grandparentPath.isForXStatement() || + // ex: `++args[0]` + // ex: `args[0]--` + grandparentPath.isUpdateExpression() || + // ex: `delete args[0]` + grandparentPath.isUnaryExpression({ operator: "delete" }) || + // ex: `args[0]()` + // ex: `new args[0]()` + // ex: `new args[0]` + ((grandparentPath.isCallExpression() || + grandparentPath.isNewExpression()) && + parentPath.node === grandparentPath.node.callee) + ) ); if (argsOptEligible) { diff --git a/packages/babel-plugin-transform-react-constant-elements/src/index.js b/packages/babel-plugin-transform-react-constant-elements/src/index.js index 15589bd808..48d5e2bbc7 100644 --- a/packages/babel-plugin-transform-react-constant-elements/src/index.js +++ b/packages/babel-plugin-transform-react-constant-elements/src/index.js @@ -59,7 +59,8 @@ export default declare((api, options) => { const { value } = expressionResult; const isMutable = (!state.mutablePropsAllowed && - (value && typeof value === "object")) || + value && + typeof value === "object") || typeof value === "function"; if (!isMutable) { // It evaluated to an immutable value, so we can hoist it. diff --git a/packages/babel-types/src/index.js b/packages/babel-types/src/index.js index d3311dfc9f..51fd0b9846 100644 --- a/packages/babel-types/src/index.js +++ b/packages/babel-types/src/index.js @@ -7,13 +7,9 @@ import buildChildren from "./builders/react/buildChildren"; export { default as assertNode } from "./asserts/assertNode"; export * from "./asserts/generated"; -//builders -export { - default as createTypeAnnotationBasedOnTypeof, -} from "./builders/flow/createTypeAnnotationBasedOnTypeof"; -export { - default as createUnionTypeAnnotation, -} from "./builders/flow/createUnionTypeAnnotation"; +// builders +export { default as createTypeAnnotationBasedOnTypeof } from "./builders/flow/createTypeAnnotationBasedOnTypeof"; +export { default as createUnionTypeAnnotation } from "./builders/flow/createUnionTypeAnnotation"; export * from "./builders/generated"; // clone @@ -25,16 +21,10 @@ export { default as cloneWithoutLoc } from "./clone/cloneWithoutLoc"; // comments export { default as addComment } from "./comments/addComment"; export { default as addComments } from "./comments/addComments"; -export { - default as inheritInnerComments, -} from "./comments/inheritInnerComments"; -export { - default as inheritLeadingComments, -} from "./comments/inheritLeadingComments"; +export { default as inheritInnerComments } from "./comments/inheritInnerComments"; +export { default as inheritLeadingComments } from "./comments/inheritLeadingComments"; export { default as inheritsComments } from "./comments/inheritsComments"; -export { - default as inheritTrailingComments, -} from "./comments/inheritTrailingComments"; +export { default as inheritTrailingComments } from "./comments/inheritTrailingComments"; export { default as removeComments } from "./comments/removeComments"; // constants @@ -43,17 +33,13 @@ export * from "./constants"; // converters export { default as ensureBlock } from "./converters/ensureBlock"; -export { - default as toBindingIdentifierName, -} from "./converters/toBindingIdentifierName"; +export { default as toBindingIdentifierName } from "./converters/toBindingIdentifierName"; export { default as toBlock } from "./converters/toBlock"; export { default as toComputedKey } from "./converters/toComputedKey"; export { default as toExpression } from "./converters/toExpression"; export { default as toIdentifier } from "./converters/toIdentifier"; export { default as toKeyAlias } from "./converters/toKeyAlias"; -export { - default as toSequenceExpression, -} from "./converters/toSequenceExpression"; +export { default as toSequenceExpression } from "./converters/toSequenceExpression"; export { default as toStatement } from "./converters/toStatement"; export { default as valueToNode } from "./converters/valueToNode"; @@ -61,28 +47,16 @@ export { default as valueToNode } from "./converters/valueToNode"; export * from "./definitions"; // modifications -export { - default as appendToMemberExpression, -} from "./modifications/appendToMemberExpression"; +export { default as appendToMemberExpression } from "./modifications/appendToMemberExpression"; export { default as inherits } from "./modifications/inherits"; -export { - default as prependToMemberExpression, -} from "./modifications/prependToMemberExpression"; +export { default as prependToMemberExpression } from "./modifications/prependToMemberExpression"; export { default as removeProperties } from "./modifications/removeProperties"; -export { - default as removePropertiesDeep, -} from "./modifications/removePropertiesDeep"; -export { - default as removeTypeDuplicates, -} from "./modifications/flow/removeTypeDuplicates"; +export { default as removePropertiesDeep } from "./modifications/removePropertiesDeep"; +export { default as removeTypeDuplicates } from "./modifications/flow/removeTypeDuplicates"; // retrievers -export { - default as getBindingIdentifiers, -} from "./retrievers/getBindingIdentifiers"; -export { - default as getOuterBindingIdentifiers, -} from "./retrievers/getOuterBindingIdentifiers"; +export { default as getBindingIdentifiers } from "./retrievers/getBindingIdentifiers"; +export { default as getOuterBindingIdentifiers } from "./retrievers/getOuterBindingIdentifiers"; // traverse export { default as traverse } from "./traverse/traverse"; @@ -105,16 +79,12 @@ export { default as isReferenced } from "./validators/isReferenced"; export { default as isScope } from "./validators/isScope"; export { default as isSpecifierDefault } from "./validators/isSpecifierDefault"; export { default as isType } from "./validators/isType"; -export { - default as isValidES3Identifier, -} from "./validators/isValidES3Identifier"; +export { default as isValidES3Identifier } from "./validators/isValidES3Identifier"; export { default as isValidIdentifier } from "./validators/isValidIdentifier"; export { default as isVar } from "./validators/isVar"; export { default as matchesPattern } from "./validators/matchesPattern"; export { default as validate } from "./validators/validate"; -export { - default as buildMatchMemberExpression, -} from "./validators/buildMatchMemberExpression"; +export { default as buildMatchMemberExpression } from "./validators/buildMatchMemberExpression"; export * from "./validators/generated"; // react diff --git a/yarn.lock b/yarn.lock index 95eb973a33..4f3e1d5604 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8724,10 +8724,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.17.1: - version "1.18.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" - integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== +prettier@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== pretty-format@^24.9.0: version "24.9.0"