[compiler][optim] infer mixedReadOnly for numeric and computed properties

Expand type inference to infer mixedReadOnly types for numeric and computed property accesses.
```js
function Component({idx})
  const data = useFragment(...)
  // we want to type `posts` correctly as Array
  const posts = data.viewers[idx].posts.slice(0, 5);
  // ...
}
```

.codesandbox/ci.json

@@ -1,11 +1,10 @@
 {
-  "packages": ["packages/react", "packages/react-dom", "packages/react-server-dom-webpack", "packages/scheduler"],
+  "packages": ["packages/react", "packages/react-dom", "packages/scheduler"],
   "buildCommand": "download-build-in-codesandbox-ci",
   "node": "18",
   "publishDirectory": {
     "react": "build/oss-experimental/react",
     "react-dom": "build/oss-experimental/react-dom",
-    "react-server-dom-webpack": "build/oss-experimental/react-server-dom-webpack",
     "scheduler": "build/oss-experimental/scheduler"
   },
   "sandboxes": ["new"],

.eslintrc.js

@@ -496,7 +496,6 @@ module.exports = {
         'packages/react-devtools-shared/src/devtools/views/**/*.js',
         'packages/react-devtools-shared/src/hook.js',
         'packages/react-devtools-shared/src/backend/console.js',
-        'packages/react-devtools-shared/src/backend/fiber/renderer.js',
         'packages/react-devtools-shared/src/backend/shared/DevToolsComponentStackFrame.js',
         'packages/react-devtools-shared/src/frontend/utils/withPermissionsCheck.js',
       ],
@@ -505,7 +504,6 @@ module.exports = {
         __IS_FIREFOX__: 'readonly',
         __IS_EDGE__: 'readonly',
         __IS_NATIVE__: 'readonly',
-        __IS_INTERNAL_MCP_BUILD__: 'readonly',
         __IS_INTERNAL_VERSION__: 'readonly',
         chrome: 'readonly',
       },
@@ -581,7 +579,6 @@ module.exports = {
     JSONValue: 'readonly',
     JSResourceReference: 'readonly',
     MouseEventHandler: 'readonly',
-    NavigateEvent: 'readonly',
     PropagationPhases: 'readonly',
     PropertyDescriptor: 'readonly',
     React$AbstractComponent: 'readonly',
@@ -618,8 +615,6 @@ module.exports = {
     GetAnimationsOptions: 'readonly',
     Animatable: 'readonly',
     ScrollTimeline: 'readonly',
-    EventListenerOptionsOrUseCapture: 'readonly',
-    FocusOptions: 'readonly',
 
     spyOnDev: 'readonly',
     spyOnDevAndProd: 'readonly',
@@ -637,6 +632,5 @@ module.exports = {
     AsyncLocalStorage: 'readonly',
     async_hooks: 'readonly',
     globalThis: 'readonly',
-    navigation: 'readonly',
   },
 };

.github/ISSUE_TEMPLATE/19.md

@@ -0,0 +1,18 @@
+---
+name: "⚛React 19 beta issue"
+about: Report a issue with React 19 beta.
+title: '[React 19]'
+labels: 'React 19'
+
+---
+
+
+## Summary
+
+<!--
+  Please provide a CodeSandbox (https://codesandbox.io/s/new), a link to a
+  repository on GitHub, or provide a minimal code example that reproduces the
+  problem. You may provide a screenshot of the application if you think it is
+  relevant to your bug report. Here are some tips for providing a minimal
+  example: https://stackoverflow.com/help/mcve.
+-->

.github/workflows/compiler_discord_notify.yml

@@ -7,27 +7,9 @@ on:
       - compiler/**
       - .github/workflows/compiler_**.yml
 
-permissions: {}
-
 jobs:
-  check_access:
-    runs-on: ubuntu-latest
-    outputs:
-      is_member_or_collaborator: ${{ steps.check_is_member_or_collaborator.outputs.is_member_or_collaborator }}
-    steps:
-      - run: echo ${{ github.event.pull_request.author_association }}
-      - name: Check is member or collaborator
-        id: check_is_member_or_collaborator
-        if: ${{ github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR' }}
-        run: echo "is_member_or_collaborator=true" >> "$GITHUB_OUTPUT"
-
   check_maintainer:
-    if: ${{ needs.check_access.outputs.is_member_or_collaborator == 'true' || needs.check_access.outputs.is_member_or_collaborator == true }}
-    needs: [check_access]
     uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
-    permissions:
-      # Used by check_maintainer
-      contents: read
     with:
       actor: ${{ github.event.pull_request.user.login }}
 
@@ -37,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@86dc739f3f165f16dadc5666051c367efa1692f4
+        uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.COMPILER_DISCORD_WEBHOOK_URL }}
           embed-author-name: ${{ github.event.pull_request.user.login }}

.github/workflows/compiler_playground.yml

@@ -8,8 +8,6 @@ on:
       - compiler/**
       - .github/workflows/compiler_playground.yml
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
@@ -38,27 +36,10 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: compiler-and-playground-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
+          path: "**/node_modules"
+          key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        working-directory: compiler
-      - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Check Playwright version
-        id: playwright_version
-        run: echo "playwright_version=$(npm ls @playwright/test | grep @playwright | sed 's/.*@//' | head -1)" >> "$GITHUB_OUTPUT"
-      - name: Cache Playwright Browsers for version ${{ steps.playwright_version.outputs.playwright_version }}
-        id: cache_playwright_browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-v6-${{ runner.arch }}-${{ runner.os }}-${{ steps.playwright_version.outputs.playwright_version }}
       - run: npx playwright install --with-deps chromium
-        if: steps.cache_playwright_browsers.outputs.cache-hit != 'true'
-      - run: npx playwright install-deps
-        if: steps.cache_playwright_browsers.outputs.cache-hit == 'true'
       - run: CI=true yarn test
       - run: ls -R test-results
         if: '!cancelled()'
@@ -68,4 +49,3 @@ jobs:
         with:
           name: test-results
           path: compiler/apps/playground/test-results
-          if-no-files-found: ignore

.github/workflows/compiler_prereleases.yml

@@ -16,19 +16,15 @@ on:
       version_name:
         required: true
         type: string
-      tag_version:
-        required: false
-        type: string
     secrets:
       NPM_TOKEN:
         required: true
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
+  GH_TOKEN: ${{ github.token }}
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 defaults:
@@ -50,12 +46,10 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/yarn.lock') }}
+          path: "**/node_modules"
+          key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Publish packages to npm
         run: |
           cp ./scripts/release/ci-npmrc ~/.npmrc
-          scripts/release/publish.js --frfr --ci --versionName=${{ inputs.version_name }} --tag=${{ inputs.dist_tag }} ${{ inputs.tag_version && format('--tagVersion={0}', inputs.tag_version) || '' }}
+          scripts/release/publish.js --frfr --ci --versionName=${{ inputs.version_name }} --tag ${{ inputs.dist_tag }}

.github/workflows/compiler_prereleases_manual.yml

@@ -14,11 +14,6 @@ on:
       version_name:
         required: true
         type: string
-      tag_version:
-        required: false
-        type: string
-
-permissions: {}
 
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
@@ -32,6 +27,5 @@ jobs:
       release_channel: ${{ inputs.release_channel }}
       dist_tag: ${{ inputs.dist_tag }}
       version_name: ${{ inputs.version_name }}
-      tag_version: ${{ inputs.tag_version }}
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/compiler_prereleases_nightly.yml

@@ -5,8 +5,6 @@ on:
     # At 10 minutes past 16:00 on Mon, Tue, Wed, Thu, and Fri
     - cron: 10 16 * * 1,2,3,4,5
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
 

.github/workflows/compiler_prereleases_weekly.yml

@@ -0,0 +1,21 @@
+name: (Compiler) Publish Prereleases Weekly
+
+on:
+  schedule:
+    # At 10 minutes past 9:00 on Mon
+    - cron: 10 9 * * 1
+
+env:
+  TZ: /usr/share/zoneinfo/America/Los_Angeles
+
+jobs:
+  publish_prerelease_beta:
+    name: Publish to beta channel
+    uses: facebook/react/.github/workflows/compiler_prereleases.yml@main
+    with:
+      commit_sha: ${{ github.sha }}
+      release_channel: beta
+      dist_tag: beta
+      version_name: '19.0.0'
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/compiler_typescript.yml

@@ -8,8 +8,6 @@ on:
       - compiler/**
       - .github/workflows/compiler_typescript.yml
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
@@ -47,13 +45,10 @@ jobs:
           cache-dependency-path: compiler/yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
-        id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/yarn.lock') }}
+          path: "**/node_modules"
+          key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: yarn workspace babel-plugin-react-compiler lint
 
   # Hardcoded to improve parallelism
@@ -71,11 +66,9 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/yarn.lock') }}
+          path: "**/node_modules"
+          key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: yarn workspace babel-plugin-react-compiler jest
 
   test:
@@ -97,11 +90,9 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/yarn.lock') }}
+          path: "**/node_modules"
+          key: compiler-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('compiler/**/yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: xvfb-run -a yarn workspace ${{ matrix.workspace_name }} test
         if: runner.os == 'Linux' && matrix.workspace_name == 'react-forgive'
       - run: yarn workspace ${{ matrix.workspace_name }} test

.github/workflows/devtools_regression_tests.yml

@@ -9,8 +9,6 @@ on:
         required: false
         type: string
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
@@ -20,9 +18,6 @@ jobs:
   download_build:
     name: Download base build
     runs-on: ubuntu-latest
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -34,15 +29,13 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-release-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd scripts/release install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
+      - run: yarn install --frozen-lockfile
+        working-directory: scripts/release
       - name: Download react-devtools artifacts for base revision
         run: |
           git fetch origin main
@@ -54,7 +47,6 @@ jobs:
         with:
           name: build
           path: build
-          if-no-files-found: error
 
   build_devtools_and_process_artifacts:
     name: Build DevTools and process artifacts
@@ -71,13 +63,11 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -93,20 +83,17 @@ jobs:
         with:
           name: react-devtools
           path: build/devtools.tgz
-          if-no-files-found: error
       # Simplifies getting the extension for local testing
       - name: Archive chrome extension
         uses: actions/upload-artifact@v4
         with:
           name: react-devtools-chrome-extension
           path: build/devtools/chrome-extension.zip
-          if-no-files-found: error
       - name: Archive firefox extension
         uses: actions/upload-artifact@v4
         with:
           name: react-devtools-firefox-extension
           path: build/devtools/firefox-extension.zip
-          if-no-files-found: error
 
   run_devtools_tests_for_versions:
     name: Run DevTools tests for versions
@@ -133,11 +120,9 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore all archived build artifacts
         uses: actions/download-artifact@v4
       - name: Display structure of build
@@ -169,28 +154,17 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore all archived build artifacts
         uses: actions/download-artifact@v4
       - name: Display structure of build
         run: ls -R build
-      - name: Check Playwright version
-        id: playwright_version
-        run: echo "playwright_version=$(npm ls @playwright/test | grep @playwright | sed 's/.*@//' | head -1)" >> "$GITHUB_OUTPUT"
-      - name: Cache Playwright Browsers for version ${{ steps.playwright_version.outputs.playwright_version }}
-        id: cache_playwright_browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-v6-${{ runner.arch }}-${{ runner.os }}-${{ steps.playwright_version.outputs.playwright_version }}
-      - run: npx playwright install --with-deps
-        if: steps.cache_playwright_browsers.outputs.cache-hit != 'true'
-      - run: npx playwright install-deps
-        if: steps.cache_playwright_browsers.outputs.cache-hit == 'true'
+      - name: Playwright install deps
+        run: |
+          npx playwright install
+          sudo npx playwright install-deps
       - run: ./scripts/ci/download_devtools_regression_build.js ${{ matrix.version }}
       - run: ls -R build-regression
       - run: ./scripts/ci/run_devtools_e2e_tests.js ${{ matrix.version }}
@@ -202,4 +176,3 @@ jobs:
         with:
           name: screenshots
           path: ./tmp/screenshots
-          if-no-files-found: warn

.github/workflows/runtime_build_and_test.yml

@@ -7,8 +7,6 @@ on:
     paths-ignore:
       - compiler/**
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
@@ -19,95 +17,6 @@ env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
 
 jobs:
-  # ----- NODE_MODULES CACHE -----
-  # Centralize the node_modules cache so it is saved once and each subsequent job only needs to
-  # restore the cache. Prevents race conditions where multiple workflows try to write to the cache.
-  runtime_node_modules_cache:
-    name: Cache Runtime node_modules
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      - name: Check cache hit
-        uses: actions/cache/restore@v4
-        id: node_modules
-        with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          lookup-only: true
-      - uses: actions/setup-node@v4
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-          cache-dependency-path: yarn.lock
-      - name: Warm with old cache
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
-      - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Save cache
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-
-  runtime_compiler_node_modules_cache:
-    name: Cache Runtime, Compiler node_modules
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      - name: Check cache hit
-        uses: actions/cache/restore@v4
-        id: node_modules
-        with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-          lookup-only: true
-      - uses: actions/setup-node@v4
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-          cache-dependency-path: |
-            yarn.lock
-            compiler/yarn.lock
-      - name: Warm with old cache
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-          restore-keys: |
-            runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-and-compiler-node_modules-v6-
-      - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd compiler install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Save cache
-        if: steps.node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-
   # ----- FLOW -----
   discover_flow_inline_configs:
     name: Discover flow inline configs
@@ -127,7 +36,7 @@ jobs:
 
   flow:
     name: Flow check ${{ matrix.flow_inline_config_shortname }}
-    needs: [discover_flow_inline_configs, runtime_node_modules_cache]
+    needs: discover_flow_inline_configs
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -143,25 +52,19 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: node ./scripts/tasks/flow-ci ${{ matrix.flow_inline_config_shortname }}
 
   # ----- FIZZ -----
   check_generated_fizz_runtime:
     name: Confirm generated inline Fizz runtime is up to date
-    needs: [runtime_node_modules_cache]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -173,19 +76,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: |
           yarn generate-inline-fizz-runtime
           git diff --quiet || (echo "There was a change to the Fizz runtime. Run `yarn generate-inline-fizz-runtime` and check in the result." && false)
@@ -193,7 +91,6 @@ jobs:
   # ----- FEATURE FLAGS -----
   flags:
     name: Check flags
-    needs: [runtime_node_modules_cache]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -205,22 +102,19 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: yarn flags
 
   # ----- TESTS -----
   test:
     name: yarn test ${{ matrix.params }} (Shard ${{ matrix.shard }})
-    needs: [runtime_compiler_node_modules_cache]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -259,37 +153,27 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-          cache-dependency-path: |
-            yarn.lock
-            compiler/yarn.lock
+          cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-          restore-keys: |
-            runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-and-compiler-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd compiler install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: yarn test ${{ matrix.params }} --ci --shard=${{ matrix.shard }}
 
   # ----- BUILD -----
   build_and_lint:
     name: yarn build and lint
-    needs: [runtime_compiler_node_modules_cache]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         # yml is dumb. update the --total arg to yarn build if you change the number of workers
-        worker_id: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24]
+        worker_id: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]
         release_channel: [stable, experimental]
     steps:
       - uses: actions/checkout@v4
@@ -299,30 +183,21 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-          cache-dependency-path: |
-            yarn.lock
-            compiler/yarn.lock
+          cache-dependency-path: yarn.lock
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 11.0.22
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-          restore-keys: |
-            runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-and-compiler-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd compiler install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn build --index=${{ matrix.worker_id }} --total=25 --r=${{ matrix.release_channel }} --ci
+      - run: yarn build --index=${{ matrix.worker_id }} --total=20 --r=${{ matrix.release_channel }} --ci
         env:
           CI: github
           RELEASE_CHANNEL: ${{ matrix.release_channel }}
@@ -336,11 +211,10 @@ jobs:
         with:
           name: _build_${{ matrix.worker_id }}_${{ matrix.release_channel }}
           path: build
-          if-no-files-found: error
 
   test_build:
     name: yarn test-build
-    needs: [build_and_lint, runtime_compiler_node_modules_cache]
+    needs: build_and_lint
     strategy:
       fail-fast: false
       matrix:
@@ -375,16 +249,9 @@ jobs:
           # TODO: Test more persistent configurations?
         ]
         shard:
-          - 1/10
-          - 2/10
-          - 3/10
-          - 4/10
-          - 5/10
-          - 6/10
-          - 7/10
-          - 8/10
-          - 9/10
-          - 10/10
+          - 1/3
+          - 2/3
+          - 3/3
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -394,25 +261,16 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-          cache-dependency-path: |
-            yarn.lock
-            compiler/yarn.lock
+          cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock') }}
-          restore-keys: |
-            runtime-and-compiler-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-and-compiler-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd compiler install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -425,11 +283,7 @@ jobs:
 
   process_artifacts_combined:
     name: Process artifacts combined
-    needs: [build_and_lint, runtime_node_modules_cache]
-    permissions:
-      # https://github.com/actions/attest-build-provenance
-      id-token: write
-      attestations: write
+    needs: build_and_lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -441,19 +295,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -462,7 +311,7 @@ jobs:
           merge-multiple: true
       - name: Display structure of build
         run: ls -R build
-      - run: echo ${{ github.event.pull_request.head.sha || github.sha }} >> build/COMMIT_SHA
+      - run: echo ${{ github.sha }} >> build/COMMIT_SHA
       - name: Scrape warning messages
         run: |
           mkdir -p ./build/__test_utils__
@@ -472,29 +321,16 @@ jobs:
         # TODO: Migrate scripts to use `build` directory instead of `build2`
       - run: cp ./build.tgz ./build2.tgz
       - name: Archive build artifacts
-        id: upload_artifacts_combined
         uses: actions/upload-artifact@v4
         with:
           name: artifacts_combined
           path: |
             ./build.tgz
             ./build2.tgz
-          if-no-files-found: error
-      - uses: actions/attest-build-provenance@v2
-        # We don't verify builds generated from pull requests not originating from facebook/react.
-        # However, if the PR lands, the run on `main` will generate the attestation which can then
-        # be used to download a build via scripts/release/download-experimental-build.js.
-        #
-        # Note that this means that scripts/release/download-experimental-build.js must be run with
-        # --no-verify when downloading a build from a fork.
-        if: github.event_name == 'push' && github.ref_name == 'main' || github.event.pull_request.head.repo.full_name == github.repository
-        with:
-          subject-name: artifacts_combined.zip
-          subject-digest: sha256:${{ steps.upload_artifacts_combined.outputs.artifact-digest }}
 
   check_error_codes:
     name: Search build artifacts for unminified errors
-    needs: [build_and_lint, runtime_node_modules_cache]
+    needs: build_and_lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -506,19 +342,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -534,7 +365,7 @@ jobs:
 
   check_release_dependencies:
     name: Check release dependencies
-    needs: [build_and_lint, runtime_node_modules_cache]
+    needs: build_and_lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -546,19 +377,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -583,16 +409,15 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache@v4 # note: this does not reuse centralized cache since it has unique cache key
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: fixtures_dom-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'fixtures/dom/yarn.lock') }}
+          path: "**/node_modules"
+          key: fixtures_dom-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
-      - run: yarn --cwd fixtures/dom install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
+      - run: yarn install --frozen-lockfile
+        working-directory: fixtures/dom
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -627,31 +452,14 @@ jobs:
       # That means dependencies of the built packages are not installed.
       # We need to install dependencies of the workroot to fulfill all dependency constraints
       - name: Restore cached node_modules
-        uses: actions/cache@v4 # note: this does not reuse centralized cache since it has unique cache key
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: fixtures_flight-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'fixtures/flight/yarn.lock') }}
+          path: "**/node_modules"
+          key: fixtures_flight-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd fixtures/flight install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Check Playwright version
-        id: playwright_version
-        run: echo "playwright_version=$(npm ls @playwright/test | grep @playwright | sed 's/.*@//' | head -1)" >> "$GITHUB_OUTPUT"
-      - name: Cache Playwright Browsers for version ${{ steps.playwright_version.outputs.playwright_version }}
-        id: cache_playwright_browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-v6-${{ runner.arch }}-${{ runner.os }}-${{ steps.playwright_version.outputs.playwright_version }}
-      - name: Playwright install deps
-        if: steps.cache_playwright_browsers.outputs.cache-hit != 'true'
-        working-directory: fixtures/flight
-        run: npx playwright install --with-deps chromium
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -660,6 +468,16 @@ jobs:
           merge-multiple: true
       - name: Display structure of build
         run: ls -R build
+      - name: Install fixture dependencies
+        working-directory: fixtures/flight
+        run: |
+          yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          if [ $? -ne 0 ]; then
+            yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          fi
+      - name: Playwright install deps
+        working-directory: fixtures/flight
+        run: npx playwright install --with-deps chromium
       - name: Run tests
         working-directory: fixtures/flight
         run: yarn test
@@ -671,18 +489,16 @@ jobs:
         with:
           name: flight-playwright-report
           path: fixtures/flight/playwright-report
-          if-no-files-found: warn
       - name: Archive Flight fixture artifacts
         uses: actions/upload-artifact@v4
         with:
           name: flight-test-results
           path: fixtures/flight/test-results
-          if-no-files-found: ignore
 
   # ----- DEVTOOLS -----
   build_devtools_and_process_artifacts:
     name: Build DevTools and process artifacts
-    needs: [build_and_lint, runtime_node_modules_cache]
+    needs: build_and_lint
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -698,19 +514,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -728,7 +539,6 @@ jobs:
         with:
           name: react-devtools-${{ matrix.browser }}-extension
           path: build/devtools/${{ matrix.browser }}-extension.zip
-          if-no-files-found: error
 
   merge_devtools_artifacts:
     name: Merge DevTools artifacts
@@ -743,7 +553,7 @@ jobs:
 
   run_devtools_e2e_tests:
     name: Run DevTools e2e tests
-    needs: [build_and_lint, runtime_node_modules_cache]
+    needs: build_and_lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -755,19 +565,14 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            runtime-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-
-            runtime-node_modules-v6-
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
@@ -786,9 +591,6 @@ jobs:
     if: ${{ github.event_name == 'pull_request' && github.ref_name != 'main' && github.event.pull_request.base.ref == 'main' }}
     name: Run sizebot
     needs: [build_and_lint]
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -800,36 +602,30 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
-        uses: actions/cache@v4 # note: this does not reuse centralized cache since it has unique cache key
+        uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-release-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd scripts/release install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
+        working-directory: scripts/release
       - name: Download artifacts for base revision
-        # The build could have been generated from a fork, so we must download the build without
-        # any verification. This is safe since we only use this for sizebot calculation and the
-        # unverified artifact is not used. Additionally this workflow runs in the pull_request
-        # trigger so only restricted permissions are available.
         run: |
-          GH_TOKEN=${{ github.token }} scripts/release/download-experimental-build.js --commit=$(git rev-parse ${{ github.event.pull_request.base.sha }}) ${{ (github.event.pull_request.head.repo.full_name != github.repository && '--noVerify') || ''}}
+          GH_TOKEN=${{ github.token }} scripts/release/download-experimental-build.js --commit=$(git rev-parse ${{ github.event.pull_request.base.sha }})
           mv ./build ./base-build
+      # TODO: The `download-experimental-build` script copies the npm
+      # packages into the `node_modules` directory. This is a historical
+      # quirk of how the release script works. Let's pretend they
+      # don't exist.
       - name: Delete extraneous files
-        # TODO: The `download-experimental-build` script copies the npm
-        # packages into the `node_modules` directory. This is a historical
-        # quirk of how the release script works. Let's pretend they
-        # don't exist.
         run: rm -rf ./base-build/node_modules
       - name: Display structure of base-build from origin/main
         run: ls -R base-build
       - name: Ensure clean build directory
         run: rm -rf build
+      - run: yarn install --frozen-lockfile
       - name: Restore archived build for PR
         uses: actions/download-artifact@v4
         with:
@@ -842,11 +638,10 @@ jobs:
           node ./scripts/print-warnings/print-warnings.js > build/__test_utils__/ReactAllWarnings.js
       - name: Display structure of build for PR
         run: ls -R build
-      - run: echo ${{ github.event.pull_request.head.sha || github.sha }} >> build/COMMIT_SHA
+      - run: echo ${{ github.sha }} >> build/COMMIT_SHA
       - run: node ./scripts/tasks/danger
       - name: Archive sizebot results
         uses: actions/upload-artifact@v4
         with:
           name: sizebot-message
           path: sizebot-message.md
-          if-no-files-found: ignore

.github/workflows/runtime_commit_artifacts.yml

@@ -16,13 +16,6 @@ on:
         required: true
         default: false
         type: boolean
-      dry_run:
-        description: Perform a dry run (run everything except push)
-        required: true
-        default: false
-        type: boolean
-
-permissions: {}
 
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
@@ -32,40 +25,6 @@ env:
 jobs:
   download_artifacts:
     runs-on: ubuntu-latest
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
-    steps:
-      - uses: actions/checkout@v4
-      - name: Restore cached node_modules
-        uses: actions/cache@v4
-        id: node_modules
-        with:
-          path: |
-            **/node_modules
-          key: runtime-release-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
-      - name: Ensure clean build directory
-        run: rm -rf build
-      - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd scripts/release install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Download artifacts for base revision
-        run: |
-          GH_TOKEN=${{ github.token }} scripts/release/download-experimental-build.js --commit=${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }}
-      - name: Display structure of build
-        run: ls -R build
-      - name: Archive build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: build/
-          if-no-files-found: error
-
-
-  process_artifacts:
-    runs-on: ubuntu-latest
-    needs: [download_artifacts]
     outputs:
       www_branch_count: ${{ steps.check_branches.outputs.www_branch_count }}
       fbsource_branch_count: ${{ steps.check_branches.outputs.fbsource_branch_count }}
@@ -105,11 +64,27 @@ jobs:
         run: |
           echo "www_branch_count=$(git ls-remote --heads origin "refs/heads/meta-www" | wc -l)" >> "$GITHUB_OUTPUT"
           echo "fbsource_branch_count=$(git ls-remote --heads origin "refs/heads/meta-fbsource" | wc -l)" >> "$GITHUB_OUTPUT"
-      - name: Restore downloaded build
-        uses: actions/download-artifact@v4
+      - uses: actions/setup-node@v4
         with:
-          name: build
-          path: build
+          node-version-file: '.nvmrc'
+          cache: yarn
+          cache-dependency-path: yarn.lock
+      - name: Restore cached node_modules
+        uses: actions/cache@v4
+        id: node_modules
+        with:
+          path: "**/node_modules"
+          key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+      - name: Ensure clean build directory
+        run: rm -rf build
+      - run: yarn install --frozen-lockfile
+        name: yarn install (react)
+      - run: yarn install --frozen-lockfile
+        name: yarn install (scripts/release)
+        working-directory: scripts/release
+      - name: Download artifacts for base revision
+        run: |
+          GH_TOKEN=${{ github.token }} scripts/release/download-experimental-build.js --commit=${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }}
       - name: Display structure of build
         run: ls -R build
       - name: Strip @license from eslint plugin and react-refresh
@@ -132,10 +107,9 @@ jobs:
           mkdir ./compiled/facebook-www/__test_utils__
           mv build/__test_utils__/ReactAllWarnings.js ./compiled/facebook-www/__test_utils__/ReactAllWarnings.js
 
-          # Copy eslint-plugin-react-hooks
-          mkdir ./compiled/eslint-plugin-react-hooks
-          cp build/oss-experimental/eslint-plugin-react-hooks/cjs/eslint-plugin-react-hooks.development.js \
-            ./compiled/eslint-plugin-react-hooks/index.js
+          # Move eslint-plugin-react-hooks into facebook-www
+          mv build/oss-experimental/eslint-plugin-react-hooks/cjs/eslint-plugin-react-hooks.development.js \
+            ./compiled/facebook-www/eslint-plugin-react-hooks.js
 
           # Move unstable_server-external-runtime.js into facebook-www
           mv build/oss-experimental/react-dom/unstable_server-external-runtime.js \
@@ -167,21 +141,15 @@ jobs:
           rm $RENDERER_FOLDER/ReactFabric-{dev,prod,profiling}.js
           rm $RENDERER_FOLDER/ReactNativeRenderer-{dev,prod,profiling}.js
 
-          # Copy eslint-plugin-react-hooks
-          # NOTE: This is different from www, here we include the full package
-          #       including package.json to include dependencies in fbsource.
-          mkdir "$BASE_FOLDER/tools"
-          cp -r build/oss-experimental/eslint-plugin-react-hooks "$BASE_FOLDER/tools"
-
           # Move React Native version file
           mv build/facebook-react-native/VERSION_NATIVE_FB ./compiled-rn/VERSION_NATIVE_FB
 
           ls -R ./compiled-rn
       - name: Add REVISION files
         run: |
-          echo ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} >> ./compiled/facebook-www/REVISION
+          echo ${{ github.sha }} >> ./compiled/facebook-www/REVISION
           cp ./compiled/facebook-www/REVISION ./compiled/facebook-www/REVISION_TRANSFORMS
-          echo ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} >> ./compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
+          echo ${{ github.sha}} >> ./compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION
       - name: "Get current version string"
         id: get_current_version
         run: |
@@ -198,20 +166,15 @@ jobs:
         with:
           name: compiled
           path: compiled/
-          if-no-files-found: error
       - uses: actions/upload-artifact@v4
         with:
           name: compiled-rn
           path: compiled-rn/
-          if-no-files-found: error
 
   commit_www_artifacts:
-    needs: [download_artifacts, process_artifacts]
-    if: inputs.force == true || (github.ref == 'refs/heads/main' && needs.process_artifacts.outputs.www_branch_count == '0')
+    needs: download_artifacts
+    if: inputs.force == true || (github.ref == 'refs/heads/main' && needs.download_artifacts.outputs.www_branch_count == '0')
     runs-on: ubuntu-latest
-    permissions:
-      # Used to push a commit to builds/facebook-www
-      contents: write
     steps:
       - uses: actions/checkout@v4
         with:
@@ -223,12 +186,12 @@ jobs:
           name: compiled
           path: compiled/
       - name: Revert version changes
-        if: needs.process_artifacts.outputs.last_version_classic != '' && needs.process_artifacts.outputs.last_version_modern != ''
+        if: needs.download_artifacts.outputs.last_version_classic != '' && needs.download_artifacts.outputs.last_version_modern != ''
         env:
-          CURRENT_VERSION_CLASSIC: ${{ needs.process_artifacts.outputs.current_version_classic }}
-          CURRENT_VERSION_MODERN: ${{ needs.process_artifacts.outputs.current_version_modern }}
-          LAST_VERSION_CLASSIC: ${{ needs.process_artifacts.outputs.last_version_classic }}
-          LAST_VERSION_MODERN: ${{ needs.process_artifacts.outputs.last_version_modern }}
+          CURRENT_VERSION_CLASSIC: ${{ needs.download_artifacts.outputs.current_version_classic }}
+          CURRENT_VERSION_MODERN: ${{ needs.download_artifacts.outputs.current_version_modern }}
+          LAST_VERSION_CLASSIC: ${{ needs.download_artifacts.outputs.last_version_classic }}
+          LAST_VERSION_MODERN: ${{ needs.download_artifacts.outputs.last_version_modern }}
         run: |
           echo "Reverting $CURRENT_VERSION_CLASSIC to $LAST_VERSION_CLASSIC"
           grep -rl "$CURRENT_VERSION_CLASSIC" ./compiled || echo "No files found with $CURRENT_VERSION_CLASSIC"
@@ -258,12 +221,12 @@ jobs:
             echo "should_commit=false" >> "$GITHUB_OUTPUT"
           fi
       - name: Re-apply version changes
-        if: inputs.force == true || (steps.check_should_commit.outputs.should_commit == 'true' && needs.process_artifacts.outputs.last_version_classic != '' && needs.process_artifacts.outputs.last_version_modern != '')
+        if: inputs.force == true || (steps.check_should_commit.outputs.should_commit == 'true' && needs.download_artifacts.outputs.last_version_classic != '' && needs.download_artifacts.outputs.last_version_modern != '')
         env:
-          CURRENT_VERSION_CLASSIC: ${{ needs.process_artifacts.outputs.current_version_classic }}
-          CURRENT_VERSION_MODERN: ${{ needs.process_artifacts.outputs.current_version_modern }}
-          LAST_VERSION_CLASSIC: ${{ needs.process_artifacts.outputs.last_version_classic }}
-          LAST_VERSION_MODERN: ${{ needs.process_artifacts.outputs.last_version_modern }}
+          CURRENT_VERSION_CLASSIC: ${{ needs.download_artifacts.outputs.current_version_classic }}
+          CURRENT_VERSION_MODERN: ${{ needs.download_artifacts.outputs.current_version_modern }}
+          LAST_VERSION_CLASSIC: ${{ needs.download_artifacts.outputs.last_version_classic }}
+          LAST_VERSION_MODERN: ${{ needs.download_artifacts.outputs.last_version_modern }}
         run: |
           echo "Re-applying $LAST_VERSION_CLASSIC to $CURRENT_VERSION_CLASSIC"
           grep -rl "$LAST_VERSION_CLASSIC" ./compiled || echo "No files found with $LAST_VERSION_CLASSIC"
@@ -277,31 +240,24 @@ jobs:
       - name: Will commit these changes
         if: inputs.force == true || steps.check_should_commit.outputs.should_commit == 'true'
         run: |
-          git add .
-          git status
-      - name: Check commit message
-        if: inputs.dry_run
-        run: |
-          git fetch origin --quiet
-          git show ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} --no-patch --pretty=format:"%B"
+          echo ":"
+          git status -u
       - name: Commit changes to branch
         if: inputs.force == true || steps.check_should_commit.outputs.should_commit == 'true'
-        run: |
-          git config --global user.email "${{ format('{0}@users.noreply.github.com', github.triggering_actor) }}"
-          git config --global user.name "${{ github.triggering_actor }}"
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: |
+            ${{ github.event.workflow_run.head_commit.message || format('Manual build of {0}', github.event.workflow_run.head_sha || github.sha) }}
 
-          git fetch origin --quiet
-          git commit -m "$(git show ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} --no-patch --pretty=format:'%B%n%nDiffTrain build for [${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }}](https://github.com/facebook/react/commit/${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha}})')" || echo "No changes to commit"
-      - name: Push changes to branch
-        if: inputs.dry_run == false && (inputs.force == true || steps.check_should_commit.outputs.should_commit == 'true')
-        run: git push
+            DiffTrain build for [${{ github.event.workflow_run.head_sha || github.sha }}](https://github.com/facebook/react/commit/${{ github.event.workflow_run.head_sha || github.sha }})
+          branch: builds/facebook-www
+          commit_user_name: ${{ github.triggering_actor }}
+          commit_user_email: ${{ format('{0}@users.noreply.github.com', github.triggering_actor) }}
+          create_branch: true
 
   commit_fbsource_artifacts:
-    needs: [download_artifacts, process_artifacts]
-    permissions:
-      # Used to push a commit to builds/facebook-fbsource
-      contents: write
-    if: inputs.force == true || (github.ref == 'refs/heads/main' && needs.process_artifacts.outputs.fbsource_branch_count == '0')
+    needs: download_artifacts
+    if: inputs.force == true || (github.ref == 'refs/heads/main' && needs.download_artifacts.outputs.fbsource_branch_count == '0')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -314,10 +270,10 @@ jobs:
           name: compiled-rn
           path: compiled-rn/
       - name: Revert version changes
-        if: needs.process_artifacts.outputs.last_version_rn != ''
+        if: needs.download_artifacts.outputs.last_version_rn != ''
         env:
-          CURRENT_VERSION: ${{ needs.process_artifacts.outputs.current_version_rn }}
-          LAST_VERSION: ${{ needs.process_artifacts.outputs.last_version_rn }}
+          CURRENT_VERSION: ${{ needs.download_artifacts.outputs.current_version_rn }}
+          LAST_VERSION: ${{ needs.download_artifacts.outputs.last_version_rn }}
         run: |
           echo "Reverting $CURRENT_VERSION to $LAST_VERSION"
           grep -rl "$CURRENT_VERSION" ./compiled-rn || echo "No files found with $CURRENT_VERSION"
@@ -332,10 +288,10 @@ jobs:
           git --no-pager diff -U0 --cached | grep '^[+-]' | head -n 100
           echo "===================="
           # Ignore REVISION or lines removing @generated headers.
-          if git diff --cached ':(exclude)*REVISION' ':(exclude)*/eslint-plugin-react-hooks/package.json' | grep -vE "^(@@|diff|index|\-\-\-|\+\+\+|\- \* @generated SignedSource)" | grep "^[+-]" > /dev/null; then
+          if git diff --cached ':(exclude)*REVISION' | grep -vE "^(@@|diff|index|\-\-\-|\+\+\+|\- \* @generated SignedSource)" | grep "^[+-]" > /dev/null; then
             echo "Changes detected"
             echo "===== Changes ====="
-            git --no-pager diff --cached ':(exclude)*REVISION' ':(exclude)*/eslint-plugin-react-hooks/package.json' | grep -vE "^(@@|diff|index|\-\-\-|\+\+\+|\- \* @generated SignedSource)" | grep "^[+-]" | head -n 50
+            git --no-pager diff --cached ':(exclude)*REVISION' | grep -vE "^(@@|diff|index|\-\-\-|\+\+\+|\- \* @generated SignedSource)" | grep "^[+-]" | head -n 50
             echo "==================="
             echo "should_commit=true" >> "$GITHUB_OUTPUT"
           else
@@ -343,10 +299,10 @@ jobs:
             echo "should_commit=false" >> "$GITHUB_OUTPUT"
           fi
       - name: Re-apply version changes
-        if: inputs.force == true || (steps.check_should_commit.outputs.should_commit == 'true' && needs.process_artifacts.outputs.last_version_rn != '')
+        if: inputs.force == true || (steps.check_should_commit.outputs.should_commit == 'true' && needs.download_artifacts.outputs.last_version_rn != '')
         env:
-          CURRENT_VERSION: ${{ needs.process_artifacts.outputs.current_version_rn }}
-          LAST_VERSION: ${{ needs.process_artifacts.outputs.last_version_rn }}
+          CURRENT_VERSION: ${{ needs.download_artifacts.outputs.current_version_rn }}
+          LAST_VERSION: ${{ needs.download_artifacts.outputs.last_version_rn }}
         run: |
           echo "Re-applying $LAST_VERSION to $CURRENT_VERSION"
           grep -rl "$LAST_VERSION" ./compiled-rn || echo "No files found with $LAST_VERSION"
@@ -453,19 +409,15 @@ jobs:
         run: |
           git add .
           git status
-      - name: Check commit message
-        if: inputs.dry_run
-        run: |
-          git fetch origin --quiet
-          git show ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} --no-patch --pretty=format:"%B"
       - name: Commit changes to branch
         if: inputs.force == true || steps.check_should_commit.outputs.should_commit == 'true'
-        run: |
-          git config --global user.email "${{ format('{0}@users.noreply.github.com', github.triggering_actor) }}"
-          git config --global user.name "${{ github.triggering_actor }}"
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: |
+            ${{ github.event.workflow_run.head_commit.message || format('Manual build of {0}', github.event.workflow_run.head_sha || github.sha) }}
 
-          git fetch origin --quiet
-          git commit -m "$(git show ${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }} --no-patch --pretty=format:'%B%n%nDiffTrain build for [${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha }}](https://github.com/facebook/react/commit/${{ inputs.commit_sha || github.event.workflow_run.head_sha || github.sha}})')" || echo "No changes to commit"
-      - name: Push changes to branch
-        if: inputs.dry_run == false && (inputs.force == true || steps.check_should_commit.outputs.should_commit == 'true')
-        run: git push
+            DiffTrain build for [${{ github.event.workflow_run.head_sha || github.sha }}](https://github.com/facebook/react/commit/${{ github.event.workflow_run.head_sha || github.sha }})
+          branch: builds/facebook-fbsource
+          commit_user_name: ${{ github.triggering_actor }}
+          commit_user_email: ${{ format('{0}@users.noreply.github.com', github.triggering_actor) }}
+          create_branch: true

.github/workflows/runtime_discord_notify.yml

@@ -7,27 +7,9 @@ on:
       - compiler/**
       - .github/workflows/compiler_**.yml
 
-permissions: {}
-
 jobs:
-  check_access:
-    runs-on: ubuntu-latest
-    outputs:
-      is_member_or_collaborator: ${{ steps.check_is_member_or_collaborator.outputs.is_member_or_collaborator }}
-    steps:
-      - run: echo ${{ github.event.pull_request.author_association }}
-      - name: Check is member or collaborator
-        id: check_is_member_or_collaborator
-        if: ${{ github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR' }}
-        run: echo "is_member_or_collaborator=true" >> "$GITHUB_OUTPUT"
-
   check_maintainer:
-    if: ${{ needs.check_access.outputs.is_member_or_collaborator == 'true' || needs.check_access.outputs.is_member_or_collaborator == true }}
-    needs: [check_access]
     uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
-    permissions:
-      # Used by check_maintainer
-      contents: read
     with:
       actor: ${{ github.event.pull_request.user.login }}
 
@@ -37,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@86dc739f3f165f16dadc5666051c367efa1692f4
+        uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
           embed-author-name: ${{ github.event.pull_request.user.login }}

.github/workflows/runtime_eslint_plugin_e2e.yml

@@ -7,8 +7,6 @@ on:
     paths-ignore:
       - compiler/**
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
@@ -37,29 +35,22 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-          cache-dependency-path: |
-            yarn.lock
-            compiler/yarn.lock
+          cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-and-compiler-eslint_e2e-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'compiler/yarn.lock', 'fixtures/eslint-v*/yarn.lock') }}
+          path: "node_modules"
+          key: runtime-eslint_e2e-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd compiler install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - name: Install fixture dependencies
-        working-directory: ./fixtures/eslint-v${{ matrix.eslint_major }}
-        run: yarn --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - name: Build plugin
         working-directory: fixtures/eslint-v${{ matrix.eslint_major }}
         run: node build.mjs
+      - name: Install fixture dependencies
+        working-directory: ./fixtures/eslint-v${{ matrix.eslint_major }}
+        run: yarn --frozen-lockfile
       - name: Run lint test
         working-directory: ./fixtures/eslint-v${{ matrix.eslint_major }}
         run: yarn lint

.github/workflows/runtime_fuzz_tests.yml

@@ -8,8 +8,6 @@ on:
       - main
   workflow_dispatch:
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
 

.github/workflows/runtime_prereleases.yml

@@ -13,34 +13,21 @@ on:
       dist_tag:
         required: true
         type: string
-      enableFailureNotification:
-        description: 'Whether to notify the team on Discord when the release fails. Useful if this workflow is called from an automation.'
-        required: false
-        type: boolean
     secrets:
-      DISCORD_WEBHOOK_URL:
-        description: 'Discord webhook URL to notify on failure. Only required if enableFailureNotification is true.'
-        required: false
-      GH_TOKEN:
-        required: true
       NPM_TOKEN:
         required: true
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
+  GH_TOKEN: ${{ github.token }}
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 jobs:
   publish_prerelease:
     name: Publish prelease (${{ inputs.release_channel }}) ${{ inputs.commit_sha }} @${{ inputs.dist_tag }}
     runs-on: ubuntu-latest
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -52,24 +39,14 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-release-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd scripts/release install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
+      - run: yarn install --frozen-lockfile
+        working-directory: scripts/release
       - run: |
-          GH_TOKEN=${{ secrets.GH_TOKEN }} scripts/release/prepare-release-from-ci.js --skipTests -r ${{ inputs.release_channel }} --commit=${{ inputs.commit_sha }}
+          scripts/release/prepare-release-from-ci.js --skipTests -r ${{ inputs.release_channel }} --commit=${{ inputs.commit_sha }}
           cp ./scripts/release/ci-npmrc ~/.npmrc
           scripts/release/publish.js --ci --tags ${{ inputs.dist_tag }}
-      - name: Notify Discord on failure
-        if: failure() && inputs.enableFailureNotification == true
-        uses: tsickert/discord-webhook@86dc739f3f165f16dadc5666051c367efa1692f4
-        with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          embed-author-name: "GitHub Actions"
-          embed-title: 'Publish of $${{ inputs.release_channel }} release failed'
-          embed-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}

.github/workflows/runtime_prereleases_manual.yml

@@ -6,8 +6,6 @@ on:
       prerelease_commit_sha:
         required: true
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
 
@@ -16,9 +14,6 @@ jobs:
   publish_prerelease_canary:
     name: Publish to Canary channel
     uses: facebook/react/.github/workflows/runtime_prereleases.yml@main
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     with:
       commit_sha: ${{ inputs.prerelease_commit_sha }}
       release_channel: stable
@@ -35,14 +30,10 @@ jobs:
       dist_tag: canary,next
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish_prerelease_experimental:
     name: Publish to Experimental channel
     uses: facebook/react/.github/workflows/runtime_prereleases.yml@main
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     # NOTE: Intentionally running these jobs sequentially because npm
     # will sometimes fail if you try to concurrently publish two
     # different versions of the same package, even if they use different
@@ -54,4 +45,3 @@ jobs:
       dist_tag: experimental
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/runtime_prereleases_nightly.yml

@@ -5,8 +5,6 @@ on:
     # At 10 minutes past 16:00 on Mon, Tue, Wed, Thu, and Fri
     - cron: 10 16 * * 1,2,3,4,5
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
 
@@ -14,25 +12,16 @@ jobs:
   publish_prerelease_canary:
     name: Publish to Canary channel
     uses: facebook/react/.github/workflows/runtime_prereleases.yml@main
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     with:
       commit_sha: ${{ github.sha }}
       release_channel: stable
       dist_tag: canary,next
-      enableFailureNotification: true
     secrets:
-      DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish_prerelease_experimental:
     name: Publish to Experimental channel
     uses: facebook/react/.github/workflows/runtime_prereleases.yml@main
-    permissions:
-      # We use github.token to download the build artifact from a previous runtime_build_and_test.yml run
-      actions: read
     # NOTE: Intentionally running these jobs sequentially because npm
     # will sometimes fail if you try to concurrently publish two
     # different versions of the same package, even if they use different
@@ -42,8 +31,5 @@ jobs:
       commit_sha: ${{ github.sha }}
       release_channel: experimental
       dist_tag: experimental
-      enableFailureNotification: true
     secrets:
-      DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/runtime_releases_from_npm_manual.yml

@@ -31,12 +31,11 @@ on:
         type: boolean
         default: false
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
+  GH_TOKEN: ${{ github.token }}
   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 jobs:
@@ -45,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@86dc739f3f165f16dadc5666051c367efa1692f4
+        uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
           embed-author-name: ${{ github.event.sender.login }}
@@ -72,15 +71,13 @@ jobs:
         uses: actions/cache@v4
         id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: runtime-release-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+          path: "**/node_modules"
+          key: runtime-release-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
-      - run: yarn --cwd scripts/release install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
+      - run: yarn install --frozen-lockfile
+        working-directory: scripts/release
       - run: cp ./scripts/release/ci-npmrc ~/.npmrc
       - if: '${{ inputs.only_packages }}'
         name: 'Prepare ${{ inputs.only_packages }} from NPM'

.github/workflows/shared_check_maintainer.yml

@@ -6,12 +6,14 @@ on:
       actor:
         required: true
         type: string
+      is_remote:
+        required: false
+        type: boolean
+        default: false
     outputs:
       is_core_team:
         value: ${{ jobs.check_maintainer.outputs.is_core_team }}
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
@@ -20,12 +22,10 @@ env:
 jobs:
   check_maintainer:
     runs-on: ubuntu-latest
-    permissions:
-      # We fetch the contents of the MAINTAINERS file
-      contents: read
     outputs:
       is_core_team: ${{ steps.check_if_actor_is_maintainer.outputs.result }}
     steps:
+      - uses: actions/checkout@v4
       - name: Check if actor is maintainer
         id: check_if_actor_is_maintainer
         uses: actions/github-script@v7
@@ -33,20 +33,33 @@ jobs:
           script: |
             const fs = require('fs');
             const actor = '${{ inputs.actor }}';
-            const res = await github.rest.repos.getContent({
-              owner: 'facebook',
-              repo: 'react',
-              path: 'MAINTAINERS',
-              ref: 'main',
-              headers: { Accept: 'application/vnd.github+json' }
-            });
-            if (res.status !== 200) {
-              console.error(res);
-              throw new Error('Unable to fetch MAINTAINERS file');
+            let isRemote = ${{ inputs.is_remote }};
+            if (typeof isRemote === 'string') {
+              isRemote = isRemote === 'true';
             }
-            content = Buffer.from(res.data.content, 'base64').toString();
-            if (content == null || typeof content !== 'string') {
-              throw new Error('Unable to retrieve MAINTAINERS file');
+            if (typeof isRemote !== 'boolean') {
+              throw new Error(`Invalid \`isRemote\` input. Expected a boolean, got: ${isRemote}`);
+            }
+
+            let content = null;
+            if (isRemote === true) {
+              const res = await github.rest.repos.getContent({
+                owner: 'facebook',
+                repo: 'react',
+                path: 'MAINTAINERS',
+                ref: 'main',
+                headers: { Accept: 'application/vnd.github+json' }
+              });
+              if (res.status !== 200) {
+                console.error(res);
+                throw new Error('Unable to fetch MAINTAINERS file');
+              }
+              content = Buffer.from(res.data.content, 'base64').toString();
+            } else {
+              content = await fs.readFileSync('./MAINTAINERS', { encoding: 'utf8' });
+            }
+            if (content === null) {
+              throw new Error('Unable to retrieve local or http MAINTAINERS file');
             }
 
             const maintainers = new Set(content.split('\n'));

.github/workflows/shared_cleanup_merged_branch_caches.yml

@@ -1,41 +0,0 @@
-# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
-
-name: (Shared) Cleanup Merged Branch Caches
-on:
-  pull_request:
-    types:
-      - closed
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        required: true
-        type: string
-
-permissions: {}
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      # `actions:write` permission is required to delete caches
-      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
-      actions: write
-      contents: read
-    steps:
-      - name: Cleanup
-        run: |
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh cache list --ref $BRANCH --limit 100 --json id --jq '.[].id')
-
-          ## Setting this to not fail the workflow while deleting cache keys.
-          set +e
-          for cacheKey in $cacheKeysForPR
-          do
-              gh cache delete $cacheKey
-              echo "Deleting $cacheKey"
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-          BRANCH: refs/pull/${{ inputs.pr_number || github.event.pull_request.number }}/merge

.github/workflows/shared_cleanup_stale_branch_caches.yml

@@ -1,36 +0,0 @@
-# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
-
-name: (Shared) Cleanup Stale Branch Caches
-on:
-  schedule:
-    # Every 6 hours
-    - cron: 0 */6 * * *
-  workflow_dispatch:
-
-permissions: {}
-
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      # `actions:write` permission is required to delete caches
-      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
-      actions: write
-      contents: read
-    steps:
-      - name: Cleanup
-        run: |
-          echo "Fetching list of cache keys"
-          cacheKeysForPR=$(gh cache list --limit 100 --json id,ref --jq '.[] | select(.ref != "refs/heads/main") | .id')
-
-          ## Setting this to not fail the workflow while deleting cache keys.
-          set +e
-          for cacheKey in $cacheKeysForPR
-          do
-              gh cache delete $cacheKey
-              echo "Deleting $cacheKey"
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}

.github/workflows/shared_close_direct_sync_branch_prs.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - 'builds/facebook-**'
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
   # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
@@ -15,9 +13,6 @@ env:
 jobs:
   close_pr:
     runs-on: ubuntu-latest
-    permissions:
-      # Used to create a review and close PRs
-      pull-requests: write
     steps:
       - name: Close PR
         uses: actions/github-script@v7

.github/workflows/shared_label_core_team_prs.yml

@@ -2,9 +2,6 @@ name: (Shared) Label Core Team PRs
 
 on:
   pull_request_target:
-    types: [opened]
-
-permissions: {}
 
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
@@ -12,24 +9,8 @@ env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
 
 jobs:
-  check_access:
-    runs-on: ubuntu-latest
-    outputs:
-      is_member_or_collaborator: ${{ steps.check_is_member_or_collaborator.outputs.is_member_or_collaborator }}
-    steps:
-      - run: echo ${{ github.event.pull_request.author_association }}
-      - name: Check is member or collaborator
-        id: check_is_member_or_collaborator
-        if: ${{ github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'COLLABORATOR' }}
-        run: echo "is_member_or_collaborator=true" >> "$GITHUB_OUTPUT"
-
   check_maintainer:
-    if: ${{ needs.check_access.outputs.is_member_or_collaborator == 'true' || needs.check_access.outputs.is_member_or_collaborator == true }}
-    needs: [check_access]
     uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
-    permissions:
-      # Used by check_maintainer
-      contents: read
     with:
       actor: ${{ github.event.pull_request.user.login }}
 
@@ -37,11 +18,6 @@ jobs:
     if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
     runs-on: ubuntu-latest
     needs: check_maintainer
-    permissions:
-      # Used to add labels on issues
-      issues: write
-      # Used to add labels on PRs
-      pull-requests: write
     steps:
       - name: Label PR as React Core Team
         uses: actions/github-script@v7

.github/workflows/shared_lint.yml

@@ -5,8 +5,6 @@ on:
     branches: [main]
   pull_request:
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
@@ -29,15 +27,12 @@ jobs:
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
-        id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: shared-lint-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: "**/node_modules"
+          key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: yarn prettier-check
 
   eslint:
@@ -52,15 +47,12 @@ jobs:
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
-        id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: shared-lint-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: "**/node_modules"
+          key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: node ./scripts/tasks/eslint
 
   check_license:
@@ -75,15 +67,12 @@ jobs:
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
-        id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: shared-lint-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: "**/node_modules"
+          key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: ./scripts/ci/check_license.sh
 
   test_print_warnings:
@@ -98,13 +87,10 @@ jobs:
           cache-dependency-path: yarn.lock
       - name: Restore cached node_modules
         uses: actions/cache@v4
-        id: node_modules
         with:
-          path: |
-            **/node_modules
-          key: shared-lint-node_modules-v6-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: "**/node_modules"
+          key: shared-lint-node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Ensure clean build directory
         run: rm -rf build
       - run: yarn install --frozen-lockfile
-        if: steps.node_modules.outputs.cache-hit != 'true'
       - run: ./scripts/ci/test_print_warnings.sh

.github/workflows/shared_stale.yml

@@ -6,8 +6,6 @@ on:
     - cron: '0 * * * *'
   workflow_dispatch:
 
-permissions: {}
-
 env:
   TZ: /usr/share/zoneinfo/America/Los_Angeles
 

.nvmrc

@@ -1 +1 @@
-v20.19.0
+v18.20.1

CHANGELOG-canary.md

@@ -0,0 +1,18 @@
+## March 22, 2024 (18.3.0-canary-670811593-20240322)
+
+## React
+- Added `useActionState` to replace `useFormState` and added `pending` value ([#28491](https://github.com/facebook/react/pull/28491)).
+
+## October 5, 2023 (18.3.0-canary-546178f91-20231005)
+
+### React
+
+- Added support for async functions to be passed to `startTransition`. 
+- `useTransition` now triggers the nearest error boundary instead of a global error.
+- Added `useOptimistic`, a new Hook for handling optimistic UI updates. It optimistically updates the UI before receiving confirmation from a server or external source.
+
+### React DOM
+
+- Added support for passing async functions to the `action` prop on `<form>`. When the function passed to `action` is marked with [`'use server'`](https://react.dev/reference/react/use-server), the form is [progressively enhanced](https://developer.mozilla.org/en-US/docs/Glossary/Progressive_Enhancement).
+- Added `useFormStatus`, a new Hook for checking the submission state of a form.
+- Added `useFormState`, a new Hook for updating state upon form submission. When the function passed to `useFormState` is marked with [`'use server'`](https://react.dev/reference/react/use-server), the update is [progressively enhanced](https://developer.mozilla.org/en-US/docs/Glossary/Progressive_Enhancement).

CHANGELOG.md

@@ -1,50 +1,3 @@
-## 19.1.0 (March 28, 2025)
-
-### Owner Stack
-
-An Owner Stack is a string representing the components that are directly responsible for rendering a particular component. You can log Owner Stacks when debugging or use Owner Stacks to enhance error overlays or other development tools. Owner Stacks are only available in development builds. Component Stacks in production are unchanged.
-
-* An Owner Stack is a development-only stack trace that helps identify which components are responsible for rendering a particular component. An Owner Stack is distinct from a Component Stacks, which shows the hierarchy of components leading to an error.
-* The [captureOwnerStack API](https://react.dev/reference/react/captureOwnerStack) is only available in development mode and returns a Owner Stack, if available. The API can be used to enhance error overlays or log component relationships when debugging. [#29923](https://github.com/facebook/react/pull/29923), [#32353](https://github.com/facebook/react/pull/32353), [#30306](https://github.com/facebook/react/pull/30306),
-[#32538](https://github.com/facebook/react/pull/32538), [#32529](https://github.com/facebook/react/pull/32529), [#32538](https://github.com/facebook/react/pull/32538)
-
-### React
-* Enhanced support for Suspense boundaries to be used anywhere, including the client, server, and during hydration. [#32069](https://github.com/facebook/react/pull/32069), [#32163](https://github.com/facebook/react/pull/32163), [#32224](https://github.com/facebook/react/pull/32224), [#32252](https://github.com/facebook/react/pull/32252)
-* Reduced unnecessary client rendering through improved hydration scheduling [#31751](https://github.com/facebook/react/pull/31751)
-* Increased priority of client rendered Suspense boundaries [#31776](https://github.com/facebook/react/pull/31776)
-* Fixed frozen fallback states by rendering unfinished Suspense boundaries on the client. [#31620](https://github.com/facebook/react/pull/31620)
-* Reduced garbage collection pressure by improving Suspense boundary retries. [#31667](https://github.com/facebook/react/pull/31667)
-* Fixed erroneous “Waiting for Paint” log when the passive effect phase was not delayed [#31526](https://github.com/facebook/react/pull/31526)
-* Fixed a regression causing key warnings for flattened positional children in development mode. [#32117](https://github.com/facebook/react/pull/32117)
-* Updated `useId` to use valid CSS selectors, changing format from `:r123:` to `«r123»`. [#32001](https://github.com/facebook/react/pull/32001)
-* Added a dev-only warning for null/undefined created in useEffect, useInsertionEffect, and useLayoutEffect. [#32355](https://github.com/facebook/react/pull/32355)
-* Fixed a bug where dev-only methods were exported in production builds. React.act is no longer available in production builds. [#32200](https://github.com/facebook/react/pull/32200)
-* Improved consistency across prod and dev to improve compatibility with Google Closure Complier and bindings [#31808](https://github.com/facebook/react/pull/31808)
-* Improve passive effect scheduling for consistent task yielding. [#31785](https://github.com/facebook/react/pull/31785)
-* Fixed asserts in React Native when passChildrenWhenCloningPersistedNodes is enabled for OffscreenComponent rendering. [#32528](https://github.com/facebook/react/pull/32528)
-* Fixed component name resolution for Portal [#32640](https://github.com/facebook/react/pull/32640)
-* Added support for beforetoggle and toggle events on the dialog element. #32479 [#32479](https://github.com/facebook/react/pull/32479)
-
-### React DOM
-* Fixed double warning when the `href` attribute is an empty string [#31783](https://github.com/facebook/react/pull/31783)
- * Fixed an edge case where `getHoistableRoot()` didn’t work properly when the container was a Document [#32321](https://github.com/facebook/react/pull/32321)
-* Removed support for using HTML comments (e.g. `<!-- -->`) as a DOM container. [#32250](https://github.com/facebook/react/pull/32250)
-* Added support for `<script>` and `<template>` tags to be nested within `<select>` tags. [#31837](https://github.com/facebook/react/pull/31837)
-* Fixed responsive images to be preloaded as HTML instead of headers [#32445](https://github.com/facebook/react/pull/32445)
-
-### use-sync-external-store
-* Added `exports` field to `package.json` for `use-sync-external-store` to support various entrypoints. [#25231](https://github.com/facebook/react/pull/25231)
-
-### React Server Components
-* Added `unstable_prerender`, a new experimental API for prerendering React Server Components on the server [#31724](https://github.com/facebook/react/pull/31724)
-* Fixed an issue where streams would hang when receiving new chunks after a global error [#31840](https://github.com/facebook/react/pull/31840), [#31851](https://github.com/facebook/react/pull/31851)
-* Fixed an issue where pending chunks were counted twice. [#31833](https://github.com/facebook/react/pull/31833)
-* Added support for streaming in edge environments [#31852](https://github.com/facebook/react/pull/31852)
-* Added support for sending custom error names from a server so that they are available in the client for console replaying. [#32116](https://github.com/facebook/react/pull/32116)
-* Updated the server component wire format to remove IDs for hints and console.log because they have no return value [#31671](https://github.com/facebook/react/pull/31671)
-* Exposed `registerServerReference` in client builds to handle server references in different environments. [#32534](https://github.com/facebook/react/pull/32534)
-* Added react-server-dom-parcel package which integrates Server Components with the [Parcel bundler](https://parceljs.org/) [#31725](https://github.com/facebook/react/pull/31725), [#32132](https://github.com/facebook/react/pull/32132), [#31799](https://github.com/facebook/react/pull/31799), [#32294](https://github.com/facebook/react/pull/32294), [#31741](https://github.com/facebook/react/pull/31741)
-
 ## 19.0.0 (December 5, 2024)
 
 Below is a list of all new features, APIs, deprecations, and breaking changes. Read [React 19 release post](https://react.dev/blog/2024/04/25/react-19) and [React 19 upgrade guide](https://react.dev/blog/2024/04/25/react-19-upgrade-guide) for more information.

ReactVersions.js

@@ -18,7 +18,7 @@
 //
 //   0.0.0-experimental-241c4467e-20200129
 
-const ReactVersion = '19.2.0';
+const ReactVersion = '19.1.0';
 
 // The label used by the @canary channel. Represents the upcoming release's
 // stability. Most of the time, this will be "canary", but we may temporarily
@@ -33,7 +33,7 @@ const canaryChannelLabel = 'canary';
 const rcNumber = 0;
 
 const stablePackages = {
-  'eslint-plugin-react-hooks': '6.1.0',
+  'eslint-plugin-react-hooks': '5.2.0',
   'jest-react': '0.17.0',
   react: ReactVersion,
   'react-art': ReactVersion,
@@ -42,12 +42,12 @@ const stablePackages = {
   'react-server-dom-turbopack': ReactVersion,
   'react-server-dom-parcel': ReactVersion,
   'react-is': ReactVersion,
-  'react-reconciler': '0.33.0',
-  'react-refresh': '0.18.0',
+  'react-reconciler': '0.32.0',
+  'react-refresh': '0.17.0',
   'react-test-renderer': ReactVersion,
-  'use-subscription': '1.12.0',
-  'use-sync-external-store': '1.6.0',
-  scheduler: '0.27.0',
+  'use-subscription': '1.11.0',
+  'use-sync-external-store': '1.5.0',
+  scheduler: '0.26.0',
 };
 
 // These packages do not exist in the @canary or @latest channel, only

babel.config.js

@@ -4,7 +4,8 @@ module.exports = {
   plugins: [
     '@babel/plugin-syntax-jsx',
     '@babel/plugin-transform-flow-strip-types',
-    ['@babel/plugin-proposal-class-properties', {loose: true}],
+    ['@babel/plugin-transform-class-properties', {loose: true}],
+    '@babel/plugin-transform-classes',
     'syntax-trailing-function-commas',
     [
       '@babel/plugin-proposal-object-rest-spread',

compiler/CHANGELOG.md

@@ -1,65 +0,0 @@
-## 19.1.0-rc.2 (May 14, 2025)
-
-## babel-plugin-react-compiler
-
-* Fix for string attribute values with emoji [#33096](https://github.com/facebook/react/pull/33096) by [@josephsavona](https://github.com/josephsavona)
-
-## 19.1.0-rc.1 (April 21, 2025)
-
-## eslint-plugin-react-hooks
-* Temporarily disable ref access in render validation [#32839](https://github.com/facebook/react/pull/32839) by [@poteto](https://github.com/poteto)
-* Fix type error with recommended config [#32666](https://github.com/facebook/react/pull/32666) by [@niklasholm](https://github.com/niklasholm)
-* Merge rule from eslint-plugin-react-compiler into `react-hooks` plugin [#32416](https://github.com/facebook/react/pull/32416) by [@michaelfaith](https://github.com/michaelfaith)
-* Add dev dependencies for typescript migration [#32279](https://github.com/facebook/react/pull/32279) by [@michaelfaith](https://github.com/michaelfaith)
-* Support v9 context api [#32045](https://github.com/facebook/react/pull/32045) by [@michaelfaith](https://github.com/michaelfaith)
-* Support eslint 8+ flat plugin syntax out of the box for eslint-plugin-react-compiler [#32120](https://github.com/facebook/react/pull/32120) by [@orta](https://github.com/orta)
-
-## babel-plugin-react-compiler
-* Support satisfies operator [#32742](https://github.com/facebook/react/pull/32742) by [@rodrigofariow](https://github.com/rodrigofariow)
-* Fix inferEffectDependencies lint false positives [#32769](https://github.com/facebook/react/pull/32769) by [@mofeiZ](https://github.com/mofeiZ)
-* Fix hoisting of let declarations [#32724](https://github.com/facebook/react/pull/32724) by [@mofeiZ](https://github.com/mofeiZ)
-* Avoid failing builds when import specifiers conflict or shadow vars [#32663](https://github.com/facebook/react/pull/32663) by [@mofeiZ](https://github.com/mofeiZ)
-* Optimize components declared with arrow function and implicit return and `compilationMode: 'infer'` [#31792](https://github.com/facebook/react/pull/31792) by [@dimaMachina](https://github.com/dimaMachina)
-* Validate static components [#32683](https://github.com/facebook/react/pull/32683) by [@josephsavona](https://github.com/josephsavona)
-* Hoist dependencies from functions more conservatively [#32616](https://github.com/facebook/react/pull/32616) by [@mofeiZ](https://github.com/mofeiZ)
-* Implement NumericLiteral as ObjectPropertyKey [#31791](https://github.com/facebook/react/pull/31791) by [@dimaMachina](https://github.com/dimaMachina)
-* Avoid bailouts when inserting gating [#32598](https://github.com/facebook/react/pull/32598) by [@mofeiZ](https://github.com/mofeiZ)
-* Stop bailing out early for hoisted gated functions [#32597](https://github.com/facebook/react/pull/32597) by [@mofeiZ](https://github.com/mofeiZ)
-* Add shape for Array.from [#32522](https://github.com/facebook/react/pull/32522) by [@mofeiZ](https://github.com/mofeiZ)
-* Patch array and argument spread mutability [#32521](https://github.com/facebook/react/pull/32521) by [@mofeiZ](https://github.com/mofeiZ)
-* Make CompilerError compatible with reflection [#32539](https://github.com/facebook/react/pull/32539) by [@poteto](https://github.com/poteto)
-* Add simple walltime measurement [#32331](https://github.com/facebook/react/pull/32331) by [@poteto](https://github.com/poteto)
-* Improve error messages for unhandled terminal and instruction kinds [#32324](https://github.com/facebook/react/pull/32324) by [@inottn](https://github.com/inottn)
-* Handle TSInstantiationExpression in lowerExpression [#32302](https://github.com/facebook/react/pull/32302) by [@inottn](https://github.com/inottn)
-* Fix invalid Array.map type [#32095](https://github.com/facebook/react/pull/32095) by [@mofeiZ](https://github.com/mofeiZ)
-* Patch for JSX escape sequences in @babel/generator [#32131](https://github.com/facebook/react/pull/32131) by [@mofeiZ](https://github.com/mofeiZ)
-* `JSXText` emits incorrect with bracket [#32138](https://github.com/facebook/react/pull/32138) by [@himself65](https://github.com/himself65)
-* Validation against calling impure functions [#31960](https://github.com/facebook/react/pull/31960) by [@josephsavona](https://github.com/josephsavona)
-* Always target node [#32091](https://github.com/facebook/react/pull/32091) by [@poteto](https://github.com/poteto)
-* Patch compilationMode:infer object method edge case [#32055](https://github.com/facebook/react/pull/32055) by [@mofeiZ](https://github.com/mofeiZ)
-* Generate ts defs [#31994](https://github.com/facebook/react/pull/31994) by [@poteto](https://github.com/poteto)
-* Relax react peer dep requirement [#31915](https://github.com/facebook/react/pull/31915) by [@poteto](https://github.com/poteto)
-* Allow type cast expressions with refs [#31871](https://github.com/facebook/react/pull/31871) by [@josephsavona](https://github.com/josephsavona)
-* Add shape for global Object.keys [#31583](https://github.com/facebook/react/pull/31583) by [@mofeiZ](https://github.com/mofeiZ)
-* Optimize method calls w props receiver [#31775](https://github.com/facebook/react/pull/31775) by [@josephsavona](https://github.com/josephsavona)
-* Fix dropped ref with spread props in InlineJsxTransform [#31726](https://github.com/facebook/react/pull/31726) by [@jackpope](https://github.com/jackpope)
-* Support for non-declatation for in/of iterators [#31710](https://github.com/facebook/react/pull/31710) by [@mvitousek](https://github.com/mvitousek)
-* Support for context variable loop iterators [#31709](https://github.com/facebook/react/pull/31709) by [@mvitousek](https://github.com/mvitousek)
-* Replace deprecated dependency in `eslint-plugin-react-compiler` [#31629](https://github.com/facebook/react/pull/31629) by [@rakleed](https://github.com/rakleed)
-* Support enableRefAsProp in jsx transform [#31558](https://github.com/facebook/react/pull/31558) by [@jackpope](https://github.com/jackpope)
-* Fix: ref.current now correctly reactive [#31521](https://github.com/facebook/react/pull/31521) by [@mofeiZ](https://github.com/mofeiZ)
-* Outline JSX with non-jsx children [#31442](https://github.com/facebook/react/pull/31442) by [@gsathya](https://github.com/gsathya)
-* Outline jsx with duplicate attributes [#31441](https://github.com/facebook/react/pull/31441) by [@gsathya](https://github.com/gsathya)
-* Store original and new prop names [#31440](https://github.com/facebook/react/pull/31440) by [@gsathya](https://github.com/gsathya)
-* Stabilize compiler output: sort deps and decls by name [#31362](https://github.com/facebook/react/pull/31362) by [@mofeiZ](https://github.com/mofeiZ)
-* Bugfix for hoistable deps for nested functions [#31345](https://github.com/facebook/react/pull/31345) by [@mofeiZ](https://github.com/mofeiZ)
-* Remove compiler runtime-compat fixture library [#31430](https://github.com/facebook/react/pull/31430) by [@poteto](https://github.com/poteto)
-* Wrap inline jsx transform codegen in conditional [#31267](https://github.com/facebook/react/pull/31267) by [@jackpope](https://github.com/jackpope)
-* Check if local identifier is a hook when resolving globals [#31384](https://github.com/facebook/react/pull/31384) by [@poteto](https://github.com/poteto)
-* Handle member expr as computed property [#31344](https://github.com/facebook/react/pull/31344) by [@gsathya](https://github.com/gsathya)
-* Fix to ref access check to ban ref?.current [#31360](https://github.com/facebook/react/pull/31360) by [@mvitousek](https://github.com/mvitousek)
-* InlineJSXTransform transforms jsx inside function expressions [#31282](https://github.com/facebook/react/pull/31282) by [@josephsavona](https://github.com/josephsavona)
-
-## Other
-* Add shebang to banner [#32225](https://github.com/facebook/react/pull/32225) by [@Jeremy-Hibiki](https://github.com/Jeremy-Hibiki)
-* remove terser from react-compiler-runtime build [#31326](https://github.com/facebook/react/pull/31326) by [@henryqdineen](https://github.com/henryqdineen)

compiler/apps/playground/__tests__/e2e/__snapshots__/page.spec.ts/compilationMode-all-output.txt

@@ -1,5 +1,5 @@
 import { c as _c } from "react/compiler-runtime"; // 
-        @compilationMode:"all"
+        @compilationMode(all)
 function nonReactFn() {
   const $ = _c(1);
   let t0;

compiler/apps/playground/__tests__/e2e/__snapshots__/page.spec.ts/compilationMode-infer-output.txt

@@ -1,4 +1,4 @@
-// @compilationMode:"infer"
+// @compilationMode(infer)
 function nonReactFn() {
   return {};
 }

compiler/apps/playground/__tests__/e2e/page.spec.ts

@@ -92,7 +92,7 @@ function useFoo(propVal: {+baz: number}) {
   },
   {
     name: 'compilationMode-infer',
-    input: `// @compilationMode:"infer"
+    input: `// @compilationMode(infer)
 function nonReactFn() {
   return {};
 }
@@ -101,7 +101,7 @@ function nonReactFn() {
   },
   {
     name: 'compilationMode-all',
-    input: `// @compilationMode:"all"
+    input: `// @compilationMode(all)
 function nonReactFn() {
   return {};
 }

compiler/apps/playground/components/Editor/EditorImpl.tsx

@@ -19,9 +19,7 @@ import BabelPluginReactCompiler, {
   PluginOptions,
   CompilerPipelineValue,
   parsePluginOptions,
-  printReactiveFunctionWithOutlined,
-  printFunctionWithOutlined,
-} from 'babel-plugin-react-compiler';
+} from 'babel-plugin-react-compiler/src';
 import clsx from 'clsx';
 import invariant from 'invariant';
 import {useSnackbar} from 'notistack';
@@ -43,6 +41,8 @@ import {
   default as Output,
   PrintedCompilerPipelineValue,
 } from './Output';
+import {printFunctionWithOutlined} from 'babel-plugin-react-compiler/src/HIR/PrintHIR';
+import {printReactiveFunctionWithOutlined} from 'babel-plugin-react-compiler/src/ReactiveScopes/PrintReactiveFunction';
 import {transformFromAstSync} from '@babel/core';
 
 function parseInput(

compiler/apps/playground/components/Editor/Input.tsx

@@ -6,7 +6,7 @@
  */
 
 import MonacoEditor, {loader, type Monaco} from '@monaco-editor/react';
-import {CompilerErrorDetail} from 'babel-plugin-react-compiler';
+import {CompilerErrorDetail} from 'babel-plugin-react-compiler/src';
 import invariant from 'invariant';
 import type {editor} from 'monaco-editor';
 import * as monaco from 'monaco-editor';

compiler/apps/playground/components/Editor/Output.tsx

@@ -11,7 +11,7 @@ import {
   InformationCircleIcon,
 } from '@heroicons/react/outline';
 import MonacoEditor, {DiffEditor} from '@monaco-editor/react';
-import {type CompilerError} from 'babel-plugin-react-compiler';
+import {type CompilerError} from 'babel-plugin-react-compiler/src';
 import parserBabel from 'prettier/plugins/babel';
 import * as prettierPluginEstree from 'prettier/plugins/estree';
 import * as prettier from 'prettier/standalone';

compiler/apps/playground/lib/reactCompilerMonacoDiagnostics.ts

@@ -6,7 +6,10 @@
  */
 
 import {Monaco} from '@monaco-editor/react';
-import {CompilerErrorDetail, ErrorSeverity} from 'babel-plugin-react-compiler';
+import {
+  CompilerErrorDetail,
+  ErrorSeverity,
+} from 'babel-plugin-react-compiler/src';
 import {MarkerSeverity, type editor} from 'monaco-editor';
 
 function mapReactCompilerSeverityToMonaco(
@@ -51,7 +54,7 @@ export function renderReactCompilerMarkers({
   model,
   details,
 }: ReactCompilerMarkerConfig): void {
-  const markers: Array<editor.IMarkerData> = [];
+  let markers = [];
   for (const detail of details) {
     const marker = mapReactCompilerDiagnosticToMonacoMarker(detail, monaco);
     if (marker == null) {

compiler/apps/playground/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "cd ../.. && concurrently --kill-others -n compiler,runtime,playground \"yarn workspace babel-plugin-react-compiler run watch\" \"yarn workspace react-compiler-runtime run watch\" \"wait-on packages/babel-plugin-react-compiler/dist/index.js && cd apps/playground && NODE_ENV=development next dev\"",
-    "build:compiler": "cd ../.. && concurrently -n compiler,runtime \"yarn workspace babel-plugin-react-compiler run build --dts\" \"yarn workspace react-compiler-runtime run build\"",
+    "build:compiler": "cd ../.. && concurrently -n compiler,runtime \"yarn workspace babel-plugin-react-compiler run build\" \"yarn workspace react-compiler-runtime run build\"",
     "build": "yarn build:compiler && next build",
     "postbuild": "node ./scripts/downloadFonts.js",
     "preinstall": "cd ../.. && yarn install --frozen-lockfile",
@@ -27,7 +27,7 @@
     "@babel/types": "7.26.3",
     "@heroicons/react": "^1.0.6",
     "@monaco-editor/react": "^4.4.6",
-    "@playwright/test": "^1.51.1",
+    "@playwright/test": "^1.42.1",
     "@use-gesture/react": "^10.2.22",
     "hermes-eslint": "^0.25.0",
     "hermes-parser": "^0.25.0",

compiler/apps/playground/yarn.lock

@@ -781,12 +781,12 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@playwright/test@^1.51.1":
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.51.1.tgz#75357d513221a7be0baad75f01e966baf9c41a2e"
-  integrity sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==
+"@playwright/test@^1.42.1":
+  version "1.47.2"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.47.2.tgz#dbe7051336bfc5cc599954214f9111181dbc7475"
+  integrity sha512-jTXRsoSPONAs8Za9QEQdyjFn+0ZQFjCiIztAIF6bi1HqhBzG9Ma7g1WotyiGqFSBRZjIEqMdT8RUlbk1QVhzCQ==
   dependencies:
-    playwright "1.51.1"
+    playwright "1.47.2"
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
@@ -1249,14 +1249,14 @@ camelcase-css@^2.0.1:
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
 caniuse-lite@^1.0.30001579:
-  version "1.0.30001715"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz"
-  integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==
+  version "1.0.30001669"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz#fda8f1d29a8bfdc42de0c170d7f34a9cf19ed7a3"
+  integrity sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==
 
 caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001663:
-  version "1.0.30001715"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz"
-  integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==
+  version "1.0.30001664"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz#d588d75c9682d3301956b05a3749652a80677df4"
+  integrity sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -3008,17 +3008,17 @@ pirates@^4.0.1:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
-playwright-core@1.51.1:
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.51.1.tgz#d57f0393e02416f32a47cf82b27533656a8acce1"
-  integrity sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==
+playwright-core@1.47.2:
+  version "1.47.2"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.47.2.tgz#7858da9377fa32a08be46ba47d7523dbd9460a4e"
+  integrity sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==
 
-playwright@1.51.1:
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.51.1.tgz#ae1467ee318083968ad28d6990db59f47a55390f"
-  integrity sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==
+playwright@1.47.2:
+  version "1.47.2"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.47.2.tgz#155688aa06491ee21fb3e7555b748b525f86eb20"
+  integrity sha512-nx1cLMmQWqmA3UsnjaaokyoUpdVaaDhJhMoxX2qj3McpjnsqFHs516QAKYhqHAgOP+oCFTEOCOAaD1RgD/RQfA==
   dependencies:
-    playwright-core "1.51.1"
+    playwright-core "1.47.2"
   optionalDependencies:
     fsevents "2.3.2"
 

compiler/package.json

@@ -37,7 +37,7 @@
     "prettier": "^3.3.3",
     "prettier-plugin-hermes-parser": "^0.26.0",
     "prompt-promise": "^1.0.3",
-    "rimraf": "^6.0.1",
+    "rimraf": "^5.0.10",
     "to-fast-properties": "^2.0.0",
     "tsup": "^8.4.0",
     "typescript": "^5.4.3",
@@ -45,6 +45,7 @@
     "yargs": "^17.7.2"
   },
   "resolutions": {
+    "rimraf": "5.0.10",
     "@babel/types": "7.26.3"
   },
   "packageManager": "yarn@1.22.22"

compiler/packages/babel-plugin-react-compiler/package.json

@@ -12,12 +12,12 @@
     "build": "rimraf dist && tsup",
     "test": "./scripts/link-react-compiler-runtime.sh && yarn snap:ci",
     "jest": "yarn build && ts-node node_modules/.bin/jest",
-    "snap": "yarn workspace snap run snap",
+    "snap": "node ../snap/dist/main.js",
     "snap:build": "yarn workspace snap run build",
     "snap:ci": "yarn snap:build && yarn snap",
     "ts:analyze-trace": "scripts/ts-analyze-trace.sh",
     "lint": "yarn eslint src",
-    "watch": "yarn build --dts --watch"
+    "watch": "yarn build --watch"
   },
   "dependencies": {
     "@babel/types": "^7.26.0"

compiler/packages/babel-plugin-react-compiler/scripts/jest/e2e-forget.config.js

@@ -7,4 +7,7 @@
 
 const makeE2EConfig = require('../jest/makeE2EConfig');
 
-module.exports = makeE2EConfig('e2e with forget', true);
+const config = makeE2EConfig('e2e with forget', true);
+config.setupFilesAfterEnv = ['<rootDir>/../scripts/jest/setupEnvE2E.js'];
+
+module.exports = config;

compiler/packages/babel-plugin-react-compiler/scripts/jest/makeTransform.ts

@@ -5,16 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {jsx} from '@babel/plugin-syntax-jsx';
 import babelJest from 'babel-jest';
-import {
-  validateEnvironmentConfig,
-  EnvironmentConfig,
-} from 'babel-plugin-react-compiler';
+import {compile} from 'babel-plugin-react-compiler';
 import {execSync} from 'child_process';
 
 import type {NodePath, Visitor} from '@babel/traverse';
-import type {CallExpression} from '@babel/types';
-import BabelPluginReactCompiler from 'babel-plugin-react-compiler';
+import type {CallExpression, FunctionDeclaration} from '@babel/types';
+import * as t from '@babel/types';
+import {
+  EnvironmentConfig,
+  validateEnvironmentConfig,
+} from 'babel-plugin-react-compiler';
+import {basename} from 'path';
 
 /**
  * -- IMPORTANT --
@@ -25,19 +28,10 @@ import BabelPluginReactCompiler from 'babel-plugin-react-compiler';
 const e2eTransformerCacheKey = 1;
 const forgetOptions: EnvironmentConfig = validateEnvironmentConfig({
   enableAssumeHooksFollowRulesOfReact: true,
+  enableFunctionOutlining: false,
 });
 const debugMode = process.env['DEBUG_FORGET_COMPILER'] != null;
 
-const compilerCacheKey = execSync(
-  'yarn --silent --cwd ../.. hash packages/babel-plugin-react-compiler/dist',
-)
-  .toString()
-  .trim();
-
-if (debugMode) {
-  console.log('cachebreaker', compilerCacheKey);
-}
-
 module.exports = (useForget: boolean) => {
   function createTransformer() {
     return babelJest.createTransformer({
@@ -48,14 +42,15 @@ module.exports = (useForget: boolean) => {
           plugins: [
             useForget
               ? [
-                  BabelPluginReactCompiler,
+                  ReactForgetFunctionTransform,
                   {
-                    environment: forgetOptions,
                     /*
                      * Jest hashes the babel config as a cache breaker.
                      * (see https://github.com/jestjs/jest/blob/v29.6.2/packages/babel-jest/src/index.ts#L84)
                      */
-                    compilerCacheKey,
+                    compilerCacheKey: execSync(
+                      'yarn --silent --cwd ../.. hash packages/babel-plugin-react-compiler/dist',
+                    ).toString(),
                     transformOptionsCacheKey: forgetOptions,
                     e2eTransformerCacheKey,
                   },
@@ -110,3 +105,103 @@ module.exports = (useForget: boolean) => {
     createTransformer,
   };
 };
+
+// Mostly copied from react/scripts/babel/transform-forget.js
+function isReactComponentLike(fn: NodePath<FunctionDeclaration>): boolean {
+  let isReactComponent = false;
+  let hasNoUseForgetDirective = false;
+
+  /*
+   * React components start with an upper case letter,
+   * React hooks start with `use`
+   */
+  if (
+    fn.node.id == null ||
+    (fn.node.id.name[0].toUpperCase() !== fn.node.id.name[0] &&
+      !/^use[A-Z0-9]/.test(fn.node.id.name))
+  ) {
+    return false;
+  }
+
+  fn.traverse({
+    DirectiveLiteral(path) {
+      if (path.node.value === 'use no forget') {
+        hasNoUseForgetDirective = true;
+      }
+    },
+
+    JSX(path) {
+      // Is there is a JSX node created in the current function context?
+      if (path.scope.getFunctionParent()?.path.node === fn.node) {
+        isReactComponent = true;
+      }
+    },
+
+    CallExpression(path) {
+      // Is there hook usage?
+      if (
+        path.node.callee.type === 'Identifier' &&
+        !/^use[A-Z0-9]/.test(path.node.callee.name)
+      ) {
+        isReactComponent = true;
+      }
+    },
+  });
+
+  if (hasNoUseForgetDirective) {
+    return false;
+  }
+
+  return isReactComponent;
+}
+
+function ReactForgetFunctionTransform() {
+  const compiledFns = new Set();
+  const visitor = {
+    FunctionDeclaration(fn: NodePath<FunctionDeclaration>, state: any): void {
+      if (compiledFns.has(fn.node)) {
+        return;
+      }
+
+      if (!isReactComponentLike(fn)) {
+        return;
+      }
+      if (debugMode) {
+        const filename = basename(state.file.opts.filename);
+        if (fn.node.loc && fn.node.id) {
+          console.log(
+            ` Compiling ${filename}:${fn.node.loc.start.line}:${fn.node.loc.start.column}  ${fn.node.id.name}`,
+          );
+        } else {
+          console.log(` Compiling ${filename} ${fn.node.id?.name}`);
+        }
+      }
+
+      const compiled = compile(
+        fn,
+        forgetOptions,
+        'Other',
+        '_c',
+        null,
+        null,
+        null,
+      );
+      compiledFns.add(compiled);
+
+      const fun = t.functionDeclaration(
+        compiled.id,
+        compiled.params,
+        compiled.body,
+        compiled.generator,
+        compiled.async,
+      );
+      fn.replaceWith(fun);
+      fn.skip();
+    },
+  };
+  return {
+    name: 'react-forget-e2e',
+    inherits: jsx,
+    visitor,
+  };
+}

compiler/packages/babel-plugin-react-compiler/scripts/jest/setupEnvE2E.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const ReactCompilerRuntime = require('react/compiler-runtime');
+
+/*
+ * Our e2e babel transform currently only compiles functions, not programs.
+ * As a result, our e2e transpiled code does not contain an import for the
+ * memo cache function. As a temporary hack, we add a `_c` global, which is
+ * the name that is used for the import by default.
+ */
+globalThis._c = ReactCompilerRuntime.c;

compiler/packages/babel-plugin-react-compiler/src/Babel/BabelPlugin.ts

@@ -11,7 +11,6 @@ import {
   injectReanimatedFlag,
   pipelineUsesReanimatedPlugin,
 } from '../Entrypoint/Reanimated';
-import validateNoUntransformedReferences from '../Entrypoint/ValidateNoUntransformedReferences';
 
 const ENABLE_REACT_COMPILER_TIMINGS =
   process.env['ENABLE_REACT_COMPILER_TIMINGS'] === '1';
@@ -62,19 +61,12 @@ export default function BabelPluginReactCompiler(
               },
             };
           }
-          const result = compileProgram(prog, {
+          compileProgram(prog, {
             opts,
             filename: pass.filename ?? null,
             comments: pass.file.ast.comments ?? [],
             code: pass.file.code,
           });
-          validateNoUntransformedReferences(
-            prog,
-            pass.filename ?? null,
-            opts.logger,
-            opts.environment,
-            result,
-          );
           if (ENABLE_REACT_COMPILER_TIMINGS === true) {
             performance.mark(`${filename}:end`, {
               detail: 'BabelPlugin:Program:end',

compiler/packages/babel-plugin-react-compiler/src/CompilerError.ts

@@ -6,7 +6,6 @@
  */
 
 import type {SourceLocation} from './HIR';
-import {Err, Ok, Result} from './Utils/Result';
 import {assertExhaustive} from './Utils/utils';
 
 export enum ErrorSeverity {
@@ -225,10 +224,6 @@ export class CompilerError extends Error {
     return this.details.length > 0;
   }
 
-  asResult(): Result<void, CompilerError> {
-    return this.hasErrors() ? Err(this) : Ok(undefined);
-  }
-
   /*
    * An error is critical if it means the compiler has entered into a broken state and cannot
    * continue safely. Other expected errors such as Todos mean that we can skip over that component

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Gating.ts

@@ -7,122 +7,8 @@
 
 import {NodePath} from '@babel/core';
 import * as t from '@babel/types';
-import {CompilerError} from '../CompilerError';
-import {ProgramContext} from './Imports';
-import {ExternalFunction} from '..';
+import {PluginOptions} from './Options';
 
-/**
- * Gating rewrite for function declarations which are referenced before their
- * declaration site.
- *
- * ```js
- * // original
- * export default React.memo(Foo);
- * function Foo() { ... }
- *
- * // React compiler optimized + gated
- * import {gating} from 'myGating';
- * export default React.memo(Foo);
- * const gating_result = gating();  <- inserted
- * function Foo_optimized() {}      <- inserted
- * function Foo_unoptimized() {}    <- renamed from Foo
- * function Foo() {                 <- inserted function, which can be hoisted by JS engines
- *   if (gating_result) return Foo_optimized();
- *   else return Foo_unoptimized();
- * }
- * ```
- */
-function insertAdditionalFunctionDeclaration(
-  fnPath: NodePath<t.FunctionDeclaration>,
-  compiled: t.FunctionDeclaration,
-  programContext: ProgramContext,
-  gatingFunctionIdentifierName: string,
-): void {
-  const originalFnName = fnPath.node.id;
-  const originalFnParams = fnPath.node.params;
-  const compiledParams = fnPath.node.params;
-  /**
-   * Note that other than `export default function() {}`, all other function
-   * declarations must have a binding identifier. Since default exports cannot
-   * be referenced, it's safe to assume that all function declarations passed
-   * here will have an identifier.
-   * https://tc39.es/ecma262/multipage/ecmascript-language-functions-and-classes.html#sec-function-definitions
-   */
-  CompilerError.invariant(originalFnName != null && compiled.id != null, {
-    reason:
-      'Expected function declarations that are referenced elsewhere to have a named identifier',
-    loc: fnPath.node.loc ?? null,
-  });
-  CompilerError.invariant(originalFnParams.length === compiledParams.length, {
-    reason:
-      'Expected React Compiler optimized function declarations to have the same number of parameters as source',
-    loc: fnPath.node.loc ?? null,
-  });
-
-  const gatingCondition = t.identifier(
-    programContext.newUid(`${gatingFunctionIdentifierName}_result`),
-  );
-  const unoptimizedFnName = t.identifier(
-    programContext.newUid(`${originalFnName.name}_unoptimized`),
-  );
-  const optimizedFnName = t.identifier(
-    programContext.newUid(`${originalFnName.name}_optimized`),
-  );
-  /**
-   * Step 1: rename existing functions
-   */
-  compiled.id.name = optimizedFnName.name;
-  fnPath.get('id').replaceInline(unoptimizedFnName);
-
-  /**
-   * Step 2: insert new function declaration
-   */
-  const newParams: Array<t.Identifier | t.RestElement> = [];
-  const genNewArgs: Array<() => t.Identifier | t.SpreadElement> = [];
-  for (let i = 0; i < originalFnParams.length; i++) {
-    const argName = `arg${i}`;
-    if (originalFnParams[i].type === 'RestElement') {
-      newParams.push(t.restElement(t.identifier(argName)));
-      genNewArgs.push(() => t.spreadElement(t.identifier(argName)));
-    } else {
-      newParams.push(t.identifier(argName));
-      genNewArgs.push(() => t.identifier(argName));
-    }
-  }
-  // insertAfter called in reverse order of how nodes should appear in program
-  fnPath.insertAfter(
-    t.functionDeclaration(
-      originalFnName,
-      newParams,
-      t.blockStatement([
-        t.ifStatement(
-          gatingCondition,
-          t.returnStatement(
-            t.callExpression(
-              compiled.id,
-              genNewArgs.map(fn => fn()),
-            ),
-          ),
-          t.returnStatement(
-            t.callExpression(
-              unoptimizedFnName,
-              genNewArgs.map(fn => fn()),
-            ),
-          ),
-        ),
-      ]),
-    ),
-  );
-  fnPath.insertBefore(
-    t.variableDeclaration('const', [
-      t.variableDeclarator(
-        gatingCondition,
-        t.callExpression(t.identifier(gatingFunctionIdentifierName), []),
-      ),
-    ]),
-  );
-  fnPath.insertBefore(compiled);
-}
 export function insertGatedFunctionDeclaration(
   fnPath: NodePath<
     t.FunctionDeclaration | t.ArrowFunctionExpression | t.FunctionExpression
@@ -131,65 +17,48 @@ export function insertGatedFunctionDeclaration(
     | t.FunctionDeclaration
     | t.ArrowFunctionExpression
     | t.FunctionExpression,
-  programContext: ProgramContext,
-  gating: ExternalFunction,
-  referencedBeforeDeclaration: boolean,
+  gating: NonNullable<PluginOptions['gating']>,
 ): void {
-  const gatingImportedName = programContext.addImportSpecifier(gating).name;
-  if (referencedBeforeDeclaration && fnPath.isFunctionDeclaration()) {
-    CompilerError.invariant(compiled.type === 'FunctionDeclaration', {
-      reason: 'Expected compiled node type to match input type',
-      description: `Got ${compiled.type} but expected FunctionDeclaration`,
-      loc: fnPath.node.loc ?? null,
-    });
-    insertAdditionalFunctionDeclaration(
-      fnPath,
-      compiled,
-      programContext,
-      gatingImportedName,
+  const gatingExpression = t.conditionalExpression(
+    t.callExpression(t.identifier(gating.importSpecifierName), []),
+    buildFunctionExpression(compiled),
+    buildFunctionExpression(fnPath.node),
+  );
+
+  /*
+   * Convert function declarations to named variables *unless* this is an
+   * `export default function ...` since `export default const ...` is
+   * not supported. For that case we fall through to replacing w the raw
+   * conditional expression
+   */
+  if (
+    fnPath.parentPath.node.type !== 'ExportDefaultDeclaration' &&
+    fnPath.node.type === 'FunctionDeclaration' &&
+    fnPath.node.id != null
+  ) {
+    fnPath.replaceWith(
+      t.variableDeclaration('const', [
+        t.variableDeclarator(fnPath.node.id, gatingExpression),
+      ]),
+    );
+  } else if (
+    fnPath.parentPath.node.type === 'ExportDefaultDeclaration' &&
+    fnPath.node.type !== 'ArrowFunctionExpression' &&
+    fnPath.node.id != null
+  ) {
+    fnPath.insertAfter(
+      t.exportDefaultDeclaration(t.identifier(fnPath.node.id.name)),
+    );
+    fnPath.parentPath.replaceWith(
+      t.variableDeclaration('const', [
+        t.variableDeclarator(
+          t.identifier(fnPath.node.id.name),
+          gatingExpression,
+        ),
+      ]),
     );
   } else {
-    const gatingExpression = t.conditionalExpression(
-      t.callExpression(t.identifier(gatingImportedName), []),
-      buildFunctionExpression(compiled),
-      buildFunctionExpression(fnPath.node),
-    );
-
-    /*
-     * Convert function declarations to named variables *unless* this is an
-     * `export default function ...` since `export default const ...` is
-     * not supported. For that case we fall through to replacing w the raw
-     * conditional expression
-     */
-    if (
-      fnPath.parentPath.node.type !== 'ExportDefaultDeclaration' &&
-      fnPath.node.type === 'FunctionDeclaration' &&
-      fnPath.node.id != null
-    ) {
-      fnPath.replaceWith(
-        t.variableDeclaration('const', [
-          t.variableDeclarator(fnPath.node.id, gatingExpression),
-        ]),
-      );
-    } else if (
-      fnPath.parentPath.node.type === 'ExportDefaultDeclaration' &&
-      fnPath.node.type !== 'ArrowFunctionExpression' &&
-      fnPath.node.id != null
-    ) {
-      fnPath.insertAfter(
-        t.exportDefaultDeclaration(t.identifier(fnPath.node.id.name)),
-      );
-      fnPath.parentPath.replaceWith(
-        t.variableDeclaration('const', [
-          t.variableDeclarator(
-            t.identifier(fnPath.node.id.name),
-            gatingExpression,
-          ),
-        ]),
-      );
-    } else {
-      fnPath.replaceWith(gatingExpression);
-    }
+    fnPath.replaceWith(gatingExpression);
   }
 }
 

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Imports.ts

@@ -7,20 +7,9 @@
 
 import {NodePath} from '@babel/core';
 import * as t from '@babel/types';
-import {Scope as BabelScope} from '@babel/traverse';
-
 import {CompilerError, ErrorSeverity} from '../CompilerError';
-import {
-  EnvironmentConfig,
-  GeneratedSource,
-  NonLocalImportSpecifier,
-} from '../HIR';
-import {getOrInsertWith} from '../Utils/utils';
-import {ExternalFunction, isHookName} from '../HIR/Environment';
-import {Err, Ok, Result} from '../Utils/Result';
-import {LoggerEvent, PluginOptions} from './Options';
-import {BabelFn, getReactCompilerRuntimeModule} from './Program';
-import {SuppressionRange} from './Suppression';
+import {EnvironmentConfig, ExternalFunction, GeneratedSource} from '../HIR';
+import {getOrInsertDefault} from '../Utils/utils';
 
 export function validateRestrictedImports(
   path: NodePath<t.Program>,
@@ -53,248 +42,50 @@ export function validateRestrictedImports(
   }
 }
 
-type ProgramContextOptions = {
-  program: NodePath<t.Program>;
-  suppressions: Array<SuppressionRange>;
-  opts: PluginOptions;
-  filename: string | null;
-  code: string | null;
-  hasModuleScopeOptOut: boolean;
-};
-export class ProgramContext {
-  /**
-   * Program and environment context
-   */
-  scope: BabelScope;
-  opts: PluginOptions;
-  filename: string | null;
-  code: string | null;
-  reactRuntimeModule: string;
-  suppressions: Array<SuppressionRange>;
-  hasModuleScopeOptOut: boolean;
-
-  /*
-   * This is a hack to work around what seems to be a Babel bug. Babel doesn't
-   * consistently respect the `skip()` function to avoid revisiting a node within
-   * a pass, so we use this set to track nodes that we have compiled.
-   */
-  alreadyCompiled: WeakSet<object> | Set<object> = new (WeakSet ?? Set)();
-  // known generated or referenced identifiers in the program
-  knownReferencedNames: Set<string> = new Set();
-  // generated imports
-  imports: Map<string, Map<string, NonLocalImportSpecifier>> = new Map();
-
-  /**
-   * Metadata from compilation
-   */
-  retryErrors: Array<{fn: BabelFn; error: CompilerError}> = [];
-  inferredEffectLocations: Set<t.SourceLocation> = new Set();
-
-  constructor({
-    program,
-    suppressions,
-    opts,
-    filename,
-    code,
-    hasModuleScopeOptOut,
-  }: ProgramContextOptions) {
-    this.scope = program.scope;
-    this.opts = opts;
-    this.filename = filename;
-    this.code = code;
-    this.reactRuntimeModule = getReactCompilerRuntimeModule(opts.target);
-    this.suppressions = suppressions;
-    this.hasModuleScopeOptOut = hasModuleScopeOptOut;
-  }
-
-  isHookName(name: string): boolean {
-    if (this.opts.environment.hookPattern == null) {
-      return isHookName(name);
-    } else {
-      const match = new RegExp(this.opts.environment.hookPattern).exec(name);
-      return (
-        match != null && typeof match[1] === 'string' && isHookName(match[1])
-      );
-    }
-  }
-
-  hasReference(name: string): boolean {
-    return (
-      this.knownReferencedNames.has(name) ||
-      this.scope.hasBinding(name) ||
-      this.scope.hasGlobal(name) ||
-      this.scope.hasReference(name)
-    );
-  }
-
-  newUid(name: string): string {
-    /**
-     * Don't call babel's generateUid for known hook imports, as
-     * InferTypes might eventually type `HookKind` based on callee naming
-     * convention and `_useFoo` is not named as a hook.
-     *
-     * Local uid generation is susceptible to check-before-use bugs since we're
-     * checking for naming conflicts / references long before we actually insert
-     * the import. (see similar logic in HIRBuilder:resolveBinding)
-     */
-    let uid;
-    if (this.isHookName(name)) {
-      uid = name;
-      let i = 0;
-      while (this.hasReference(uid)) {
-        this.knownReferencedNames.add(uid);
-        uid = `${name}_${i++}`;
-      }
-    } else if (!this.hasReference(name)) {
-      uid = name;
-    } else {
-      uid = this.scope.generateUid(name);
-    }
-    this.knownReferencedNames.add(uid);
-    return uid;
-  }
-
-  addMemoCacheImport(): NonLocalImportSpecifier {
-    return this.addImportSpecifier(
-      {
-        source: this.reactRuntimeModule,
-        importSpecifierName: 'c',
-      },
-      '_c',
-    );
-  }
-
-  /**
-   *
-   * @param externalFunction
-   * @param nameHint if defined, will be used as the name of the import specifier
-   * @returns
-   */
-  addImportSpecifier(
-    {source: module, importSpecifierName: specifier}: ExternalFunction,
-    nameHint?: string,
-  ): NonLocalImportSpecifier {
-    const maybeBinding = this.imports.get(module)?.get(specifier);
-    if (maybeBinding != null) {
-      return {...maybeBinding};
-    }
-
-    const binding: NonLocalImportSpecifier = {
-      kind: 'ImportSpecifier',
-      name: this.newUid(nameHint ?? specifier),
-      module,
-      imported: specifier,
-    };
-    getOrInsertWith(this.imports, module, () => new Map()).set(specifier, {
-      ...binding,
-    });
-    return binding;
-  }
-
-  addNewReference(name: string): void {
-    this.knownReferencedNames.add(name);
-  }
-
-  assertGlobalBinding(
-    name: string,
-    localScope?: BabelScope,
-  ): Result<void, CompilerError> {
-    const scope = localScope ?? this.scope;
-    if (!scope.hasReference(name) && !scope.hasBinding(name)) {
-      return Ok(undefined);
-    }
-    const error = new CompilerError();
-    error.push({
-      severity: ErrorSeverity.Todo,
-      reason: 'Encountered conflicting global in generated program',
-      description: `Conflict from local binding ${name}`,
-      loc: scope.getBinding(name)?.path.node.loc ?? null,
-      suggestions: null,
-    });
-    return Err(error);
-  }
-
-  logEvent(event: LoggerEvent): void {
-    if (this.opts.logger != null) {
-      this.opts.logger.logEvent(this.filename, event);
-    }
-  }
-}
-
-function getExistingImports(
-  program: NodePath<t.Program>,
-): Map<string, NodePath<t.ImportDeclaration>> {
-  const existingImports = new Map<string, NodePath<t.ImportDeclaration>>();
-  program.traverse({
-    ImportDeclaration(path) {
-      if (isNonNamespacedImport(path)) {
-        existingImports.set(path.node.source.value, path);
-      }
-    },
-  });
-  return existingImports;
-}
-
 export function addImportsToProgram(
   path: NodePath<t.Program>,
-  programContext: ProgramContext,
+  importList: Array<ExternalFunction>,
 ): void {
-  const existingImports = getExistingImports(path);
+  const identifiers: Set<string> = new Set();
+  const sortedImports: Map<string, Array<string>> = new Map();
+  for (const {importSpecifierName, source} of importList) {
+    /*
+     * Codegen currently does not rename import specifiers, so we do additional
+     * validation here
+     */
+    CompilerError.invariant(identifiers.has(importSpecifierName) === false, {
+      reason: `Encountered conflicting import specifier for ${importSpecifierName} in Forget config.`,
+      description: null,
+      loc: GeneratedSource,
+      suggestions: null,
+    });
+    CompilerError.invariant(
+      path.scope.hasBinding(importSpecifierName) === false,
+      {
+        reason: `Encountered conflicting import specifiers for ${importSpecifierName} in generated program.`,
+        description: null,
+        loc: GeneratedSource,
+        suggestions: null,
+      },
+    );
+    identifiers.add(importSpecifierName);
+
+    const importSpecifierNameList = getOrInsertDefault(
+      sortedImports,
+      source,
+      [],
+    );
+    importSpecifierNameList.push(importSpecifierName);
+  }
+
   const stmts: Array<t.ImportDeclaration> = [];
-  const sortedModules = [...programContext.imports.entries()].sort(([a], [b]) =>
-    a.localeCompare(b),
-  );
-  for (const [moduleName, importsMap] of sortedModules) {
-    for (const [specifierName, loweredImport] of importsMap) {
-      /**
-       * Assert that the import identifier hasn't already be declared in the program.
-       * Note: we use getBinding here since `Scope.hasBinding` pessimistically returns true
-       * for all allocated uids (from `Scope.getUid`)
-       */
-      CompilerError.invariant(
-        path.scope.getBinding(loweredImport.name) == null,
-        {
-          reason:
-            'Encountered conflicting import specifiers in generated program',
-          description: `Conflict from import ${loweredImport.module}:(${loweredImport.imported} as ${loweredImport.name}).`,
-          loc: GeneratedSource,
-          suggestions: null,
-        },
-      );
-      CompilerError.invariant(
-        loweredImport.module === moduleName &&
-          loweredImport.imported === specifierName,
-        {
-          reason:
-            'Found inconsistent import specifier. This is an internal bug.',
-          description: `Expected import ${moduleName}:${specifierName} but found ${loweredImport.module}:${loweredImport.imported}`,
-          loc: GeneratedSource,
-        },
-      );
-    }
-    const sortedImport: Array<NonLocalImportSpecifier> = [
-      ...importsMap.values(),
-    ].sort(({imported: a}, {imported: b}) => a.localeCompare(b));
-    const importSpecifiers = sortedImport.map(specifier => {
-      return t.importSpecifier(
-        t.identifier(specifier.name),
-        t.identifier(specifier.imported),
-      );
+  for (const [source, importSpecifierNameList] of sortedImports) {
+    const importSpecifiers = importSpecifierNameList.map(name => {
+      const id = t.identifier(name);
+      return t.importSpecifier(id, id);
     });
 
-    /**
-     * If an existing import of this module exists (ie `import { ... } from
-     * '<moduleName>'`), inject new imported specifiers into the list of
-     * destructured variables.
-     */
-    const maybeExistingImports = existingImports.get(moduleName);
-    if (maybeExistingImports != null) {
-      maybeExistingImports.pushContainer('specifiers', importSpecifiers);
-    } else {
-      stmts.push(
-        t.importDeclaration(importSpecifiers, t.stringLiteral(moduleName)),
-      );
-    }
+    stmts.push(t.importDeclaration(importSpecifiers, t.stringLiteral(source)));
   }
   path.unshiftContainer('body', stmts);
 }
@@ -302,12 +93,13 @@ export function addImportsToProgram(
 /*
  * Matches `import { ... } from <moduleName>;`
  * but not `import * as React from <moduleName>;`
- *         `import type { Foo } from <moduleName>;`
  */
 function isNonNamespacedImport(
   importDeclPath: NodePath<t.ImportDeclaration>,
+  moduleName: string,
 ): boolean {
   return (
+    importDeclPath.get('source').node.value === moduleName &&
     importDeclPath
       .get('specifiers')
       .every(specifier => specifier.isImportSpecifier()) &&
@@ -315,3 +107,94 @@ function isNonNamespacedImport(
     importDeclPath.node.importKind !== 'typeof'
   );
 }
+
+function hasExistingNonNamespacedImportOfModule(
+  program: NodePath<t.Program>,
+  moduleName: string,
+): boolean {
+  let hasExistingImport = false;
+  program.traverse({
+    ImportDeclaration(importDeclPath) {
+      if (isNonNamespacedImport(importDeclPath, moduleName)) {
+        hasExistingImport = true;
+      }
+    },
+  });
+
+  return hasExistingImport;
+}
+
+/*
+ * If an existing import of React exists (ie `import { ... } from '<moduleName>'`), inject useMemoCache
+ * into the list of destructured variables.
+ */
+function addMemoCacheFunctionSpecifierToExistingImport(
+  program: NodePath<t.Program>,
+  moduleName: string,
+  identifierName: string,
+): boolean {
+  let didInsertUseMemoCache = false;
+  program.traverse({
+    ImportDeclaration(importDeclPath) {
+      if (
+        !didInsertUseMemoCache &&
+        isNonNamespacedImport(importDeclPath, moduleName)
+      ) {
+        importDeclPath.pushContainer(
+          'specifiers',
+          t.importSpecifier(t.identifier(identifierName), t.identifier('c')),
+        );
+        didInsertUseMemoCache = true;
+      }
+    },
+  });
+  return didInsertUseMemoCache;
+}
+
+export function updateMemoCacheFunctionImport(
+  program: NodePath<t.Program>,
+  moduleName: string,
+  useMemoCacheIdentifier: string,
+): void {
+  /*
+   * If there isn't already an import of * as React, insert it so useMemoCache doesn't
+   * throw
+   */
+  const hasExistingImport = hasExistingNonNamespacedImportOfModule(
+    program,
+    moduleName,
+  );
+
+  if (hasExistingImport) {
+    const didUpdateImport = addMemoCacheFunctionSpecifierToExistingImport(
+      program,
+      moduleName,
+      useMemoCacheIdentifier,
+    );
+    if (!didUpdateImport) {
+      throw new Error(
+        `Expected an ImportDeclaration of \`${moduleName}\` in order to update ImportSpecifiers with useMemoCache`,
+      );
+    }
+  } else {
+    addMemoCacheFunctionImportDeclaration(
+      program,
+      moduleName,
+      useMemoCacheIdentifier,
+    );
+  }
+}
+
+function addMemoCacheFunctionImportDeclaration(
+  program: NodePath<t.Program>,
+  moduleName: string,
+  localName: string,
+): void {
+  program.unshiftContainer(
+    'body',
+    t.importDeclaration(
+      [t.importSpecifier(t.identifier(localName), t.identifier('c'))],
+      t.stringLiteral(moduleName),
+    ),
+  );
+}

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Options.ts

@@ -12,7 +12,6 @@ import {
   EnvironmentConfig,
   ExternalFunction,
   parseEnvironmentConfig,
-  tryParseExternalFunction,
 } from '../HIR/Environment';
 import {hasOwnProperty} from '../Utils/utils';
 import {fromZodError} from 'zod-validation-error';
@@ -98,7 +97,7 @@ export type PluginOptions = {
    * provided rules will skip compilation. To disable this feature (never bailout of compilation
    * even if the default ESLint is suppressed), pass an empty array.
    */
-  eslintSuppressionRules: Array<string> | null | undefined;
+  eslintSuppressionRules?: Array<string> | null | undefined;
 
   flowSuppressions: boolean;
   /*
@@ -106,7 +105,7 @@ export type PluginOptions = {
    */
   ignoreUseNoForget: boolean;
 
-  sources: Array<string> | ((filename: string) => boolean) | null;
+  sources?: Array<string> | ((filename: string) => boolean) | null;
 
   /**
    * The compiler has customized support for react-native-reanimated, intended as a temporary workaround.
@@ -182,9 +181,7 @@ export type LoggerEvent =
   | CompileDiagnosticEvent
   | CompileSkipEvent
   | PipelineErrorEvent
-  | TimingEvent
-  | AutoDepsDecorationsEvent
-  | AutoDepsEligibleEvent;
+  | TimingEvent;
 
 export type CompileErrorEvent = {
   kind: 'CompileError';
@@ -221,16 +218,6 @@ export type TimingEvent = {
   kind: 'Timing';
   measurement: PerformanceMeasure;
 };
-export type AutoDepsDecorationsEvent = {
-  kind: 'AutoDepsDecorations';
-  fnLoc: t.SourceLocation;
-  decorations: Array<t.SourceLocation>;
-};
-export type AutoDepsEligibleEvent = {
-  kind: 'AutoDepsEligible';
-  fnLoc: t.SourceLocation;
-  depArrayLoc: t.SourceLocation;
-};
 
 export type Logger = {
   logEvent: (filename: string | null, event: LoggerEvent) => void;
@@ -284,14 +271,6 @@ export function parsePluginOptions(obj: unknown): PluginOptions {
           parsedOptions[key] = parseTargetConfig(value);
           break;
         }
-        case 'gating': {
-          if (value == null) {
-            parsedOptions[key] = null;
-          } else {
-            parsedOptions[key] = tryParseExternalFunction(value);
-          }
-          break;
-        }
         default: {
           parsedOptions[key] = value;
         }

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Pipeline.ts

@@ -8,7 +8,7 @@
 import {NodePath} from '@babel/traverse';
 import * as t from '@babel/types';
 import prettyFormat from 'pretty-format';
-import {Logger, ProgramContext} from '.';
+import {Logger} from '.';
 import {
   HIRFunction,
   ReactiveFunction,
@@ -24,7 +24,6 @@ import {
   pruneUnusedLabelsHIR,
 } from '../HIR';
 import {
-  CompilerMode,
   Environment,
   EnvironmentConfig,
   ReactFunctionType,
@@ -100,10 +99,7 @@ import {propagateScopeDependenciesHIR} from '../HIR/PropagateScopeDependenciesHI
 import {outlineJSX} from '../Optimization/OutlineJsx';
 import {optimizePropsMethodCalls} from '../Optimization/OptimizePropsMethodCalls';
 import {transformFire} from '../Transform';
-import {validateNoImpureFunctionsInRender} from '../Validation/ValidateNoImpureFunctionsInRender';
-import {CompilerError} from '..';
-import {validateStaticComponents} from '../Validation/ValidateStaticComponents';
-import {validateNoFreezingKnownMutableFunctions} from '../Validation/ValidateNoFreezingKnownMutableFunctions';
+import {validateNoImpureFunctionsInRender} from '../Validation/ValiateNoImpureFunctionsInRender';
 
 export type CompilerPipelineValue =
   | {kind: 'ast'; name: string; value: CodegenFunction}
@@ -117,8 +113,7 @@ function run(
   >,
   config: EnvironmentConfig,
   fnType: ReactFunctionType,
-  mode: CompilerMode,
-  programContext: ProgramContext,
+  useMemoCacheIdentifier: string,
   logger: Logger | null,
   filename: string | null,
   code: string | null,
@@ -127,13 +122,12 @@ function run(
   const env = new Environment(
     func.scope,
     fnType,
-    mode,
     config,
     contextIdentifiers,
     logger,
     filename,
     code,
-    programContext,
+    useMemoCacheIdentifier,
   );
   env.logger?.debugLogIRs?.({
     kind: 'debug',
@@ -163,13 +157,13 @@ function runWithEnvironment(
   log({kind: 'hir', name: 'PruneMaybeThrows', value: hir});
 
   validateContextVariableLValues(hir);
-  validateUseMemo(hir).unwrap();
+  validateUseMemo(hir);
 
   if (
-    env.isInferredMemoEnabled &&
     !env.config.enablePreserveExistingManualUseMemo &&
     !env.config.disableMemoizationForDebugging &&
-    !env.config.enableChangeDetectionForDebugging
+    !env.config.enableChangeDetectionForDebugging &&
+    !env.config.enableMinimalTransformsForRetry
   ) {
     dropManualMemoization(hir);
     log({kind: 'hir', name: 'DropManualMemoization', value: hir});
@@ -202,13 +196,8 @@ function runWithEnvironment(
   inferTypes(hir);
   log({kind: 'hir', name: 'InferTypes', value: hir});
 
-  if (env.isInferredMemoEnabled) {
-    if (env.config.validateHooksUsage) {
-      validateHooksUsage(hir).unwrap();
-    }
-    if (env.config.validateNoCapitalizedCalls) {
-      validateNoCapitalizedCalls(hir).unwrap();
-    }
+  if (env.config.validateHooksUsage) {
+    validateHooksUsage(hir);
   }
 
   if (env.config.enableFire) {
@@ -216,6 +205,10 @@ function runWithEnvironment(
     log({kind: 'hir', name: 'TransformFire', value: hir});
   }
 
+  if (env.config.validateNoCapitalizedCalls) {
+    validateNoCapitalizedCalls(hir);
+  }
+
   if (env.config.lowerContextAccess) {
     lowerContextAccess(hir, env.config.lowerContextAccess);
   }
@@ -226,12 +219,7 @@ function runWithEnvironment(
   analyseFunctions(hir);
   log({kind: 'hir', name: 'AnalyseFunctions', value: hir});
 
-  const fnEffectErrors = inferReferenceEffects(hir);
-  if (env.isInferredMemoEnabled) {
-    if (fnEffectErrors.length > 0) {
-      CompilerError.throw(fnEffectErrors[0]);
-    }
-  }
+  inferReferenceEffects(hir);
   log({kind: 'hir', name: 'InferReferenceEffects', value: hir});
 
   validateLocalsNotReassignedAfterRender(hir);
@@ -251,34 +239,28 @@ function runWithEnvironment(
   inferMutableRanges(hir);
   log({kind: 'hir', name: 'InferMutableRanges', value: hir});
 
-  if (env.isInferredMemoEnabled) {
-    if (env.config.assertValidMutableRanges) {
-      assertValidMutableRanges(hir);
-    }
+  if (env.config.assertValidMutableRanges) {
+    assertValidMutableRanges(hir);
+  }
 
-    if (env.config.validateRefAccessDuringRender) {
-      validateNoRefAccessInRender(hir).unwrap();
-    }
+  if (env.config.validateRefAccessDuringRender) {
+    validateNoRefAccessInRender(hir);
+  }
 
-    if (env.config.validateNoSetStateInRender) {
-      validateNoSetStateInRender(hir).unwrap();
-    }
+  if (env.config.validateNoSetStateInRender) {
+    validateNoSetStateInRender(hir);
+  }
 
-    if (env.config.validateNoSetStateInPassiveEffects) {
-      env.logErrors(validateNoSetStateInPassiveEffects(hir));
-    }
+  if (env.config.validateNoSetStateInPassiveEffects) {
+    validateNoSetStateInPassiveEffects(hir);
+  }
 
-    if (env.config.validateNoJSXInTryStatements) {
-      env.logErrors(validateNoJSXInTryStatement(hir));
-    }
+  if (env.config.validateNoJSXInTryStatements) {
+    validateNoJSXInTryStatement(hir);
+  }
 
-    if (env.config.validateNoImpureFunctionsInRender) {
-      validateNoImpureFunctionsInRender(hir).unwrap();
-    }
-
-    if (env.config.validateNoFreezingKnownMutableFunctions) {
-      validateNoFreezingKnownMutableFunctions(hir).unwrap();
-    }
+  if (env.config.validateNoImpureFunctionsInRender) {
+    validateNoImpureFunctionsInRender(hir);
   }
 
   inferReactivePlaces(hir);
@@ -298,16 +280,7 @@ function runWithEnvironment(
     value: hir,
   });
 
-  if (env.isInferredMemoEnabled) {
-    if (env.config.validateStaticComponents) {
-      env.logErrors(validateStaticComponents(hir));
-    }
-
-    /**
-     * Only create reactive scopes (which directly map to generated memo blocks)
-     * if inferred memoization is enabled. This makes all later passes which
-     * transform reactive-scope labeled instructions no-ops.
-     */
+  if (!env.config.enableMinimalTransformsForRetry) {
     inferReactiveScopeVariables(hir);
     log({kind: 'hir', name: 'InferReactiveScopeVariables', value: hir});
   }
@@ -397,11 +370,6 @@ function runWithEnvironment(
 
   if (env.config.inferEffectDependencies) {
     inferEffectDependencies(hir);
-    log({
-      kind: 'hir',
-      name: 'InferEffectDependencies',
-      value: hir,
-    });
   }
 
   if (env.config.inlineJsxTransform) {
@@ -524,14 +492,14 @@ function runWithEnvironment(
   });
 
   if (env.config.validateMemoizedEffectDependencies) {
-    validateMemoizedEffectDependencies(reactiveFunction).unwrap();
+    validateMemoizedEffectDependencies(reactiveFunction);
   }
 
   if (
     env.config.enablePreserveExistingMemoizationGuarantees ||
     env.config.validatePreserveExistingMemoizationGuarantees
   ) {
-    validatePreservedManualMemoization(reactiveFunction).unwrap();
+    validatePreservedManualMemoization(reactiveFunction);
   }
 
   const ast = codegenFunction(reactiveFunction, {
@@ -561,8 +529,7 @@ export function compileFn(
   >,
   config: EnvironmentConfig,
   fnType: ReactFunctionType,
-  mode: CompilerMode,
-  programContext: ProgramContext,
+  useMemoCacheIdentifier: string,
   logger: Logger | null,
   filename: string | null,
   code: string | null,
@@ -571,8 +538,7 @@ export function compileFn(
     func,
     config,
     fnType,
-    mode,
-    programContext,
+    useMemoCacheIdentifier,
     logger,
     filename,
     code,

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Program.ts

@@ -12,7 +12,13 @@ import {
   CompilerErrorDetail,
   ErrorSeverity,
 } from '../CompilerError';
-import {ReactFunctionType} from '../HIR/Environment';
+import {
+  EnvironmentConfig,
+  ExternalFunction,
+  ReactFunctionType,
+  MINIMAL_RETRY_CONFIG,
+  tryParseExternalFunction,
+} from '../HIR/Environment';
 import {CodegenFunction} from '../ReactiveScopes';
 import {isComponentDeclaration} from '../Utils/ComponentDeclaration';
 import {isHookDeclaration} from '../Utils/HookDeclaration';
@@ -20,17 +26,16 @@ import {assertExhaustive} from '../Utils/utils';
 import {insertGatedFunctionDeclaration} from './Gating';
 import {
   addImportsToProgram,
-  ProgramContext,
+  updateMemoCacheFunctionImport,
   validateRestrictedImports,
 } from './Imports';
-import {CompilerReactTarget, PluginOptions} from './Options';
+import {PluginOptions} from './Options';
 import {compileFn} from './Pipeline';
 import {
   filterSuppressionsThatAffectFunction,
   findProgramSuppressions,
   suppressionsToCompilerError,
 } from './Suppression';
-import {GeneratedSource} from '../HIR';
 
 export type CompilerPass = {
   opts: PluginOptions;
@@ -43,21 +48,17 @@ export const OPT_OUT_DIRECTIVES = new Set(['use no forget', 'use no memo']);
 
 export function findDirectiveEnablingMemoization(
   directives: Array<t.Directive>,
-): t.Directive | null {
-  return (
-    directives.find(directive =>
-      OPT_IN_DIRECTIVES.has(directive.value.value),
-    ) ?? null
+): Array<t.Directive> {
+  return directives.filter(directive =>
+    OPT_IN_DIRECTIVES.has(directive.value.value),
   );
 }
 
 export function findDirectiveDisablingMemoization(
   directives: Array<t.Directive>,
-): t.Directive | null {
-  return (
-    directives.find(directive =>
-      OPT_OUT_DIRECTIVES.has(directive.value.value),
-    ) ?? null
+): Array<t.Directive> {
+  return directives.filter(directive =>
+    OPT_OUT_DIRECTIVES.has(directive.value.value),
   );
 }
 
@@ -92,16 +93,13 @@ export type CompileResult = {
 
 function logError(
   err: unknown,
-  context: {
-    opts: PluginOptions;
-    filename: string | null;
-  },
+  pass: CompilerPass,
   fnLoc: t.SourceLocation | null,
 ): void {
-  if (context.opts.logger) {
+  if (pass.opts.logger) {
     if (err instanceof CompilerError) {
       for (const detail of err.details) {
-        context.opts.logger.logEvent(context.filename, {
+        pass.opts.logger.logEvent(pass.filename, {
           kind: 'CompileError',
           fnLoc,
           detail: detail.options,
@@ -115,7 +113,7 @@ function logError(
         stringifiedError = err?.toString() ?? '[ null ]';
       }
 
-      context.opts.logger.logEvent(context.filename, {
+      pass.opts.logger.logEvent(pass.filename, {
         kind: 'PipelineError',
         fnLoc,
         data: stringifiedError,
@@ -125,17 +123,13 @@ function logError(
 }
 function handleError(
   err: unknown,
-  context: {
-    opts: PluginOptions;
-    filename: string | null;
-  },
+  pass: CompilerPass,
   fnLoc: t.SourceLocation | null,
 ): void {
-  logError(err, context, fnLoc);
+  logError(err, pass, fnLoc);
   if (
-    context.opts.panicThreshold === 'all_errors' ||
-    (context.opts.panicThreshold === 'critical_errors' &&
-      isCriticalError(err)) ||
+    pass.opts.panicThreshold === 'all_errors' ||
+    (pass.opts.panicThreshold === 'critical_errors' && isCriticalError(err)) ||
     isConfigError(err) // Always throws regardless of panic threshold
   ) {
     throw err;
@@ -198,6 +192,7 @@ export function createNewFunctionNode(
     }
   }
   // Avoid visiting the new transformed version
+  ALREADY_COMPILED.add(transformedFn);
   return transformedFn;
 }
 
@@ -249,6 +244,13 @@ function insertNewOutlinedFunctionNode(
   }
 }
 
+/*
+ * This is a hack to work around what seems to be a Babel bug. Babel doesn't
+ * consistently respect the `skip()` function to avoid revisiting a node within
+ * a pass, so we use this set to track nodes that we have compiled.
+ */
+const ALREADY_COMPILED: WeakSet<object> | Set<object> = new (WeakSet ?? Set)();
+
 const DEFAULT_ESLINT_SUPPRESSIONS = [
   'react-hooks/exhaustive-deps',
   'react-hooks/rules-of-hooks',
@@ -271,43 +273,33 @@ function isFilePartOfSources(
   return false;
 }
 
-export type CompileProgramMetadata = {
-  retryErrors: Array<{fn: BabelFn; error: CompilerError}>;
-  inferredEffectLocations: Set<t.SourceLocation>;
-};
 /**
- * Main entrypoint for React Compiler.
- *
- * @param program The Babel program node to compile
- * @param pass Compiler configuration and context
- * @returns Compilation results or null if compilation was skipped
+ * `compileProgram` is directly invoked by the react-compiler babel plugin, so
+ * exceptions thrown by this function will fail the babel build.
+ * - call `handleError` if your error is recoverable.
+ *   Unless the error is a warning / info diagnostic, compilation of a function
+ *   / entire file should also be skipped.
+ * - throw an exception if the error is fatal / not recoverable.
+ *   Examples of this are invalid compiler configs or failure to codegen outlined
+ *   functions *after* already emitting optimized components / hooks that invoke
+ *   the outlined functions.
  */
 export function compileProgram(
   program: NodePath<t.Program>,
   pass: CompilerPass,
-): CompileProgramMetadata | null {
-  /**
-   * This is directly invoked by the react-compiler babel plugin, so exceptions
-   * thrown by this function will fail the babel build.
-   * - call `handleError` if your error is recoverable.
-   *   Unless the error is a warning / info diagnostic, compilation of a function
-   *   / entire file should also be skipped.
-   * - throw an exception if the error is fatal / not recoverable.
-   *   Examples of this are invalid compiler configs or failure to codegen outlined
-   *   functions *after* already emitting optimized components / hooks that invoke
-   *   the outlined functions.
-   */
+): void {
   if (shouldSkipCompilation(program, pass)) {
-    return null;
+    return;
   }
-  const restrictedImportsErr = validateRestrictedImports(
-    program,
-    pass.opts.environment,
-  );
+
+  const environment = pass.opts.environment;
+  const restrictedImportsErr = validateRestrictedImports(program, environment);
   if (restrictedImportsErr) {
     handleError(restrictedImportsErr, pass, null);
-    return null;
+    return;
   }
+  const useMemoCacheIdentifier = program.scope.generateUidIdentifier('c');
+
   /*
    * Record lint errors and critical errors as depending on Forget's config,
    * we may still need to run Forget's analysis on every function (even if we
@@ -318,102 +310,16 @@ export function compileProgram(
     pass.opts.eslintSuppressionRules ?? DEFAULT_ESLINT_SUPPRESSIONS,
     pass.opts.flowSuppressions,
   );
-
-  const programContext = new ProgramContext({
-    program: program,
-    opts: pass.opts,
-    filename: pass.filename,
-    code: pass.code,
-    suppressions,
-    hasModuleScopeOptOut:
-      findDirectiveDisablingMemoization(program.node.directives) != null,
-  });
-
-  const queue: Array<CompileSource> = findFunctionsToCompile(
-    program,
-    pass,
-    programContext,
-  );
+  const queue: Array<{
+    kind: 'original' | 'outlined';
+    fn: BabelFn;
+    fnType: ReactFunctionType;
+  }> = [];
   const compiledFns: Array<CompileResult> = [];
 
-  while (queue.length !== 0) {
-    const current = queue.shift()!;
-    const compiled = processFn(current.fn, current.fnType, programContext);
-
-    if (compiled != null) {
-      for (const outlined of compiled.outlined) {
-        CompilerError.invariant(outlined.fn.outlined.length === 0, {
-          reason: 'Unexpected nested outlined functions',
-          loc: outlined.fn.loc,
-        });
-        const fn = insertNewOutlinedFunctionNode(
-          program,
-          current.fn,
-          outlined.fn,
-        );
-        fn.skip();
-        programContext.alreadyCompiled.add(fn.node);
-        if (outlined.type !== null) {
-          queue.push({
-            kind: 'outlined',
-            fn,
-            fnType: outlined.type,
-          });
-        }
-      }
-      compiledFns.push({
-        kind: current.kind,
-        originalFn: current.fn,
-        compiledFn: compiled,
-      });
-    }
-  }
-
-  // Avoid modifying the program if we find a program level opt-out
-  if (programContext.hasModuleScopeOptOut) {
-    if (compiledFns.length > 0) {
-      const error = new CompilerError();
-      error.pushErrorDetail(
-        new CompilerErrorDetail({
-          reason:
-            'Unexpected compiled functions when module scope opt-out is present',
-          severity: ErrorSeverity.Invariant,
-          loc: null,
-        }),
-      );
-      handleError(error, programContext, null);
-    }
-    return null;
-  }
-
-  // Insert React Compiler generated functions into the Babel AST
-  applyCompiledFunctions(program, compiledFns, pass, programContext);
-
-  return {
-    retryErrors: programContext.retryErrors,
-    inferredEffectLocations: programContext.inferredEffectLocations,
-  };
-}
-
-type CompileSource = {
-  kind: 'original' | 'outlined';
-  fn: BabelFn;
-  fnType: ReactFunctionType;
-};
-/**
- * Find all React components and hooks that need to be compiled
- *
- * @returns An array of React functions from @param program to transform
- */
-function findFunctionsToCompile(
-  program: NodePath<t.Program>,
-  pass: CompilerPass,
-  programContext: ProgramContext,
-): Array<CompileSource> {
-  const queue: Array<CompileSource> = [];
   const traverseFunction = (fn: BabelFn, pass: CompilerPass): void => {
-    const fnType = getReactFunctionType(fn, pass);
-    if (fnType === null || programContext.alreadyCompiled.has(fn.node)) {
+    const fnType = getReactFunctionType(fn, pass, environment);
+    if (fnType === null || ALREADY_COMPILED.has(fn.node)) {
       return;
     }
 
@@ -422,7 +328,7 @@ function findFunctionsToCompile(
      * traversal will loop infinitely.
      * Ensure we avoid visiting the original function again.
      */
-    programContext.alreadyCompiled.add(fn.node);
+    ALREADY_COMPILED.add(fn.node);
     fn.skip();
 
     queue.push({kind: 'original', fn, fnType});
@@ -437,6 +343,7 @@ function findFunctionsToCompile(
          * can reference `this` which is unsafe for compilation
          */
         node.skip();
+        return;
       },
 
       ClassExpression(node: NodePath<t.ClassExpression>) {
@@ -445,6 +352,7 @@ function findFunctionsToCompile(
          * can reference `this` which is unsafe for compilation
          */
         node.skip();
+        return;
       },
 
       FunctionDeclaration: traverseFunction,
@@ -459,227 +367,253 @@ function findFunctionsToCompile(
       filename: pass.filename ?? null,
     },
   );
-  return queue;
-}
 
-/**
- * Try to compile a source function, taking into account all local suppressions,
- * opt-ins, and opt-outs.
- *
- * Errors encountered during compilation are either logged (if recoverable) or
- * thrown (if non-recoverable).
- *
- * @returns the compiled function or null if the function was skipped (due to
- * config settings and/or outputs)
- */
-function processFn(
-  fn: BabelFn,
-  fnType: ReactFunctionType,
-  programContext: ProgramContext,
-): null | CodegenFunction {
-  let directives;
-  if (fn.node.body.type !== 'BlockStatement') {
-    directives = {optIn: null, optOut: null};
-  } else {
-    directives = {
-      optIn: findDirectiveEnablingMemoization(fn.node.body.directives),
-      optOut: findDirectiveDisablingMemoization(fn.node.body.directives),
-    };
-  }
-
-  let compiledFn: CodegenFunction;
-  const compileResult = tryCompileFunction(fn, fnType, programContext);
-  if (compileResult.kind === 'error') {
-    if (directives.optOut != null) {
-      logError(compileResult.error, programContext, fn.node.loc ?? null);
-    } else {
-      handleError(compileResult.error, programContext, fn.node.loc ?? null);
+  const processFn = (
+    fn: BabelFn,
+    fnType: ReactFunctionType,
+  ): null | CodegenFunction => {
+    let optInDirectives: Array<t.Directive> = [];
+    let optOutDirectives: Array<t.Directive> = [];
+    if (fn.node.body.type === 'BlockStatement') {
+      optInDirectives = findDirectiveEnablingMemoization(
+        fn.node.body.directives,
+      );
+      optOutDirectives = findDirectiveDisablingMemoization(
+        fn.node.body.directives,
+      );
     }
-    const retryResult = retryCompileFunction(fn, fnType, programContext);
-    if (retryResult == null) {
-      return null;
-    }
-    compiledFn = retryResult;
-  } else {
-    compiledFn = compileResult.compiledFn;
-  }
 
-  /**
-   * If 'use no forget/memo' is present and we still ran the code through the
-   * compiler for validation, log a skip event and don't mutate the babel AST.
-   * This allows us to flag if there is an unused 'use no forget/memo'
-   * directive.
-   */
-  if (
-    programContext.opts.ignoreUseNoForget === false &&
-    directives.optOut != null
-  ) {
-    programContext.logEvent({
-      kind: 'CompileSkip',
-      fnLoc: fn.node.body.loc ?? null,
-      reason: `Skipped due to '${directives.optOut.value}' directive.`,
-      loc: directives.optOut.loc ?? null,
-    });
-    return null;
-  }
-  programContext.logEvent({
-    kind: 'CompileSuccess',
-    fnLoc: fn.node.loc ?? null,
-    fnName: compiledFn.id?.name ?? null,
-    memoSlots: compiledFn.memoSlotsUsed,
-    memoBlocks: compiledFn.memoBlocks,
-    memoValues: compiledFn.memoValues,
-    prunedMemoBlocks: compiledFn.prunedMemoBlocks,
-    prunedMemoValues: compiledFn.prunedMemoValues,
-  });
-
-  if (programContext.hasModuleScopeOptOut) {
-    return null;
-  } else if (programContext.opts.noEmit) {
     /**
-     * inferEffectDependencies + noEmit is currently only used for linting. In
-     * this mode, add source locations for where the compiler *can* infer effect
-     * dependencies.
+     * Note that Babel does not attach comment nodes to nodes; they are dangling off of the
+     * Program node itself. We need to figure out whether an eslint suppression range
+     * applies to this function first.
      */
-    for (const loc of compiledFn.inferredEffectLocations) {
-      if (loc !== GeneratedSource) {
-        programContext.inferredEffectLocations.add(loc);
+    const suppressionsInFunction = filterSuppressionsThatAffectFunction(
+      suppressions,
+      fn,
+    );
+    let compileResult:
+      | {kind: 'compile'; compiledFn: CodegenFunction}
+      | {kind: 'error'; error: unknown};
+    if (suppressionsInFunction.length > 0) {
+      compileResult = {
+        kind: 'error',
+        error: suppressionsToCompilerError(suppressionsInFunction),
+      };
+    } else {
+      try {
+        compileResult = {
+          kind: 'compile',
+          compiledFn: compileFn(
+            fn,
+            environment,
+            fnType,
+            useMemoCacheIdentifier.name,
+            pass.opts.logger,
+            pass.filename,
+            pass.code,
+          ),
+        };
+      } catch (err) {
+        compileResult = {kind: 'error', error: err};
       }
     }
-    return null;
-  } else if (
-    programContext.opts.compilationMode === 'annotation' &&
-    directives.optIn == null
-  ) {
-    /**
-     * If no opt-in directive is found and the compiler is configured in
-     * annotation mode, don't insert the compiled function.
-     */
-    return null;
-  } else {
-    return compiledFn;
-  }
-}
-
-function tryCompileFunction(
-  fn: BabelFn,
-  fnType: ReactFunctionType,
-  programContext: ProgramContext,
-):
-  | {kind: 'compile'; compiledFn: CodegenFunction}
-  | {kind: 'error'; error: unknown} {
-  /**
-   * Note that Babel does not attach comment nodes to nodes; they are dangling off of the
-   * Program node itself. We need to figure out whether an eslint suppression range
-   * applies to this function first.
-   */
-  const suppressionsInFunction = filterSuppressionsThatAffectFunction(
-    programContext.suppressions,
-    fn,
-  );
-  if (suppressionsInFunction.length > 0) {
-    return {
-      kind: 'error',
-      error: suppressionsToCompilerError(suppressionsInFunction),
-    };
-  }
-
-  try {
-    return {
-      kind: 'compile',
-      compiledFn: compileFn(
-        fn,
-        programContext.opts.environment,
-        fnType,
-        'all_features',
-        programContext,
-        programContext.opts.logger,
-        programContext.filename,
-        programContext.code,
-      ),
-    };
-  } catch (err) {
-    return {kind: 'error', error: err};
-  }
-}
-
-/**
- * If non-memo feature flags are enabled, retry compilation with a more minimal
- * feature set.
- *
- * @returns a CodegenFunction if retry was successful
- */
-function retryCompileFunction(
-  fn: BabelFn,
-  fnType: ReactFunctionType,
-  programContext: ProgramContext,
-): CodegenFunction | null {
-  const environment = programContext.opts.environment;
-  if (
-    !(environment.enableFire || environment.inferEffectDependencies != null)
-  ) {
-    return null;
-  }
-  /**
-   * Note that function suppressions are not checked in the retry pipeline, as
-   * they only affect auto-memoization features.
-   */
-  try {
-    const retryResult = compileFn(
-      fn,
-      environment,
-      fnType,
-      'no_inferred_memo',
-      programContext,
-      programContext.opts.logger,
-      programContext.filename,
-      programContext.code,
-    );
-
-    if (!retryResult.hasFireRewrite && !retryResult.hasInferredEffect) {
+    // If non-memoization features are enabled, retry regardless of error kind
+    if (compileResult.kind === 'error' && environment.enableFire) {
+      try {
+        compileResult = {
+          kind: 'compile',
+          compiledFn: compileFn(
+            fn,
+            {
+              ...environment,
+              ...MINIMAL_RETRY_CONFIG,
+            },
+            fnType,
+            useMemoCacheIdentifier.name,
+            pass.opts.logger,
+            pass.filename,
+            pass.code,
+          ),
+        };
+      } catch (err) {
+        compileResult = {kind: 'error', error: err};
+      }
+    }
+    if (compileResult.kind === 'error') {
+      /**
+       * If an opt out directive is present, log only instead of throwing and don't mark as
+       * containing a critical error.
+       */
+      if (optOutDirectives.length > 0) {
+        logError(compileResult.error, pass, fn.node.loc ?? null);
+      } else {
+        handleError(compileResult.error, pass, fn.node.loc ?? null);
+      }
       return null;
     }
-    return retryResult;
-  } catch (err) {
-    // TODO: we might want to log error here, but this will also result in duplicate logging
-    if (err instanceof CompilerError) {
-      programContext.retryErrors.push({fn, error: err});
+
+    pass.opts.logger?.logEvent(pass.filename, {
+      kind: 'CompileSuccess',
+      fnLoc: fn.node.loc ?? null,
+      fnName: compileResult.compiledFn.id?.name ?? null,
+      memoSlots: compileResult.compiledFn.memoSlotsUsed,
+      memoBlocks: compileResult.compiledFn.memoBlocks,
+      memoValues: compileResult.compiledFn.memoValues,
+      prunedMemoBlocks: compileResult.compiledFn.prunedMemoBlocks,
+      prunedMemoValues: compileResult.compiledFn.prunedMemoValues,
+    });
+
+    /**
+     * Always compile functions with opt in directives.
+     */
+    if (optInDirectives.length > 0) {
+      return compileResult.compiledFn;
+    } else if (pass.opts.compilationMode === 'annotation') {
+      /**
+       * No opt-in directive in annotation mode, so don't insert the compiled function.
+       */
+      return null;
+    }
+
+    /**
+     * Otherwise if 'use no forget/memo' is present, we still run the code through the compiler
+     * for validation but we don't mutate the babel AST. This allows us to flag if there is an
+     * unused 'use no forget/memo' directive.
+     */
+    if (pass.opts.ignoreUseNoForget === false && optOutDirectives.length > 0) {
+      for (const directive of optOutDirectives) {
+        pass.opts.logger?.logEvent(pass.filename, {
+          kind: 'CompileSkip',
+          fnLoc: fn.node.body.loc ?? null,
+          reason: `Skipped due to '${directive.value.value}' directive.`,
+          loc: directive.loc ?? null,
+        });
+      }
+      return null;
+    }
+
+    if (!pass.opts.noEmit) {
+      return compileResult.compiledFn;
     }
     return null;
-  }
-}
+  };
 
-/**
- * Applies React Compiler generated functions to the babel AST by replacing
- * existing functions in place or inserting new declarations.
- */
-function applyCompiledFunctions(
-  program: NodePath<t.Program>,
-  compiledFns: Array<CompileResult>,
-  pass: CompilerPass,
-  programContext: ProgramContext,
-): void {
-  const referencedBeforeDeclared =
-    pass.opts.gating != null
-      ? getFunctionReferencedBeforeDeclarationAtTopLevel(program, compiledFns)
-      : null;
+  while (queue.length !== 0) {
+    const current = queue.shift()!;
+    const compiled = processFn(current.fn, current.fnType);
+    if (compiled === null) {
+      continue;
+    }
+    for (const outlined of compiled.outlined) {
+      CompilerError.invariant(outlined.fn.outlined.length === 0, {
+        reason: 'Unexpected nested outlined functions',
+        loc: outlined.fn.loc,
+      });
+      const fn = insertNewOutlinedFunctionNode(
+        program,
+        current.fn,
+        outlined.fn,
+      );
+      fn.skip();
+      ALREADY_COMPILED.add(fn.node);
+      if (outlined.type !== null) {
+        queue.push({
+          kind: 'outlined',
+          fn,
+          fnType: outlined.type,
+        });
+      }
+    }
+    compiledFns.push({
+      kind: current.kind,
+      compiledFn: compiled,
+      originalFn: current.fn,
+    });
+  }
+
+  /**
+   * Do not modify source if there is a module scope level opt out directive.
+   */
+  const moduleScopeOptOutDirectives = findDirectiveDisablingMemoization(
+    program.node.directives,
+  );
+  if (moduleScopeOptOutDirectives.length > 0) {
+    return;
+  }
+
+  if (pass.opts.gating != null) {
+    const error = checkFunctionReferencedBeforeDeclarationAtTopLevel(
+      program,
+      compiledFns.map(result => {
+        return result.originalFn;
+      }),
+    );
+    if (error) {
+      handleError(error, pass, null);
+      return;
+    }
+  }
+
+  const hasLoweredContextAccess = compiledFns.some(
+    c => c.compiledFn.hasLoweredContextAccess,
+  );
+  const externalFunctions: Array<ExternalFunction> = [];
+  let gating: null | ExternalFunction = null;
+  try {
+    // TODO: check for duplicate import specifiers
+    if (pass.opts.gating != null) {
+      gating = tryParseExternalFunction(pass.opts.gating);
+      externalFunctions.push(gating);
+    }
+
+    const lowerContextAccess = environment.lowerContextAccess;
+    if (lowerContextAccess && hasLoweredContextAccess) {
+      externalFunctions.push(lowerContextAccess);
+    }
+
+    const enableEmitInstrumentForget = environment.enableEmitInstrumentForget;
+    if (enableEmitInstrumentForget != null) {
+      externalFunctions.push(enableEmitInstrumentForget.fn);
+      if (enableEmitInstrumentForget.gating != null) {
+        externalFunctions.push(enableEmitInstrumentForget.gating);
+      }
+    }
+
+    if (environment.enableEmitFreeze != null) {
+      externalFunctions.push(environment.enableEmitFreeze);
+    }
+
+    if (environment.enableEmitHookGuards != null) {
+      externalFunctions.push(environment.enableEmitHookGuards);
+    }
+
+    if (environment.enableChangeDetectionForDebugging != null) {
+      externalFunctions.push(environment.enableChangeDetectionForDebugging);
+    }
+
+    const hasFireRewrite = compiledFns.some(c => c.compiledFn.hasFireRewrite);
+    if (environment.enableFire && hasFireRewrite) {
+      externalFunctions.push({
+        source: getReactCompilerRuntimeModule(pass.opts),
+        importSpecifierName: 'useFire',
+      });
+    }
+  } catch (err) {
+    handleError(err, pass, null);
+    return;
+  }
+
+  /*
+   * Only insert Forget-ified functions if we have not encountered a critical
+   * error elsewhere in the file, regardless of bailout mode.
+   */
   for (const result of compiledFns) {
     const {kind, originalFn, compiledFn} = result;
     const transformedFn = createNewFunctionNode(originalFn, compiledFn);
-    programContext.alreadyCompiled.add(transformedFn);
 
-    if (referencedBeforeDeclared != null && kind === 'original') {
-      CompilerError.invariant(pass.opts.gating != null, {
-        reason: "Expected 'gating' import to be present",
-        loc: null,
-      });
-      insertGatedFunctionDeclaration(
-        originalFn,
-        transformedFn,
-        programContext,
-        pass.opts.gating,
-        referencedBeforeDeclared.has(result),
-      );
+    if (gating != null && kind === 'original') {
+      insertGatedFunctionDeclaration(originalFn, transformedFn, gating);
     } else {
       originalFn.replaceWith(transformedFn);
     }
@@ -687,7 +621,22 @@ function applyCompiledFunctions(
 
   // Forget compiled the component, we need to update existing imports of useMemoCache
   if (compiledFns.length > 0) {
-    addImportsToProgram(program, programContext);
+    let needsMemoCacheFunctionImport = false;
+    for (const fn of compiledFns) {
+      if (fn.compiledFn.memoSlotsUsed > 0) {
+        needsMemoCacheFunctionImport = true;
+        break;
+      }
+    }
+
+    if (needsMemoCacheFunctionImport) {
+      updateMemoCacheFunctionImport(
+        program,
+        getReactCompilerRuntimeModule(pass.opts),
+        useMemoCacheIdentifier.name,
+      );
+    }
+    addImportsToProgram(program, externalFunctions);
   }
 }
 
@@ -719,7 +668,7 @@ function shouldSkipCompilation(
   if (
     hasMemoCacheFunctionImport(
       program,
-      getReactCompilerRuntimeModule(pass.opts.target),
+      getReactCompilerRuntimeModule(pass.opts),
     )
   ) {
     return true;
@@ -730,10 +679,14 @@ function shouldSkipCompilation(
 function getReactFunctionType(
   fn: BabelFn,
   pass: CompilerPass,
+  /**
+   * TODO(mofeiZ): remove once we validate PluginOptions with Zod
+   */
+  environment: EnvironmentConfig,
 ): ReactFunctionType | null {
-  const hookPattern = pass.opts.environment.hookPattern;
+  const hookPattern = environment.hookPattern;
   if (fn.node.body.type === 'BlockStatement') {
-    if (findDirectiveEnablingMemoization(fn.node.body.directives) != null)
+    if (findDirectiveEnablingMemoization(fn.node.body.directives).length > 0)
       return getComponentOrHookLike(fn, hookPattern) ?? 'Other';
   }
 
@@ -1040,39 +993,31 @@ function callsHooksOrCreatesJsx(
   return invokesHooks || createsJsx;
 }
 
-function isNonNode(node?: t.Expression | null): boolean {
-  if (!node) {
-    return true;
-  }
-  switch (node.type) {
-    case 'ObjectExpression':
-    case 'ArrowFunctionExpression':
-    case 'FunctionExpression':
-    case 'BigIntLiteral':
-    case 'ClassExpression':
-    case 'NewExpression': // technically `new Array()` is legit, but unlikely
-      return true;
-  }
-  return false;
-}
-
 function returnsNonNode(
   node: NodePath<
     t.FunctionDeclaration | t.ArrowFunctionExpression | t.FunctionExpression
   >,
 ): boolean {
+  let hasReturn = false;
   let returnsNonNode = false;
-  if (
-    // node.traverse#ArrowFunctionExpression isn't called for the root node
-    node.type === 'ArrowFunctionExpression' &&
-    node.node.body.type !== 'BlockStatement'
-  ) {
-    returnsNonNode = isNonNode(node.node.body);
-  }
 
   node.traverse({
     ReturnStatement(ret) {
-      returnsNonNode = isNonNode(ret.node.argument);
+      hasReturn = true;
+      const argument = ret.node.argument;
+      if (argument == null) {
+        returnsNonNode = true;
+      } else {
+        switch (argument.type) {
+          case 'ObjectExpression':
+          case 'ArrowFunctionExpression':
+          case 'FunctionExpression':
+          case 'BigIntLiteral':
+          case 'ClassExpression':
+          case 'NewExpression': // technically `new Array()` is legit, but unlikely
+            returnsNonNode = true;
+        }
+      }
     },
     // Skip traversing all nested functions and their return statements
     ArrowFunctionExpression: skipNestedFunctions(node),
@@ -1081,7 +1026,7 @@ function returnsNonNode(
     ObjectMethod: node => node.skip(),
   });
 
-  return returnsNonNode;
+  return !hasReturn || returnsNonNode;
 }
 
 /*
@@ -1148,23 +1093,20 @@ function getFunctionName(
   }
 }
 
-function getFunctionReferencedBeforeDeclarationAtTopLevel(
+function checkFunctionReferencedBeforeDeclarationAtTopLevel(
   program: NodePath<t.Program>,
-  fns: Array<CompileResult>,
-): Set<CompileResult> {
-  const fnNames = new Map<string, {id: t.Identifier; fn: CompileResult}>(
+  fns: Array<BabelFn>,
+): CompilerError | null {
+  const fnIds = new Set(
     fns
-      .map<[NodePath<t.Expression> | null, CompileResult]>(fn => [
-        getFunctionName(fn.originalFn),
-        fn,
-      ])
+      .map(fn => getFunctionName(fn))
       .filter(
-        (entry): entry is [NodePath<t.Identifier>, CompileResult] =>
-          !!entry[0] && entry[0].isIdentifier(),
+        (name): name is NodePath<t.Identifier> => !!name && name.isIdentifier(),
       )
-      .map(entry => [entry[0].node.name, {id: entry[0].node, fn: entry[1]}]),
+      .map(name => name.node),
   );
-  const referencedBeforeDeclaration = new Set<CompileResult>();
+  const fnNames = new Map([...fnIds].map(id => [id.name, id]));
+  const errors = new CompilerError();
 
   program.traverse({
     TypeAnnotation(path) {
@@ -1190,7 +1132,8 @@ function getFunctionReferencedBeforeDeclarationAtTopLevel(
        * We've reached the declaration, hoisting is no longer possible, stop
        * checking for this component name.
        */
-      if (id.node === fn.id) {
+      if (fnIds.has(id.node)) {
+        fnIds.delete(id.node);
         fnNames.delete(id.node.name);
         return;
       }
@@ -1200,27 +1143,33 @@ function getFunctionReferencedBeforeDeclarationAtTopLevel(
        * A null scope means there's no function scope, which means we're at the
        * top level scope.
        */
-      if (scope === null && id.isReferencedIdentifier()) {
-        referencedBeforeDeclaration.add(fn.fn);
+      if (scope === null) {
+        errors.pushErrorDetail(
+          new CompilerErrorDetail({
+            reason: `Encountered a function used before its declaration, which breaks Forget's gating codegen due to hoisting`,
+            description: `Rewrite the reference to ${fn.name} to not rely on hoisting to fix this issue`,
+            loc: fn.loc ?? null,
+            suggestions: null,
+            severity: ErrorSeverity.Invariant,
+          }),
+        );
       }
     },
   });
 
-  return referencedBeforeDeclaration;
+  return errors.details.length > 0 ? errors : null;
 }
 
-export function getReactCompilerRuntimeModule(
-  target: CompilerReactTarget,
-): string {
-  if (target === '19') {
+function getReactCompilerRuntimeModule(opts: PluginOptions): string {
+  if (opts.target === '19') {
     return 'react/compiler-runtime'; // from react namespace
-  } else if (target === '17' || target === '18') {
+  } else if (opts.target === '17' || opts.target === '18') {
     return 'react-compiler-runtime'; // npm package
   } else {
     CompilerError.invariant(
-      target != null &&
-        target.kind === 'donotuse_meta_internal' &&
-        typeof target.runtimeModule === 'string',
+      opts.target != null &&
+        opts.target.kind === 'donotuse_meta_internal' &&
+        typeof opts.target.runtimeModule === 'string',
       {
         reason: 'Expected target to already be validated',
         description: null,
@@ -1228,6 +1177,6 @@ export function getReactCompilerRuntimeModule(
         suggestions: null,
       },
     );
-    return target.runtimeModule;
+    return opts.target.runtimeModule;
   }
 }

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/Reanimated.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import type * as BabelCore from '@babel/core';
 import {hasOwnProperty} from '../Utils/utils';
 import {PluginOptions} from './Options';

compiler/packages/babel-plugin-react-compiler/src/Entrypoint/ValidateNoUntransformedReferences.ts

@@ -1,290 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import {NodePath} from '@babel/core';
-import * as t from '@babel/types';
-
-import {
-  CompilerError,
-  CompilerErrorDetailOptions,
-  EnvironmentConfig,
-  ErrorSeverity,
-  Logger,
-} from '..';
-import {getOrInsertWith} from '../Utils/utils';
-import {Environment} from '../HIR';
-import {DEFAULT_EXPORT} from '../HIR/Environment';
-import {CompileProgramMetadata} from './Program';
-
-function throwInvalidReact(
-  options: Omit<CompilerErrorDetailOptions, 'severity'>,
-  {logger, filename}: TraversalState,
-): never {
-  const detail: CompilerErrorDetailOptions = {
-    ...options,
-    severity: ErrorSeverity.InvalidReact,
-  };
-  logger?.logEvent(filename, {
-    kind: 'CompileError',
-    fnLoc: null,
-    detail,
-  });
-  CompilerError.throw(detail);
-}
-function assertValidEffectImportReference(
-  numArgs: number,
-  paths: Array<NodePath<t.Node>>,
-  context: TraversalState,
-): void {
-  for (const path of paths) {
-    const parent = path.parentPath;
-    if (parent != null && parent.isCallExpression()) {
-      const args = parent.get('arguments');
-      const maybeCalleeLoc = path.node.loc;
-      const hasInferredEffect =
-        maybeCalleeLoc != null &&
-        context.inferredEffectLocations.has(maybeCalleeLoc);
-      /**
-       * Only error on untransformed references of the form `useMyEffect(...)`
-       * or `moduleNamespace.useMyEffect(...)`, with matching argument counts.
-       * TODO: do we also want a mode to also hard error on non-call references?
-       */
-      if (args.length === numArgs && !hasInferredEffect) {
-        const maybeErrorDiagnostic = matchCompilerDiagnostic(
-          path,
-          context.transformErrors,
-        );
-        /**
-         * Note that we cannot easily check the type of the first argument here,
-         * as it may have already been transformed by the compiler (and not
-         * memoized).
-         */
-        throwInvalidReact(
-          {
-            reason:
-              '[InferEffectDependencies] React Compiler is unable to infer dependencies of this effect. ' +
-              'This will break your build! ' +
-              'To resolve, either pass your own dependency array or fix reported compiler bailout diagnostics.',
-            description: maybeErrorDiagnostic
-              ? `(Bailout reason: ${maybeErrorDiagnostic})`
-              : null,
-            loc: parent.node.loc ?? null,
-          },
-          context,
-        );
-      }
-    }
-  }
-}
-
-function assertValidFireImportReference(
-  paths: Array<NodePath<t.Node>>,
-  context: TraversalState,
-): void {
-  if (paths.length > 0) {
-    const maybeErrorDiagnostic = matchCompilerDiagnostic(
-      paths[0],
-      context.transformErrors,
-    );
-    throwInvalidReact(
-      {
-        reason:
-          '[Fire] Untransformed reference to compiler-required feature. ' +
-          'Either remove this `fire` call or ensure it is successfully transformed by the compiler',
-        description: maybeErrorDiagnostic
-          ? `(Bailout reason: ${maybeErrorDiagnostic})`
-          : null,
-        loc: paths[0].node.loc ?? null,
-      },
-      context,
-    );
-  }
-}
-export default function validateNoUntransformedReferences(
-  path: NodePath<t.Program>,
-  filename: string | null,
-  logger: Logger | null,
-  env: EnvironmentConfig,
-  compileResult: CompileProgramMetadata | null,
-): void {
-  const moduleLoadChecks = new Map<
-    string,
-    Map<string, CheckInvalidReferenceFn>
-  >();
-  if (env.enableFire) {
-    /**
-     * Error on any untransformed references to `fire` (e.g. including non-call
-     * expressions)
-     */
-    for (const module of Environment.knownReactModules) {
-      const react = getOrInsertWith(moduleLoadChecks, module, () => new Map());
-      react.set('fire', assertValidFireImportReference);
-    }
-  }
-  if (env.inferEffectDependencies) {
-    for (const {
-      function: {source, importSpecifierName},
-      numRequiredArgs,
-    } of env.inferEffectDependencies) {
-      const module = getOrInsertWith(moduleLoadChecks, source, () => new Map());
-      module.set(
-        importSpecifierName,
-        assertValidEffectImportReference.bind(null, numRequiredArgs),
-      );
-    }
-  }
-  if (moduleLoadChecks.size > 0) {
-    transformProgram(path, moduleLoadChecks, filename, logger, compileResult);
-  }
-}
-
-type TraversalState = {
-  shouldInvalidateScopes: boolean;
-  program: NodePath<t.Program>;
-  logger: Logger | null;
-  filename: string | null;
-  transformErrors: Array<{fn: NodePath<t.Node>; error: CompilerError}>;
-  inferredEffectLocations: Set<t.SourceLocation>;
-};
-type CheckInvalidReferenceFn = (
-  paths: Array<NodePath<t.Node>>,
-  context: TraversalState,
-) => void;
-
-function validateImportSpecifier(
-  specifier: NodePath<t.ImportSpecifier>,
-  importSpecifierChecks: Map<string, CheckInvalidReferenceFn>,
-  state: TraversalState,
-): void {
-  const imported = specifier.get('imported');
-  const specifierName: string =
-    imported.node.type === 'Identifier'
-      ? imported.node.name
-      : imported.node.value;
-  const checkFn = importSpecifierChecks.get(specifierName);
-  if (checkFn == null) {
-    return;
-  }
-  if (state.shouldInvalidateScopes) {
-    state.shouldInvalidateScopes = false;
-    state.program.scope.crawl();
-  }
-
-  const local = specifier.get('local');
-  const binding = local.scope.getBinding(local.node.name);
-  CompilerError.invariant(binding != null, {
-    reason: 'Expected binding to be found for import specifier',
-    loc: local.node.loc ?? null,
-  });
-  checkFn(binding.referencePaths, state);
-}
-
-function validateNamespacedImport(
-  specifier: NodePath<t.ImportNamespaceSpecifier | t.ImportDefaultSpecifier>,
-  importSpecifierChecks: Map<string, CheckInvalidReferenceFn>,
-  state: TraversalState,
-): void {
-  if (state.shouldInvalidateScopes) {
-    state.shouldInvalidateScopes = false;
-    state.program.scope.crawl();
-  }
-  const local = specifier.get('local');
-  const binding = local.scope.getBinding(local.node.name);
-  const defaultCheckFn = importSpecifierChecks.get(DEFAULT_EXPORT);
-
-  CompilerError.invariant(binding != null, {
-    reason: 'Expected binding to be found for import specifier',
-    loc: local.node.loc ?? null,
-  });
-  const filteredReferences = new Map<
-    CheckInvalidReferenceFn,
-    Array<NodePath<t.Node>>
-  >();
-  for (const reference of binding.referencePaths) {
-    if (defaultCheckFn != null) {
-      getOrInsertWith(filteredReferences, defaultCheckFn, () => []).push(
-        reference,
-      );
-    }
-    const parent = reference.parentPath;
-    if (
-      parent != null &&
-      parent.isMemberExpression() &&
-      parent.get('object') === reference
-    ) {
-      if (parent.node.computed || parent.node.property.type !== 'Identifier') {
-        continue;
-      }
-      const checkFn = importSpecifierChecks.get(parent.node.property.name);
-      if (checkFn != null) {
-        getOrInsertWith(filteredReferences, checkFn, () => []).push(parent);
-      }
-    }
-  }
-
-  for (const [checkFn, references] of filteredReferences) {
-    checkFn(references, state);
-  }
-}
-function transformProgram(
-  path: NodePath<t.Program>,
-
-  moduleLoadChecks: Map<string, Map<string, CheckInvalidReferenceFn>>,
-  filename: string | null,
-  logger: Logger | null,
-  compileResult: CompileProgramMetadata | null,
-): void {
-  const traversalState: TraversalState = {
-    shouldInvalidateScopes: true,
-    program: path,
-    filename,
-    logger,
-    transformErrors: compileResult?.retryErrors ?? [],
-    inferredEffectLocations:
-      compileResult?.inferredEffectLocations ?? new Set(),
-  };
-  path.traverse({
-    ImportDeclaration(path: NodePath<t.ImportDeclaration>) {
-      const importSpecifierChecks = moduleLoadChecks.get(
-        path.node.source.value,
-      );
-      if (importSpecifierChecks == null) {
-        return;
-      }
-      const specifiers = path.get('specifiers');
-      for (const specifier of specifiers) {
-        if (specifier.isImportSpecifier()) {
-          validateImportSpecifier(
-            specifier,
-            importSpecifierChecks,
-            traversalState,
-          );
-        } else {
-          validateNamespacedImport(
-            specifier as NodePath<
-              t.ImportNamespaceSpecifier | t.ImportDefaultSpecifier
-            >,
-            importSpecifierChecks,
-            traversalState,
-          );
-        }
-      }
-    },
-  });
-}
-
-function matchCompilerDiagnostic(
-  badReference: NodePath<t.Node>,
-  transformErrors: Array<{fn: NodePath<t.Node>; error: CompilerError}>,
-): string | null {
-  for (const {fn, error} of transformErrors) {
-    if (fn.isAncestor(badReference)) {
-      return error.toString();
-    }
-  }
-  return null;
-}

compiler/packages/babel-plugin-react-compiler/src/HIR/AssertValidBlockNesting.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {CompilerError} from '..';
 import {
   BlockId,

compiler/packages/babel-plugin-react-compiler/src/HIR/BuildHIR.ts

@@ -1455,11 +1455,6 @@ function lowerObjectPropertyKey(
       kind: 'identifier',
       name: key.node.name,
     };
-  } else if (key.isNumericLiteral()) {
-    return {
-      kind: 'identifier',
-      name: String(key.node.value),
-    };
   }
 
   builder.errors.push({
@@ -2406,19 +2401,6 @@ function lowerExpression(
         kind: 'TypeCastExpression',
         value: lowerExpressionToTemporary(builder, expr.get('expression')),
         typeAnnotation: typeAnnotation.node,
-        typeAnnotationKind: 'cast',
-        type: lowerType(typeAnnotation.node),
-        loc: exprLoc,
-      };
-    }
-    case 'TSSatisfiesExpression': {
-      let expr = exprPath as NodePath<t.TSSatisfiesExpression>;
-      const typeAnnotation = expr.get('typeAnnotation');
-      return {
-        kind: 'TypeCastExpression',
-        value: lowerExpressionToTemporary(builder, expr.get('expression')),
-        typeAnnotation: typeAnnotation.node,
-        typeAnnotationKind: 'satisfies',
         type: lowerType(typeAnnotation.node),
         loc: exprLoc,
       };
@@ -2430,7 +2412,6 @@ function lowerExpression(
         kind: 'TypeCastExpression',
         value: lowerExpressionToTemporary(builder, expr.get('expression')),
         typeAnnotation: typeAnnotation.node,
-        typeAnnotationKind: 'as',
         type: lowerType(typeAnnotation.node),
         loc: exprLoc,
       };
@@ -3609,40 +3590,31 @@ function lowerAssignment(
 
       let temporary;
       if (builder.isContextIdentifier(lvalue)) {
-        if (kind === InstructionKind.Const && !isHoistedIdentifier) {
-          builder.errors.push({
-            reason: `Expected \`const\` declaration not to be reassigned`,
-            severity: ErrorSeverity.InvalidJS,
-            loc: lvalue.node.loc ?? null,
-            suggestions: null,
+        if (kind !== InstructionKind.Reassign && !isHoistedIdentifier) {
+          if (kind === InstructionKind.Const) {
+            builder.errors.push({
+              reason: `Expected \`const\` declaration not to be reassigned`,
+              severity: ErrorSeverity.InvalidJS,
+              loc: lvalue.node.loc ?? null,
+              suggestions: null,
+            });
+          }
+          lowerValueToTemporary(builder, {
+            kind: 'DeclareContext',
+            lvalue: {
+              kind: InstructionKind.Let,
+              place: {...place},
+            },
+            loc: place.loc,
           });
         }
 
-        if (
-          kind !== InstructionKind.Const &&
-          kind !== InstructionKind.Reassign &&
-          kind !== InstructionKind.Let &&
-          kind !== InstructionKind.Function
-        ) {
-          builder.errors.push({
-            reason: `Unexpected context variable kind`,
-            severity: ErrorSeverity.InvalidJS,
-            loc: lvalue.node.loc ?? null,
-            suggestions: null,
-          });
-          temporary = lowerValueToTemporary(builder, {
-            kind: 'UnsupportedNode',
-            node: lvalueNode,
-            loc: lvalueNode.loc ?? GeneratedSource,
-          });
-        } else {
-          temporary = lowerValueToTemporary(builder, {
-            kind: 'StoreContext',
-            lvalue: {place: {...place}, kind},
-            value,
-            loc,
-          });
-        }
+        temporary = lowerValueToTemporary(builder, {
+          kind: 'StoreContext',
+          lvalue: {place: {...place}, kind: InstructionKind.Reassign},
+          value,
+          loc,
+        });
       } else {
         const typeAnnotation = lvalue.get('typeAnnotation');
         let type: t.FlowType | t.TSType | null;

compiler/packages/babel-plugin-react-compiler/src/HIR/BuildReactiveScopeTerminalsHIR.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {CompilerError} from '../CompilerError';
 import {getScopes, recursivelyTraverseItems} from './AssertValidBlockNesting';
 import {Environment} from './Environment';

compiler/packages/babel-plugin-react-compiler/src/HIR/CollectHoistablePropertyLoads.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {CompilerError} from '../CompilerError';
 import {inRange} from '../ReactiveScopes/InferReactiveScopeVariables';
 import {printDependency} from '../ReactiveScopes/PrintReactiveFunction';
@@ -19,19 +12,15 @@ import {
   BasicBlock,
   BlockId,
   DependencyPathEntry,
-  FunctionExpression,
   GeneratedSource,
-  getHookKind,
   HIRFunction,
   Identifier,
   IdentifierId,
   InstructionId,
   InstructionValue,
-  LoweredFunction,
   PropertyLiteral,
   ReactiveScopeDependency,
   ScopeId,
-  TInstruction,
 } from './HIR';
 
 const DEBUG_PRINT = false;
@@ -123,39 +112,9 @@ export function collectHoistablePropertyLoads(
     hoistableFromOptionals,
     registry,
     nestedFnImmutableContext: null,
-    assumedInvokedFns: fn.env.config.enableTreatFunctionDepsAsConditional
-      ? new Set()
-      : getAssumedInvokedFunctions(fn),
   });
 }
 
-export function collectHoistablePropertyLoadsInInnerFn(
-  fnInstr: TInstruction<FunctionExpression>,
-  temporaries: ReadonlyMap<IdentifierId, ReactiveScopeDependency>,
-  hoistableFromOptionals: ReadonlyMap<BlockId, ReactiveScopeDependency>,
-): ReadonlyMap<BlockId, BlockInfo> {
-  const fn = fnInstr.value.loweredFunc.func;
-  const initialContext: CollectHoistablePropertyLoadsContext = {
-    temporaries,
-    knownImmutableIdentifiers: new Set(),
-    hoistableFromOptionals,
-    registry: new PropertyPathRegistry(),
-    nestedFnImmutableContext: null,
-    assumedInvokedFns: fn.env.config.enableTreatFunctionDepsAsConditional
-      ? new Set()
-      : getAssumedInvokedFunctions(fn),
-  };
-  const nestedFnImmutableContext = new Set(
-    fn.context
-      .filter(place =>
-        isImmutableAtInstr(place.identifier, fnInstr.id, initialContext),
-      )
-      .map(place => place.identifier.id),
-  );
-  initialContext.nestedFnImmutableContext = nestedFnImmutableContext;
-  return collectHoistablePropertyLoadsImpl(fn, initialContext);
-}
-
 type CollectHoistablePropertyLoadsContext = {
   temporaries: ReadonlyMap<IdentifierId, ReactiveScopeDependency>;
   knownImmutableIdentifiers: ReadonlySet<IdentifierId>;
@@ -168,11 +127,6 @@ type CollectHoistablePropertyLoadsContext = {
    * but are currently kept separate for readability.
    */
   nestedFnImmutableContext: ReadonlySet<IdentifierId> | null;
-  /**
-   * Functions which are assumed to be eventually called (as opposed to ones which might
-   * not be called, e.g. the 0th argument of Array.map)
-   */
-  assumedInvokedFns: ReadonlySet<LoweredFunction>;
 };
 function collectHoistablePropertyLoadsImpl(
   fn: HIRFunction,
@@ -384,13 +338,7 @@ function collectNonNullsInBlocks(
       context.registry.getOrCreateIdentifier(identifier),
     );
   }
-  const nodes = new Map<
-    BlockId,
-    {
-      block: BasicBlock;
-      assumedNonNullObjects: Set<PropertyPathNode>;
-    }
-  >();
+  const nodes = new Map<BlockId, BlockInfo>();
   for (const [_, block] of fn.body.blocks) {
     const assumedNonNullObjects = new Set<PropertyPathNode>(
       knownNonNullIdentifiers,
@@ -410,30 +358,32 @@ function collectNonNullsInBlocks(
       ) {
         assumedNonNullObjects.add(maybeNonNull);
       }
-      if (instr.value.kind === 'FunctionExpression') {
+      if (
+        (instr.value.kind === 'FunctionExpression' ||
+          instr.value.kind === 'ObjectMethod') &&
+        !fn.env.config.enableTreatFunctionDepsAsConditional
+      ) {
         const innerFn = instr.value.loweredFunc;
-        if (context.assumedInvokedFns.has(innerFn)) {
-          const innerHoistableMap = collectHoistablePropertyLoadsImpl(
-            innerFn.func,
-            {
-              ...context,
-              nestedFnImmutableContext:
-                context.nestedFnImmutableContext ??
-                new Set(
-                  innerFn.func.context
-                    .filter(place =>
-                      isImmutableAtInstr(place.identifier, instr.id, context),
-                    )
-                    .map(place => place.identifier.id),
-                ),
-            },
-          );
-          const innerHoistables = assertNonNull(
-            innerHoistableMap.get(innerFn.func.body.entry),
-          );
-          for (const entry of innerHoistables.assumedNonNullObjects) {
-            assumedNonNullObjects.add(entry);
-          }
+        const innerHoistableMap = collectHoistablePropertyLoadsImpl(
+          innerFn.func,
+          {
+            ...context,
+            nestedFnImmutableContext:
+              context.nestedFnImmutableContext ??
+              new Set(
+                innerFn.func.context
+                  .filter(place =>
+                    isImmutableAtInstr(place.identifier, instr.id, context),
+                  )
+                  .map(place => place.identifier.id),
+              ),
+          },
+        );
+        const innerHoistables = assertNonNull(
+          innerHoistableMap.get(innerFn.func.body.entry),
+        );
+        for (const entry of innerHoistables.assumedNonNullObjects) {
+          assumedNonNullObjects.add(entry);
         }
       }
     }
@@ -641,130 +591,3 @@ function reduceMaybeOptionalChains(
     }
   } while (changed);
 }
-
-function getAssumedInvokedFunctions(
-  fn: HIRFunction,
-  temporaries: Map<
-    IdentifierId,
-    {fn: LoweredFunction; mayInvoke: Set<LoweredFunction>}
-  > = new Map(),
-): ReadonlySet<LoweredFunction> {
-  const hoistableFunctions = new Set<LoweredFunction>();
-  /**
-   * Step 1: Conservatively collect identifier to function expression mappings
-   */
-  for (const block of fn.body.blocks.values()) {
-    for (const {lvalue, value} of block.instructions) {
-      /**
-       * Conservatively only match function expressions which can have guaranteed ssa.
-       * ObjectMethods and ObjectProperties do not.
-       */
-      if (value.kind === 'FunctionExpression') {
-        temporaries.set(lvalue.identifier.id, {
-          fn: value.loweredFunc,
-          mayInvoke: new Set(),
-        });
-      } else if (value.kind === 'StoreLocal') {
-        const lvalue = value.lvalue.place.identifier;
-        const maybeLoweredFunc = temporaries.get(value.value.identifier.id);
-        if (maybeLoweredFunc != null) {
-          temporaries.set(lvalue.id, maybeLoweredFunc);
-        }
-      } else if (value.kind === 'LoadLocal') {
-        const maybeLoweredFunc = temporaries.get(value.place.identifier.id);
-        if (maybeLoweredFunc != null) {
-          temporaries.set(lvalue.identifier.id, maybeLoweredFunc);
-        }
-      }
-    }
-  }
-  /**
-   * Step 2: Forward pass to do analysis of assumed function calls. Note that
-   * this is conservative and does not count indirect references through
-   * containers (e.g. `return {cb: () => {...}})`).
-   */
-  for (const block of fn.body.blocks.values()) {
-    for (const {lvalue, value} of block.instructions) {
-      if (value.kind === 'CallExpression') {
-        const callee = value.callee;
-        const maybeHook = getHookKind(fn.env, callee.identifier);
-        const maybeLoweredFunc = temporaries.get(callee.identifier.id);
-        if (maybeLoweredFunc != null) {
-          // Direct calls
-          hoistableFunctions.add(maybeLoweredFunc.fn);
-        } else if (maybeHook != null) {
-          /**
-           * Assume arguments to all hooks are safe to invoke
-           */
-          for (const arg of value.args) {
-            if (arg.kind === 'Identifier') {
-              const maybeLoweredFunc = temporaries.get(arg.identifier.id);
-              if (maybeLoweredFunc != null) {
-                hoistableFunctions.add(maybeLoweredFunc.fn);
-              }
-            }
-          }
-        }
-      } else if (value.kind === 'JsxExpression') {
-        /**
-         * Assume JSX attributes and children are safe to invoke
-         */
-        for (const attr of value.props) {
-          if (attr.kind === 'JsxSpreadAttribute') {
-            continue;
-          }
-          const maybeLoweredFunc = temporaries.get(attr.place.identifier.id);
-          if (maybeLoweredFunc != null) {
-            hoistableFunctions.add(maybeLoweredFunc.fn);
-          }
-        }
-        for (const child of value.children ?? []) {
-          const maybeLoweredFunc = temporaries.get(child.identifier.id);
-          if (maybeLoweredFunc != null) {
-            hoistableFunctions.add(maybeLoweredFunc.fn);
-          }
-        }
-      } else if (value.kind === 'FunctionExpression') {
-        /**
-         * Recursively traverse into other function expressions which may invoke
-         * or pass already declared functions to react (e.g. as JSXAttributes).
-         *
-         * If lambda A calls lambda B, we assume lambda B is safe to invoke if
-         * lambda A is -- even if lambda B is conditionally called. (see
-         * `conditional-call-chain` fixture for example).
-         */
-        const loweredFunc = value.loweredFunc.func;
-        const lambdasCalled = getAssumedInvokedFunctions(
-          loweredFunc,
-          temporaries,
-        );
-        const maybeLoweredFunc = temporaries.get(lvalue.identifier.id);
-        if (maybeLoweredFunc != null) {
-          for (const called of lambdasCalled) {
-            maybeLoweredFunc.mayInvoke.add(called);
-          }
-        }
-      }
-    }
-    if (block.terminal.kind === 'return') {
-      /**
-       * Assume directly returned functions are safe to call
-       */
-      const maybeLoweredFunc = temporaries.get(
-        block.terminal.value.identifier.id,
-      );
-      if (maybeLoweredFunc != null) {
-        hoistableFunctions.add(maybeLoweredFunc.fn);
-      }
-    }
-  }
-
-  for (const [_, {fn, mayInvoke}] of temporaries) {
-    if (hoistableFunctions.has(fn)) {
-      for (const called of mayInvoke) {
-        hoistableFunctions.add(called);
-      }
-    }
-  }
-  return hoistableFunctions;
-}

compiler/packages/babel-plugin-react-compiler/src/HIR/CollectOptionalChainDependencies.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {CompilerError} from '..';
 import {assertNonNull} from './CollectHoistablePropertyLoads';
 import {

compiler/packages/babel-plugin-react-compiler/src/HIR/Environment.ts

@@ -9,7 +9,13 @@ import * as t from '@babel/types';
 import {ZodError, z} from 'zod';
 import {fromZodError} from 'zod-validation-error';
 import {CompilerError} from '../CompilerError';
-import {Logger, ProgramContext} from '../Entrypoint';
+import {
+  CompilationMode,
+  Logger,
+  PanicThresholdOptions,
+  parsePluginOptions,
+  PluginOptions,
+} from '../Entrypoint';
 import {Err, Ok, Result} from '../Utils/Result';
 import {
   DEFAULT_GLOBALS,
@@ -78,8 +84,6 @@ export const InstrumentationSchema = z
   );
 
 export type ExternalFunction = z.infer<typeof ExternalFunctionSchema>;
-export const USE_FIRE_FUNCTION_NAME = 'useFire';
-export const EMIT_FREEZE_GLOBAL_GATING = '__DEV__';
 
 export const MacroMethodSchema = z.union([
   z.object({type: z.literal('wildcard')}),
@@ -92,8 +96,6 @@ export const MacroSchema = z.union([
   z.tuple([z.string(), z.array(MacroMethodSchema)]),
 ]);
 
-export type CompilerMode = 'all_features' | 'no_inferred_memo';
-
 export type Macro = z.infer<typeof MacroSchema>;
 export type MacroMethod = z.infer<typeof MacroMethodSchema>;
 
@@ -150,7 +152,7 @@ export type Hook = z.infer<typeof HookSchema>;
  *   missing some recursive Object / Function shapeIds
  */
 
-export const EnvironmentConfigSchema = z.object({
+const EnvironmentConfigSchema = z.object({
   customHooks: z.map(z.string(), HookSchema).default(new Map()),
 
   /**
@@ -326,11 +328,6 @@ export const EnvironmentConfigSchema = z.object({
    */
   validateNoJSXInTryStatements: z.boolean().default(false),
 
-  /**
-   * Validates against dynamically creating components during render.
-   */
-  validateStaticComponents: z.boolean().default(false),
-
   /**
    * Validates that the dependencies of all effect hooks are memoized. This helps ensure
    * that Forget does not introduce infinite renders caused by a dependency changing,
@@ -359,11 +356,6 @@ export const EnvironmentConfigSchema = z.object({
    */
   validateNoImpureFunctionsInRender: z.boolean().default(false),
 
-  /**
-   * Validate against passing mutable functions to hooks
-   */
-  validateNoFreezingKnownMutableFunctions: z.boolean().default(false),
-
   /*
    * When enabled, the compiler assumes that hooks follow the Rules of React:
    * - Hooks may memoize computation based on any of their parameters, thus
@@ -558,6 +550,8 @@ export const EnvironmentConfigSchema = z.object({
    */
   disableMemoizationForDebugging: z.boolean().default(false),
 
+  enableMinimalTransformsForRetry: z.boolean().default(false),
+
   /**
    * When true, rather using memoized values, the compiler will always re-compute
    * values, and then use a heuristic to compare the memoized value to the newly
@@ -632,6 +626,196 @@ export const EnvironmentConfigSchema = z.object({
 
 export type EnvironmentConfig = z.infer<typeof EnvironmentConfigSchema>;
 
+export const MINIMAL_RETRY_CONFIG: PartialEnvironmentConfig = {
+  validateHooksUsage: false,
+  validateRefAccessDuringRender: false,
+  validateNoSetStateInRender: false,
+  validateNoSetStateInPassiveEffects: false,
+  validateNoJSXInTryStatements: false,
+  validateMemoizedEffectDependencies: false,
+  validateNoCapitalizedCalls: null,
+  validateBlocklistedImports: null,
+  enableMinimalTransformsForRetry: true,
+};
+/**
+ * For test fixtures and playground only.
+ *
+ * Pragmas are straightforward to parse for boolean options (`:true` and
+ * `:false`). These are 'enabled' config values for non-boolean configs (i.e.
+ * what is used when parsing `:true`).
+ */
+const testComplexConfigDefaults: PartialEnvironmentConfig = {
+  validateNoCapitalizedCalls: [],
+  enableChangeDetectionForDebugging: {
+    source: 'react-compiler-runtime',
+    importSpecifierName: '$structuralCheck',
+  },
+  enableEmitFreeze: {
+    source: 'react-compiler-runtime',
+    importSpecifierName: 'makeReadOnly',
+  },
+  enableEmitInstrumentForget: {
+    fn: {
+      source: 'react-compiler-runtime',
+      importSpecifierName: 'useRenderCounter',
+    },
+    gating: {
+      source: 'react-compiler-runtime',
+      importSpecifierName: 'shouldInstrument',
+    },
+    globalGating: '__DEV__',
+  },
+  enableEmitHookGuards: {
+    source: 'react-compiler-runtime',
+    importSpecifierName: '$dispatcherGuard',
+  },
+  inlineJsxTransform: {
+    elementSymbol: 'react.transitional.element',
+    globalDevVar: 'DEV',
+  },
+  lowerContextAccess: {
+    source: 'react-compiler-runtime',
+    importSpecifierName: 'useContext_withSelector',
+  },
+  inferEffectDependencies: [
+    {
+      function: {
+        source: 'react',
+        importSpecifierName: 'useEffect',
+      },
+      numRequiredArgs: 1,
+    },
+    {
+      function: {
+        source: 'shared-runtime',
+        importSpecifierName: 'useSpecialEffect',
+      },
+      numRequiredArgs: 2,
+    },
+    {
+      function: {
+        source: 'useEffectWrapper',
+        importSpecifierName: 'default',
+      },
+      numRequiredArgs: 1,
+    },
+  ],
+};
+
+/**
+ * For snap test fixtures and playground only.
+ */
+function parseConfigPragmaEnvironmentForTest(
+  pragma: string,
+): EnvironmentConfig {
+  const maybeConfig: any = {};
+  // Get the defaults to programmatically check for boolean properties
+  const defaultConfig = EnvironmentConfigSchema.parse({});
+
+  for (const token of pragma.split(' ')) {
+    if (!token.startsWith('@')) {
+      continue;
+    }
+    const keyVal = token.slice(1);
+    let [key, val = undefined] = keyVal.split(':');
+    const isSet = val === undefined || val === 'true';
+
+    if (isSet && key in testComplexConfigDefaults) {
+      maybeConfig[key] =
+        testComplexConfigDefaults[key as keyof PartialEnvironmentConfig];
+      continue;
+    }
+
+    if (key === 'customMacros' && val) {
+      const valSplit = val.split('.');
+      if (valSplit.length > 0) {
+        const props = [];
+        for (const elt of valSplit.slice(1)) {
+          if (elt === '*') {
+            props.push({type: 'wildcard'});
+          } else if (elt.length > 0) {
+            props.push({type: 'name', name: elt});
+          }
+        }
+        maybeConfig[key] = [[valSplit[0], props]];
+      }
+      continue;
+    }
+
+    if (
+      key !== 'enableResetCacheOnSourceFileChanges' &&
+      typeof defaultConfig[key as keyof EnvironmentConfig] !== 'boolean'
+    ) {
+      // skip parsing non-boolean properties
+      continue;
+    }
+    if (val === undefined || val === 'true') {
+      maybeConfig[key] = true;
+    } else {
+      maybeConfig[key] = false;
+    }
+  }
+  const config = EnvironmentConfigSchema.safeParse(maybeConfig);
+  if (config.success) {
+    /**
+     * Unless explicitly enabled, do not insert HMR handling code
+     * in test fixtures or playground to reduce visual noise.
+     */
+    if (config.data.enableResetCacheOnSourceFileChanges == null) {
+      config.data.enableResetCacheOnSourceFileChanges = false;
+    }
+    return config.data;
+  }
+  CompilerError.invariant(false, {
+    reason: 'Internal error, could not parse config from pragma string',
+    description: `${fromZodError(config.error)}`,
+    loc: null,
+    suggestions: null,
+  });
+}
+export function parseConfigPragmaForTests(
+  pragma: string,
+  defaults: {
+    compilationMode: CompilationMode;
+  },
+): PluginOptions {
+  const environment = parseConfigPragmaEnvironmentForTest(pragma);
+  let compilationMode: CompilationMode = defaults.compilationMode;
+  let panicThreshold: PanicThresholdOptions = 'all_errors';
+  for (const token of pragma.split(' ')) {
+    if (!token.startsWith('@')) {
+      continue;
+    }
+    switch (token) {
+      case '@compilationMode(annotation)': {
+        compilationMode = 'annotation';
+        break;
+      }
+      case '@compilationMode(infer)': {
+        compilationMode = 'infer';
+        break;
+      }
+      case '@compilationMode(all)': {
+        compilationMode = 'all';
+        break;
+      }
+      case '@compilationMode(syntax)': {
+        compilationMode = 'syntax';
+        break;
+      }
+      case '@panicThreshold(none)': {
+        panicThreshold = 'none';
+        break;
+      }
+    }
+  }
+  return parsePluginOptions({
+    environment,
+    compilationMode,
+    panicThreshold,
+  });
+}
+
 export type PartialEnvironmentConfig = Partial<EnvironmentConfig>;
 
 export type ReactFunctionType = 'Component' | 'Hook' | 'Other';
@@ -667,11 +851,9 @@ export class Environment {
   code: string | null;
   config: EnvironmentConfig;
   fnType: ReactFunctionType;
-  compilerMode: CompilerMode;
-  programContext: ProgramContext;
+  useMemoCacheIdentifier: string;
+  hasLoweredContextAccess: boolean;
   hasFireRewrite: boolean;
-  hasInferredEffect: boolean;
-  inferredEffectLocations: Set<SourceLocation> = new Set();
 
   #contextIdentifiers: Set<t.Identifier>;
   #hoistedIdentifiers: Set<t.Identifier>;
@@ -679,26 +861,24 @@ export class Environment {
   constructor(
     scope: BabelScope,
     fnType: ReactFunctionType,
-    compilerMode: CompilerMode,
     config: EnvironmentConfig,
     contextIdentifiers: Set<t.Identifier>,
     logger: Logger | null,
     filename: string | null,
     code: string | null,
-    programContext: ProgramContext,
+    useMemoCacheIdentifier: string,
   ) {
     this.#scope = scope;
     this.fnType = fnType;
-    this.compilerMode = compilerMode;
     this.config = config;
     this.filename = filename;
     this.code = code;
     this.logger = logger;
-    this.programContext = programContext;
+    this.useMemoCacheIdentifier = useMemoCacheIdentifier;
     this.#shapes = new Map(DEFAULT_SHAPES);
     this.#globals = new Map(DEFAULT_GLOBALS);
+    this.hasLoweredContextAccess = false;
     this.hasFireRewrite = false;
-    this.hasInferredEffect = false;
 
     if (
       config.disableMemoizationForDebugging &&
@@ -744,10 +924,6 @@ export class Environment {
     this.#hoistedIdentifiers = new Set();
   }
 
-  get isInferredMemoEnabled(): boolean {
-    return this.compilerMode !== 'no_inferred_memo';
-  }
-
   get nextIdentifierId(): IdentifierId {
     return makeIdentifierId(this.#nextIdentifer++);
   }
@@ -760,23 +936,6 @@ export class Environment {
     return makeScopeId(this.#nextScope++);
   }
 
-  get scope(): BabelScope {
-    return this.#scope;
-  }
-
-  logErrors(errors: Result<void, CompilerError>): void {
-    if (errors.isOk() || this.logger == null) {
-      return;
-    }
-    for (const error of errors.unwrapErr().details) {
-      this.logger.logEvent(this.filename, {
-        kind: 'CompileError',
-        detail: error,
-        fnLoc: null,
-      });
-    }
-  }
-
   isContextIdentifier(node: t.Identifier): boolean {
     return this.#contextIdentifiers.has(node);
   }
@@ -966,7 +1125,6 @@ export class Environment {
       moduleName.toLowerCase() === 'react-dom'
     );
   }
-  static knownReactModules: ReadonlyArray<string> = ['react', 'react-dom'];
 
   getFallthroughPropertyType(
     receiver: Type,

compiler/packages/babel-plugin-react-compiler/src/HIR/Globals.ts

@@ -9,12 +9,8 @@ import {Effect, ValueKind, ValueReason} from './HIR';
 import {
   BUILTIN_SHAPES,
   BuiltInArrayId,
-  BuiltInFireFunctionId,
   BuiltInFireId,
-  BuiltInMapId,
   BuiltInMixedReadonlyId,
-  BuiltInObjectId,
-  BuiltInSetId,
   BuiltInUseActionStateId,
   BuiltInUseContextHookId,
   BuiltInUseEffectHookId,
@@ -25,9 +21,6 @@ import {
   BuiltInUseRefId,
   BuiltInUseStateId,
   BuiltInUseTransitionId,
-  BuiltInWeakMapId,
-  BuiltInWeakSetId,
-  ReanimatedSharedValueId,
   ShapeRegistry,
   addFunction,
   addHook,
@@ -52,23 +45,29 @@ export const DEFAULT_SHAPES: ShapeRegistry = new Map(BUILTIN_SHAPES);
 
 // Hack until we add ObjectShapes for all globals
 const UNTYPED_GLOBALS: Set<string> = new Set([
+  'String',
   'Object',
   'Function',
+  'Number',
   'RegExp',
   'Date',
   'Error',
+  'Function',
   'TypeError',
   'RangeError',
   'ReferenceError',
   'SyntaxError',
   'URIError',
   'EvalError',
+  'Boolean',
   'DataView',
   'Float32Array',
   'Float64Array',
   'Int8Array',
   'Int16Array',
   'Int32Array',
+  'Map',
+  'Set',
   'WeakMap',
   'Uint8Array',
   'Uint8ClampedArray',
@@ -76,8 +75,16 @@ const UNTYPED_GLOBALS: Set<string> = new Set([
   'Uint32Array',
   'ArrayBuffer',
   'JSON',
+  'parseFloat',
+  'parseInt',
   'console',
+  'isNaN',
   'eval',
+  'isFinite',
+  'encodeURI',
+  'decodeURI',
+  'encodeURIComponent',
+  'decodeURIComponent',
 ]);
 
 const TYPED_GLOBALS: Array<[string, BuiltInType]> = [
@@ -94,23 +101,6 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [
           returnValueKind: ValueKind.Mutable,
         }),
       ],
-      [
-        /**
-         * Object.fromEntries(iterable)
-         * iterable: An iterable, such as an Array or Map, containing a list of
-         *           objects. Each object should have two properties.
-         * Returns a new object whose properties are given by the entries of the
-         * iterable.
-         */
-        'fromEntries',
-        addFunction(DEFAULT_SHAPES, [], {
-          positionalParams: [Effect.ConditionallyMutate],
-          restParam: null,
-          returnType: {kind: 'Object', shapeId: BuiltInObjectId},
-          calleeEffect: Effect.Read,
-          returnValueKind: ValueKind.Mutable,
-        }),
-      ],
     ]),
   ],
   [
@@ -142,7 +132,7 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [
         'from',
         addFunction(DEFAULT_SHAPES, [], {
           positionalParams: [
-            Effect.ConditionallyMutateIterator,
+            Effect.ConditionallyMutate,
             Effect.ConditionallyMutate,
             Effect.ConditionallyMutate,
           ],
@@ -382,150 +372,6 @@ const TYPED_GLOBALS: Array<[string, BuiltInType]> = [
       returnValueKind: ValueKind.Primitive,
     }),
   ],
-  [
-    'parseInt',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'parseFloat',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'isNaN',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'isFinite',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'encodeURI',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'encodeURIComponent',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'decodeURI',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'decodeURIComponent',
-    addFunction(DEFAULT_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'Map',
-    addFunction(
-      DEFAULT_SHAPES,
-      [],
-      {
-        positionalParams: [Effect.ConditionallyMutateIterator],
-        restParam: null,
-        returnType: {kind: 'Object', shapeId: BuiltInMapId},
-        calleeEffect: Effect.Read,
-        returnValueKind: ValueKind.Mutable,
-      },
-      null,
-      true,
-    ),
-  ],
-  [
-    'Set',
-    addFunction(
-      DEFAULT_SHAPES,
-      [],
-      {
-        positionalParams: [Effect.ConditionallyMutateIterator],
-        restParam: null,
-        returnType: {kind: 'Object', shapeId: BuiltInSetId},
-        calleeEffect: Effect.Read,
-        returnValueKind: ValueKind.Mutable,
-      },
-      null,
-      true,
-    ),
-  ],
-  [
-    'WeakMap',
-    addFunction(
-      DEFAULT_SHAPES,
-      [],
-      {
-        positionalParams: [Effect.ConditionallyMutateIterator],
-        restParam: null,
-        returnType: {kind: 'Object', shapeId: BuiltInWeakMapId},
-        calleeEffect: Effect.Read,
-        returnValueKind: ValueKind.Mutable,
-      },
-      null,
-      true,
-    ),
-  ],
-  [
-    'WeakSet',
-    addFunction(
-      DEFAULT_SHAPES,
-      [],
-      {
-        positionalParams: [Effect.ConditionallyMutateIterator],
-        restParam: null,
-        returnType: {kind: 'Object', shapeId: BuiltInWeakSetId},
-        calleeEffect: Effect.Read,
-        returnValueKind: ValueKind.Mutable,
-      },
-      null,
-      true,
-    ),
-  ],
   // TODO: rest of Global objects
 ];
 
@@ -710,12 +556,7 @@ const REACT_APIS: Array<[string, BuiltInType]> = [
       {
         positionalParams: [],
         restParam: null,
-        returnType: {
-          kind: 'Function',
-          return: {kind: 'Poly'},
-          shapeId: BuiltInFireFunctionId,
-          isConstructor: false,
-        },
+        returnType: {kind: 'Primitive'},
         calleeEffect: Effect.Read,
         returnValueKind: ValueKind.Frozen,
       },
@@ -943,7 +784,7 @@ export function getReanimatedModuleType(registry: ShapeRegistry): ObjectType {
       addHook(registry, {
         positionalParams: [],
         restParam: Effect.Freeze,
-        returnType: {kind: 'Object', shapeId: ReanimatedSharedValueId},
+        returnType: {kind: 'Poly'},
         returnValueKind: ValueKind.Mutable,
         noAlias: true,
         calleeEffect: Effect.Read,

compiler/packages/babel-plugin-react-compiler/src/HIR/HIR.ts

@@ -10,7 +10,7 @@ import * as t from '@babel/types';
 import {CompilerError, CompilerErrorDetailOptions} from '../CompilerError';
 import {assertExhaustive} from '../Utils/utils';
 import {Environment, ReactFunctionType} from './Environment';
-import type {HookKind} from './ObjectShape';
+import {HookKind} from './ObjectShape';
 import {Type, makeType} from './Types';
 import {z} from 'zod';
 
@@ -703,10 +703,6 @@ export type ObjectPropertyKey =
   | {
       kind: 'computed';
       name: Place;
-    }
-  | {
-      kind: 'number';
-      name: number;
     };
 
 export type ObjectProperty = {
@@ -746,27 +742,6 @@ export enum InstructionKind {
   Function = 'Function',
 }
 
-export function convertHoistedLValueKind(
-  kind: InstructionKind,
-): InstructionKind | null {
-  switch (kind) {
-    case InstructionKind.HoistedLet:
-      return InstructionKind.Let;
-    case InstructionKind.HoistedConst:
-      return InstructionKind.Const;
-    case InstructionKind.HoistedFunction:
-      return InstructionKind.Function;
-    case InstructionKind.Let:
-    case InstructionKind.Const:
-    case InstructionKind.Function:
-    case InstructionKind.Reassign:
-    case InstructionKind.Catch:
-      return null;
-    default:
-      assertExhaustive(kind, 'Unexpected lvalue kind');
-  }
-}
-
 function _staticInvariantInstructionValueHasLocation(
   value: InstructionValue,
 ): SourceLocation {
@@ -850,13 +825,6 @@ export type CallExpression = {
   typeArguments?: Array<t.FlowType>;
 };
 
-export type NewExpression = {
-  kind: 'NewExpression';
-  callee: Place;
-  args: Array<Place | SpreadPattern>;
-  loc: SourceLocation;
-};
-
 export type LoadLocal = {
   kind: 'LoadLocal';
   place: Place;
@@ -901,20 +869,8 @@ export type InstructionValue =
   | StoreLocal
   | {
       kind: 'StoreContext';
-      /**
-       * StoreContext kinds:
-       * Reassign: context variable reassignment in source
-       * Const:    const declaration + assignment in source
-       *           ('const' context vars are ones whose declarations are hoisted)
-       * Let:      let declaration + assignment in source
-       * Function: function declaration in source (similar to `const`)
-       */
       lvalue: {
-        kind:
-          | InstructionKind.Reassign
-          | InstructionKind.Const
-          | InstructionKind.Let
-          | InstructionKind.Function;
+        kind: InstructionKind.Reassign;
         place: Place;
       };
       value: Place;
@@ -934,7 +890,12 @@ export type InstructionValue =
       right: Place;
       loc: SourceLocation;
     }
-  | NewExpression
+  | {
+      kind: 'NewExpression';
+      callee: Place;
+      args: Array<Place | SpreadPattern>;
+      loc: SourceLocation;
+    }
   | CallExpression
   | MethodCall
   | {
@@ -943,21 +904,13 @@ export type InstructionValue =
       value: Place;
       loc: SourceLocation;
     }
-  | ({
+  | {
       kind: 'TypeCastExpression';
       value: Place;
+      typeAnnotation: t.FlowType | t.TSType;
       type: Type;
       loc: SourceLocation;
-    } & (
-      | {
-          typeAnnotation: t.FlowType;
-          typeAnnotationKind: 'cast';
-        }
-      | {
-          typeAnnotation: t.TSType;
-          typeAnnotationKind: 'as' | 'satisfies';
-        }
-    ))
+    }
   | JsxExpression
   | {
       kind: 'ObjectExpression';
@@ -1208,21 +1161,18 @@ export type VariableBinding =
   // bindings declard outside the current component/hook
   | NonLocalBinding;
 
-// `import {bar as baz} from 'foo'`: name=baz, module=foo, imported=bar
-export type NonLocalImportSpecifier = {
-  kind: 'ImportSpecifier';
-  name: string;
-  module: string;
-  imported: string;
-};
-
 export type NonLocalBinding =
   // `import Foo from 'foo'`: name=Foo, module=foo
   | {kind: 'ImportDefault'; name: string; module: string}
   // `import * as Foo from 'foo'`: name=Foo, module=foo
   | {kind: 'ImportNamespace'; name: string; module: string}
-  // `import {bar as baz} from 'foo'`
-  | NonLocalImportSpecifier
+  // `import {bar as baz} from 'foo'`: name=baz, module=foo, imported=bar
+  | {
+      kind: 'ImportSpecifier';
+      name: string;
+      module: string;
+      imported: string;
+    }
   // let, const, function, etc declared in the module but outside the current component/hook
   | {kind: 'ModuleLocal'; name: string}
   // an unresolved binding
@@ -1440,7 +1390,6 @@ export enum Effect {
   Read = 'read',
   // This reference reads and stores the value
   Capture = 'capture',
-  ConditionallyMutateIterator = 'mutate-iterator?',
   /*
    * This reference *may* write to (mutate) the value. This covers two similar cases:
    * - The compiler is being conservative and assuming that a value *may* be mutated
@@ -1459,11 +1408,11 @@ export enum Effect {
   // This reference may alias to (mutate) the value
   Store = 'store',
 }
+
 export const EffectSchema = z.enum([
   Effect.Read,
   Effect.Mutate,
   Effect.ConditionallyMutate,
-  Effect.ConditionallyMutateIterator,
   Effect.Capture,
   Effect.Store,
   Effect.Freeze,
@@ -1477,7 +1426,6 @@ export function isMutableEffect(
     case Effect.Capture:
     case Effect.Store:
     case Effect.ConditionallyMutate:
-    case Effect.ConditionallyMutateIterator:
     case Effect.Mutate: {
       return true;
     }
@@ -1697,14 +1645,6 @@ export function isArrayType(id: Identifier): boolean {
   return id.type.kind === 'Object' && id.type.shapeId === 'BuiltInArray';
 }
 
-export function isMapType(id: Identifier): boolean {
-  return id.type.kind === 'Object' && id.type.shapeId === 'BuiltInMap';
-}
-
-export function isSetType(id: Identifier): boolean {
-  return id.type.kind === 'Object' && id.type.shapeId === 'BuiltInSet';
-}
-
 export function isPropsType(id: Identifier): boolean {
   return id.type.kind === 'Object' && id.type.shapeId === 'BuiltInProps';
 }
@@ -1725,18 +1665,6 @@ export function isRefOrRefValue(id: Identifier): boolean {
   return isUseRefType(id) || isRefValueType(id);
 }
 
-/*
- * Returns true if the type is a Ref or a custom user type that acts like a ref when it
- * shouldn't. For now the only other case of this is Reanimated's shared values.
- */
-export function isRefOrRefLikeMutableType(type: Type): boolean {
-  return (
-    type.kind === 'Object' &&
-    (type.shapeId === 'BuiltInUseRefId' ||
-      type.shapeId == 'ReanimatedSharedValueId')
-  );
-}
-
 export function isSetStateType(id: Identifier): boolean {
   return id.type.kind === 'Function' && id.type.shapeId === 'BuiltInSetState';
 }
@@ -1767,12 +1695,6 @@ export function isDispatcherType(id: Identifier): boolean {
   return id.type.kind === 'Function' && id.type.shapeId === 'BuiltInDispatch';
 }
 
-export function isFireFunctionType(id: Identifier): boolean {
-  return (
-    id.type.kind === 'Function' && id.type.shapeId === 'BuiltInFireFunction'
-  );
-}
-
 export function isStableType(id: Identifier): boolean {
   return (
     isSetStateType(id) ||
@@ -1783,40 +1705,6 @@ export function isStableType(id: Identifier): boolean {
   );
 }
 
-export function isStableTypeContainer(id: Identifier): boolean {
-  const type_ = id.type;
-  if (type_.kind !== 'Object') {
-    return false;
-  }
-  return (
-    isUseStateType(id) || // setState
-    type_.shapeId === 'BuiltInUseActionState' || // setActionState
-    isUseReducerType(id) || // dispatcher
-    type_.shapeId === 'BuiltInUseTransition' // startTransition
-  );
-}
-
-export function evaluatesToStableTypeOrContainer(
-  env: Environment,
-  {value}: Instruction,
-): boolean {
-  if (value.kind === 'CallExpression' || value.kind === 'MethodCall') {
-    const callee =
-      value.kind === 'CallExpression' ? value.callee : value.property;
-
-    const calleeHookKind = getHookKind(env, callee.identifier);
-    switch (calleeHookKind) {
-      case 'useState':
-      case 'useReducer':
-      case 'useActionState':
-      case 'useRef':
-      case 'useTransition':
-        return true;
-    }
-  }
-  return false;
-}
-
 export function isUseEffectHookType(id: Identifier): boolean {
   return (
     id.type.kind === 'Function' && id.type.shapeId === 'BuiltInUseEffectHook'

compiler/packages/babel-plugin-react-compiler/src/HIR/HIRBuilder.ts

@@ -331,7 +331,6 @@ export default class HIRBuilder {
           type: makeType(),
           loc: node.loc ?? GeneratedSource,
         };
-        this.#env.programContext.addNewReference(name);
         this.#bindings.set(name, {node, identifier});
         return identifier;
       } else if (mapping.node === node) {

compiler/packages/babel-plugin-react-compiler/src/HIR/MergeOverlappingReactiveScopesHIR.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {
   HIRFunction,
   InstructionId,

compiler/packages/babel-plugin-react-compiler/src/HIR/ObjectShape.ts

@@ -44,7 +44,6 @@ export function addFunction(
   properties: Iterable<[string, BuiltInType | PolyType]>,
   fn: Omit<FunctionSignature, 'hookKind'>,
   id: string | null = null,
-  isConstructor: boolean = false,
 ): FunctionType {
   const shapeId = id ?? createAnonId();
   addShape(registry, shapeId, properties, {
@@ -55,7 +54,6 @@ export function addFunction(
     kind: 'Function',
     return: fn.returnType,
     shapeId,
-    isConstructor,
   };
 }
 
@@ -75,7 +73,6 @@ export function addHook(
     kind: 'Function',
     return: fn.returnType,
     shapeId,
-    isConstructor: false,
   };
 }
 
@@ -201,10 +198,6 @@ export type ObjectShape = {
 export type ShapeRegistry = Map<string, ObjectShape>;
 export const BuiltInPropsId = 'BuiltInProps';
 export const BuiltInArrayId = 'BuiltInArray';
-export const BuiltInSetId = 'BuiltInSet';
-export const BuiltInMapId = 'BuiltInMap';
-export const BuiltInWeakSetId = 'BuiltInWeakSet';
-export const BuiltInWeakMapId = 'BuiltInWeakMap';
 export const BuiltInFunctionId = 'BuiltInFunction';
 export const BuiltInJsxId = 'BuiltInJsx';
 export const BuiltInObjectId = 'BuiltInObject';
@@ -225,10 +218,6 @@ export const BuiltInUseContextHookId = 'BuiltInUseContextHook';
 export const BuiltInUseTransitionId = 'BuiltInUseTransition';
 export const BuiltInStartTransitionId = 'BuiltInStartTransition';
 export const BuiltInFireId = 'BuiltInFire';
-export const BuiltInFireFunctionId = 'BuiltInFireFunction';
-
-// See getReanimatedModuleType() in Globals.ts — this is part of supporting Reanimated's ref-like types
-export const ReanimatedSharedValueId = 'ReanimatedSharedValueId';
 
 // ShapeRegistry with default definitions for built-ins.
 export const BUILTIN_SHAPES: ShapeRegistry = new Map();
@@ -462,408 +451,6 @@ addObject(BUILTIN_SHAPES, BuiltInObjectId, [
    */
 ]);
 
-/* Built-in Set shape */
-addObject(BUILTIN_SHAPES, BuiltInSetId, [
-  [
-    /**
-     * add(value)
-     * Parameters
-     *   value: the value of the element to add to the Set object.
-     * Returns the Set object with added value.
-     */
-    'add',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInSetId},
-      calleeEffect: Effect.Store,
-      // returnValueKind is technically dependent on the ValueKind of the set itself
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    /**
-     * clear()
-     * Parameters none
-     * Returns undefined
-     */
-    'clear',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    /**
-     * setInstance.delete(value)
-     * Returns true if value was already in Set; otherwise false.
-     */
-    'delete',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'has',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  ['size', PRIMITIVE_TYPE],
-  [
-    /**
-     * difference(other)
-     * Parameters
-     *   other: A Set object, or set-like object.
-     * Returns a new Set object containing elements in this set but not in the other set.
-     */
-    'difference',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInSetId},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    /**
-     * union(other)
-     * Parameters
-     *   other: A Set object, or set-like object.
-     * Returns a new Set object containing elements in either this set or the other set.
-     */
-    'union',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInSetId},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    /**
-     * symmetricalDifference(other)
-     * Parameters
-     *   other: A Set object, or set-like object.
-     * A new Set object containing elements which are in either this set or the other set, but not in both.
-     */
-    'symmetricalDifference',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInSetId},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    /**
-     * isSubsetOf(other)
-     * Parameters
-     *   other: A Set object, or set-like object.
-     * Returns true if all elements in this set are also in the other set, and false otherwise.
-     */
-    'isSubsetOf',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    /**
-     * isSupersetOf(other)
-     * Parameters
-     *  other: A Set object, or set-like object.
-     * Returns true if all elements in the other set are also in this set, and false otherwise.
-     */
-    'isSupersetOf',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    /**
-     * forEach(callbackFn)
-     * forEach(callbackFn, thisArg)
-     */
-    'forEach',
-    addFunction(BUILTIN_SHAPES, [], {
-      /**
-       * see Array.map explanation for why arguments are marked `ConditionallyMutate`
-       */
-      positionalParams: [],
-      restParam: Effect.ConditionallyMutate,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.ConditionallyMutate,
-      returnValueKind: ValueKind.Primitive,
-      noAlias: true,
-      mutableOnlyIfOperandsAreMutable: true,
-    }),
-  ],
-  /**
-   * Iterators
-   */
-  [
-    'entries',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'keys',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'values',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-]);
-addObject(BUILTIN_SHAPES, BuiltInMapId, [
-  [
-    /**
-     * clear()
-     * Parameters none
-     * Returns undefined
-     */
-    'clear',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'delete',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'get',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'has',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    /**
-     * Params
-     *   key: the key of the element to add to the Map object. The key may be
-     *   any JavaScript type (any primitive value or any type of JavaScript
-     *   object).
-     *   value: the value of the element to add to the Map object.
-     * Returns the Map object.
-     */
-    'set',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture, Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInMapId},
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  ['size', PRIMITIVE_TYPE],
-  [
-    'forEach',
-    addFunction(BUILTIN_SHAPES, [], {
-      /**
-       * see Array.map explanation for why arguments are marked `ConditionallyMutate`
-       */
-      positionalParams: [],
-      restParam: Effect.ConditionallyMutate,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.ConditionallyMutate,
-      returnValueKind: ValueKind.Primitive,
-      noAlias: true,
-      mutableOnlyIfOperandsAreMutable: true,
-    }),
-  ],
-  /**
-   * Iterators
-   */
-  [
-    'entries',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'keys',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'values',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-]);
-
-addObject(BUILTIN_SHAPES, BuiltInWeakSetId, [
-  [
-    /**
-     * add(value)
-     * Parameters
-     *   value: the value of the element to add to the Set object.
-     * Returns the Set object with added value.
-     */
-    'add',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInWeakSetId},
-      calleeEffect: Effect.Store,
-      // returnValueKind is technically dependent on the ValueKind of the set itself
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    /**
-     * setInstance.delete(value)
-     * Returns true if value was already in Set; otherwise false.
-     */
-    'delete',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'has',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-]);
-
-addObject(BUILTIN_SHAPES, BuiltInWeakMapId, [
-  [
-    'delete',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'get',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: {kind: 'Poly'},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-  [
-    'has',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: PRIMITIVE_TYPE,
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    /**
-     * Params
-     *   key: the key of the element to add to the Map object. The key may be
-     *   any JavaScript type (any primitive value or any type of JavaScript
-     *   object).
-     *   value: the value of the element to add to the Map object.
-     * Returns the Map object.
-     */
-    'set',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Capture, Effect.Capture],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInWeakMapId},
-      calleeEffect: Effect.Store,
-      returnValueKind: ValueKind.Mutable,
-    }),
-  ],
-]);
-
 addObject(BUILTIN_SHAPES, BuiltInUseStateId, [
   ['0', {kind: 'Poly'}],
   [
@@ -948,30 +535,6 @@ addObject(BUILTIN_SHAPES, BuiltInRefValueId, [
   ['*', {kind: 'Object', shapeId: BuiltInRefValueId}],
 ]);
 
-/**
- * MixedReadOnly =
- *   | primitive
- *   | simple objects (Record<string, MixedReadOnly>)
- *   | Array<MixedReadOnly>
- *
- * APIs such as Relay — but also Flux and other data stores — often return a
- * union of types with some interesting properties in terms of analysis.
- *
- * Given this constraint, if data came from Relay, then we should be able to
- * infer things like `data.items.map(): Array`. That may seem like a leap at
- * first but remember, we assume you're not patching builtins. Thus the only way
- * data.items.map can exist and be a function, given the above set of data types
- * and builtin JS methods, is if `data.items` was an Array, and `data.items.map`
- * is therefore calling Array.prototype.map. Then we know that function returns
- * an Array as well. This relies on the fact that map() is being called, so if
- * data.items was some other type it would error at runtime - so it's sound.
- *
- * Note that this shape is currently only used for hook return values, which
- * means that it's safe to type aliasing method-call return kinds as `Frozen`.
- *
- * Also note that all newly created arrays from method-calls (e.g. `.map`)
- * have the appropriate mutable `BuiltInArray` shape
- */
 addObject(BUILTIN_SHAPES, BuiltInMixedReadonlyId, [
   [
     'toString',
@@ -983,36 +546,6 @@ addObject(BUILTIN_SHAPES, BuiltInMixedReadonlyId, [
       returnValueKind: ValueKind.Primitive,
     }),
   ],
-  [
-    'indexOf',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'includes',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [],
-      restParam: Effect.Read,
-      returnType: {kind: 'Primitive'},
-      calleeEffect: Effect.Read,
-      returnValueKind: ValueKind.Primitive,
-    }),
-  ],
-  [
-    'at',
-    addFunction(BUILTIN_SHAPES, [], {
-      positionalParams: [Effect.Read],
-      restParam: null,
-      returnType: {kind: 'Object', shapeId: BuiltInMixedReadonlyId},
-      calleeEffect: Effect.Capture,
-      returnValueKind: ValueKind.Frozen,
-    }),
-  ],
   [
     'map',
     addFunction(BUILTIN_SHAPES, [], {
@@ -1109,9 +642,9 @@ addObject(BUILTIN_SHAPES, BuiltInMixedReadonlyId, [
     addFunction(BUILTIN_SHAPES, [], {
       positionalParams: [],
       restParam: Effect.ConditionallyMutate,
-      returnType: {kind: 'Object', shapeId: BuiltInMixedReadonlyId},
+      returnType: {kind: 'Poly'},
       calleeEffect: Effect.ConditionallyMutate,
-      returnValueKind: ValueKind.Frozen,
+      returnValueKind: ValueKind.Mutable,
       noAlias: true,
       mutableOnlyIfOperandsAreMutable: true,
     }),

compiler/packages/babel-plugin-react-compiler/src/HIR/PrintHIR.ts

@@ -330,9 +330,6 @@ function printObjectPropertyKey(key: ObjectPropertyKey): string {
     case 'computed': {
       return `[${printPlace(key.name)}]`;
     }
-    case 'number': {
-      return String(key.name);
-    }
   }
 }
 

compiler/packages/babel-plugin-react-compiler/src/HIR/PropagateScopeDependenciesHIR.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {
   ScopeId,
   HIRFunction,
@@ -30,7 +23,6 @@ import {
   FunctionExpression,
   ObjectMethod,
   PropertyLiteral,
-  convertHoistedLValueKind,
 } from './HIR';
 import {
   collectHoistablePropertyLoads,
@@ -117,7 +109,7 @@ export function propagateScopeDependenciesHIR(fn: HIRFunction): void {
   }
 }
 
-export function findTemporariesUsedOutsideDeclaringScope(
+function findTemporariesUsedOutsideDeclaringScope(
   fn: HIRFunction,
 ): ReadonlySet<DeclarationId> {
   /*
@@ -247,18 +239,12 @@ function isLoadContextMutable(
   id: InstructionId,
 ): instrValue is LoadContext {
   if (instrValue.kind === 'LoadContext') {
-    /**
-     * Not all context variables currently have scopes due to limitations of
-     * mutability analysis for function expressions.
-     *
-     * Currently, many function expressions references are inferred to be
-     * 'Read' | 'Freeze' effects which don't replay mutable effects of captured
-     * context.
-     */
-    return (
-      instrValue.place.identifier.scope != null &&
-      id >= instrValue.place.identifier.scope.range.end
-    );
+    CompilerError.invariant(instrValue.place.identifier.scope != null, {
+      reason:
+        '[PropagateScopeDependencies] Expected all context variables to be assigned a scope',
+      loc: instrValue.loc,
+    });
+    return id >= instrValue.place.identifier.scope.range.end;
   }
   return false;
 }
@@ -385,7 +371,7 @@ type Decl = {
   scope: Stack<ReactiveScope>;
 };
 
-export class DependencyCollectionContext {
+class Context {
   #declarations: Map<DeclarationId, Decl> = new Map();
   #reassignments: Map<Identifier, Decl> = new Map();
 
@@ -478,9 +464,6 @@ export class DependencyCollectionContext {
     }
     this.#reassignments.set(identifier, decl);
   }
-  hasDeclared(identifier: Identifier): boolean {
-    return this.#declarations.has(identifier.declarationId);
-  }
 
   // Checks if identifier is a valid dependency in the current scope
   #checkValidDependency(maybeDependency: ReactiveScopeDependency): boolean {
@@ -655,10 +638,7 @@ enum HIRValue {
   Terminal,
 }
 
-export function handleInstruction(
-  instr: Instruction,
-  context: DependencyCollectionContext,
-): void {
+function handleInstruction(instr: Instruction, context: Context): void {
   const {id, value, lvalue} = instr;
   context.declare(lvalue.identifier, {
     id,
@@ -682,21 +662,21 @@ export function handleInstruction(
     });
   } else if (value.kind === 'DeclareLocal' || value.kind === 'DeclareContext') {
     /*
-     * Some variables may be declared and never initialized. We need to retain
-     * (and hoist) these declarations if they are included in a reactive scope.
-     * One approach is to simply add all `DeclareLocal`s as scope declarations.
-     *
-     * Context variables with hoisted declarations only become live after their
-     * first assignment. We only declare real DeclareLocal / DeclareContext
-     * instructions (not hoisted ones) to avoid generating dependencies on
-     * hoisted declarations.
+     * Some variables may be declared and never initialized. We need
+     * to retain (and hoist) these declarations if they are included
+     * in a reactive scope. One approach is to simply add all `DeclareLocal`s
+     * as scope declarations.
      */
-    if (convertHoistedLValueKind(value.lvalue.kind) === null) {
-      context.declare(value.lvalue.place.identifier, {
-        id,
-        scope: context.currentScope,
-      });
-    }
+
+    /*
+     * We add context variable declarations here, not at `StoreContext`, since
+     * context Store / Loads are modeled as reads and mutates to the underlying
+     * variable reference (instead of through intermediate / inlined temporaries)
+     */
+    context.declare(value.lvalue.place.identifier, {
+      id,
+      scope: context.currentScope,
+    });
   } else if (value.kind === 'Destructure') {
     context.visitOperand(value.value);
     for (const place of eachPatternOperand(value.lvalue.pattern)) {
@@ -708,26 +688,6 @@ export function handleInstruction(
         scope: context.currentScope,
       });
     }
-  } else if (value.kind === 'StoreContext') {
-    /**
-     * Some StoreContext variables have hoisted declarations. If we're storing
-     * to a context variable that hasn't yet been declared, the StoreContext is
-     * the declaration.
-     * (see corresponding logic in PruneHoistedContext)
-     */
-    if (
-      !context.hasDeclared(value.lvalue.place.identifier) ||
-      value.lvalue.kind !== InstructionKind.Reassign
-    ) {
-      context.declare(value.lvalue.place.identifier, {
-        id,
-        scope: context.currentScope,
-      });
-    }
-
-    for (const operand of eachInstructionValueOperand(value)) {
-      context.visitOperand(operand);
-    }
   } else {
     for (const operand of eachInstructionValueOperand(value)) {
       context.visitOperand(operand);
@@ -741,7 +701,7 @@ function collectDependencies(
   temporaries: ReadonlyMap<IdentifierId, ReactiveScopeDependency>,
   processedInstrsInOptional: ReadonlySet<Instruction | Terminal>,
 ): Map<ReactiveScope, Array<ReactiveScopeDependency>> {
-  const context = new DependencyCollectionContext(
+  const context = new Context(
     usedOutsideDeclaringScope,
     temporaries,
     processedInstrsInOptional,

compiler/packages/babel-plugin-react-compiler/src/HIR/PruneUnusedLabelsHIR.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {CompilerError} from '..';
 import {BlockId, GotoVariant, HIRFunction} from './HIR';
 

compiler/packages/babel-plugin-react-compiler/src/HIR/Types.ts

@@ -38,7 +38,6 @@ export type FunctionType = {
   kind: 'Function';
   shapeId: string | null;
   return: Type;
-  isConstructor: boolean;
 };
 
 export type ObjectType = {
@@ -112,7 +111,6 @@ export function duplicateType(type: Type): Type {
         kind: 'Function',
         return: duplicateType(type.return),
         shapeId: type.shapeId,
-        isConstructor: type.isConstructor,
       };
     }
     case 'Object': {

compiler/packages/babel-plugin-react-compiler/src/HIR/index.ts

@@ -17,6 +17,7 @@ export {buildReactiveScopeTerminalsHIR} from './BuildReactiveScopeTerminalsHIR';
 export {computeDominatorTree, computePostDominatorTree} from './Dominator';
 export {
   Environment,
+  parseConfigPragmaForTests,
   validateEnvironmentConfig,
   type EnvironmentConfig,
   type ExternalFunction,
@@ -31,5 +32,5 @@ export {
 } from './HIRBuilder';
 export {mergeConsecutiveBlocks} from './MergeConsecutiveBlocks';
 export {mergeOverlappingReactiveScopesHIR} from './MergeOverlappingReactiveScopesHIR';
-export {printFunction, printHIR, printFunctionWithOutlined} from './PrintHIR';
+export {printFunction, printHIR} from './PrintHIR';
 export {pruneUnusedLabelsHIR} from './PruneUnusedLabelsHIR';

compiler/packages/babel-plugin-react-compiler/src/Inference/InerAliasForUncalledFunctions.ts

@@ -1,134 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import {
-  Effect,
-  HIRFunction,
-  Identifier,
-  isMutableEffect,
-  isRefOrRefLikeMutableType,
-  makeInstructionId,
-} from '../HIR/HIR';
-import {eachInstructionValueOperand} from '../HIR/visitors';
-import {isMutable} from '../ReactiveScopes/InferReactiveScopeVariables';
-import DisjointSet from '../Utils/DisjointSet';
-
-/**
- * If a function captures a mutable value but never gets called, we don't infer a
- * mutable range for that function. This means that we also don't alias the function
- * with its mutable captures.
- *
- * This case is tricky, because we don't generally know for sure what is a mutation
- * and what may just be a normal function call. For example:
- *
- * ```
- * hook useFoo() {
- *   const x = makeObject();
- *   return () => {
- *     return readObject(x); // could be a mutation!
- *   }
- * }
- * ```
- *
- * If we pessimistically assume that all such cases are mutations, we'd have to group
- * lots of memo scopes together unnecessarily. However, if there is definitely a mutation:
- *
- * ```
- * hook useFoo(createEntryForKey) {
- *   const cache = new WeakMap();
- *   return (key) => {
- *     let entry = cache.get(key);
- *     if (entry == null) {
- *       entry = createEntryForKey(key);
- *       cache.set(key, entry); // known mutation!
- *     }
- *     return entry;
- *   }
- * }
- * ```
- *
- * Then we have to ensure that the function and its mutable captures alias together and
- * end up in the same scope. However, aliasing together isn't enough if the function
- * and operands all have empty mutable ranges (end = start + 1).
- *
- * This pass finds function expressions and object methods that have an empty mutable range
- * and known-mutable operands which also don't have a mutable range, and ensures that the
- * function and those operands are aliased together *and* that their ranges are updated to
- * end after the function expression. This is sufficient to ensure that a reactive scope is
- * created for the alias set.
- */
-export function inferAliasForUncalledFunctions(
-  fn: HIRFunction,
-  aliases: DisjointSet<Identifier>,
-): void {
-  for (const block of fn.body.blocks.values()) {
-    instrs: for (const instr of block.instructions) {
-      const {lvalue, value} = instr;
-      if (
-        value.kind !== 'ObjectMethod' &&
-        value.kind !== 'FunctionExpression'
-      ) {
-        continue;
-      }
-      /*
-       * If the function is known to be mutated, we will have
-       * already aliased any mutable operands with it
-       */
-      const range = lvalue.identifier.mutableRange;
-      if (range.end > range.start + 1) {
-        continue;
-      }
-      /*
-       * If the function already has operands with an active mutable range,
-       * then we don't need to do anything — the function will have already
-       * been visited and included in some mutable alias set. This case can
-       * also occur due to visiting the same function in an earlier iteration
-       * of the outer fixpoint loop.
-       */
-      for (const operand of eachInstructionValueOperand(value)) {
-        if (isMutable(instr, operand)) {
-          continue instrs;
-        }
-      }
-      const operands: Set<Identifier> = new Set();
-      for (const effect of value.loweredFunc.func.effects ?? []) {
-        if (effect.kind !== 'ContextMutation') {
-          continue;
-        }
-        /*
-         * We're looking for known-mutations only, so we look at the effects
-         * rather than function context
-         */
-        if (effect.effect === Effect.Store || effect.effect === Effect.Mutate) {
-          for (const operand of effect.places) {
-            /*
-             * It's possible that function effect analysis thinks there was a context mutation,
-             * but then InferReferenceEffects figures out some operands are globals and therefore
-             * creates a non-mutable effect for those operands.
-             * We should change InferReferenceEffects to swap the ContextMutation for a global
-             * mutation in that case, but for now we just filter them out here
-             */
-            if (
-              isMutableEffect(operand.effect, operand.loc) &&
-              !isRefOrRefLikeMutableType(operand.identifier.type)
-            ) {
-              operands.add(operand.identifier);
-            }
-          }
-        }
-      }
-      if (operands.size !== 0) {
-        operands.add(lvalue.identifier);
-        aliases.union([...operands]);
-        // Update mutable ranges, if the ranges are empty then a reactive scope isn't created
-        for (const operand of operands) {
-          operand.mutableRange.end = makeInstructionId(instr.id + 1);
-        }
-      }
-    }
-  }
-}

compiler/packages/babel-plugin-react-compiler/src/Inference/InferEffectDependencies.ts

@@ -1,11 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import * as t from '@babel/types';
 import {CompilerError, SourceLocation} from '..';
 import {
   ArrayExpression,
@@ -22,30 +14,17 @@ import {
   ScopeId,
   ReactiveScopeDependency,
   Place,
-  ReactiveScope,
   ReactiveScopeDependencies,
-  Terminal,
   isUseRefType,
   isSetStateType,
-  isFireFunctionType,
-  makeScopeId,
 } from '../HIR';
-import {collectHoistablePropertyLoadsInInnerFn} from '../HIR/CollectHoistablePropertyLoads';
-import {collectOptionalChainSidemap} from '../HIR/CollectOptionalChainDependencies';
-import {ReactiveScopeDependencyTreeHIR} from '../HIR/DeriveMinimalDependenciesHIR';
 import {DEFAULT_EXPORT} from '../HIR/Environment';
 import {
   createTemporaryPlace,
   fixScopeAndIdentifierRanges,
   markInstructionIds,
 } from '../HIR/HIRBuilder';
-import {
-  collectTemporariesSidemap,
-  DependencyCollectionContext,
-  handleInstruction,
-} from '../HIR/PropagateScopeDependenciesHIR';
 import {eachInstructionOperand, eachTerminalOperand} from '../HIR/visitors';
-import {empty} from '../Utils/Stack';
 import {getOrInsertWith} from '../Utils/utils';
 
 /**
@@ -74,7 +53,10 @@ export function inferEffectDependencies(fn: HIRFunction): void {
   const autodepFnLoads = new Map<IdentifierId, number>();
   const autodepModuleLoads = new Map<IdentifierId, Map<string, number>>();
 
-  const scopeInfos = new Map<ScopeId, ReactiveScopeDependencies>();
+  const scopeInfos = new Map<
+    ScopeId,
+    {pruned: boolean; deps: ReactiveScopeDependencies; hasSingleInstr: boolean}
+  >();
 
   const loadGlobals = new Set<IdentifierId>();
 
@@ -88,18 +70,19 @@ export function inferEffectDependencies(fn: HIRFunction): void {
   const reactiveIds = inferReactiveIdentifiers(fn);
 
   for (const [, block] of fn.body.blocks) {
-    if (block.terminal.kind === 'scope') {
+    if (
+      block.terminal.kind === 'scope' ||
+      block.terminal.kind === 'pruned-scope'
+    ) {
       const scopeBlock = fn.body.blocks.get(block.terminal.block)!;
-      if (
-        scopeBlock.instructions.length === 1 &&
-        scopeBlock.terminal.kind === 'goto' &&
-        scopeBlock.terminal.block === block.terminal.fallthrough
-      ) {
-        scopeInfos.set(
-          block.terminal.scope.id,
-          block.terminal.scope.dependencies,
-        );
-      }
+      scopeInfos.set(block.terminal.scope.id, {
+        pruned: block.terminal.kind === 'pruned-scope',
+        deps: block.terminal.scope.dependencies,
+        hasSingleInstr:
+          scopeBlock.instructions.length === 1 &&
+          scopeBlock.terminal.kind === 'goto' &&
+          scopeBlock.terminal.block === block.terminal.fallthrough,
+      });
     }
     const rewriteInstrs = new Map<InstructionId, Array<Instruction>>();
     for (const instr of block.instructions) {
@@ -181,12 +164,22 @@ export function inferEffectDependencies(fn: HIRFunction): void {
               fnExpr.lvalue.identifier.scope != null
                 ? scopeInfos.get(fnExpr.lvalue.identifier.scope.id)
                 : null;
-            let minimalDeps: Set<ReactiveScopeDependency>;
-            if (scopeInfo != null) {
-              minimalDeps = new Set(scopeInfo);
-            } else {
-              minimalDeps = inferMinimalDependencies(fnExpr);
+            CompilerError.invariant(scopeInfo != null, {
+              reason: 'Expected function expression scope to exist',
+              loc: value.loc,
+            });
+            if (scopeInfo.pruned || !scopeInfo.hasSingleInstr) {
+              /**
+               * TODO: retry pipeline that ensures effect function expressions
+               * are placed into their own scope
+               */
+              CompilerError.throwTodo({
+                reason:
+                  '[InferEffectDependencies] Expected effect function to have non-pruned scope and its scope to have exactly one instruction',
+                loc: fnExpr.loc,
+              });
             }
+
             /**
              * Step 1: push dependencies to the effect deps array
              *
@@ -194,14 +187,11 @@ export function inferEffectDependencies(fn: HIRFunction): void {
              * the `infer-effect-deps/pruned-nonreactive-obj` fixture for an
              * explanation.
              */
-
-            const usedDeps = [];
-            for (const dep of minimalDeps) {
+            for (const dep of scopeInfo.deps) {
               if (
-                ((isUseRefType(dep.identifier) ||
+                (isUseRefType(dep.identifier) ||
                   isSetStateType(dep.identifier)) &&
-                  !reactiveIds.has(dep.identifier.id)) ||
-                isFireFunctionType(dep.identifier)
+                !reactiveIds.has(dep.identifier.id)
               ) {
                 // exclude non-reactive hook results, which will never be in a memo block
                 continue;
@@ -215,23 +205,6 @@ export function inferEffectDependencies(fn: HIRFunction): void {
               );
               newInstructions.push(...instructions);
               effectDeps.push(place);
-              usedDeps.push(dep);
-            }
-
-            // For LSP autodeps feature.
-            const decorations: Array<t.SourceLocation> = [];
-            for (const loc of collectDepUsages(usedDeps, fnExpr.value)) {
-              if (typeof loc === 'symbol') {
-                continue;
-              }
-              decorations.push(loc);
-            }
-            if (typeof value.loc !== 'symbol') {
-              fn.env.logger?.logEvent(fn.env.filename, {
-                kind: 'AutoDepsDecorations',
-                fnLoc: value.loc,
-                decorations,
-              });
             }
 
             newInstructions.push({
@@ -244,7 +217,6 @@ export function inferEffectDependencies(fn: HIRFunction): void {
             // Step 2: push the inferred deps array as an argument of the useEffect
             value.args.push({...depsPlace, effect: Effect.Freeze});
             rewriteInstrs.set(instr.id, newInstructions);
-            fn.env.inferredEffectLocations.add(callee.loc);
           } else if (loadGlobals.has(value.args[0].identifier.id)) {
             // Global functions have no reactive dependencies, so we can insert an empty array
             newInstructions.push({
@@ -255,32 +227,6 @@ export function inferEffectDependencies(fn: HIRFunction): void {
             });
             value.args.push({...depsPlace, effect: Effect.Freeze});
             rewriteInstrs.set(instr.id, newInstructions);
-            fn.env.inferredEffectLocations.add(callee.loc);
-          }
-        } else if (
-          value.args.length >= 2 &&
-          value.args.length - 1 === autodepFnLoads.get(callee.identifier.id) &&
-          value.args[0] != null &&
-          value.args[0].kind === 'Identifier'
-        ) {
-          const penultimateArg = value.args[value.args.length - 2];
-          const depArrayArg = value.args[value.args.length - 1];
-          if (
-            depArrayArg.kind !== 'Spread' &&
-            penultimateArg.kind !== 'Spread' &&
-            typeof depArrayArg.loc !== 'symbol' &&
-            typeof penultimateArg.loc !== 'symbol' &&
-            typeof value.loc !== 'symbol'
-          ) {
-            fn.env.logger?.logEvent(fn.env.filename, {
-              kind: 'AutoDepsEligible',
-              fnLoc: value.loc,
-              depArrayLoc: {
-                ...depArrayArg.loc,
-                start: penultimateArg.loc.end,
-                end: depArrayArg.loc.end,
-              },
-            });
           }
         }
       }
@@ -303,7 +249,6 @@ export function inferEffectDependencies(fn: HIRFunction): void {
     // Renumber instructions and fix scope ranges
     markInstructionIds(fn.body);
     fixScopeAndIdentifierRanges(fn.body);
-    fn.env.hasInferredEffect = true;
   }
 }
 
@@ -390,163 +335,3 @@ function inferReactiveIdentifiers(fn: HIRFunction): Set<IdentifierId> {
   }
   return reactiveIds;
 }
-
-function collectDepUsages(
-  deps: Array<ReactiveScopeDependency>,
-  fnExpr: FunctionExpression,
-): Array<SourceLocation> {
-  const identifiers: Map<IdentifierId, ReactiveScopeDependency> = new Map();
-  const loadedDeps: Set<IdentifierId> = new Set();
-  const sourceLocations = [];
-  for (const dep of deps) {
-    identifiers.set(dep.identifier.id, dep);
-  }
-
-  for (const [, block] of fnExpr.loweredFunc.func.body.blocks) {
-    for (const instr of block.instructions) {
-      if (
-        instr.value.kind === 'LoadLocal' &&
-        identifiers.has(instr.value.place.identifier.id)
-      ) {
-        loadedDeps.add(instr.lvalue.identifier.id);
-      }
-      for (const place of eachInstructionOperand(instr)) {
-        if (loadedDeps.has(place.identifier.id)) {
-          // TODO(@jbrown215): handle member exprs!!
-          sourceLocations.push(place.identifier.loc);
-        }
-      }
-    }
-  }
-
-  return sourceLocations;
-}
-
-function inferMinimalDependencies(
-  fnInstr: TInstruction<FunctionExpression>,
-): Set<ReactiveScopeDependency> {
-  const fn = fnInstr.value.loweredFunc.func;
-
-  const temporaries = collectTemporariesSidemap(fn, new Set());
-  const {
-    hoistableObjects,
-    processedInstrsInOptional,
-    temporariesReadInOptional,
-  } = collectOptionalChainSidemap(fn);
-
-  const hoistablePropertyLoads = collectHoistablePropertyLoadsInInnerFn(
-    fnInstr,
-    temporaries,
-    hoistableObjects,
-  );
-  const hoistableToFnEntry = hoistablePropertyLoads.get(fn.body.entry);
-  CompilerError.invariant(hoistableToFnEntry != null, {
-    reason:
-      '[InferEffectDependencies] Internal invariant broken: missing entry block',
-    loc: fnInstr.loc,
-  });
-
-  const dependencies = inferDependencies(
-    fnInstr,
-    new Map([...temporaries, ...temporariesReadInOptional]),
-    processedInstrsInOptional,
-  );
-
-  const tree = new ReactiveScopeDependencyTreeHIR(
-    [...hoistableToFnEntry.assumedNonNullObjects].map(o => o.fullPath),
-  );
-  for (const dep of dependencies) {
-    tree.addDependency({...dep});
-  }
-
-  return tree.deriveMinimalDependencies();
-}
-
-function inferDependencies(
-  fnInstr: TInstruction<FunctionExpression>,
-  temporaries: ReadonlyMap<IdentifierId, ReactiveScopeDependency>,
-  processedInstrsInOptional: ReadonlySet<Instruction | Terminal>,
-): Set<ReactiveScopeDependency> {
-  const fn = fnInstr.value.loweredFunc.func;
-  const context = new DependencyCollectionContext(
-    new Set(),
-    temporaries,
-    processedInstrsInOptional,
-  );
-  for (const dep of fn.context) {
-    context.declare(dep.identifier, {
-      id: makeInstructionId(0),
-      scope: empty(),
-    });
-  }
-  const placeholderScope: ReactiveScope = {
-    id: makeScopeId(0),
-    range: {
-      start: fnInstr.id,
-      end: makeInstructionId(fnInstr.id + 1),
-    },
-    dependencies: new Set(),
-    reassignments: new Set(),
-    declarations: new Map(),
-    earlyReturnValue: null,
-    merged: new Set(),
-    loc: GeneratedSource,
-  };
-  context.enterScope(placeholderScope);
-  inferDependenciesInFn(fn, context, temporaries);
-  context.exitScope(placeholderScope, false);
-  const resultUnfiltered = context.deps.get(placeholderScope);
-  CompilerError.invariant(resultUnfiltered != null, {
-    reason:
-      '[InferEffectDependencies] Internal invariant broken: missing scope dependencies',
-    loc: fn.loc,
-  });
-
-  const fnContext = new Set(fn.context.map(dep => dep.identifier.id));
-  const result = new Set<ReactiveScopeDependency>();
-  for (const dep of resultUnfiltered) {
-    if (fnContext.has(dep.identifier.id)) {
-      result.add(dep);
-    }
-  }
-
-  return result;
-}
-
-function inferDependenciesInFn(
-  fn: HIRFunction,
-  context: DependencyCollectionContext,
-  temporaries: ReadonlyMap<IdentifierId, ReactiveScopeDependency>,
-): void {
-  for (const [, block] of fn.body.blocks) {
-    // Record referenced optional chains in phis
-    for (const phi of block.phis) {
-      for (const operand of phi.operands) {
-        const maybeOptionalChain = temporaries.get(operand[1].identifier.id);
-        if (maybeOptionalChain) {
-          context.visitDependency(maybeOptionalChain);
-        }
-      }
-    }
-    for (const instr of block.instructions) {
-      if (
-        instr.value.kind === 'FunctionExpression' ||
-        instr.value.kind === 'ObjectMethod'
-      ) {
-        context.declare(instr.lvalue.identifier, {
-          id: instr.id,
-          scope: context.currentScope,
-        });
-        /**
-         * Recursively visit the inner function to extract dependencies
-         */
-        const innerFn = instr.value.loweredFunc.func;
-        context.enterInnerFn(instr as TInstruction<FunctionExpression>, () => {
-          inferDependenciesInFn(innerFn, context, temporaries);
-        });
-      } else {
-        handleInstruction(instr, context);
-      }
-    }
-  }
-}

compiler/packages/babel-plugin-react-compiler/src/Inference/InferFunctionEffects.ts

@@ -5,12 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {
-  CompilerError,
-  CompilerErrorDetailOptions,
-  ErrorSeverity,
-  ValueKind,
-} from '..';
+import {CompilerError, ErrorSeverity, ValueKind} from '..';
 import {
   AbstractValue,
   BasicBlock,
@@ -295,21 +290,21 @@ export function inferTerminalFunctionEffects(
   return functionEffects;
 }
 
-export function transformFunctionEffectErrors(
+export function raiseFunctionEffectErrors(
   functionEffects: Array<FunctionEffect>,
-): Array<CompilerErrorDetailOptions> {
-  return functionEffects.map(eff => {
+): void {
+  functionEffects.forEach(eff => {
     switch (eff.kind) {
       case 'ReactMutation':
       case 'GlobalMutation': {
-        return eff.error;
+        CompilerError.throw(eff.error);
       }
       case 'ContextMutation': {
-        return {
+        CompilerError.throw({
           severity: ErrorSeverity.Invariant,
           reason: `Unexpected ContextMutation in top-level function effects`,
           loc: eff.loc,
-        };
+        });
       }
       default:
         assertExhaustive(

compiler/packages/babel-plugin-react-compiler/src/Inference/InferMutableLifetimes.ts

@@ -11,10 +11,7 @@ import {
   Identifier,
   InstructionId,
   InstructionKind,
-  isArrayType,
-  isMapType,
   isRefOrRefValue,
-  isSetType,
   makeInstructionId,
   Place,
 } from '../HIR/HIR';
@@ -93,17 +90,6 @@ function inferPlace(
         infer(place, instrId);
       }
       return;
-    case Effect.ConditionallyMutateIterator: {
-      const identifier = place.identifier;
-      if (
-        !isArrayType(identifier) &&
-        !isSetType(identifier) &&
-        !isMapType(identifier)
-      ) {
-        infer(place, instrId);
-      }
-      return;
-    }
     case Effect.ConditionallyMutate:
     case Effect.Mutate: {
       infer(place, instrId);
@@ -176,15 +162,9 @@ export function inferMutableLifetimes(
       if (
         instr.value.kind === 'DeclareContext' ||
         (instr.value.kind === 'StoreContext' &&
-          instr.value.lvalue.kind !== InstructionKind.Reassign &&
-          !contextVariableDeclarationInstructions.has(
-            instr.value.lvalue.place.identifier,
-          ))
+          instr.value.lvalue.kind !== InstructionKind.Reassign)
       ) {
-        /**
-         * Save declarations of context variables if they hasn't already been
-         * declared (due to hoisted declarations).
-         */
+        // Save declarations of context variables
         contextVariableDeclarationInstructions.set(
           instr.value.lvalue.place.identifier,
           instr.id,

compiler/packages/babel-plugin-react-compiler/src/Inference/InferMutableRanges.ts

@@ -6,7 +6,6 @@
  */
 
 import {HIRFunction, Identifier} from '../HIR/HIR';
-import {inferAliasForUncalledFunctions} from './InerAliasForUncalledFunctions';
 import {inferAliases} from './InferAlias';
 import {inferAliasForPhis} from './InferAliasForPhis';
 import {inferAliasForStores} from './InferAliasForStores';
@@ -77,7 +76,6 @@ export function inferMutableRanges(ir: HIRFunction): void {
   while (true) {
     inferMutableRangesForAlias(ir, aliases);
     inferAliasForPhis(ir, aliases);
-    inferAliasForUncalledFunctions(ir, aliases);
     const nextAliases = aliases.canonicalize();
     if (areEqualMaps(prevAliases, nextAliases)) {
       break;

compiler/packages/babel-plugin-react-compiler/src/Inference/InferReactivePlaces.ts

@@ -9,19 +9,14 @@ import {CompilerError} from '..';
 import {
   BlockId,
   Effect,
-  Environment,
   HIRFunction,
   Identifier,
   IdentifierId,
-  Instruction,
   Place,
   computePostDominatorTree,
-  evaluatesToStableTypeOrContainer,
   getHookKind,
   isStableType,
-  isStableTypeContainer,
   isUseOperator,
-  isUseRefType,
 } from '../HIR';
 import {PostDominator} from '../HIR/Dominator';
 import {
@@ -36,103 +31,6 @@ import {
 import DisjointSet from '../Utils/DisjointSet';
 import {assertExhaustive} from '../Utils/utils';
 
-/**
- * Side map to track and propagate sources of stability (i.e. hook calls such as
- * `useRef()` and property reads such as `useState()[1]). Note that this
- * requires forward data flow analysis since stability is not part of React
- * Compiler's type system.
- */
-class StableSidemap {
-  map: Map<IdentifierId, {isStable: boolean}> = new Map();
-  env: Environment;
-
-  constructor(env: Environment) {
-    this.env = env;
-  }
-
-  handleInstruction(instr: Instruction): void {
-    const {value, lvalue} = instr;
-
-    switch (value.kind) {
-      case 'CallExpression':
-      case 'MethodCall': {
-        /**
-         * Sources of stability are known hook calls
-         */
-        if (evaluatesToStableTypeOrContainer(this.env, instr)) {
-          if (isStableType(lvalue.identifier)) {
-            this.map.set(lvalue.identifier.id, {
-              isStable: true,
-            });
-          } else {
-            this.map.set(lvalue.identifier.id, {
-              isStable: false,
-            });
-          }
-        } else if (
-          this.env.config.enableTreatRefLikeIdentifiersAsRefs &&
-          isUseRefType(lvalue.identifier)
-        ) {
-          this.map.set(lvalue.identifier.id, {
-            isStable: true,
-          });
-        }
-        break;
-      }
-
-      case 'Destructure':
-      case 'PropertyLoad': {
-        /**
-         * PropertyLoads may from stable containers may also produce stable
-         * values. ComputedLoads are technically safe for now (as all stable
-         * containers have differently-typed elements), but are not handled as
-         * they should be rare anyways.
-         */
-        const source =
-          value.kind === 'Destructure'
-            ? value.value.identifier.id
-            : value.object.identifier.id;
-        const entry = this.map.get(source);
-        if (entry) {
-          for (const lvalue of eachInstructionLValue(instr)) {
-            if (isStableTypeContainer(lvalue.identifier)) {
-              this.map.set(lvalue.identifier.id, {
-                isStable: false,
-              });
-            } else if (isStableType(lvalue.identifier)) {
-              this.map.set(lvalue.identifier.id, {
-                isStable: true,
-              });
-            }
-          }
-        }
-        break;
-      }
-
-      case 'StoreLocal': {
-        const entry = this.map.get(value.value.identifier.id);
-        if (entry) {
-          this.map.set(lvalue.identifier.id, entry);
-          this.map.set(value.lvalue.place.identifier.id, entry);
-        }
-        break;
-      }
-
-      case 'LoadLocal': {
-        const entry = this.map.get(value.place.identifier.id);
-        if (entry) {
-          this.map.set(lvalue.identifier.id, entry);
-        }
-        break;
-      }
-    }
-  }
-
-  isStable(id: IdentifierId): boolean {
-    const entry = this.map.get(id);
-    return entry != null ? entry.isStable : false;
-  }
-}
 /*
  * Infers which `Place`s are reactive, ie may *semantically* change
  * over the course of the component/hook's lifetime. Places are reactive
@@ -213,7 +111,6 @@ class StableSidemap {
  */
 export function inferReactivePlaces(fn: HIRFunction): void {
   const reactiveIdentifiers = new ReactivityMap(findDisjointMutableValues(fn));
-  const stableIdentifierSources = new StableSidemap(fn.env);
   for (const param of fn.params) {
     const place = param.kind === 'Identifier' ? param : param.place;
     reactiveIdentifiers.markReactive(place);
@@ -287,7 +184,6 @@ export function inferReactivePlaces(fn: HIRFunction): void {
         }
       }
       for (const instruction of block.instructions) {
-        stableIdentifierSources.handleInstruction(instruction);
         const {value} = instruction;
         let hasReactiveInput = false;
         /*
@@ -322,13 +218,7 @@ export function inferReactivePlaces(fn: HIRFunction): void {
 
         if (hasReactiveInput) {
           for (const lvalue of eachInstructionLValue(instruction)) {
-            /**
-             * Note that it's not correct to mark all stable-typed identifiers
-             * as non-reactive, since ternaries and other value blocks can
-             * produce reactive identifiers typed as these.
-             * (e.g. `props.cond ? setState1 : setState2`)
-             */
-            if (stableIdentifierSources.isStable(lvalue.identifier.id)) {
+            if (isStableType(lvalue.identifier)) {
               continue;
             }
             reactiveIdentifiers.markReactive(lvalue);
@@ -340,7 +230,6 @@ export function inferReactivePlaces(fn: HIRFunction): void {
               case Effect.Capture:
               case Effect.Store:
               case Effect.ConditionallyMutate:
-              case Effect.ConditionallyMutateIterator:
               case Effect.Mutate: {
                 if (isMutable(instruction, operand)) {
                   reactiveIdentifiers.markReactive(operand);

compiler/packages/babel-plugin-react-compiler/src/Inference/InferReferenceEffects.ts

@@ -5,14 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {CompilerError, CompilerErrorDetailOptions} from '../CompilerError';
+import {CompilerError} from '../CompilerError';
 import {Environment} from '../HIR';
 import {
   AbstractValue,
   BasicBlock,
   BlockId,
   CallExpression,
-  NewExpression,
   Effect,
   FunctionEffect,
   GeneratedSource,
@@ -24,15 +23,12 @@ import {
   Phi,
   Place,
   SpreadPattern,
-  TInstruction,
   Type,
   ValueKind,
   ValueReason,
   isArrayType,
-  isMapType,
   isMutableEffect,
   isObjectType,
-  isSetType,
 } from '../HIR/HIR';
 import {FunctionSignature} from '../HIR/ObjectShape';
 import {
@@ -42,6 +38,7 @@ import {
   printSourceLocation,
 } from '../HIR/PrintHIR';
 import {
+  eachCallArgument,
   eachInstructionOperand,
   eachInstructionValueOperand,
   eachPatternOperand,
@@ -52,7 +49,7 @@ import {assertExhaustive} from '../Utils/utils';
 import {
   inferTerminalFunctionEffects,
   inferInstructionFunctionEffects,
-  transformFunctionEffectErrors,
+  raiseFunctionEffectErrors,
 } from './InferFunctionEffects';
 
 const UndefinedValue: InstructionValue = {
@@ -106,15 +103,12 @@ const UndefinedValue: InstructionValue = {
 export default function inferReferenceEffects(
   fn: HIRFunction,
   options: {isFunctionExpression: boolean} = {isFunctionExpression: false},
-): Array<CompilerErrorDetailOptions> {
+): void {
   /*
    * Initial state contains function params
    * TODO: include module declarations here as well
    */
-  const initialState = InferenceState.empty(
-    fn.env,
-    options.isFunctionExpression,
-  );
+  const initialState = InferenceState.empty(fn.env);
   const value: InstructionValue = {
     kind: 'Primitive',
     loc: fn.loc,
@@ -247,9 +241,8 @@ export default function inferReferenceEffects(
 
   if (options.isFunctionExpression) {
     fn.effects = functionEffects;
-    return [];
-  } else {
-    return transformFunctionEffectErrors(functionEffects);
+  } else if (!fn.env.config.enableMinimalTransformsForRetry) {
+    raiseFunctionEffectErrors(functionEffects);
   }
 }
 
@@ -257,8 +250,7 @@ type FreezeAction = {values: Set<InstructionValue>; reason: Set<ValueReason>};
 
 // Maintains a mapping of top-level variables to the kind of value they hold
 class InferenceState {
-  env: Environment;
-  #isFunctionExpression: boolean;
+  #env: Environment;
 
   // The kind of each value, based on its allocation site
   #values: Map<InstructionValue, AbstractValue>;
@@ -271,25 +263,16 @@ class InferenceState {
 
   constructor(
     env: Environment,
-    isFunctionExpression: boolean,
     values: Map<InstructionValue, AbstractValue>,
     variables: Map<IdentifierId, Set<InstructionValue>>,
   ) {
-    this.env = env;
-    this.#isFunctionExpression = isFunctionExpression;
+    this.#env = env;
     this.#values = values;
     this.#variables = variables;
   }
 
-  static empty(
-    env: Environment,
-    isFunctionExpression: boolean,
-  ): InferenceState {
-    return new InferenceState(env, isFunctionExpression, new Map(), new Map());
-  }
-
-  get isFunctionExpression(): boolean {
-    return this.#isFunctionExpression;
+  static empty(env: Environment): InferenceState {
+    return new InferenceState(env, new Map(), new Map());
   }
 
   // (Re)initializes a @param value with its default @param kind.
@@ -407,14 +390,9 @@ class InferenceState {
 
   freezeValues(values: Set<InstructionValue>, reason: Set<ValueReason>): void {
     for (const value of values) {
-      if (
-        value.kind === 'DeclareContext' ||
-        (value.kind === 'StoreContext' &&
-          (value.lvalue.kind === InstructionKind.Let ||
-            value.lvalue.kind === InstructionKind.Const))
-      ) {
+      if (value.kind === 'DeclareContext') {
         /**
-         * Avoid freezing context variable declarations, hoisted or otherwise
+         * Avoid freezing hoisted context declarations
          * function Component() {
          *   const cb = useBar(() => foo(2)); // produces a hoisted context declaration
          *   const foo = useFoo();            // reassigns to the context variable
@@ -430,8 +408,8 @@ class InferenceState {
       });
       if (
         value.kind === 'FunctionExpression' &&
-        (this.env.config.enablePreserveExistingMemoizationGuarantees ||
-          this.env.config.enableTransitivelyFreezeFunctionExpressions)
+        (this.#env.config.enablePreserveExistingMemoizationGuarantees ||
+          this.#env.config.enableTransitivelyFreezeFunctionExpressions)
       ) {
         for (const operand of value.loweredFunc.func.context) {
           const operandValues = this.#variables.get(operand.identifier.id);
@@ -489,25 +467,6 @@ class InferenceState {
         }
         break;
       }
-      case Effect.ConditionallyMutateIterator: {
-        if (
-          valueKind.kind === ValueKind.Mutable ||
-          valueKind.kind === ValueKind.Context
-        ) {
-          if (
-            isArrayType(place.identifier) ||
-            isSetType(place.identifier) ||
-            isMapType(place.identifier)
-          ) {
-            effect = Effect.Capture;
-          } else {
-            effect = Effect.ConditionallyMutate;
-          }
-        } else {
-          effect = Effect.Read;
-        }
-        break;
-      }
       case Effect.Mutate: {
         effect = Effect.Mutate;
         break;
@@ -630,8 +589,7 @@ class InferenceState {
       return null;
     } else {
       return new InferenceState(
-        this.env,
-        this.#isFunctionExpression,
+        this.#env,
         nextValues ?? new Map(this.#values),
         nextVariables ?? new Map(this.#variables),
       );
@@ -645,8 +603,7 @@ class InferenceState {
    */
   clone(): InferenceState {
     return new InferenceState(
-      this.env,
-      this.#isFunctionExpression,
+      this.#env,
       new Map(this.#values),
       new Map(this.#variables),
     );
@@ -921,7 +878,9 @@ function inferBlock(
             state.referenceAndRecordEffects(
               freezeActions,
               element.place,
-              Effect.ConditionallyMutateIterator,
+              isArrayType(element.place.identifier)
+                ? Effect.Capture
+                : Effect.ConditionallyMutate,
               ValueReason.Other,
             );
           } else if (element.kind === 'Identifier') {
@@ -944,12 +903,43 @@ function inferBlock(
         break;
       }
       case 'NewExpression': {
-        inferCallEffects(
-          state,
-          instr as TInstruction<NewExpression>,
+        /**
+         * For new expressions, we infer a `read` effect on the Class / Function type
+         * to avoid extending mutable ranges of locally created classes, e.g.
+         * ```js
+         * const MyClass = getClass();
+         * const value = new MyClass(val1, val2)
+         *                   ^ (read)   ^ (conditionally mutate)
+         * ```
+         *
+         * Risks:
+         * Classes / functions created during render could technically capture and
+         * mutate their enclosing scope, which we currently do not detect.
+         */
+        const valueKind: AbstractValue = {
+          kind: ValueKind.Mutable,
+          reason: new Set([ValueReason.Other]),
+          context: new Set(),
+        };
+        state.referenceAndRecordEffects(
           freezeActions,
-          getFunctionCallSignature(env, instrValue.callee.identifier.type),
+          instrValue.callee,
+          Effect.Read,
+          ValueReason.Other,
         );
+
+        for (const operand of eachCallArgument(instrValue.args)) {
+          state.referenceAndRecordEffects(
+            freezeActions,
+            operand,
+            Effect.ConditionallyMutate,
+            ValueReason.Other,
+          );
+        }
+
+        state.initialize(instrValue, valueKind);
+        state.define(instr.lvalue, instrValue);
+        instr.lvalue.effect = Effect.ConditionallyMutate;
         continuation = {kind: 'funeffects'};
         break;
       }
@@ -1247,12 +1237,62 @@ function inferBlock(
         break;
       }
       case 'CallExpression': {
-        inferCallEffects(
-          state,
-          instr as TInstruction<CallExpression>,
-          freezeActions,
-          getFunctionCallSignature(env, instrValue.callee.identifier.type),
+        const signature = getFunctionCallSignature(
+          env,
+          instrValue.callee.identifier.type,
         );
+
+        const effects =
+          signature !== null ? getFunctionEffects(instrValue, signature) : null;
+        const returnValueKind: AbstractValue =
+          signature !== null
+            ? {
+                kind: signature.returnValueKind,
+                reason: new Set([
+                  signature.returnValueReason ??
+                    ValueReason.KnownReturnSignature,
+                ]),
+                context: new Set(),
+              }
+            : {
+                kind: ValueKind.Mutable,
+                reason: new Set([ValueReason.Other]),
+                context: new Set(),
+              };
+        let hasCaptureArgument = false;
+        for (let i = 0; i < instrValue.args.length; i++) {
+          const arg = instrValue.args[i];
+          const place = arg.kind === 'Identifier' ? arg : arg.place;
+          state.referenceAndRecordEffects(
+            freezeActions,
+            place,
+            getArgumentEffect(effects != null ? effects[i] : null, arg),
+            ValueReason.Other,
+          );
+          hasCaptureArgument ||= place.effect === Effect.Capture;
+        }
+        if (signature !== null) {
+          state.referenceAndRecordEffects(
+            freezeActions,
+            instrValue.callee,
+            signature.calleeEffect,
+            ValueReason.Other,
+          );
+        } else {
+          state.referenceAndRecordEffects(
+            freezeActions,
+            instrValue.callee,
+            Effect.ConditionallyMutate,
+            ValueReason.Other,
+          );
+        }
+        hasCaptureArgument ||= instrValue.callee.effect === Effect.Capture;
+
+        state.initialize(instrValue, returnValueKind);
+        state.define(instr.lvalue, instrValue);
+        instr.lvalue.effect = hasCaptureArgument
+          ? Effect.Store
+          : Effect.ConditionallyMutate;
         continuation = {kind: 'funeffects'};
         break;
       }
@@ -1270,12 +1310,102 @@ function inferBlock(
           Effect.Read,
           ValueReason.Other,
         );
-        inferCallEffects(
-          state,
-          instr as TInstruction<MethodCall>,
-          freezeActions,
-          getFunctionCallSignature(env, instrValue.property.identifier.type),
+
+        const signature = getFunctionCallSignature(
+          env,
+          instrValue.property.identifier.type,
         );
+
+        const returnValueKind: AbstractValue =
+          signature !== null
+            ? {
+                kind: signature.returnValueKind,
+                reason: new Set([
+                  signature.returnValueReason ??
+                    ValueReason.KnownReturnSignature,
+                ]),
+                context: new Set(),
+              }
+            : {
+                kind: ValueKind.Mutable,
+                reason: new Set([ValueReason.Other]),
+                context: new Set(),
+              };
+
+        if (
+          signature !== null &&
+          signature.mutableOnlyIfOperandsAreMutable &&
+          areArgumentsImmutableAndNonMutating(state, instrValue.args)
+        ) {
+          /*
+           * None of the args are mutable or mutate their params, we can downgrade to
+           * treating as all reads (except that the receiver may be captured)
+           */
+          for (const arg of instrValue.args) {
+            const place = arg.kind === 'Identifier' ? arg : arg.place;
+            state.referenceAndRecordEffects(
+              freezeActions,
+              place,
+              Effect.Read,
+              ValueReason.Other,
+            );
+          }
+          state.referenceAndRecordEffects(
+            freezeActions,
+            instrValue.receiver,
+            Effect.Capture,
+            ValueReason.Other,
+          );
+          state.initialize(instrValue, returnValueKind);
+          state.define(instr.lvalue, instrValue);
+          instr.lvalue.effect =
+            instrValue.receiver.effect === Effect.Capture
+              ? Effect.Store
+              : Effect.ConditionallyMutate;
+          continuation = {kind: 'funeffects'};
+          break;
+        }
+
+        const effects =
+          signature !== null ? getFunctionEffects(instrValue, signature) : null;
+        let hasCaptureArgument = false;
+        for (let i = 0; i < instrValue.args.length; i++) {
+          const arg = instrValue.args[i];
+          const place = arg.kind === 'Identifier' ? arg : arg.place;
+          /*
+           * If effects are inferred for an argument, we should fail invalid
+           * mutating effects
+           */
+          state.referenceAndRecordEffects(
+            freezeActions,
+            place,
+            getArgumentEffect(effects != null ? effects[i] : null, arg),
+            ValueReason.Other,
+          );
+          hasCaptureArgument ||= place.effect === Effect.Capture;
+        }
+        if (signature !== null) {
+          state.referenceAndRecordEffects(
+            freezeActions,
+            instrValue.receiver,
+            signature.calleeEffect,
+            ValueReason.Other,
+          );
+        } else {
+          state.referenceAndRecordEffects(
+            freezeActions,
+            instrValue.receiver,
+            Effect.ConditionallyMutate,
+            ValueReason.Other,
+          );
+        }
+        hasCaptureArgument ||= instrValue.receiver.effect === Effect.Capture;
+
+        state.initialize(instrValue, returnValueKind);
+        state.define(instr.lvalue, instrValue);
+        instr.lvalue.effect = hasCaptureArgument
+          ? Effect.Store
+          : Effect.ConditionallyMutate;
         continuation = {kind: 'funeffects'};
         break;
       }
@@ -1611,14 +1741,6 @@ function inferBlock(
         );
 
         const lvalue = instr.lvalue;
-        if (instrValue.lvalue.kind !== InstructionKind.Reassign) {
-          state.initialize(instrValue, {
-            kind: ValueKind.Mutable,
-            reason: new Set([ValueReason.Other]),
-            context: new Set(),
-          });
-          state.define(instrValue.lvalue.place, instrValue);
-        }
         state.alias(lvalue, instrValue.value);
         lvalue.effect = Effect.Store;
         continuation = {kind: 'funeffects'};
@@ -1690,13 +1812,7 @@ function inferBlock(
           kind === ValueKind.Mutable || kind === ValueKind.Context;
         let effect;
         let valueKind: AbstractValue;
-        const iterator = instrValue.collection.identifier;
-        if (
-          !isMutable ||
-          isArrayType(iterator) ||
-          isMapType(iterator) ||
-          isSetType(iterator)
-        ) {
+        if (!isMutable || isArrayType(instrValue.collection.identifier)) {
           // Case 1, assume iterator is a separate mutable object
           effect = {
             kind: Effect.Read,
@@ -1737,7 +1853,7 @@ function inferBlock(
         state.referenceAndRecordEffects(
           freezeActions,
           instrValue.iterator,
-          Effect.ConditionallyMutateIterator,
+          Effect.ConditionallyMutate,
           ValueReason.Other,
         );
         /**
@@ -1809,15 +1925,8 @@ function inferBlock(
     if (block.terminal.kind === 'return' || block.terminal.kind === 'throw') {
       if (
         state.isDefined(operand) &&
-        ((operand.identifier.type.kind === 'Function' &&
-          state.isFunctionExpression) ||
-          state.kind(operand).kind === ValueKind.Context)
+        state.kind(operand).kind === ValueKind.Context
       ) {
-        /**
-         * Returned values should only be typed as 'frozen' if they are both (1)
-         * local and (2) not a function expression which may capture and mutate
-         * this function's outer context.
-         */
         effect = Effect.ConditionallyMutate;
       } else {
         effect = Effect.Freeze;
@@ -1873,7 +1982,7 @@ export function getFunctionCallSignature(
  * @returns Inferred effects of function arguments, or null if inference fails.
  */
 export function getFunctionEffects(
-  fn: MethodCall | CallExpression | NewExpression,
+  fn: MethodCall | CallExpression,
   sig: FunctionSignature,
 ): Array<Effect> | null {
   const results = [];
@@ -1902,33 +2011,6 @@ export function getFunctionEffects(
   return results;
 }
 
-export function isKnownMutableEffect(effect: Effect): boolean {
-  switch (effect) {
-    case Effect.Store:
-    case Effect.ConditionallyMutate:
-    case Effect.ConditionallyMutateIterator:
-    case Effect.Mutate: {
-      return true;
-    }
-
-    case Effect.Unknown: {
-      CompilerError.invariant(false, {
-        reason: 'Unexpected unknown effect',
-        description: null,
-        loc: GeneratedSource,
-        suggestions: null,
-      });
-    }
-    case Effect.Read:
-    case Effect.Capture:
-    case Effect.Freeze: {
-      return false;
-    }
-    default: {
-      assertExhaustive(effect, `Unexpected effect \`${effect}\``);
-    }
-  }
-}
 /**
  * Returns true if all of the arguments are both non-mutable (immutable or frozen)
  * _and_ are not functions which might mutate their arguments. Note that function
@@ -1940,20 +2022,10 @@ function areArgumentsImmutableAndNonMutating(
   args: MethodCall['args'],
 ): boolean {
   for (const arg of args) {
-    if (arg.kind === 'Identifier' && arg.identifier.type.kind === 'Function') {
-      const fnShape = state.env.getFunctionSignature(arg.identifier.type);
-      if (fnShape != null) {
-        return (
-          !fnShape.positionalParams.some(isKnownMutableEffect) &&
-          (fnShape.restParam == null ||
-            !isKnownMutableEffect(fnShape.restParam))
-        );
-      }
-    }
     const place = arg.kind === 'Identifier' ? arg : arg.place;
-
     const kind = state.kind(place).kind;
     switch (kind) {
+      case ValueKind.Global:
       case ValueKind.Primitive:
       case ValueKind.Frozen: {
         /*
@@ -1964,10 +2036,6 @@ function areArgumentsImmutableAndNonMutating(
         break;
       }
       default: {
-        /**
-         * Globals, module locals, and other locally defined functions may
-         * mutate their arguments.
-         */
         return false;
       }
     }
@@ -2010,128 +2078,9 @@ function getArgumentEffect(
         });
       }
       // effects[i] is Effect.Capture | Effect.Read | Effect.Store
-      return Effect.ConditionallyMutateIterator;
+      return Effect.ConditionallyMutate;
     }
   } else {
     return Effect.ConditionallyMutate;
   }
 }
-
-function inferCallEffects(
-  state: InferenceState,
-  instr:
-    | TInstruction<CallExpression>
-    | TInstruction<MethodCall>
-    | TInstruction<NewExpression>,
-  freezeActions: Array<FreezeAction>,
-  signature: FunctionSignature | null,
-): void {
-  const instrValue = instr.value;
-  const returnValueKind: AbstractValue =
-    signature !== null
-      ? {
-          kind: signature.returnValueKind,
-          reason: new Set([
-            signature.returnValueReason ?? ValueReason.KnownReturnSignature,
-          ]),
-          context: new Set(),
-        }
-      : {
-          kind: ValueKind.Mutable,
-          reason: new Set([ValueReason.Other]),
-          context: new Set(),
-        };
-
-  if (
-    instrValue.kind === 'MethodCall' &&
-    signature !== null &&
-    signature.mutableOnlyIfOperandsAreMutable &&
-    areArgumentsImmutableAndNonMutating(state, instrValue.args)
-  ) {
-    /*
-     * None of the args are mutable or mutate their params, we can downgrade to
-     * treating as all reads (except that the receiver may be captured)
-     */
-    for (const arg of instrValue.args) {
-      const place = arg.kind === 'Identifier' ? arg : arg.place;
-      state.referenceAndRecordEffects(
-        freezeActions,
-        place,
-        Effect.Read,
-        ValueReason.Other,
-      );
-    }
-    state.referenceAndRecordEffects(
-      freezeActions,
-      instrValue.receiver,
-      Effect.Capture,
-      ValueReason.Other,
-    );
-    state.initialize(instrValue, returnValueKind);
-    state.define(instr.lvalue, instrValue);
-    instr.lvalue.effect =
-      instrValue.receiver.effect === Effect.Capture
-        ? Effect.Store
-        : Effect.ConditionallyMutate;
-    return;
-  }
-
-  const effects =
-    signature !== null ? getFunctionEffects(instrValue, signature) : null;
-  let hasCaptureArgument = false;
-  for (let i = 0; i < instrValue.args.length; i++) {
-    const arg = instrValue.args[i];
-    const place = arg.kind === 'Identifier' ? arg : arg.place;
-    /*
-     * If effects are inferred for an argument, we should fail invalid
-     * mutating effects
-     */
-    state.referenceAndRecordEffects(
-      freezeActions,
-      place,
-      getArgumentEffect(effects != null ? effects[i] : null, arg),
-      ValueReason.Other,
-    );
-    hasCaptureArgument ||= place.effect === Effect.Capture;
-  }
-  const callee =
-    instrValue.kind === 'MethodCall' ? instrValue.receiver : instrValue.callee;
-  if (signature !== null) {
-    state.referenceAndRecordEffects(
-      freezeActions,
-      callee,
-      signature.calleeEffect,
-      ValueReason.Other,
-    );
-  } else {
-    /**
-     * For new expressions, we infer a `read` effect on the Class / Function type
-     * to avoid extending mutable ranges of locally created classes, e.g.
-     * ```js
-     * const MyClass = getClass();
-     * const value = new MyClass(val1, val2)
-     *                   ^ (read)   ^ (conditionally mutate)
-     * ```
-     *
-     * Risks:
-     * Classes / functions created during render could technically capture and
-     * mutate their enclosing scope, which we currently do not detect.
-     */
-
-    state.referenceAndRecordEffects(
-      freezeActions,
-      callee,
-      instrValue.kind === 'NewExpression'
-        ? Effect.Read
-        : Effect.ConditionallyMutate,
-      ValueReason.Other,
-    );
-  }
-  hasCaptureArgument ||= callee.effect === Effect.Capture;
-
-  state.initialize(instrValue, returnValueKind);
-  state.define(instr.lvalue, instrValue);
-  instr.lvalue.effect = hasCaptureArgument
-    ? Effect.Store
-    : Effect.ConditionallyMutate;
-}

compiler/packages/babel-plugin-react-compiler/src/Optimization/ConstantPropagation.ts

@@ -327,23 +327,6 @@ function evaluateInstruction(
           }
           return null;
         }
-        case '-': {
-          const operand = read(constants, value.value);
-          if (
-            operand !== null &&
-            operand.kind === 'Primitive' &&
-            typeof operand.value === 'number'
-          ) {
-            const result: Primitive = {
-              kind: 'Primitive',
-              value: operand.value * -1,
-              loc: value.loc,
-            };
-            instr.value = result;
-            return result;
-          }
-          return null;
-        }
         default:
           return null;
       }
@@ -509,73 +492,6 @@ function evaluateInstruction(
       }
       return null;
     }
-    case 'TemplateLiteral': {
-      if (value.subexprs.length === 0) {
-        const result: InstructionValue = {
-          kind: 'Primitive',
-          value: value.quasis.map(q => q.cooked).join(''),
-          loc: value.loc,
-        };
-        instr.value = result;
-        return result;
-      }
-
-      if (value.subexprs.length !== value.quasis.length - 1) {
-        return null;
-      }
-
-      if (value.quasis.some(q => q.cooked === undefined)) {
-        return null;
-      }
-
-      let quasiIndex = 0;
-      let resultString = value.quasis[quasiIndex].cooked as string;
-      ++quasiIndex;
-
-      for (const subExpr of value.subexprs) {
-        const subExprValue = read(constants, subExpr);
-        if (!subExprValue || subExprValue.kind !== 'Primitive') {
-          return null;
-        }
-
-        const expressionValue = subExprValue.value;
-        if (
-          typeof expressionValue !== 'number' &&
-          typeof expressionValue !== 'string' &&
-          typeof expressionValue !== 'boolean' &&
-          !(typeof expressionValue === 'object' && expressionValue === null)
-        ) {
-          // value is not supported (function, object) or invalid (symbol), or something else
-          return null;
-        }
-
-        const suffix = value.quasis[quasiIndex].cooked;
-        ++quasiIndex;
-
-        if (suffix === undefined) {
-          return null;
-        }
-
-        /*
-         * Spec states that concat calls ToString(argument) internally on its parameters
-         * -> we don't have to implement ToString(argument) ourselves and just use the engine implementation
-         * Refs:
-         *  - https://tc39.es/ecma262/2024/#sec-tostring
-         *  - https://tc39.es/ecma262/2024/#sec-string.prototype.concat
-         *  - https://tc39.es/ecma262/2024/#sec-template-literals-runtime-semantics-evaluation
-         */
-        resultString = resultString.concat(expressionValue as string, suffix);
-      }
-
-      const result: InstructionValue = {
-        kind: 'Primitive',
-        value: resultString,
-        loc: value.loc,
-      };
-
-      instr.value = result;
-      return result;
-    }
     case 'LoadLocal': {
       const placeValue = read(constants, value.place);
       if (placeValue !== null) {

compiler/packages/babel-plugin-react-compiler/src/Optimization/LowerContextAccess.ts

@@ -18,7 +18,6 @@ import {
   Instruction,
   LoadGlobal,
   LoadLocal,
-  NonLocalImportSpecifier,
   Place,
   PropertyLoad,
   isUseContextHookType,
@@ -36,7 +35,7 @@ import {inferTypes} from '../TypeInference';
 
 export function lowerContextAccess(
   fn: HIRFunction,
-  loweredContextCalleeConfig: ExternalFunction,
+  loweredContextCallee: ExternalFunction,
 ): void {
   const contextAccess: Map<IdentifierId, CallExpression> = new Map();
   const contextKeys: Map<IdentifierId, Array<string>> = new Map();
@@ -80,8 +79,6 @@ export function lowerContextAccess(
     }
   }
 
-  let importLoweredContextCallee: NonLocalImportSpecifier | null = null;
-
   if (contextAccess.size > 0 && contextKeys.size > 0) {
     for (const [, block] of fn.body.blocks) {
       let nextInstructions: Array<Instruction> | null = null;
@@ -94,13 +91,9 @@ export function lowerContextAccess(
           isUseContextHookType(value.callee.identifier) &&
           contextKeys.has(lvalue.identifier.id)
         ) {
-          importLoweredContextCallee ??=
-            fn.env.programContext.addImportSpecifier(
-              loweredContextCalleeConfig,
-            );
           const loweredContextCalleeInstr = emitLoadLoweredContextCallee(
             fn.env,
-            importLoweredContextCallee,
+            loweredContextCallee,
           );
 
           if (nextInstructions === null) {
@@ -129,16 +122,21 @@ export function lowerContextAccess(
     }
     markInstructionIds(fn.body);
     inferTypes(fn);
+    fn.env.hasLoweredContextAccess = true;
   }
 }
 
 function emitLoadLoweredContextCallee(
   env: Environment,
-  importedLowerContextCallee: NonLocalImportSpecifier,
+  loweredContextCallee: ExternalFunction,
 ): Instruction {
   const loadGlobal: LoadGlobal = {
     kind: 'LoadGlobal',
-    binding: {...importedLowerContextCallee},
+    binding: {
+      kind: 'ImportNamespace',
+      module: loweredContextCallee.source,
+      name: loweredContextCallee.importSpecifierName,
+    },
     loc: GeneratedSource,
   };
 

compiler/packages/babel-plugin-react-compiler/src/Optimization/OutlineJsx.ts

@@ -196,7 +196,7 @@ function process(
     return null;
   }
 
-  const props = collectProps(fn.env, jsx);
+  const props = collectProps(jsx);
   if (!props) return null;
 
   const outlinedTag = fn.env.generateGloballyUniqueIdentifierName(null).value;
@@ -217,7 +217,6 @@ type OutlinedJsxAttribute = {
 };
 
 function collectProps(
-  env: Environment,
   instructions: Array<JsxInstruction>,
 ): Array<OutlinedJsxAttribute> | null {
   let id = 1;
@@ -228,7 +227,6 @@ function collectProps(
       newName = `${oldName}${id++}`;
     }
     seen.add(newName);
-    env.programContext.addNewReference(newName);
     return newName;
   }
 

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/CodegenReactiveFunction.ts

@@ -14,7 +14,7 @@ import {
   renameVariables,
 } from '.';
 import {CompilerError, ErrorSeverity} from '../CompilerError';
-import {Environment, ExternalFunction} from '../HIR';
+import {Environment, EnvironmentConfig, ExternalFunction} from '../HIR';
 import {
   ArrayPattern,
   BlockId,
@@ -52,8 +52,7 @@ import {assertExhaustive} from '../Utils/utils';
 import {buildReactiveFunction} from './BuildReactiveFunction';
 import {SINGLE_CHILD_FBT_TAGS} from './MemoizeFbtAndMacroOperandsInSameScope';
 import {ReactiveFunctionVisitor, visitReactiveFunction} from './visitors';
-import {EMIT_FREEZE_GLOBAL_GATING, ReactFunctionType} from '../HIR/Environment';
-import {ProgramContext} from '../Entrypoint';
+import {ReactFunctionType} from '../HIR/Environment';
 
 export const MEMO_CACHE_SENTINEL = 'react.memo_cache_sentinel';
 export const EARLY_RETURN_SENTINEL = 'react.early_return_sentinel';
@@ -101,10 +100,9 @@ export type CodegenFunction = {
   }>;
 
   /**
-   * This is true if the compiler has compiled inferred effect dependencies
+   * This is true if the compiler has the lowered useContext calls.
    */
-  hasInferredEffect: boolean;
-  inferredEffectLocations: Set<SourceLocation>;
+  hasLoweredContextAccess: boolean;
 
   /**
    * This is true if the compiler has compiled a fire to a useFire call
@@ -158,11 +156,10 @@ export function codegenFunction(
   const compiled = compileResult.unwrap();
 
   const hookGuard = fn.env.config.enableEmitHookGuards;
-  if (hookGuard != null && fn.env.isInferredMemoEnabled) {
+  if (hookGuard != null) {
     compiled.body = t.blockStatement([
       createHookGuard(
         hookGuard,
-        fn.env.programContext,
         compiled.body.body,
         GuardKind.PushHookGuard,
         GuardKind.PopHookGuard,
@@ -173,15 +170,13 @@ export function codegenFunction(
   const cacheCount = compiled.memoSlotsUsed;
   if (cacheCount !== 0) {
     const preface: Array<t.Statement> = [];
-    const useMemoCacheIdentifier =
-      fn.env.programContext.addMemoCacheImport().name;
 
     // The import declaration for `useMemoCache` is inserted in the Babel plugin
     preface.push(
       t.variableDeclaration('const', [
         t.variableDeclarator(
           t.identifier(cx.synthesizeName('$')),
-          t.callExpression(t.identifier(useMemoCacheIdentifier), [
+          t.callExpression(t.identifier(fn.env.useMemoCacheIdentifier), [
             t.numericLiteral(cacheCount),
           ]),
         ),
@@ -255,63 +250,39 @@ export function codegenFunction(
   }
 
   const emitInstrumentForget = fn.env.config.enableEmitInstrumentForget;
-  if (
-    emitInstrumentForget != null &&
-    fn.id != null &&
-    fn.env.isInferredMemoEnabled
-  ) {
+  if (emitInstrumentForget != null && fn.id != null) {
     /*
      * Technically, this is a conditional hook call. However, we expect
      * __DEV__ and gating identifier to be runtime constants
      */
-    const gating =
-      emitInstrumentForget.gating != null
-        ? t.identifier(
-            fn.env.programContext.addImportSpecifier(
-              emitInstrumentForget.gating,
-            ).name,
-          )
-        : null;
-
-    const globalGating =
+    let gating: t.Expression;
+    if (
+      emitInstrumentForget.gating != null &&
       emitInstrumentForget.globalGating != null
-        ? t.identifier(emitInstrumentForget.globalGating)
-        : null;
-
-    if (emitInstrumentForget.globalGating != null) {
-      const assertResult = fn.env.programContext.assertGlobalBinding(
-        emitInstrumentForget.globalGating,
+    ) {
+      gating = t.logicalExpression(
+        '&&',
+        t.identifier(emitInstrumentForget.globalGating),
+        t.identifier(emitInstrumentForget.gating.importSpecifierName),
       );
-      if (assertResult.isErr()) {
-        return assertResult;
-      }
-    }
-
-    let ifTest: t.Expression;
-    if (gating != null && globalGating != null) {
-      ifTest = t.logicalExpression('&&', globalGating, gating);
-    } else if (gating != null) {
-      ifTest = gating;
+    } else if (emitInstrumentForget.gating != null) {
+      gating = t.identifier(emitInstrumentForget.gating.importSpecifierName);
     } else {
-      CompilerError.invariant(globalGating != null, {
+      CompilerError.invariant(emitInstrumentForget.globalGating != null, {
         reason:
           'Bad config not caught! Expected at least one of gating or globalGating',
         loc: null,
         suggestions: null,
       });
-      ifTest = globalGating;
+      gating = t.identifier(emitInstrumentForget.globalGating);
     }
-
-    const instrumentFnIdentifier = fn.env.programContext.addImportSpecifier(
-      emitInstrumentForget.fn,
-    ).name;
     const test: t.IfStatement = t.ifStatement(
-      ifTest,
+      gating,
       t.expressionStatement(
-        t.callExpression(t.identifier(instrumentFnIdentifier), [
-          t.stringLiteral(fn.id),
-          t.stringLiteral(fn.env.filename ?? ''),
-        ]),
+        t.callExpression(
+          t.identifier(emitInstrumentForget.fn.importSpecifierName),
+          [t.stringLiteral(fn.id), t.stringLiteral(fn.env.filename ?? '')],
+        ),
       ),
     );
     compiled.body.body.unshift(test);
@@ -388,9 +359,8 @@ function codegenReactiveFunction(
     prunedMemoBlocks: countMemoBlockVisitor.prunedMemoBlocks,
     prunedMemoValues: countMemoBlockVisitor.prunedMemoValues,
     outlined: [],
+    hasLoweredContextAccess: fn.env.hasLoweredContextAccess,
     hasFireRewrite: fn.env.hasFireRewrite,
-    hasInferredEffect: fn.env.hasInferredEffect,
-    inferredEffectLocations: fn.env.inferredEffectLocations,
   });
 }
 
@@ -578,19 +548,14 @@ function codegenBlockNoReset(
 }
 
 function wrapCacheDep(cx: Context, value: t.Expression): t.Expression {
-  if (cx.env.config.enableEmitFreeze != null && cx.env.isInferredMemoEnabled) {
-    const emitFreezeIdentifier = cx.env.programContext.addImportSpecifier(
-      cx.env.config.enableEmitFreeze,
-    ).name;
-    cx.env.programContext
-      .assertGlobalBinding(EMIT_FREEZE_GLOBAL_GATING, cx.env.scope)
-      .unwrap();
+  if (cx.env.config.enableEmitFreeze != null) {
+    // The import declaration for emitFreeze is inserted in the Babel plugin
     return t.conditionalExpression(
-      t.identifier(EMIT_FREEZE_GLOBAL_GATING),
-      t.callExpression(t.identifier(emitFreezeIdentifier), [
-        value,
-        t.stringLiteral(cx.fnName),
-      ]),
+      t.identifier('__DEV__'),
+      t.callExpression(
+        t.identifier(cx.env.config.enableEmitFreeze.importSpecifierName),
+        [value, t.stringLiteral(cx.fnName)],
+      ),
       value,
     );
   } else {
@@ -744,14 +709,16 @@ function codegenReactiveScope(
   let computationBlock = codegenBlock(cx, block);
 
   let memoStatement;
-  const detectionFunction = cx.env.config.enableChangeDetectionForDebugging;
-  if (detectionFunction != null && changeExpressions.length > 0) {
+  if (
+    cx.env.config.enableChangeDetectionForDebugging != null &&
+    changeExpressions.length > 0
+  ) {
     const loc =
       typeof scope.loc === 'symbol'
         ? 'unknown location'
         : `(${scope.loc.start.line}:${scope.loc.end.line})`;
-    const importedDetectionFunctionIdentifier =
-      cx.env.programContext.addImportSpecifier(detectionFunction).name;
+    const detectionFunction =
+      cx.env.config.enableChangeDetectionForDebugging.importSpecifierName;
     const cacheLoadOldValueStatements: Array<t.Statement> = [];
     const changeDetectionStatements: Array<t.Statement> = [];
     const idempotenceDetectionStatements: Array<t.Statement> = [];
@@ -773,7 +740,7 @@ function codegenReactiveScope(
       );
       changeDetectionStatements.push(
         t.expressionStatement(
-          t.callExpression(t.identifier(importedDetectionFunctionIdentifier), [
+          t.callExpression(t.identifier(detectionFunction), [
             t.identifier(loadName),
             t.cloneNode(name, true),
             t.stringLiteral(name.name),
@@ -785,7 +752,7 @@ function codegenReactiveScope(
       );
       idempotenceDetectionStatements.push(
         t.expressionStatement(
-          t.callExpression(t.identifier(importedDetectionFunctionIdentifier), [
+          t.callExpression(t.identifier(detectionFunction), [
             t.cloneNode(slot, true),
             t.cloneNode(name, true),
             t.stringLiteral(name.name),
@@ -1000,14 +967,6 @@ function codegenTerminal(
           lval = codegenLValue(cx, iterableItem.value.lvalue.pattern);
           break;
         }
-        case 'StoreContext': {
-          CompilerError.throwTodo({
-            reason: 'Support non-trivial for..in inits',
-            description: null,
-            loc: terminal.init.loc,
-            suggestions: null,
-          });
-        }
         default:
           CompilerError.invariant(false, {
             reason: `Expected a StoreLocal or Destructure to be assigned to the collection`,
@@ -1100,14 +1059,6 @@ function codegenTerminal(
           lval = codegenLValue(cx, iterableItem.value.lvalue.pattern);
           break;
         }
-        case 'StoreContext': {
-          CompilerError.throwTodo({
-            reason: 'Support non-trivial for..of inits',
-            description: null,
-            loc: terminal.init.loc,
-            suggestions: null,
-          });
-        }
         default:
           CompilerError.invariant(false, {
             reason: `Expected a StoreLocal or Destructure to be assigned to the collection`,
@@ -1563,15 +1514,15 @@ const createStringLiteral = withLoc(t.stringLiteral);
 
 function createHookGuard(
   guard: ExternalFunction,
-  context: ProgramContext,
   stmts: Array<t.Statement>,
   before: GuardKind,
   after: GuardKind,
 ): t.TryStatement {
-  const guardFnName = context.addImportSpecifier(guard).name;
   function createHookGuardImpl(kind: number): t.ExpressionStatement {
     return t.expressionStatement(
-      t.callExpression(t.identifier(guardFnName), [t.numericLiteral(kind)]),
+      t.callExpression(t.identifier(guard.importSpecifierName), [
+        t.numericLiteral(kind),
+      ]),
     );
   }
 
@@ -1602,7 +1553,7 @@ function createHookGuard(
  * ```
  */
 function createCallExpression(
-  env: Environment,
+  config: EnvironmentConfig,
   callee: t.Expression,
   args: Array<t.Expression | t.SpreadElement>,
   loc: SourceLocation | null,
@@ -1613,15 +1564,14 @@ function createCallExpression(
     callExpr.loc = loc;
   }
 
-  const hookGuard = env.config.enableEmitHookGuards;
-  if (hookGuard != null && isHook && env.isInferredMemoEnabled) {
+  const hookGuard = config.enableEmitHookGuards;
+  if (hookGuard != null && isHook) {
     const iife = t.functionExpression(
       null,
       [],
       t.blockStatement([
         createHookGuard(
           hookGuard,
-          env.programContext,
           [t.returnStatement(callExpr)],
           GuardKind.AllowHook,
           GuardKind.DisallowHook,
@@ -1751,7 +1701,7 @@ function codegenInstructionValue(
       const callee = codegenPlaceToExpression(cx, instrValue.callee);
       const args = instrValue.args.map(arg => codegenArgument(cx, arg));
       value = createCallExpression(
-        cx.env,
+        cx.env.config,
         callee,
         args,
         instrValue.loc,
@@ -1841,7 +1791,7 @@ function codegenInstructionValue(
       );
       const args = instrValue.args.map(arg => codegenArgument(cx, arg));
       value = createCallExpression(
-        cx.env,
+        cx.env.config,
         memberExpr,
         args,
         instrValue.loc,
@@ -2131,17 +2081,10 @@ function codegenInstructionValue(
     }
     case 'TypeCastExpression': {
       if (t.isTSType(instrValue.typeAnnotation)) {
-        if (instrValue.typeAnnotationKind === 'satisfies') {
-          value = t.tsSatisfiesExpression(
-            codegenPlaceToExpression(cx, instrValue.value),
-            instrValue.typeAnnotation,
-          );
-        } else {
-          value = t.tsAsExpression(
-            codegenPlaceToExpression(cx, instrValue.value),
-            instrValue.typeAnnotation,
-          );
-        }
+        value = t.tsAsExpression(
+          codegenPlaceToExpression(cx, instrValue.value),
+          instrValue.typeAnnotation,
+        );
       } else {
         value = t.typeCastExpression(
           codegenPlaceToExpression(cx, instrValue.value),
@@ -2327,12 +2270,9 @@ function codegenInstructionValue(
  * u0080 to u009F: C1 control codes
  * u00A0 to uFFFF: All non-basic Latin characters
  * https://en.wikipedia.org/wiki/List_of_Unicode_characters#Control_codes
- *
- * u010000 to u10FFFF: Astral plane characters
- * https://mathiasbynens.be/notes/javascript-unicode
  */
 const STRING_REQUIRES_EXPR_CONTAINER_PATTERN =
-  /[\u{0000}-\u{001F}\u{007F}\u{0080}-\u{FFFF}\u{010000}-\u{10FFFF}]|"|\\/u;
+  /[\u{0000}-\u{001F}\u{007F}\u{0080}-\u{FFFF}]|"|\\/u;
 function codegenJsxAttribute(
   cx: Context,
   attribute: JsxAttribute,
@@ -2489,9 +2429,6 @@ function codegenObjectPropertyKey(
       });
       return expr;
     }
-    case 'number': {
-      return t.numericLiteral(key.name);
-    }
   }
 }
 

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/PrintReactiveFunction.ts

@@ -255,12 +255,6 @@ function writeReactiveValue(writer: Writer, value: ReactiveValue): void {
   }
 }
 
-export function printReactiveTerminal(terminal: ReactiveTerminal): string {
-  const writer = new Writer();
-  writeTerminal(writer, terminal);
-  return writer.complete();
-}
-
 function writeTerminal(writer: Writer, terminal: ReactiveTerminal): void {
   switch (terminal.kind) {
     case 'break': {

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/PruneHoistedContexts.ts

@@ -5,19 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {CompilerError} from '..';
 import {
-  convertHoistedLValueKind,
-  IdentifierId,
-  InstructionId,
+  DeclarationId,
   InstructionKind,
-  Place,
   ReactiveFunction,
   ReactiveInstruction,
-  ReactiveScopeBlock,
   ReactiveStatement,
 } from '../HIR';
-import {empty, Stack} from '../Utils/Stack';
 import {
   ReactiveFunctionTransform,
   Transformed,
@@ -27,144 +21,80 @@ import {
 /*
  * Prunes DeclareContexts lowered for HoistedConsts, and transforms any references back to its
  * original instruction kind.
- *
- * Also detects and bails out on context variables which are:
- * - function declarations, which are hoisted by JS engines to the nearest block scope
- * - referenced before they are defined (i.e. having a `DeclareContext HoistedConst`)
- * - declared
- *
- * This is because React Compiler converts a `function foo()` function declaration to
- * 1. a `let foo;` declaration before reactive memo blocks
- * 2. a `foo = function foo() {}` assignment within the block
- *
- * This means references before the assignment are invalid (see fixture
- * error.todo-functiondecl-hoisting)
  */
 export function pruneHoistedContexts(fn: ReactiveFunction): void {
-  visitReactiveFunction(fn, new Visitor(), {
-    activeScopes: empty(),
-    uninitialized: new Map(),
-  });
+  const hoistedIdentifiers: HoistedIdentifiers = new Map();
+  visitReactiveFunction(fn, new Visitor(), hoistedIdentifiers);
 }
 
-type VisitorState = {
-  activeScopes: Stack<Set<IdentifierId>>;
-  uninitialized: Map<
-    IdentifierId,
-    | {
-        kind: 'unknown-kind';
-      }
-    | {
-        kind: 'func';
-        definition: Place | null;
-      }
-  >;
-};
+type HoistedIdentifiers = Map<DeclarationId, InstructionKind>;
 
-class Visitor extends ReactiveFunctionTransform<VisitorState> {
-  override visitScope(scope: ReactiveScopeBlock, state: VisitorState): void {
-    state.activeScopes = state.activeScopes.push(
-      new Set(scope.scope.declarations.keys()),
-    );
-    /**
-     * Add declared but not initialized / assigned variables. This may include
-     * function declarations that escape the memo block.
-     */
-    for (const decl of scope.scope.declarations.values()) {
-      state.uninitialized.set(decl.identifier.id, {kind: 'unknown-kind'});
-    }
-    this.traverseScope(scope, state);
-    state.activeScopes.pop();
-    for (const decl of scope.scope.declarations.values()) {
-      state.uninitialized.delete(decl.identifier.id);
-    }
-  }
-  override visitPlace(
-    _id: InstructionId,
-    place: Place,
-    state: VisitorState,
-  ): void {
-    const maybeHoistedFn = state.uninitialized.get(place.identifier.id);
-    if (
-      maybeHoistedFn?.kind === 'func' &&
-      maybeHoistedFn.definition !== place
-    ) {
-      CompilerError.throwTodo({
-        reason: '[PruneHoistedContexts] Rewrite hoisted function references',
-        loc: place.loc,
-      });
-    }
-  }
+class Visitor extends ReactiveFunctionTransform<HoistedIdentifiers> {
   override transformInstruction(
     instruction: ReactiveInstruction,
-    state: VisitorState,
+    state: HoistedIdentifiers,
   ): Transformed<ReactiveStatement> {
-    /**
-     * Remove hoisted declarations to preserve TDZ
-     */
-    if (instruction.value.kind === 'DeclareContext') {
-      const maybeNonHoisted = convertHoistedLValueKind(
-        instruction.value.lvalue.kind,
-      );
-      if (maybeNonHoisted != null) {
-        if (
-          maybeNonHoisted === InstructionKind.Function &&
-          state.uninitialized.has(instruction.value.lvalue.place.identifier.id)
-        ) {
-          state.uninitialized.set(
-            instruction.value.lvalue.place.identifier.id,
-            {
-              kind: 'func',
-              definition: null,
-            },
-          );
-        }
-        return {kind: 'remove'};
-      }
-    }
+    this.visitInstruction(instruction, state);
     if (
-      instruction.value.kind === 'StoreContext' &&
-      instruction.value.lvalue.kind !== InstructionKind.Reassign
+      instruction.value.kind === 'DeclareContext' &&
+      instruction.value.lvalue.kind === 'HoistedConst'
     ) {
-      /**
-       * Rewrite StoreContexts let/const that will be pre-declared in
-       * codegen to reassignments.
-       */
-      const lvalueId = instruction.value.lvalue.place.identifier.id;
-      const isDeclaredByScope = state.activeScopes.find(scope =>
-        scope.has(lvalueId),
+      state.set(
+        instruction.value.lvalue.place.identifier.declarationId,
+        InstructionKind.Const,
       );
-      if (isDeclaredByScope) {
-        if (
-          instruction.value.lvalue.kind === InstructionKind.Let ||
-          instruction.value.lvalue.kind === InstructionKind.Const
-        ) {
-          instruction.value.lvalue.kind = InstructionKind.Reassign;
-        } else if (instruction.value.lvalue.kind === InstructionKind.Function) {
-          const maybeHoistedFn = state.uninitialized.get(lvalueId);
-          if (maybeHoistedFn != null) {
-            CompilerError.invariant(maybeHoistedFn.kind === 'func', {
-              reason: '[PruneHoistedContexts] Unexpected hoisted function',
-              loc: instruction.loc,
-            });
-            maybeHoistedFn.definition = instruction.value.lvalue.place;
-            /**
-             * References to hoisted functions are now "safe" as variable assignments
-             * have finished.
-             */
-            state.uninitialized.delete(lvalueId);
-          }
-        } else {
-          CompilerError.throwTodo({
-            reason: '[PruneHoistedContexts] Unexpected kind',
-            description: `(${instruction.value.lvalue.kind})`,
-            loc: instruction.loc,
-          });
-        }
-      }
+      return {kind: 'remove'};
+    }
+
+    if (
+      instruction.value.kind === 'DeclareContext' &&
+      instruction.value.lvalue.kind === 'HoistedLet'
+    ) {
+      state.set(
+        instruction.value.lvalue.place.identifier.declarationId,
+        InstructionKind.Let,
+      );
+      return {kind: 'remove'};
+    }
+
+    if (
+      instruction.value.kind === 'DeclareContext' &&
+      instruction.value.lvalue.kind === 'HoistedFunction'
+    ) {
+      state.set(
+        instruction.value.lvalue.place.identifier.declarationId,
+        InstructionKind.Function,
+      );
+      return {kind: 'remove'};
+    }
+
+    if (
+      instruction.value.kind === 'StoreContext' &&
+      state.has(instruction.value.lvalue.place.identifier.declarationId)
+    ) {
+      const kind = state.get(
+        instruction.value.lvalue.place.identifier.declarationId,
+      )!;
+      return {
+        kind: 'replace',
+        value: {
+          kind: 'instruction',
+          instruction: {
+            ...instruction,
+            value: {
+              ...instruction.value,
+              lvalue: {
+                ...instruction.value.lvalue,
+                kind,
+              },
+              type: null,
+              kind: 'StoreLocal',
+            },
+          },
+        },
+      };
     }
 
-    this.visitInstruction(instruction, state);
     return {kind: 'keep'};
   }
 }

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/RenameVariables.ts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {ProgramContext} from '..';
 import {CompilerError} from '../CompilerError';
 import {
   DeclarationId,
@@ -48,7 +47,7 @@ import {ReactiveFunctionVisitor, visitReactiveFunction} from './visitors';
  */
 export function renameVariables(fn: ReactiveFunction): Set<string> {
   const globals = collectReferencedGlobals(fn);
-  const scopes = new Scopes(globals, fn.env.programContext);
+  const scopes = new Scopes(globals);
   renameVariablesImpl(fn, new Visitor(), scopes);
   return new Set([...scopes.names, ...globals]);
 }
@@ -125,12 +124,10 @@ class Scopes {
   #seen: Map<DeclarationId, IdentifierName> = new Map();
   #stack: Array<Map<string, DeclarationId>> = [new Map()];
   #globals: Set<string>;
-  #programContext: ProgramContext;
   names: Set<ValidIdentifierName> = new Set();
 
-  constructor(globals: Set<string>, programContext: ProgramContext) {
+  constructor(globals: Set<string>) {
     this.#globals = globals;
-    this.#programContext = programContext;
   }
 
   visit(identifier: Identifier): void {
@@ -159,7 +156,6 @@ class Scopes {
         name = `${originalName.value}$${id++}`;
       }
     }
-    this.#programContext.addNewReference(name);
     const identifierName = makeIdentifierName(name);
     identifier.name = identifierName;
     this.#seen.set(identifier.declarationId, identifierName);

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/StabilizeBlockIds.ts

@@ -1,10 +1,3 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 import {
   BlockId,
   ReactiveFunction,

compiler/packages/babel-plugin-react-compiler/src/ReactiveScopes/index.ts

@@ -14,10 +14,7 @@ export {extractScopeDeclarationsFromDestructuring} from './ExtractScopeDeclarati
 export {inferReactiveScopeVariables} from './InferReactiveScopeVariables';
 export {memoizeFbtAndMacroOperandsInSameScope} from './MemoizeFbtAndMacroOperandsInSameScope';
 export {mergeReactiveScopesThatInvalidateTogether} from './MergeReactiveScopesThatInvalidateTogether';
-export {
-  printReactiveFunction,
-  printReactiveFunctionWithOutlined,
-} from './PrintReactiveFunction';
+export {printReactiveFunction} from './PrintReactiveFunction';
 export {promoteUsedTemporaries} from './PromoteUsedTemporaries';
 export {propagateEarlyReturns} from './PropagateEarlyReturns';
 export {pruneAllReactiveScopes} from './PruneAllReactiveScopes';

compiler/packages/babel-plugin-react-compiler/src/Transform/TransformFire.ts

@@ -28,20 +28,14 @@ import {
   isUseEffectHookType,
   LoadLocal,
   makeInstructionId,
-  NonLocalImportSpecifier,
   Place,
   promoteTemporary,
 } from '../HIR';
 import {createTemporaryPlace, markInstructionIds} from '../HIR/HIRBuilder';
 import {getOrInsertWith} from '../Utils/utils';
-import {
-  BuiltInFireFunctionId,
-  BuiltInFireId,
-  DefaultNonmutatingHook,
-} from '../HIR/ObjectShape';
+import {BuiltInFireId, DefaultNonmutatingHook} from '../HIR/ObjectShape';
 import {eachInstructionOperand} from '../HIR/visitors';
 import {printSourceLocationLine} from '../HIR/PrintHIR';
-import {USE_FIRE_FUNCTION_NAME} from '../HIR/Environment';
 
 /*
  * TODO(jmbrown):
@@ -62,7 +56,6 @@ export function transformFire(fn: HIRFunction): void {
 }
 
 function replaceFireFunctions(fn: HIRFunction, context: Context): void {
-  let importedUseFire: NonLocalImportSpecifier | null = null;
   let hasRewrite = false;
   for (const [, block] of fn.body.blocks) {
     const rewriteInstrs = new Map<InstructionId, Array<Instruction>>();
@@ -94,15 +87,7 @@ function replaceFireFunctions(fn: HIRFunction, context: Context): void {
           ] of capturedCallees.entries()) {
             if (!context.hasCalleeWithInsertedFire(fireCalleePlace)) {
               context.addCalleeWithInsertedFire(fireCalleePlace);
-
-              importedUseFire ??= fn.env.programContext.addImportSpecifier({
-                source: fn.env.programContext.reactRuntimeModule,
-                importSpecifierName: USE_FIRE_FUNCTION_NAME,
-              });
-              const loadUseFireInstr = makeLoadUseFireInstruction(
-                fn.env,
-                importedUseFire,
-              );
+              const loadUseFireInstr = makeLoadUseFireInstruction(fn.env);
               const loadFireCalleeInstr = makeLoadFireCalleeInstruction(
                 fn.env,
                 fireCalleeInfo.capturedCalleeIdentifier,
@@ -419,16 +404,18 @@ function ensureNoMoreFireUses(fn: HIRFunction, context: Context): void {
   }
 }
 
-function makeLoadUseFireInstruction(
-  env: Environment,
-  importedLoadUseFire: NonLocalImportSpecifier,
-): Instruction {
+function makeLoadUseFireInstruction(env: Environment): Instruction {
   const useFirePlace = createTemporaryPlace(env, GeneratedSource);
   useFirePlace.effect = Effect.Read;
   useFirePlace.identifier.type = DefaultNonmutatingHook;
   const instrValue: InstructionValue = {
     kind: 'LoadGlobal',
-    binding: {...importedLoadUseFire},
+    binding: {
+      kind: 'ImportSpecifier',
+      name: 'useFire',
+      module: 'react',
+      imported: 'useFire',
+    },
     loc: GeneratedSource,
   };
   return {
@@ -637,13 +624,6 @@ class Context {
       () => createTemporaryPlace(this.#env, GeneratedSource),
     );
 
-    fireFunctionBinding.identifier.type = {
-      kind: 'Function',
-      shapeId: BuiltInFireFunctionId,
-      return: {kind: 'Poly'},
-      isConstructor: false,
-    };
-
     this.#capturedCalleeIdentifierIds.set(callee.identifier.id, {
       fireFunctionBinding,
       capturedCalleeIdentifier: callee.identifier,

compiler/packages/babel-plugin-react-compiler/src/Transform/index.ts

@@ -4,5 +4,4 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
 export {transformFire} from './TransformFire';

compiler/packages/babel-plugin-react-compiler/src/TypeInference/InferTypes.ts

@@ -261,7 +261,6 @@ function* generateInstructionTypes(
         kind: 'Function',
         shapeId: null,
         return: returnType,
-        isConstructor: false,
       });
       yield equation(left, returnType);
       break;
@@ -278,7 +277,6 @@ function* generateInstructionTypes(
         kind: 'Function',
         shapeId: null,
         return: returnType,
-        isConstructor: false,
       });
       yield equation(left, returnType);
       break;
@@ -335,7 +333,6 @@ function* generateInstructionTypes(
         kind: 'Function',
         return: returnType,
         shapeId: null,
-        isConstructor: false,
       });
 
       yield equation(left, returnType);
@@ -408,7 +405,6 @@ function* generateInstructionTypes(
         kind: 'Function',
         shapeId: BuiltInFunctionId,
         return: value.loweredFunc.func.returnType,
-        isConstructor: false,
       });
       break;
     }
@@ -429,20 +425,9 @@ function* generateInstructionTypes(
       yield equation(left, {kind: 'Object', shapeId: BuiltInJsxId});
       break;
     }
-    case 'NewExpression': {
-      const returnType = makeType();
-      yield equation(value.callee.identifier.type, {
-        kind: 'Function',
-        return: returnType,
-        shapeId: null,
-        isConstructor: true,
-      });
-
-      yield equation(left, returnType);
-      break;
-    }
     case 'PropertyStore':
     case 'DeclareLocal':
+    case 'NewExpression':
     case 'RegExpLiteral':
     case 'MetaProperty':
     case 'ComputedStore':
@@ -520,11 +505,7 @@ class Unifier {
       return;
     }
 
-    if (
-      tB.kind === 'Function' &&
-      tA.kind === 'Function' &&
-      tA.isConstructor === tB.isConstructor
-    ) {
+    if (tB.kind === 'Function' && tA.kind === 'Function') {
       this.unify(tA.return, tB.return);
       return;
     }
@@ -667,7 +648,6 @@ class Unifier {
           kind: 'Function',
           return: returnType,
           shapeId: type.shapeId,
-          isConstructor: type.isConstructor,
         };
       }
       case 'ObjectMethod':

compiler/packages/babel-plugin-react-compiler/src/Utils/TestUtils.ts

@@ -1,210 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import {fromZodError} from 'zod-validation-error';
-import {CompilerError} from '../CompilerError';
-import {
-  CompilationMode,
-  defaultOptions,
-  parsePluginOptions,
-  PluginOptions,
-} from '../Entrypoint';
-import {EnvironmentConfig} from '..';
-import {
-  EnvironmentConfigSchema,
-  PartialEnvironmentConfig,
-} from '../HIR/Environment';
-import {Err, Ok, Result} from './Result';
-import {hasOwnProperty} from './utils';
-
-function tryParseTestPragmaValue(val: string): Result<unknown, unknown> {
-  try {
-    let parsedVal: unknown;
-    const stringMatch = /^"([^"]*)"$/.exec(val);
-    if (stringMatch && stringMatch.length > 1) {
-      parsedVal = stringMatch[1];
-    } else {
-      parsedVal = JSON.parse(val);
-    }
-    return Ok(parsedVal);
-  } catch (e) {
-    return Err(e);
-  }
-}
-
-const testComplexConfigDefaults: PartialEnvironmentConfig = {
-  validateNoCapitalizedCalls: [],
-  enableChangeDetectionForDebugging: {
-    source: 'react-compiler-runtime',
-    importSpecifierName: '$structuralCheck',
-  },
-  enableEmitFreeze: {
-    source: 'react-compiler-runtime',
-    importSpecifierName: 'makeReadOnly',
-  },
-  enableEmitInstrumentForget: {
-    fn: {
-      source: 'react-compiler-runtime',
-      importSpecifierName: 'useRenderCounter',
-    },
-    gating: {
-      source: 'react-compiler-runtime',
-      importSpecifierName: 'shouldInstrument',
-    },
-    globalGating: 'DEV',
-  },
-  enableEmitHookGuards: {
-    source: 'react-compiler-runtime',
-    importSpecifierName: '$dispatcherGuard',
-  },
-  inlineJsxTransform: {
-    elementSymbol: 'react.transitional.element',
-    globalDevVar: 'DEV',
-  },
-  lowerContextAccess: {
-    source: 'react-compiler-runtime',
-    importSpecifierName: 'useContext_withSelector',
-  },
-  inferEffectDependencies: [
-    {
-      function: {
-        source: 'react',
-        importSpecifierName: 'useEffect',
-      },
-      numRequiredArgs: 1,
-    },
-    {
-      function: {
-        source: 'shared-runtime',
-        importSpecifierName: 'useSpecialEffect',
-      },
-      numRequiredArgs: 2,
-    },
-    {
-      function: {
-        source: 'useEffectWrapper',
-        importSpecifierName: 'default',
-      },
-      numRequiredArgs: 1,
-    },
-  ],
-};
-/**
- * For snap test fixtures and playground only.
- */
-function parseConfigPragmaEnvironmentForTest(
-  pragma: string,
-): EnvironmentConfig {
-  const maybeConfig: Partial<Record<keyof EnvironmentConfig, unknown>> = {};
-
-  for (const token of pragma.split(' ')) {
-    if (!token.startsWith('@')) {
-      continue;
-    }
-    const keyVal = token.slice(1);
-    const valIdx = keyVal.indexOf(':');
-    const key = valIdx === -1 ? keyVal : keyVal.slice(0, valIdx);
-    const val = valIdx === -1 ? undefined : keyVal.slice(valIdx + 1);
-    const isSet = val === undefined || val === 'true';
-    if (!hasOwnProperty(EnvironmentConfigSchema.shape, key)) {
-      continue;
-    }
-
-    if (isSet && key in testComplexConfigDefaults) {
-      maybeConfig[key] = testComplexConfigDefaults[key];
-    } else if (isSet) {
-      maybeConfig[key] = true;
-    } else if (val === 'false') {
-      maybeConfig[key] = false;
-    } else if (val) {
-      const parsedVal = tryParseTestPragmaValue(val).unwrap();
-      if (key === 'customMacros' && typeof parsedVal === 'string') {
-        const valSplit = parsedVal.split('.');
-        const props = [];
-        for (const elt of valSplit.slice(1)) {
-          if (elt === '*') {
-            props.push({type: 'wildcard'});
-          } else if (elt.length > 0) {
-            props.push({type: 'name', name: elt});
-          }
-        }
-        maybeConfig[key] = [[valSplit[0], props]];
-        continue;
-      }
-      maybeConfig[key] = parsedVal;
-    }
-  }
-  const config = EnvironmentConfigSchema.safeParse(maybeConfig);
-  if (config.success) {
-    /**
-     * Unless explicitly enabled, do not insert HMR handling code
-     * in test fixtures or playground to reduce visual noise.
-     */
-    if (config.data.enableResetCacheOnSourceFileChanges == null) {
-      config.data.enableResetCacheOnSourceFileChanges = false;
-    }
-    return config.data;
-  }
-  CompilerError.invariant(false, {
-    reason: 'Internal error, could not parse config from pragma string',
-    description: `${fromZodError(config.error)}`,
-    loc: null,
-    suggestions: null,
-  });
-}
-
-const testComplexPluginOptionDefaults: Partial<PluginOptions> = {
-  gating: {
-    source: 'ReactForgetFeatureFlag',
-    importSpecifierName: 'isForgetEnabled_Fixtures',
-  },
-};
-export function parseConfigPragmaForTests(
-  pragma: string,
-  defaults: {
-    compilationMode: CompilationMode;
-  },
-): PluginOptions {
-  const environment = parseConfigPragmaEnvironmentForTest(pragma);
-  const options: Record<keyof PluginOptions, unknown> = {
-    ...defaultOptions,
-    panicThreshold: 'all_errors',
-    compilationMode: defaults.compilationMode,
-    environment,
-  };
-  for (const token of pragma.split(' ')) {
-    if (!token.startsWith('@')) {
-      continue;
-    }
-    const keyVal = token.slice(1);
-    const idx = keyVal.indexOf(':');
-    const key = idx === -1 ? keyVal : keyVal.slice(0, idx);
-    const val = idx === -1 ? undefined : keyVal.slice(idx + 1);
-    if (!hasOwnProperty(defaultOptions, key)) {
-      continue;
-    }
-    const isSet = val === undefined || val === 'true';
-    if (isSet && key in testComplexPluginOptionDefaults) {
-      options[key] = testComplexPluginOptionDefaults[key];
-    } else if (isSet) {
-      options[key] = true;
-    } else if (val === 'false') {
-      options[key] = false;
-    } else if (val != null) {
-      const parsedVal = tryParseTestPragmaValue(val).unwrap();
-      if (key === 'target' && parsedVal === 'donotuse_meta_internal') {
-        options[key] = {
-          kind: parsedVal,
-          runtimeModule: 'react',
-        };
-      } else {
-        options[key] = parsedVal;
-      }
-    }
-  }
-  return parsePluginOptions(options);
-}

compiler/packages/babel-plugin-react-compiler/src/Validation/ValiateNoImpureFunctionsInRender.ts

@@ -8,7 +8,6 @@
 import {CompilerError, ErrorSeverity} from '..';
 import {HIRFunction} from '../HIR';
 import {getFunctionCallSignature} from '../Inference/InferReferenceEffects';
-import {Result} from '../Utils/Result';
 
 /**
  * Checks that known-impure functions are not called during render. Examples of invalid functions to
@@ -19,9 +18,7 @@ import {Result} from '../Utils/Result';
  * this in several of our validation passes and should unify those analyses into a reusable helper
  * and use it here.
  */
-export function validateNoImpureFunctionsInRender(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
+export function validateNoImpureFunctionsInRender(fn: HIRFunction): void {
   const errors = new CompilerError();
   for (const [, block] of fn.body.blocks) {
     for (const instr of block.instructions) {
@@ -49,5 +46,7 @@ export function validateNoImpureFunctionsInRender(
       }
     }
   }
-  return errors.asResult();
+  if (errors.hasErrors()) {
+    throw errors;
+  }
 }

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateHooksUsage.ts

@@ -26,7 +26,6 @@ import {
   eachTerminalOperand,
 } from '../HIR/visitors';
 import {assertExhaustive} from '../Utils/utils';
-import {Result} from '../Utils/Result';
 
 /**
  * Represents the possible kinds of value which may be stored at a given Place during
@@ -88,9 +87,7 @@ function joinKinds(a: Kind, b: Kind): Kind {
  *   may not appear as the callee of a conditional call.
  *   See the note for Kind.PotentialHook for sources of potential hooks
  */
-export function validateHooksUsage(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
+export function validateHooksUsage(fn: HIRFunction): void {
   const unconditionalBlocks = computeUnconditionalBlocks(fn);
 
   const errors = new CompilerError();
@@ -426,7 +423,9 @@ export function validateHooksUsage(
   for (const [, error] of errorsByPlace) {
     errors.push(error);
   }
-  return errors.asResult();
+  if (errors.hasErrors()) {
+    throw errors;
+  }
 }
 
 function visitFunctionExpression(errors: CompilerError, fn: HIRFunction): void {

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateMemoizedEffectDependencies.ts

@@ -22,7 +22,6 @@ import {
   ReactiveFunctionVisitor,
   visitReactiveFunction,
 } from '../ReactiveScopes/visitors';
-import {Result} from '../Utils/Result';
 
 /**
  * Validates that all known effect dependencies are memoized. The algorithm checks two things:
@@ -48,12 +47,12 @@ import {Result} from '../Utils/Result';
  * mutate(object); // ... mutable range ends here after this mutation
  * ```
  */
-export function validateMemoizedEffectDependencies(
-  fn: ReactiveFunction,
-): Result<void, CompilerError> {
+export function validateMemoizedEffectDependencies(fn: ReactiveFunction): void {
   const errors = new CompilerError();
   visitReactiveFunction(fn, new Visitor(), errors);
-  return errors.asResult();
+  if (errors.hasErrors()) {
+    throw errors;
+  }
 }
 
 class Visitor extends ReactiveFunctionVisitor<CompilerError> {

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateNoCapitalizedCalls.ts

@@ -4,15 +4,11 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-import {CompilerError, EnvironmentConfig, ErrorSeverity} from '..';
+import {CompilerError, EnvironmentConfig} from '..';
 import {HIRFunction, IdentifierId} from '../HIR';
 import {DEFAULT_GLOBALS} from '../HIR/Globals';
-import {Result} from '../Utils/Result';
 
-export function validateNoCapitalizedCalls(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
+export function validateNoCapitalizedCalls(fn: HIRFunction): void {
   const envConfig: EnvironmentConfig = fn.env.config;
   const ALLOW_LIST = new Set([
     ...DEFAULT_GLOBALS.keys(),
@@ -30,7 +26,6 @@ export function validateNoCapitalizedCalls(
     );
   };
 
-  const errors = new CompilerError();
   const capitalLoadGlobals = new Map<IdentifierId, string>();
   const capitalizedProperties = new Map<IdentifierId, string>();
   const reason =
@@ -78,8 +73,7 @@ export function validateNoCapitalizedCalls(
           const propertyIdentifier = value.property.identifier.id;
           const propertyName = capitalizedProperties.get(propertyIdentifier);
           if (propertyName != null) {
-            errors.push({
-              severity: ErrorSeverity.InvalidReact,
+            CompilerError.throwInvalidReact({
               reason,
               description: `${propertyName} may be a component.`,
               loc: value.loc,
@@ -91,5 +85,4 @@ export function validateNoCapitalizedCalls(
       }
     }
   }
-  return errors.asResult();
 }

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateNoFreezingKnownMutableFunctions.ts

@@ -1,130 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import {CompilerError, Effect, ErrorSeverity} from '..';
-import {
-  FunctionEffect,
-  HIRFunction,
-  IdentifierId,
-  isMutableEffect,
-  isRefOrRefLikeMutableType,
-  Place,
-} from '../HIR';
-import {
-  eachInstructionValueOperand,
-  eachTerminalOperand,
-} from '../HIR/visitors';
-import {Result} from '../Utils/Result';
-import {Iterable_some} from '../Utils/utils';
-
-/**
- * Validates that functions with known mutations (ie due to types) cannot be passed
- * where a frozen value is expected. Example:
- *
- * ```
- * function Component() {
- *   const cache = new Map();
- *   const onClick = () => {
- *     cache.set(...);
- *   }
- *   useHook(onClick); // ERROR: cannot pass a mutable value
- *   return <Foo onClick={onClick} /> // ERROR: cannot pass a mutable value
- * }
- * ```
- *
- * Because `onClick` function mutates `cache` when called, `onClick` is equivalent to a mutable
- * variables. But unlike other mutables values like an array, the receiver of the function has
- * no way to avoid mutation — for example, a function can receive an array and choose not to mutate
- * it, but there's no way to know that a function is mutable and avoid calling it.
- *
- * This pass detects functions with *known* mutations (Store or Mutate, not ConditionallyMutate)
- * that are passed where a frozen value is expected and rejects them.
- */
-export function validateNoFreezingKnownMutableFunctions(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
-  const errors = new CompilerError();
-  const contextMutationEffects: Map<
-    IdentifierId,
-    Extract<FunctionEffect, {kind: 'ContextMutation'}>
-  > = new Map();
-
-  function visitOperand(operand: Place): void {
-    if (operand.effect === Effect.Freeze) {
-      const effect = contextMutationEffects.get(operand.identifier.id);
-      if (effect != null) {
-        errors.push({
-          reason: `This argument is a function which modifies local variables when called, which can bypass memoization and cause the UI not to update`,
-          description: `Functions that are returned from hooks, passed as arguments to hooks, or passed as props to components may not mutate local variables`,
-          loc: operand.loc,
-          severity: ErrorSeverity.InvalidReact,
-        });
-        errors.push({
-          reason: `The function modifies a local variable here`,
-          loc: effect.loc,
-          severity: ErrorSeverity.InvalidReact,
-        });
-      }
-    }
-  }
-
-  for (const block of fn.body.blocks.values()) {
-    for (const instr of block.instructions) {
-      const {lvalue, value} = instr;
-      switch (value.kind) {
-        case 'LoadLocal': {
-          const effect = contextMutationEffects.get(value.place.identifier.id);
-          if (effect != null) {
-            contextMutationEffects.set(lvalue.identifier.id, effect);
-          }
-          break;
-        }
-        case 'StoreLocal': {
-          const effect = contextMutationEffects.get(value.value.identifier.id);
-          if (effect != null) {
-            contextMutationEffects.set(lvalue.identifier.id, effect);
-            contextMutationEffects.set(
-              value.lvalue.place.identifier.id,
-              effect,
-            );
-          }
-          break;
-        }
-        case 'FunctionExpression': {
-          const knownMutation = (value.loweredFunc.func.effects ?? []).find(
-            effect => {
-              return (
-                effect.kind === 'ContextMutation' &&
-                (effect.effect === Effect.Store ||
-                  effect.effect === Effect.Mutate) &&
-                Iterable_some(effect.places, place => {
-                  return (
-                    isMutableEffect(place.effect, place.loc) &&
-                    !isRefOrRefLikeMutableType(place.identifier.type)
-                  );
-                })
-              );
-            },
-          );
-          if (knownMutation && knownMutation.kind === 'ContextMutation') {
-            contextMutationEffects.set(lvalue.identifier.id, knownMutation);
-          }
-          break;
-        }
-        default: {
-          for (const operand of eachInstructionValueOperand(value)) {
-            visitOperand(operand);
-          }
-        }
-      }
-    }
-    for (const operand of eachTerminalOperand(block.terminal)) {
-      visitOperand(operand);
-    }
-  }
-  return errors.asResult();
-}

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateNoJSXInTryStatement.ts

@@ -7,7 +7,6 @@
 
 import {CompilerError, ErrorSeverity} from '..';
 import {BlockId, HIRFunction} from '../HIR';
-import {Result} from '../Utils/Result';
 import {retainWhere} from '../Utils/utils';
 
 /**
@@ -20,9 +19,7 @@ import {retainWhere} from '../Utils/utils';
  * created within a try block. JSX is allowed within a catch statement, unless that catch
  * is itself nested inside an outer try.
  */
-export function validateNoJSXInTryStatement(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
+export function validateNoJSXInTryStatement(fn: HIRFunction): void {
   const activeTryBlocks: Array<BlockId> = [];
   const errors = new CompilerError();
   for (const [, block] of fn.body.blocks) {
@@ -49,5 +46,7 @@ export function validateNoJSXInTryStatement(
       activeTryBlocks.push(block.terminal.handler);
     }
   }
-  return errors.asResult();
+  if (errors.hasErrors()) {
+    throw errors;
+  }
 }

compiler/packages/babel-plugin-react-compiler/src/Validation/ValidateNoRefAccesInRender.ts

@@ -99,11 +99,9 @@ class Env extends Map<IdentifierId, RefAccessType> {
   }
 }
 
-export function validateNoRefAccessInRender(
-  fn: HIRFunction,
-): Result<void, CompilerError> {
+export function validateNoRefAccessInRender(fn: HIRFunction): void {
   const env = new Env();
-  return validateNoRefAccessInRenderImpl(fn, env).map(_ => undefined);
+  validateNoRefAccessInRenderImpl(fn, env).unwrap();
 }
 
 function refTypeOfType(place: Place): RefAccessType {