Merge branch 'main' into feat/bigint/render-gk

Author: kassens

.circleci/config.yml

@@ -97,6 +97,16 @@ jobs:
       - setup_node_modules
       - run: node ./scripts/tasks/flow-ci
 
+
+  yarn_flags:
+    docker: *docker
+    environment: *environment
+
+    steps:
+      - checkout
+      - setup_node_modules
+      - run: yarn flags
+
   scrape_warning_messages:
     docker: *docker
     environment: *environment
@@ -447,6 +457,11 @@ workflows:
   build_and_test:
     unless: << pipeline.parameters.prerelease_commit_sha >>
     jobs:
+      - yarn_flags:
+          filters:
+            branches:
+              ignore:
+                - builds/facebook-www
       - yarn_flow:
           filters:
             branches:

.eslintrc.js

@@ -381,6 +381,13 @@ module.exports = {
         'jest/valid-expect-in-promise': ERROR,
       },
     },
+    {
+      // disable no focused tests for test setup helper files even if they are inside __tests__ directory
+      files: ['**/setupTests.js'],
+      rules: {
+        'jest/no-focused-tests': OFF,
+      },
+    },
     {
       files: [
         '**/__tests__/**/*.js',
@@ -448,6 +455,13 @@ module.exports = {
         __IS_CHROME__: 'readonly',
         __IS_FIREFOX__: 'readonly',
         __IS_EDGE__: 'readonly',
+        __IS_INTERNAL_VERSION__: 'readonly',
+      },
+    },
+    {
+      files: ['packages/react-devtools-shared/**/*.js'],
+      globals: {
+        __IS_INTERNAL_VERSION__: 'readonly',
       },
     },
   ],

fixtures/dom/src/components/fixtures/suspense/index.js

@@ -213,7 +213,7 @@ class TextInputFixtures extends React.Component {
 
           <Fixture>
             <SuspendyTree>
-              <img src="https://upload.wikimedia.org/wikipedia/commons/e/ee/Atom_%282%29.png" />
+              <img src="https://upload.wikimedia.org/wikipedia/commons/1/1b/Atom.png" />
               React is cool
             </SuspendyTree>
           </Fixture>

packages/eslint-plugin-react-hooks/__tests__/ESLintRuleExhaustiveDeps-test.js

@@ -6747,7 +6747,7 @@ const tests = {
             '  }\n' +
             '  fetchData();\n' +
             `}, [someId]); // Or [] if effect doesn't need props or state\n\n` +
-            'Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching',
+            'Learn more about data fetching with Hooks: https://react.dev/link/hooks-data-fetching',
           suggestions: undefined,
         },
       ],
@@ -6771,7 +6771,7 @@ const tests = {
             '  }\n' +
             '  fetchData();\n' +
             `}, [someId]); // Or [] if effect doesn't need props or state\n\n` +
-            'Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching',
+            'Learn more about data fetching with Hooks: https://react.dev/link/hooks-data-fetching',
           suggestions: undefined,
         },
       ],

packages/eslint-plugin-react-hooks/package.json

@@ -26,7 +26,7 @@
   "engines": {
     "node": ">=10"
   },
-  "homepage": "https://reactjs.org/",
+  "homepage": "https://react.dev/",
   "peerDependencies": {
     "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
   },

packages/eslint-plugin-react-hooks/src/ExhaustiveDeps.js

@@ -111,7 +111,7 @@ export default {
             '  }\n' +
             '  fetchData();\n' +
             `}, [someId]); // Or [] if effect doesn't need props or state\n\n` +
-            'Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching',
+            'Learn more about data fetching with Hooks: https://react.dev/link/hooks-data-fetching',
         });
       }
 

packages/jest-react/package.json

@@ -17,7 +17,7 @@
   "bugs": {
     "url": "https://github.com/facebook/react/issues"
   },
-  "homepage": "https://reactjs.org/",
+  "homepage": "https://react.dev/",
   "peerDependencies": {
     "jest": "^23.0.1 || ^24.0.0 || ^25.1.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0",
     "react": "^18.2.0",

packages/react-art/package.json

@@ -20,11 +20,10 @@
   "bugs": {
     "url": "https://github.com/facebook/react/issues"
   },
-  "homepage": "https://reactjs.org/",
+  "homepage": "https://react.dev/",
   "dependencies": {
     "art": "^0.10.1",
     "create-react-class": "^15.6.2",
-    "loose-envify": "^1.1.0",
     "scheduler": "^0.23.0"
   },
   "peerDependencies": {
@@ -39,10 +38,5 @@
     "Circle.js",
     "Rectangle.js",
     "Wedge.js"
-  ],
-  "browserify": {
-    "transform": [
-      "loose-envify"
-    ]
-  }
+  ]
 }

