diff --git a/.prettierrc.js b/.prettierrc.js index 37cf9c9d3a89b..aa54cbae1f9f8 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -3,13 +3,12 @@ const {esNextPaths} = require('./scripts/shared/pathsByLanguageVersion'); module.exports = { - plugins: ['prettier-plugin-hermes-parser'], bracketSpacing: false, singleQuote: true, bracketSameLine: true, trailingComma: 'es5', printWidth: 80, - parser: 'hermes', + parser: 'flow', arrowParens: 'avoid', overrides: [ { diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.expect.md index 171a57f3ea5ed..6e99be2e6f4cc 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.expect.md @@ -3,7 +3,7 @@ ```javascript function ternary(props) { - const a = props.a && props.b ? props.c || props.d : props.e ?? props.f; + const a = props.a && props.b ? props.c || props.d : (props.e ?? props.f); const b = props.a ? (props.b && props.c ? props.d : props.e) : props.f; return a ? b : null; } diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.js b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.js index 8a741ccb12f25..2a39d90bbcd6d 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.js +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/ternary-expression.js @@ -1,5 +1,5 @@ function ternary(props) { - const a = props.a && props.b ? props.c || props.d : props.e ?? props.f; + const a = props.a && props.b ? props.c || props.d : (props.e ?? props.f); const b = props.a ? (props.b && props.c ? props.d : props.e) : props.f; return a ? b : null; } diff --git a/package.json b/package.json index 875986ebdaf6a..6ad9211568541 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,6 @@ "ncp": "^2.0.0", "prettier": "^3.3.3", "prettier-2": "npm:prettier@^2", - "prettier-plugin-hermes-parser": "^0.23.0", "pretty-format": "^29.4.1", "prop-types": "^15.6.2", "random-seed": "^0.3.0", diff --git a/packages/react-devtools-shared/src/devtools/ContextMenu/types.js b/packages/react-devtools-shared/src/devtools/ContextMenu/types.js index c2f296db10fe5..9fda9be199941 100644 --- a/packages/react-devtools-shared/src/devtools/ContextMenu/types.js +++ b/packages/react-devtools-shared/src/devtools/ContextMenu/types.js @@ -25,7 +25,7 @@ export type ContextMenuHandle = { hide(): void, }; -/*:: -export type ContextMenuComponent = component(ref: React$RefSetter); -*/ +export type ContextMenuComponent = component( + ref: React$RefSetter, +); export type ContextMenuRef = {current: ContextMenuHandle | null}; diff --git a/packages/react-devtools-shared/src/hooks/astUtils.js b/packages/react-devtools-shared/src/hooks/astUtils.js index d2d2088349e0c..13adcc0e36639 100644 --- a/packages/react-devtools-shared/src/hooks/astUtils.js +++ b/packages/react-devtools-shared/src/hooks/astUtils.js @@ -289,7 +289,7 @@ function getHookVariableName( const nodeType = hook.node.id.type; switch (nodeType) { case AST_NODE_TYPES.ARRAY_PATTERN: - return !isCustomHook ? hook.node.id.elements[0]?.name ?? null : null; + return !isCustomHook ? (hook.node.id.elements[0]?.name ?? null) : null; case AST_NODE_TYPES.IDENTIFIER: return hook.node.id.name; diff --git a/packages/react-noop-renderer/src/createReactNoop.js b/packages/react-noop-renderer/src/createReactNoop.js index 6fbad9adac195..37d3e5fd12a11 100644 --- a/packages/react-noop-renderer/src/createReactNoop.js +++ b/packages/react-noop-renderer/src/createReactNoop.js @@ -253,7 +253,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) { id: instance.id, type: type, parent: instance.parent, - children: keepChildren ? instance.children : children ?? [], + children: keepChildren ? instance.children : (children ?? []), text: shouldSetTextContent(type, newProps) ? computeText((newProps.children: any) + '', instance.context) : null, diff --git a/scripts/flow/config/flowconfig b/scripts/flow/config/flowconfig index bd5092f1580a8..5fa574b50f74c 100644 --- a/scripts/flow/config/flowconfig +++ b/scripts/flow/config/flowconfig @@ -14,8 +14,6 @@ .*/__mocks__/.* .*/__tests__/.* -# contains modern flow syntax that requires a Flow upgrade -.*/node_modules/prettier-plugin-hermes-parser/.* # TODO: noop should get its own inlinedHostConfig entry .*/packages/react-noop-renderer/.* diff --git a/yarn.lock b/yarn.lock index 0496eb7844560..c2780d78f0ac5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9975,11 +9975,6 @@ hermes-eslint@^0.25.1: hermes-estree "0.25.1" hermes-parser "0.25.1" -hermes-estree@0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.23.0.tgz#89c5419877b9d6bce4bb616821f496f5c5daddbc" - integrity sha512-Rkp0PNLGpORw4ktsttkVbpYJbrYKS3hAnkxu8D9nvQi6LvSbuPa+tYw/t2u3Gjc35lYd/k95YkjqyTcN4zspag== - hermes-estree@0.23.1: version "0.23.1" resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.23.1.tgz#d0bac369a030188120ee7024926aabe5a9f84fdb" @@ -9990,13 +9985,6 @@ hermes-estree@0.25.1: resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.25.1.tgz#6aeec17d1983b4eabf69721f3aa3eb705b17f480" integrity sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw== -hermes-parser@0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.23.0.tgz#3541907b77ca9e94fd093e8ef0ff97ca5340dee8" - integrity sha512-xLwM4ylfHGwrm+2qXfO1JT/fnqEDGSnpS/9hQ4VLtqTexSviu2ZpBgz07U8jVtndq67qdb/ps0qvaWDZ3fkTyg== - dependencies: - hermes-estree "0.23.0" - hermes-parser@0.23.1: version "0.23.1" resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.23.1.tgz#e5de648e664f3b3d84d01b48fc7ab164f4b68205" @@ -14088,15 +14076,6 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== -prettier-plugin-hermes-parser@0.23.0, prettier-plugin-hermes-parser@^0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/prettier-plugin-hermes-parser/-/prettier-plugin-hermes-parser-0.23.0.tgz#67fa061e503600087169283e150bc3f3239bf39c" - integrity sha512-EMwgZFcKDyVfUCvIy/kxVc4siYEOYPt7lLqtaELVadKYNbOLUFjYW3QKGZ8jzidUy4DonfFbi/hJOXJ5vfRzxA== - dependencies: - hermes-estree "0.23.0" - hermes-parser "0.23.0" - prettier-plugin-hermes-parser "0.23.0" - prettier@*, prettier@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"