Merge pull request #1927 from amgleitman/0.72-rest

Bring in the rest of 0.72-stable from RNCore

Author: amgleitman

.circleci/Dockerfiles/Dockerfile.android

@@ -55,11 +55,6 @@ ADD jsc /app/jsc
 # set workdir
 WORKDIR /app
 
-RUN scripts/buck/buck_fetch.sh
-
-RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
-RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell
-
 ADD gradle /app/gradle
 ADD gradlew /app/gradlew
 ADD settings.gradle /app/settings.gradle

.circleci/config.yml

@@ -46,7 +46,7 @@ references:
   #        Dependency Anchors
   # -------------------------
   dependency_versions:
-    xcode_version: &xcode_version "14.2.0"
+    xcode_version: &xcode_version "14.3.0"
     nodelts_image: &nodelts_image "cimg/node:18.12.1"
     nodeprevlts_image: &nodeprevlts_image "cimg/node:16.18.1"
 
@@ -62,7 +62,8 @@ references:
     hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
     hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
-    hermes_windows_cache_key: &hermes_windows_cache_key v3-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
+    hermes_linux_cache_key: &hermes_linux_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-linux-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
+    hermes_windows_cache_key: &hermes_windows_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-windows-{{ checksum "/Users/circleci/project/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
     pods_cache_key: &pods_cache_key v8-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
@@ -317,11 +318,24 @@ commands:
       - run:
           name: Get React Native version
           command: |
-            VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
+            VERSION=$(cat packages/react-native/package.json | jq -r '.version')
             # Save the react native version we are building in a file so we can use that file as part of the cache key.
             echo "$VERSION" > /tmp/react-native-version
             echo "React Native Version is $(cat /tmp/react-native-version)"
-            echo "Hermes commit is $(cat /tmp/hermes/hermesversion)"
+            HERMES_VERSION="$(cat /tmp/hermes/hermesversion)"
+            echo "Hermes commit is $HERMES_VERSION"
+
+  get_react_native_version_windows:
+    steps:
+      - run:
+          name: Get React Native version on Windows
+          command: |
+            $VERSION=cat packages/react-native/package.json | jq -r '.version'
+            # Save the react native version we are building in a file so we can use that file as part of the cache key.
+            echo "$VERSION" > /tmp/react-native-version
+            echo "React Native Version is $(cat /tmp/react-native-version)"
+            $HERMES_VERSION=cat C:\Users\circleci\project\tmp\hermes\hermesversion
+            echo "Hermes commit is $HERMES_VERSION"
 
   with_hermes_tarball_cache_span:
     parameters:
@@ -624,7 +638,7 @@ jobs:
       - run:
           name: Run Ruby Tests
           command: |
-            cd scripts
+            cd packages/react-native/scripts
             sh run_ruby_tests.sh
       - run_yarn
       - *attach_hermes_workspace
@@ -723,60 +737,6 @@ jobs:
       - store_test_results:
           path: ./reports/junit
 
-  # -------------------------
-  #    JOBS: Test Buck
-  # -------------------------
-  test_buck:
-    executor: reactnativeandroid
-    environment:
-      KOTLIN_HOME=packages/react-native/third-party/kotlin
-    steps:
-      - checkout
-      - setup_artifacts
-      - run_yarn
-
-      - run:
-          name: Download Dependencies Using Buck
-          command: ./scripts/buck/buck_fetch.sh
-
-      - run:
-          name: Build & Test React Native using Buck
-          command: |
-            buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
-            buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell
-
-      - run:
-          name: Run Tests - Android Unit Tests with Buck
-          command: buck test packages/react-native/ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
-
-      - run:
-          name: Build JavaScript Bundle for instrumentation tests
-          working_directory: ~/react-native/packages/react-native
-          command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-
-      - run:
-          name: Build Tests - Android Instrumentation Tests with Buck
-          # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
-          command: |
-            if [[ ! -e packages/react-native/ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
-              echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
-            fi
-            source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build packages/react-native/ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
-
-      - run:
-          name: Collect Test Results
-          command: |
-            find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
-            find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
-            find . -type f -regex ".*/buck-out/gen/packages/react-native/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
-            if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
-              ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
-            fi
-          when: always
-
-      - store_test_results:
-          path: ./reports/junit
-
   # -------------------------
   #    JOBS: Test Android
   # -------------------------
@@ -1090,9 +1050,15 @@ jobs:
           name: Enable Yarn with corepack
           command: corepack enable
 
+      # it looks like that, last week, envinfo released version 7.9.0 which does not works
+      # with Windows. I have opened an issue here: https://github.com/tabrindle/envinfo/issues/238
+      # TODO: T156811874 - Revert this to npx envinfo@latest when the issue is addressed
       - run:
           name: Display Environment info
-          command: npx envinfo@latest
+          command: |
+            npm install -g envinfo
+            envinfo -v
+            envinfo
 
       - restore_cache:
           keys:
@@ -1176,7 +1142,7 @@ jobs:
       - image: debian:11
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
-      - HERMES_VERSION_FILE: "sdks/.hermesversion"
+      - HERMES_VERSION_FILE: "packages/react-native/sdks/.hermesversion"
       - BUILD_FROM_SOURCE: true
     steps:
       - run:
@@ -1195,8 +1161,10 @@ jobs:
             mkdir -p "/tmp/hermes" "/tmp/hermes/download" "/tmp/hermes/hermes"
 
             if [ -f "$HERMES_VERSION_FILE" ]; then
+              echo "Hermes version file found. Using the latest commit"
               cat $HERMES_VERSION_FILE > /tmp/hermes/hermesversion
             else
+              echo "No hermes version file found. Using the latest commit"
               HERMES_TAG_SHA=$(git ls-remote https://github.com/facebook/hermes main | cut -f 1 | tr -d '[:space:]')
               echo $HERMES_TAG_SHA > /tmp/hermes/hermesversion
             fi
@@ -1228,17 +1196,18 @@ jobs:
       - image: debian:bullseye
     # [macOS] Change resource_class to large as we're on the free CircleCI plan
     resource_class: "large"
-    working_directory: /root
     steps:
+      - checkout_code_with_cache
       - run:
           name: Install dependencies
           command: |
             apt update
             apt install -y git openssh-client cmake build-essential \
-                libreadline-dev libicu-dev zip python3
+                libreadline-dev libicu-dev jq zip python3
       - *attach_hermes_workspace
+      - get_react_native_version
       - restore_cache:
-          key: *hermes_workspace_cache_key
+          key: *hermes_linux_cache_key
       - run:
           name: Set up workspace
           command: |
@@ -1257,7 +1226,7 @@ jobs:
               cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
             fi
       - save_cache:
-          key: *hermes_workspace_cache_key
+          key: *hermes_linux_cache_key
           paths:
             - /tmp/hermes/linux64-bin/
             - /tmp/hermes/hermes/destroot/
@@ -1378,7 +1347,9 @@ jobs:
       - MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
       - CMAKE_DIR: 'C:\Program Files\CMake\bin'
     steps:
+      - checkout_code_with_cache
       - *attach_hermes_workspace
+      - get_react_native_version_windows
       - restore_cache:
           key: *hermes_windows_cache_key
       - run:
@@ -1595,6 +1566,19 @@ jobs:
                     -d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
       # END: Stable releases
 
+  poll_maven:
+    docker:
+      - image: cimg/node:current
+    resource_class: small
+    steps:
+      - checkout_code_with_cache
+      - run_yarn
+      - run:
+          name: Poll Maven for Artifacts
+          command: |
+            node scripts/circleci/poll-maven.js
+
+
   # -------------------------
   #    JOBS: Nightly
   # -------------------------
@@ -1702,7 +1686,6 @@ workflows:
       #         jsengine: ["Hermes", "JSC"]
       #         flavor: ["Debug", "Release"]
       # macOS]
-      - test_buck
       - test_ios_template:
           requires:
             - build_npm_package
@@ -1938,6 +1921,9 @@ workflows:
             - build_hermesc_linux
             - build_hermes_macos
             - build_hermesc_windows
+      - poll_maven:
+          requires:
+            -  build_and_publish_npm_package
 
   package_and_publish_release_dryrun:
     when:

Gemfile.lock

@@ -3,23 +3,23 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7.5)
+    activesupport (7.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.12.0)
+    cocoapods (1.12.1)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.12.0)
+      cocoapods-core (= 1.12.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.6.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -34,7 +34,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.12.0)
+    cocoapods-core (1.12.1)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -72,7 +72,7 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.2.6)
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -95,7 +95,7 @@ DEPENDENCIES
   cocoapods (~> 1.12)
 
 RUBY VERSION
-   ruby 3.2.0p0
+   ruby 3.0.6p216
 
 BUNDLED WITH
    2.3.22

change/@react-native-mac-virtualized-lists-502c73bf-9001-46d1-9d12-648b6fd90294.json

@@ -43,7 +43,7 @@
     "test-typescript": "dtslint packages/react-native/types",
     "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib packages/react-native/types",
     "bump-all-updated-packages": "node ./scripts/monorepo/bump-all-updated-packages",
-    "align-package-versions": "node ./scripts/monorepo/align-package-versions.js"
+    "trigger-react-native-release": "node ./scripts/trigger-react-native-release.js"
   },
   "workspaces": [
     "packages/*"
@@ -53,16 +53,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
-    "@babel/eslint-parser": "^7.19.0",
+    "@babel/eslint-parser": "^7.20.0",
     "@babel/generator": "^7.20.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@babel/plugin-transform-regenerator": "^7.20.0",
     "@definitelytyped/dtslint": "^0.0.127",
     "@jest/create-cache-key-function": "^29.2.1",
     "@reactions/component": "^2.0.2",
+    "@react-native/metro-config": "^0.72.11",
     "@types/react": "^18.0.18",
     "@typescript-eslint/parser": "^5.30.5",
     "async": "^3.2.2",
-    "babel-plugin-transform-flow-enums":"^0.0.2",
+    "babel-plugin-transform-flow-enums": "^0.0.2",
     "clang-format": "^1.8.0",
     "connect": "^3.6.5",
     "coveralls": "^3.1.1",
@@ -86,9 +87,9 @@
     "jest": "^29.2.1",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.14.0",
-    "metro-babel-register": "0.75.1",
-    "metro-memory-fs": "0.75.1",
-    "metro-react-native-babel-transformer": "0.75.1",
+    "metro-babel-register": "0.76.7",
+    "metro-memory-fs": "0.76.7",
+    "metro-react-native-babel-transformer": "0.76.7",
     "mkdirp": "^0.5.1",
     "mock-fs": "^5.1.4",
     "prettier": "^2.4.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-config",
-  "version": "0.72.1",
+  "version": "0.72.2",
   "description": "ESLint config for React Native",
   "main": "index.js",
   "license": "MIT",
@@ -12,7 +12,7 @@
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/eslint-config-react-native-community#readme",
   "dependencies": {
     "@babel/core": "^7.20.0",
-    "@babel/eslint-parser": "^7.19.0",
+    "@babel/eslint-parser": "^7.20.0",
     "@react-native/eslint-plugin": "^0.72.0",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",

packages/eslint-config-react-native-community/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.72.2",
+  "version": "0.72.4",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "main": "index.js",
   "repository": {
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@babel/core": "^7.20.0",
-    "@babel/eslint-parser": "^7.19.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/preset-flow": "^7.18.0",
+    "@babel/eslint-parser": "^7.20.0",
+    "@babel/plugin-transform-flow-strip-types": "^7.20.0",
+    "@babel/preset-flow": "^7.20.0",
     "@react-native/codegen": "*",
-    "flow-parser": "^0.185.0",
+    "flow-parser": "^0.206.0",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
     "source-map-support": "0.5.0"