From b7e7f1a3fab87e8fc19e86a8088a9e0fe4710973 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Mon, 22 Jul 2024 16:09:01 -0400 Subject: [PATCH] [BE] upgrade prettier to 3.3.3 (#30420) Mostly just changes in ternary formatting. --- .../fixtures/compiler/hook-noAlias.expect.md | 10 ++----- .../fixtures/compiler/hook-noAlias.js | 10 ++----- .../useMemo-constant-prop.expect.md | 4 +-- .../useMemo-constant-prop.ts | 4 +-- .../compiler/ternary-expression.expect.md | 2 +- .../fixtures/compiler/ternary-expression.js | 2 +- package.json | 2 +- .../react-debug-tools/src/ReactDebugHooks.js | 6 ++-- .../ReactHooksInspectionIntegration-test.js | 24 ++++++---------- .../views/Settings/ComponentsSettings.js | 4 +-- .../src/hooks/astUtils.js | 2 +- .../src/content-views/ReactMeasuresView.js | 4 +-- .../src/client/ReactFiberConfigDOM.js | 6 ++-- .../src/events/SyntheticEvent.js | 24 ++++++++-------- .../src/events/plugins/SelectEventPlugin.js | 4 +-- .../src/server/ReactFizzConfigDOM.js | 28 +++++++++---------- .../src/shared/ReactDOMResourceValidation.js | 20 ++++++------- .../src/__tests__/ReactDOMFizzStatic-test.js | 4 +-- ...actDOMFizzSuppressHydrationWarning-test.js | 4 +-- .../src/__tests__/ReactDOMFloat-test.js | 4 +-- .../ReactDOMServerSuspense-test.internal.js | 4 +-- .../ReactDOMSingletonComponents-test.js | 4 +-- .../react-dom/src/shared/ReactDOMFloat.js | 24 ++++++++-------- .../react-dom/src/test-utils/FizzTestUtils.js | 4 +-- .../ResponderEventPlugin-test.internal.js | 12 ++++---- .../src/legacy-events/EventPluginUtils.js | 8 +++--- .../src/legacy-events/ResponderEventPlugin.js | 20 ++++++------- .../src/createReactNoop.js | 20 ++++++------- packages/react-reconciler/src/ReactFiber.js | 4 +-- .../src/__tests__/ReactFlushSync-test.js | 4 +-- .../ReactFlushSyncNoAggregateError-test.js | 4 +-- .../ReactHooksWithNoopRenderer-test.js | 12 +++----- .../ReactIncrementalSideEffects-test.js | 4 +-- .../src/__tests__/ReactLazy-test.internal.js | 8 +++--- .../__tests__/useSyncExternalStore-test.js | 10 ++----- .../src/__tests__/ReactFlightDOM-test.js | 4 +-- packages/react-server/src/ReactFizzServer.js | 6 ++-- .../react-server/src/ReactFlightServer.js | 24 +++++++++------- .../npm/umd/scheduler.development.js | 4 +-- .../npm/umd/scheduler.production.min.js | 4 +-- .../npm/umd/scheduler.profiling.min.js | 4 +-- packages/shared/ReactComponentStackFrame.js | 8 +++--- packages/shared/ReactTypes.js | 12 ++++---- scripts/jest/TestFlags.js | 8 +++--- scripts/jest/config.build-devtools.js | 5 ++-- scripts/jest/config.build.js | 20 ++++++------- .../config.build-devtools-regression.js | 15 ++++------ scripts/rollup/build-ghaction.js | 4 +-- scripts/rollup/build.js | 4 +-- yarn.lock | 8 +++--- 50 files changed, 206 insertions(+), 234 deletions(-) diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.expect.md index 4cfe1d00eeffe..d1c8c4a6a8efc 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.expect.md @@ -6,13 +6,9 @@ import {useNoAlias} from 'shared-runtime'; function Component(props) { const item = {a: props.a}; - const x = useNoAlias( - item, - () => { - console.log(props); - }, - [props.a] - ); + const x = useNoAlias(item, () => { + console.log(props); + }, [props.a]); return [x, item]; } diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.js b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.js index 8603fb93fd824..c04890cbbb26c 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.js +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/hook-noAlias.js @@ -2,13 +2,9 @@ import {useNoAlias} from 'shared-runtime'; function Component(props) { const item = {a: props.a}; - const x = useNoAlias( - item, - () => { - console.log(props); - }, - [props.a] - ); + const x = useNoAlias(item, () => { + console.log(props); + }, [props.a]); return [x, item]; } diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.expect.md b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.expect.md index 9853fef973708..5a3dd5d552afa 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.expect.md +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.expect.md @@ -11,11 +11,11 @@ function useFoo(cond) { const derived1 = useMemo(() => { return identity(sourceDep); }, [sourceDep]); - const derived2 = cond ?? Math.min(sourceDep, 1) ? 1 : 2; + const derived2 = (cond ?? Math.min(sourceDep, 1)) ? 1 : 2; const derived3 = useMemo(() => { return identity(sourceDep); }, [sourceDep]); - const derived4 = Math.min(sourceDep, -1) ?? cond ? 1 : 2; + const derived4 = (Math.min(sourceDep, -1) ?? cond) ? 1 : 2; return [derived1, derived2, derived3, derived4]; } diff --git a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.ts b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.ts index 7178aba078861..7415713419d36 100644 --- a/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.ts +++ b/compiler/packages/babel-plugin-react-compiler/src/__tests__/fixtures/compiler/preserve-memo-validation/useMemo-constant-prop.ts @@ -7,11 +7,11 @@ function useFoo(cond) { const derived1 = useMemo(() => { return identity(sourceDep); }, [sourceDep]); - const derived2 = cond ?? Math.min(sourceDep, 1) ? 1 : 2; + const derived2 = (cond ?? Math.min(sourceDep, 1)) ? 1 : 2; const derived3 = useMemo(() => { return identity(sourceDep); }, [sourceDep]); - const derived4 = Math.min(sourceDep, -1) ?? cond ? 1 : 2; + const derived4 = (Math.min(sourceDep, -1) ?? cond) ? 1 : 2; return [derived1, derived2, derived3, derived4]; } 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 5601108da7315..c0773ddae2054 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 e310883cc8d70..a256a75b6cb96 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "minimist": "^1.2.3", "mkdirp": "^0.5.1", "ncp": "^2.0.0", - "prettier": "3.0.3", + "prettier": "^3.3.3", "prettier-2": "npm:prettier@^2", "pretty-format": "^29.4.1", "prop-types": "^15.6.2", diff --git a/packages/react-debug-tools/src/ReactDebugHooks.js b/packages/react-debug-tools/src/ReactDebugHooks.js index d7ffc6626c69d..69827f2bf05f3 100644 --- a/packages/react-debug-tools/src/ReactDebugHooks.js +++ b/packages/react-debug-tools/src/ReactDebugHooks.js @@ -284,9 +284,9 @@ function useState( hook !== null ? hook.memoizedState : typeof initialState === 'function' - ? // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types - initialState() - : initialState; + ? // $FlowFixMe[incompatible-use]: Flow doesn't like mixed types + initialState() + : initialState; hookLog.push({ displayName: null, primitive: 'State', diff --git a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js index 47d47926cf6ee..ef9a7c1e6edc7 100644 --- a/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js +++ b/packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js @@ -182,14 +182,10 @@ describe('ReactHooksInspectionIntegration', () => { React.useLayoutEffect(effect); React.useEffect(effect); - React.useImperativeHandle( - outsideRef, - () => { - // Return a function so that jest treats them as non-equal. - return function Instance() {}; - }, - [], - ); + React.useImperativeHandle(outsideRef, () => { + // Return a function so that jest treats them as non-equal. + return function Instance() {}; + }, []); React.useMemo(() => state1 + state2, [state1]); @@ -472,14 +468,10 @@ describe('ReactHooksInspectionIntegration', () => { React.useLayoutEffect(effect); React.useEffect(effect); - React.useImperativeHandle( - outsideRef, - () => { - // Return a function so that jest treats them as non-equal. - return function Instance() {}; - }, - [], - ); + React.useImperativeHandle(outsideRef, () => { + // Return a function so that jest treats them as non-equal. + return function Instance() {}; + }, []); React.useMemo(() => state1 + state2, [state1]); diff --git a/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js b/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js index cc53ffb3e58eb..a2a6a1d681819 100644 --- a/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js +++ b/packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js @@ -349,8 +349,8 @@ export default function ComponentsSettings(_: {}): React.Node { componentFilter.isValid === false ? 'Filter invalid' : componentFilter.isEnabled - ? 'Filter enabled' - : 'Filter disabled' + ? 'Filter enabled' + : 'Filter disabled' }> - localPromise.resolve(null).then(callback).catch(handleErrorInNextTick) - : scheduleTimeout; // TODO: Determine the best fallback here. + ? callback => + localPromise.resolve(null).then(callback).catch(handleErrorInNextTick) + : scheduleTimeout; // TODO: Determine the best fallback here. function handleErrorInNextTick(error: any) { setTimeout(() => { diff --git a/packages/react-dom-bindings/src/events/SyntheticEvent.js b/packages/react-dom-bindings/src/events/SyntheticEvent.js index cf2538d71dc16..2a1c45dda3770 100644 --- a/packages/react-dom-bindings/src/events/SyntheticEvent.js +++ b/packages/react-dom-bindings/src/events/SyntheticEvent.js @@ -564,23 +564,23 @@ const WheelEventInterface = { return 'deltaX' in event ? event.deltaX : // Fallback to `wheelDeltaX` for Webkit and normalize (right is positive). - 'wheelDeltaX' in event - ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number - -event.wheelDeltaX - : 0; + 'wheelDeltaX' in event + ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number + -event.wheelDeltaX + : 0; }, deltaY(event: {[propName: string]: mixed}) { return 'deltaY' in event ? event.deltaY : // Fallback to `wheelDeltaY` for Webkit and normalize (down is positive). - 'wheelDeltaY' in event - ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number - -event.wheelDeltaY - : // Fallback to `wheelDelta` for IE<9 and normalize (down is positive). - 'wheelDelta' in event - ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number - -event.wheelDelta - : 0; + 'wheelDeltaY' in event + ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number + -event.wheelDeltaY + : // Fallback to `wheelDelta` for IE<9 and normalize (down is positive). + 'wheelDelta' in event + ? // $FlowFixMe[unsafe-arithmetic] assuming this is a number + -event.wheelDelta + : 0; }, deltaZ: 0, diff --git a/packages/react-dom-bindings/src/events/plugins/SelectEventPlugin.js b/packages/react-dom-bindings/src/events/plugins/SelectEventPlugin.js index 1a54ba1a0a52f..ce6114257fa30 100644 --- a/packages/react-dom-bindings/src/events/plugins/SelectEventPlugin.js +++ b/packages/react-dom-bindings/src/events/plugins/SelectEventPlugin.js @@ -80,8 +80,8 @@ function getEventTargetDocument(eventTarget: any) { return eventTarget.window === eventTarget ? eventTarget.document : eventTarget.nodeType === DOCUMENT_NODE - ? eventTarget - : eventTarget.ownerDocument; + ? eventTarget + : eventTarget.ownerDocument; } /** diff --git a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js index 8a670f84592a9..1351a28db3aab 100644 --- a/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js +++ b/packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js @@ -515,8 +515,8 @@ export function createRenderState( typeof scriptConfig === 'string' || scriptConfig.crossOrigin == null ? undefined : scriptConfig.crossOrigin === 'use-credentials' - ? 'use-credentials' - : ''; + ? 'use-credentials' + : ''; } preloadBootstrapScriptOrModule(resumableState, renderState, src, props); @@ -567,8 +567,8 @@ export function createRenderState( typeof scriptConfig === 'string' || scriptConfig.crossOrigin == null ? undefined : scriptConfig.crossOrigin === 'use-credentials' - ? 'use-credentials' - : ''; + ? 'use-credentials' + : ''; } preloadBootstrapScriptOrModule(resumableState, renderState, src, props); @@ -736,8 +736,8 @@ export function createRootFormatContext(namespaceURI?: string): FormatContext { namespaceURI === 'http://www.w3.org/2000/svg' ? SVG_MODE : namespaceURI === 'http://www.w3.org/1998/Math/MathML' - ? MATHML_MODE - : ROOT_HTML_MODE; + ? MATHML_MODE + : ROOT_HTML_MODE; return createFormatContext(insertionMode, null, NO_SCOPE); } @@ -2493,8 +2493,8 @@ function pushLink( props.onLoad && props.onError ? '`onLoad` and `onError` props' : props.onLoad - ? '`onLoad` prop' - : '`onError` prop'; + ? '`onLoad` prop' + : '`onError` prop'; console.error( 'React encountered a `` with a `precedence` prop and %s. The presence of loading and error handlers indicates an intent to manage the stylesheet loading state from your from your Component code and React will not hoist or deduplicate this stylesheet. If your intent was to have React hoist and deduplciate this stylesheet using the `precedence` prop remove the %s, otherwise remove the `precedence` prop.', propDescription, @@ -2669,8 +2669,8 @@ function pushStyle( typeof child === 'function' ? 'a Function' : typeof child === 'symbol' - ? 'a Sybmol' - : 'an Array'; + ? 'a Sybmol' + : 'an Array'; console.error( 'React expect children of