Merge branch 'main' into persistent-update3

Author: kassens

.circleci/config.yml

@@ -48,22 +48,6 @@ parameters:
     default: ''
 
 jobs:
-  scrape_warning_messages:
-    docker: *docker
-    environment: *environment
-
-    steps:
-      - checkout
-      - setup_node_modules
-      - run:
-          command: |
-            mkdir -p ./build/__test_utils__
-            node ./scripts/print-warnings/print-warnings.js > build/__test_utils__/ReactAllWarnings.js
-      - persist_to_workspace:
-          root: .
-          paths:
-            - build
-
   yarn_build:
     docker: *docker
     environment: *environment
@@ -97,33 +81,6 @@ jobs:
           paths:
             - build
 
-  download_base_build_for_sizebot:
-    docker: *docker
-    environment: *environment
-    steps:
-      - checkout
-      - setup_node_modules
-      - run:
-          name: Download artifacts for base revision
-          command: |
-            git fetch origin main
-            cd ./scripts/release && yarn && cd ../../
-            scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/main) --allowBrokenCI
-            mv ./build ./base-build
-
-      - run:
-          # 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
-          command: rm -rf ./base-build/node_modules
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - base-build
-
   process_artifacts_combined:
     docker: *docker
     environment: *environment
@@ -133,7 +90,10 @@ jobs:
           at: .
       - setup_node_modules
       - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
-        # Compress build directory into a single tarball for easy download
+      - run: |
+          mkdir -p ./build/__test_utils__
+          node ./scripts/print-warnings/print-warnings.js > build/__test_utils__/ReactAllWarnings.js
+      # Compress build directory into a single tarball for easy download
       - run: tar -zcvf ./build.tgz ./build
         # TODO: Migrate scripts to use `build` directory instead of `build2`
       - run: cp ./build.tgz ./build2.tgz
@@ -142,20 +102,6 @@ jobs:
       - store_artifacts:
           path: ./build.tgz
 
-  sizebot:
-    docker: *docker
-    environment: *environment
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
-      - setup_node_modules
-      - run:
-          command: node ./scripts/tasks/danger
-      - store_artifacts:
-          path: sizebot-message.md
-
   build_devtools_and_process_artifacts:
     docker: *docker
     environment: *environment
@@ -271,28 +217,8 @@ workflows:
             branches:
               ignore:
                 - builds/facebook-www
-      - scrape_warning_messages:
-          filters:
-            branches:
-              ignore:
-                - builds/facebook-www
       - process_artifacts_combined:
           requires:
-            - scrape_warning_messages
-            - yarn_build
-      - download_base_build_for_sizebot:
-          filters:
-            branches:
-              ignore:
-                - main
-                - builds/facebook-www
-      - sizebot:
-          filters:
-            branches:
-              ignore:
-                - main
-          requires:
-            - download_base_build_for_sizebot
             - yarn_build
 
   devtools_regression_tests:

.git-blame-ignore-revs

@@ -1 +1,2 @@
 c998bb1ed4b3285398c9c7797135d3f060243c6a
+fd2b3e13d330a4559f5aa21462e1cb2cbbcf144b

.github/workflows/runtime_build_and_test.yml

@@ -180,9 +180,8 @@ jobs:
       - name: Archive build
         uses: actions/upload-artifact@v4
         with:
-          name: build_${{ matrix.worker_id }}_${{ matrix.release_channel }}
-          path: |
-            build
+          name: _build_${{ matrix.worker_id }}_${{ matrix.release_channel }}
+          path: build
 
   test_build:
     name: yarn test-build
@@ -242,6 +241,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -269,6 +269,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -285,7 +286,7 @@ jobs:
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: combined_artifacts_${{ github.sha }}
+          name: artifacts_combined
           path: |
             ./build.tgz
             ./build2.tgz
@@ -311,6 +312,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -341,6 +343,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -370,6 +373,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -407,6 +411,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - name: Display structure of build
@@ -462,6 +467,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - run: ./scripts/circleci/pack_and_store_devtools_artifacts.sh
@@ -507,6 +513,7 @@ jobs:
       - name: Restore archived build
         uses: actions/download-artifact@v4
         with:
+          pattern: _build_*
           path: build
           merge-multiple: true
       - run: |
@@ -515,3 +522,88 @@ jobs:
       - run: ./scripts/circleci/run_devtools_e2e_tests.js
         env:
           RELEASE_CHANNEL: experimental