packages/react-client/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "react"
   ],
-  "homepage": "https://reactjs.org/",
+  "homepage": "https://react.dev/",
   "bugs": "https://github.com/facebook/react/issues",
   "license": "MIT",
   "files": [
@@ -25,13 +25,5 @@
   },
   "peerDependencies": {
     "react": "^17.0.0"
-  },
-  "dependencies": {
-    "loose-envify": "^1.1.0"
-  },
-  "browserify": {
-    "transform": [
-      "loose-envify"
-    ]
   }
 }

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -994,7 +994,7 @@ describe('ReactFlight', () => {
     }).toErrorDev(
       'Each child in a list should have a unique "key" prop.\n' +
         '\n' +
-        'Check the render method of `Component`. See https://reactjs.org/link/warning-keys for more information.\n' +
+        'Check the render method of `Component`. See https://react.dev/link/warning-keys for more information.\n' +
         '    in span (at **)\n' +
         '    in Component (at **)\n' +
         '    in Indirection (at **)\n' +
@@ -1251,7 +1251,7 @@ describe('ReactFlight', () => {
       ReactNoopFlightClient.read(transport);
     }).toErrorDev(
       'Each child in a list should have a unique "key" prop. ' +
-        'See https://reactjs.org/link/warning-keys for more information.',
+        'See https://react.dev/link/warning-keys for more information.',
     );
   });
 

packages/react-debug-tools/package.json

@@ -6,7 +6,7 @@
   "keywords": [
     "react"
   ],
-  "homepage": "https://reactjs.org/",
+  "homepage": "https://react.dev/",
   "bugs": "https://github.com/facebook/react/issues",
   "license": "MIT",
   "files": [
@@ -28,6 +28,6 @@
     "react": "^17.0.0"
   },
   "dependencies": {
-    "error-stack-parser": "^2.0.2"
+    "error-stack-parser": "^2.1.4"
   }
 }

packages/react-debug-tools/src/ReactDebugHooks.js

@@ -427,16 +427,19 @@ function useTransition(): [
   // useTransition() composes multiple hooks internally.
   // Advance the current hook index the same number of times
   // so that subsequent hooks have the right memoized state.
-  nextHook(); // State
+  const stateHook = nextHook();
   nextHook(); // Callback
+
+  const isPending = stateHook !== null ? stateHook.memoizedState : false;
+
   hookLog.push({
     displayName: null,
     primitive: 'Transition',
     stackError: new Error(),
-    value: undefined,
+    value: isPending,
     debugInfo: null,
   });
-  return [false, callback => {}];
+  return [isPending, () => {}];
 }
 
 function useDeferredValue<T>(value: T, initialValue?: T): T {
@@ -521,19 +524,62 @@ function useFormState<S, P>(
 ): [Awaited<S>, (P) => void] {
   const hook = nextHook(); // FormState
   nextHook(); // ActionQueue
-  let state;
+  const stackError = new Error();
+  let value;
+  let debugInfo = null;
+  let error = null;
+
   if (hook !== null) {
-    state = hook.memoizedState;
+    const actionResult = hook.memoizedState;
+    if (
+      typeof actionResult === 'object' &&
+      actionResult !== null &&
+      // $FlowFixMe[method-unbinding]
+      typeof actionResult.then === 'function'
+    ) {
+      const thenable: Thenable<Awaited<S>> = (actionResult: any);
+      switch (thenable.status) {
+        case 'fulfilled': {
+          value = thenable.value;
+          debugInfo =
+            thenable._debugInfo === undefined ? null : thenable._debugInfo;
+          break;
+        }
+        case 'rejected': {
+          const rejectedError = thenable.reason;
+          error = rejectedError;
+          break;
+        }
+        default:
+          // If this was an uncached Promise we have to abandon this attempt
+          // but we can still emit anything up until this point.
+          error = SuspenseException;
+          debugInfo =
+            thenable._debugInfo === undefined ? null : thenable._debugInfo;
+          value = thenable;
+      }
+    } else {
+      value = (actionResult: any);
+    }
   } else {
-    state = initialState;
+    value = initialState;
   }
+
   hookLog.push({
     displayName: null,
     primitive: 'FormState',
-    stackError: new Error(),
-    value: state,
-    debugInfo: null,
+    stackError: stackError,
+    value: value,
+    debugInfo: debugInfo,
   });
+
+  if (error !== null) {
+    throw error;
+  }
+
+  // value being a Thenable is equivalent to error being not null
+  // i.e. we only reach this point with Awaited<S>
+  const state = ((value: any): Awaited<S>);
   return [state, (payload: P) => {}];
 }