Merge pull request #1909 from amgleitman/0.72-merge-to-cut

Merge up to 0.72-stable cut point

Author: amgleitman

.circleci/config.yml

@@ -794,7 +794,7 @@ jobs:
 
       - run:
           name: Build & Test React Native using Gradle
-          command: ./gradlew buildAll
+          command: ./gradlew build
 
       - report_bundle_size:
           platform: android
@@ -1512,9 +1512,9 @@ jobs:
 
             cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
             cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
-            mkdir -p ./ReactAndroid/external-artifacts/artifacts/
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
+            mkdir -p ./packages/react-native/ReactAndroid/external-artifacts/artifacts/
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
 
       - run_yarn
       - download_gradle_dependencies

.flowconfig

@@ -79,4 +79,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.201.0
+^0.202.0

.flowconfig.android

@@ -82,4 +82,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.201.0
+^0.202.0

.flowconfig.macos

@@ -82,4 +82,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.201.0
+^0.202.0

build.gradle.kts

@@ -65,18 +65,9 @@ tasks.register("cleanAll", Delete::class.java) {
   delete(rootProject.file("./packages/rn-tester/android/app/.cxx"))
 }
 
-tasks.register("buildAll") {
+tasks.register("build") {
   description = "Build and test all the React Native relevant projects."
   dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":build"))
-  // This builds both the React Native framework for both debug and release
-  dependsOn(":packages:react-native:ReactAndroid:assemble")
-  // This creates all the Maven artifacts and makes them available in the /android folder
-  dependsOn(":packages:react-native:ReactAndroid:installArchives")
-  // This builds RN Tester for Hermes/JSC for debug and release
-  dependsOn(":packages:rn-tester:android:app:assemble")
-  // This compiles the Unit Test sources (without running them as they're partially broken)
-  dependsOn(":packages:react-native:ReactAndroid:compileDebugUnitTestSources")
-  dependsOn(":packages:react-native:ReactAndroid:compileReleaseUnitTestSources")
 }
 
 tasks.register("downloadAll") {

jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
   transform: {
     '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$':
       '<rootDir>/packages/react-native/jest/assetFileTransformer.js',
-    '.*': './packages/react-native/jest/private/preprocessor.js',
+    '.*': './jest/preprocessor.js',
   },
   setupFiles: ['./packages/react-native/jest/local-setup.js'],
   fakeTimers: {

packages/react-native/jest/private/preprocessor.js renamed to jest/preprocessor.js

@@ -24,9 +24,11 @@ const nodeFiles = new RegExp(
     '/metro(?:-[^/]*)?/', // metro, metro-core, metro-source-map, metro-etc.
   ].join('|'),
 );
-const nodeOptions = babelRegisterOnly.config([nodeFiles]);
 
-babelRegisterOnly([]);
+// Use metro-babel-register to build the Babel configuration we need for Node
+// files, but Jest takes care of hooking require so we don't actually register
+// Babel here.
+const nodeOptions = babelRegisterOnly.config([nodeFiles]);
 
 const transformer = require('metro-react-native-babel-transformer');
 module.exports = {

package.json

@@ -56,10 +56,12 @@
     "@babel/generator": "^7.20.0",
     "@babel/plugin-transform-regenerator": "^7.0.0",
     "@definitelytyped/dtslint": "^0.0.127",
+    "@jest/create-cache-key-function": "^29.2.1",
     "@reactions/component": "^2.0.2",
     "@types/react": "^18.0.18",
     "@typescript-eslint/parser": "^5.30.5",
     "async": "^3.2.2",
+    "babel-plugin-transform-flow-enums":"^0.0.2",
     "clang-format": "^1.8.0",
     "connect": "^3.6.5",
     "coveralls": "^3.1.1",
@@ -77,16 +79,17 @@
     "eslint-plugin-react-native": "^4.0.0",
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
-    "flow-bin": "^0.201.0",
+    "flow-bin": "^0.202.0",
     "hermes-eslint": "0.8.0",
     "inquirer": "^7.1.0",
     "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",
-    "mock-fs": "^5.1.4",
+    "metro-react-native-babel-transformer": "0.75.1",
     "mkdirp": "^0.5.1",
+    "mock-fs": "^5.1.4",
     "prettier": "^2.4.1",
     "react": "18.2.0",
     "react-test-renderer": "^18.2.0",

packages/react-native-codegen/e2e/__test_fixtures__/components/MixedPropNativeComponent.js

@@ -0,0 +1,25 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict-local
+ */
+
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
+import type {UnsafeMixed} from 'react-native/Libraries/Types/CodegenTypes';
+
+type NativeProps = $ReadOnly<{|
+  ...ViewProps,
+
+  // Props
+  mixedProp?: UnsafeMixed,
+|}>;
+
+export default (codegenNativeComponent<NativeProps>(
+  'MixedPropNativeComponentView',
+): HostComponent<NativeProps>);

packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateComponentDescriptorH-test.js.snap

@@ -330,6 +330,34 @@ namespace react {
 
 
 
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateComponentDescriptorH can generate for 'MixedPropNativeComponent.js' 1`] = `
+Object {
+  "ComponentDescriptors.h": "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/RNCodegenModuleFixtures/ShadowNodes.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+using MixedPropNativeComponentViewComponentDescriptor = ConcreteComponentDescriptor<MixedPropNativeComponentViewShadowNode>;
+
 } // namespace react
 } // namespace facebook
 ",