+
+  # ----- SIZEBOT -----
+  download_base_build_for_sizebot:
+    if: ${{ github.event_name == 'pull_request' && github.ref_name != 'main' }}
+    name: Download base build for sizebot
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.20.1
+          cache: yarn
+          cache-dependency-path: yarn.lock
+      - name: Restore cached node_modules
+        uses: actions/cache@v4
+        id: node_modules
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.arch }}-${{ runner.os }}-modules-${{ hashFiles('yarn.lock', 'scripts/release/yarn.lock') }}
+      - run: yarn install --frozen-lockfile
+      - run: yarn install --frozen-lockfile
+        working-directory: scripts/release
+      - name: Download artifacts for base revision
+        run: |
+          git fetch origin main
+          GH_TOKEN=${{ github.token }} scripts/release/download-experimental-build-ghaction.js --commit=$(git rev-parse origin/main)
+          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
+        run: rm -rf ./base-build/node_modules
+      - name: Display structure of base-build
+        run: ls -R base-build
+      - name: Archive base-build
+        uses: actions/upload-artifact@v4
+        with:
+          name: base-build
+          path: base-build
+
+  sizebot:
+    name: Run sizebot
+    needs: [build_and_lint, download_base_build_for_sizebot]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18.20.1
+          cache: yarn
+          cache-dependency-path: yarn.lock
+      - name: Restore cached node_modules
+        uses: actions/cache@v4
+        id: node_modules
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.arch }}-${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
+      - run: yarn install --frozen-lockfile
+      - name: Restore archived build for PR
+        uses: actions/download-artifact@v4
+        with:
+          pattern: _build_*
+          path: build
+          merge-multiple: true
+      - name: Scrape warning messages
+        run: |
+          mkdir -p ./build/__test_utils__
+          node ./scripts/print-warnings/print-warnings.js > build/__test_utils__/ReactAllWarnings.js
+      - name: Display structure of build for PR
+        run: ls -R build
+      - name: Restore archived base-build from origin/main
+        uses: actions/download-artifact@v4
+        with:
+          name: base-build
+          path: base-build
+      - name: Display structure of base-build from origin/main
+        run: ls -R base-build
+      - 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

.prettierrc.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const {
-  compilerPaths,
-  esNextPaths,
-  typescriptPaths,
-} = require('./scripts/shared/pathsByLanguageVersion');
+const {esNextPaths} = require('./scripts/shared/pathsByLanguageVersion');
 
 module.exports = {
   bracketSpacing: false,
@@ -28,25 +24,11 @@ module.exports = {
       },
     },
     {
-      files: typescriptPaths,
+      files: ['*.ts', '*.tsx'],
       options: {
         trailingComma: 'all',
         parser: 'typescript',
       },
     },
-    {
-      files: compilerPaths,
-      options: {
-        requirePragma: false,
-        parser: 'babel-ts',
-        semi: true,
-        singleQuote: false,
-        trailingComma: 'es5',
-        bracketSpacing: true,
-        bracketSameLine: false,
-        printWidth: 80,
-        arrowParens: 'always',
-      },
-    },
   ],
 };

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

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { expect, test } from "@playwright/test";
-import { encodeStore, type Store } from "../../lib/stores";
+import {expect, test} from '@playwright/test';
+import {encodeStore, type Store} from '../../lib/stores';
 
 const STORE: Store = {
   source: `export default function TestComponent({ x }) {
@@ -17,33 +17,33 @@ const STORE: Store = {
 const HASH = encodeStore(STORE);
 
 function concat(data: Array<string>): string {
-  return data.join("");
+  return data.join('');
 }
 
-test("editor should compile successfully", async ({ page }) => {
-  await page.goto(`/#${HASH}`, { waitUntil: "networkidle" });
+test('editor should compile successfully', async ({page}) => {
+  await page.goto(`/#${HASH}`, {waitUntil: 'networkidle'});
   await page.screenshot({
     fullPage: true,
-    path: "test-results/00-on-networkidle.png",
+    path: 'test-results/00-on-networkidle.png',
   });
 
   // User input from hash compiles
   await page.screenshot({
     fullPage: true,
-    path: "test-results/01-show-js-before.png",
+    path: 'test-results/01-show-js-before.png',
   });
   const userInput =
-    (await page.locator(".monaco-editor").nth(2).allInnerTexts()) ?? [];
-  expect(concat(userInput)).toMatchSnapshot("user-input.txt");
+    (await page.locator('.monaco-editor').nth(2).allInnerTexts()) ?? [];
+  expect(concat(userInput)).toMatchSnapshot('user-input.txt');
 
   // Reset button works
-  page.on("dialog", (dialog) => dialog.accept());
-  await page.getByRole("button", { name: "Reset" }).click();
+  page.on('dialog', dialog => dialog.accept());
+  await page.getByRole('button', {name: 'Reset'}).click();
   await page.screenshot({
     fullPage: true,
-    path: "test-results/02-show-js-after.png",
+    path: 'test-results/02-show-js-after.png',
   });
   const defaultInput =
-    (await page.locator(".monaco-editor").nth(2).allInnerTexts()) ?? [];
-  expect(concat(defaultInput)).toMatchSnapshot("default-input.txt");
+    (await page.locator('.monaco-editor').nth(2).allInnerTexts()) ?? [];
+  expect(concat(defaultInput)).toMatchSnapshot('default-input.txt');
 });