Merge branch 'main' of https://github.com/facebook/react-native into realize-last-focused

Author: NickGerleman

.buckconfig

@@ -1,6 +1,6 @@
 
 [android]
-  target = android-30
+  target = android-31
 
 [download]
   max_number_of_retries = 3

.circleci/Dockerfiles/Dockerfile.android

@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:5.1
+FROM reactnativecommunity/react-native-android:5.2
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <[email protected]>"

.circleci/config.yml

@@ -36,7 +36,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:5.1
+      - image: reactnativecommunity/react-native-android:5.2
     resource_class: "large"
     environment:
       - TERM: "dumb"
@@ -92,12 +92,6 @@ commands:
             - ~/.cache/yarn
           key: v4-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
 
-  build_codegen:
-    steps:
-      - run:
-          name: "Codegen: Build react-native-codegen package"
-          command: cd packages/react-native-codegen && yarn build
-
   install_buck_tooling:
     steps:
       - restore_cache:
@@ -242,7 +236,7 @@ jobs:
           command: |
             curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
             apt update && apt install -y shellcheck jq
-            apt-get install openssl ca-certificates
+            apt-get -y install openssl ca-certificates
             update-ca-certificates
             curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
             apt update && apt install -y shellcheck jq
@@ -373,7 +367,6 @@ jobs:
       - setup_artifacts
       - setup_ruby
       - run_yarn
-      - build_codegen
 
       - run: |
           cd packages/rn-tester
@@ -649,8 +642,8 @@ jobs:
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
-      - ANDROID_BUILD_VERSION: 30
-      - ANDROID_TOOLS_VERSION: 30.0.2
+      - ANDROID_BUILD_VERSION: 31
+      - ANDROID_TOOLS_VERSION: 31.0.0
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
       - NDK_VERSION: 21.4.7075529
     steps:
@@ -749,6 +742,19 @@ jobs:
   # -------------------------
   #      JOBS: Releases
   # -------------------------
+  prepare_package_for_release:
+    executor: reactnativeios
+    steps:
+      - checkout
+      - run_yarn
+      - add_ssh_keys:
+          fingerprints:
+            - "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb"
+      - run:
+          name: "Set new react-native version and commit changes"
+          command: |
+            node ./scripts/prepare-package-for-release.js
+
   build_npm_package:
     parameters:
       publish_npm_args:
@@ -847,7 +853,6 @@ workflows:
               only:
                 - main
                 - /^pull\/.*$/
-                - /^(\d+)\.(\d+)-stable$/
       - test_js:
           run_disabled_tests: false
           filters:
@@ -915,6 +920,15 @@ workflows:
 
   releases:
     jobs:
+      # This job will trigger on pushes to release branch and commit a version tag to trigger `build_npm_package` for release
+      - prepare_package_for_release:
+          name: prepare_package_for_release
+          filters:
+            branches:
+              only:
+                - /^(\d+)\.(\d+)-stable$/
+
+      # This job will trigger when a version tag is pushed (by prepare_package_for_release)
       - build_npm_package:
           name: build_and_publish_npm_package
           context: react-native-bot

.eslintrc

@@ -6,7 +6,7 @@
   ],
 
   "plugins": [
-    "@react-native/eslint-plugin-codegen"
+    "@react-native/eslint-plugin-specs"
   ],
 
   "overrides": [
@@ -18,7 +18,7 @@
         "@react-native-community/no-haste-imports": 2,
         "@react-native-community/error-subclass-name": 2,
         "@react-native-community/platform-colors": 2,
-        "@react-native/codegen/react-native-modules": 2
+        "@react-native/specs/react-native-modules": 2
       }
     },
     {

.flowconfig

@@ -70,4 +70,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.165.0
+^0.167.1

.flowconfig.android

@@ -70,4 +70,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.165.0
+^0.167.1

.github/ISSUE_TEMPLATE/release_blocker_form.yml

@@ -1,5 +1,5 @@
-name: Upgrade Regression
-description: If you are upgrading to a stable release and encounter a regression.
+name: Upgrade - Build Regression
+description: If you are upgrading to a new React Native version (stable or pre-release) and encounter a build regression.
 labels: ["Needs: Triage :mag:", "Type: Upgrade Issue"]
 body:
   - type: markdown