Merge branch 'facebook:main' into fix-non-ascii-header-value

.circleci/verdaccio.yml

@@ -19,9 +19,6 @@ packages:
   '@react-native/*':
     access: $all
     publish: $all
-  'react-native-codegen':
-    access: $all
-    publish: $all
   '@*/*':
     access: $all
     publish: $authenticated

.gitignore

@@ -113,7 +113,7 @@ package-lock.json
 !/packages/rn-tester/Pods/__offline_mirrors_hermes__
 !/packages/rn-tester/Pods/__offline_mirrors_jsc__
 
-# react-native-codegen
+# @react-native/codegen
 /React/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
 /packages/react-native-codegen/tmp/

BUCK

@@ -115,7 +115,7 @@ rn_apple_xplat_cxx_library(
         react_native_root_target("React/CoreModules:CoreModules"),
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:jsbigstring"),
-        react_native_xplat_target("jsi:JSCRuntime"),
+        react_native_xplat_target("jsc:JSCRuntime"),
         react_native_xplat_target("jsiexecutor:jsiexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
     ],

Libraries/NativeComponent/NativeComponentRegistryUnstable.js

@@ -3,6 +3,9 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
  */
 
 let componentNameToExists: Map<string, boolean> = new Map();

Libraries/TypeSafety/RCTConvertHelpers.h

@@ -23,7 +23,7 @@ using LazyVector = FB::LazyVector<T, id>;
 template <typename ContainerT>
 NSArray *RCTConvertVecToArray(const ContainerT &vec, id (^convertor)(typename ContainerT::value_type element))
 {
-  NSMutableArray *array = [NSMutableArray new];
+  NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:vec.size()];
   for (size_t i = 0, size = vec.size(); i < size; ++i) {
     id object = convertor(vec[i]);
     array[i] = object ?: (id)kCFNull;

React/CxxBridge/JSCExecutorFactory.mm

@@ -7,7 +7,7 @@
 
 #include "JSCExecutorFactory.h"
 
-#import <jsi/JSCRuntime.h>
+#import <jsc/JSCRuntime.h>
 
 #import <memory>
 

ReactAndroid/build.gradle

@@ -178,13 +178,19 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                 "rrc_image",
                 new Pair("../ReactCommon/react/renderer/components/image/", "react/renderer/components/image/")
             ),
-            // This prefab target is used by Expo & Reanimated to load a new instance of Hermes
+            // These prefab targets are used by Expo & Reanimated
             new PrefabPreprocessingEntry(
                 "hermes-executor",
-                // "hermes-executor" is statically linking agaisnt "hermes-executor-common"
+                // "hermes-executor" is statically linking against "hermes-executor-common"
                 // and "hermes-inspector". Here we expose only the headers that we know are needed.
                 new Pair("../ReactCommon/hermes/inspector/", "hermes/inspector/")
             ),
+            new PrefabPreprocessingEntry(
+                "jscexecutor",
+                // "jscexecutor" is statically linking against "jscruntime"
+                // Here we expose only the headers that we know are needed.
+                new Pair("../ReactCommon/jsc/", "jsc/")
+            ),
             new PrefabPreprocessingEntry(
                 "react_render_uimanager",
                 new Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
@@ -635,7 +641,7 @@ react {
     reactNativeDir = file("$projectDir/..")
     // We search for the codegen in either one of the `node_modules` folder or in the
     // root packages folder (that's for when we build from source without calling `yarn install`).
-    codegenDir = file(findNodeModulePath(projectDir, "react-native-codegen") ?: "../packages/react-native-codegen/")
+    codegenDir = file(findNodeModulePath(projectDir, "@react-native/codegen") ?: "../packages/react-native-codegen/")
 }
 
 apply plugin: "org.jetbrains.kotlin.android"

ReactAndroid/src/main/jni/CMakeLists.txt

@@ -56,6 +56,7 @@ add_react_common_subdir(reactperflogger)
 add_react_common_subdir(logger)
 add_react_common_subdir(jsiexecutor)
 add_react_common_subdir(cxxreact)
+add_react_common_subdir(jsc)
 add_react_common_subdir(jsi)
 add_react_common_subdir(butter)
 add_react_common_subdir(callinvoker)

ReactAndroid/src/main/jni/react/jscexecutor/BUCK

@@ -16,7 +16,7 @@ rn_xplat_cxx_library(
     deps = [
         FBJNI_TARGET,
         react_native_target("jni/react/jni:jni"),
-        react_native_xplat_target("jsi:JSCRuntime"),
+        react_native_xplat_target("jsc:JSCRuntime"),
         react_native_xplat_target("jsiexecutor:jsiexecutor"),
     ],
 )

ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <fbjni/fbjni.h>
-#include <jsi/JSCRuntime.h>
+#include <jsc/JSCRuntime.h>
 #include <jsireact/JSIExecutor.h>
 #include <react/jni/JReactMarker.h>
 #include <react/jni/JSLogging.h>

ReactCommon/jsc/.clang-tidy

@@ -0,0 +1,6 @@
+---
+Checks: '>
+clang-diagnostic-*,
+'
+InheritParentConfig: true
+...

ReactCommon/jsc/BUCK

@@ -0,0 +1,34 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_preprocessor_flags_for_build_mode", "react_native_xplat_dep", "rn_xplat_cxx_library")
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "JSCRuntime",
+    srcs = [
+        "JSCRuntime.cpp",
+    ],
+    header_namespace = "jsc",
+    exported_headers = [
+        "JSCRuntime.h",
+    ],
+    apple_sdks = (IOS, MACOSX),
+    compiler_flags_pedantic = True,
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS + [
+        "-Os",
+    ],
+    fbobjc_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
+    ],
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = APPLE,
+    visibility = ["PUBLIC"],
+    xplat_mangled_args = {
+        "soname": "libjscjsi.$(ext)",
+    },
+    exported_deps = [
+        react_native_xplat_dep("jsi:jsi"),
+    ],
+)

ReactCommon/jsc/CMakeLists.txt

@@ -0,0 +1,35 @@
+# 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.
+
+##################
+### jscruntime ###
+##################
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -O3
+        -Wno-unused-lambda-capture
+        -DLOG_TAG=\"ReactNative\")
+
+add_library(jscruntime
+        STATIC
+        JSCRuntime.h
+        JSCRuntime.cpp)
+
+target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(jscruntime
+        folly_runtime
+        jsc
+        jsi
+        glog)
+
+# TODO: Remove this flag when ready.
+# Android has this enabled by default, but the flag is still needed for iOS.
+target_compile_options(jscruntime PRIVATE -DRN_FABRIC_ENABLED)

ReactCommon/jsi/React-jsc.podspec → ReactCommon/jsc/React-jsc.podspec

@@ -28,12 +28,8 @@ Pod::Spec.new do |s|
   s.source_files           = "JSCRuntime.{cpp,h}"
   s.exclude_files          = "**/test/*"
   s.framework              = "JavaScriptCore"
-  s.dependency "React-jsi", version
-  s.default_subspec        = "Default"
 
-  s.subspec "Default" do
-    # no-op
-  end
+  s.dependency "React-jsi", version
 
   s.subspec "Fabric" do |ss|
     ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" }

ReactCommon/jsi/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "react_native_xplat_dep", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_dep", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
     name = "jsi",
@@ -56,33 +56,3 @@ rn_xplat_cxx_library(
         react_native_xplat_dep("jsi:jsi"),
     ],
 )
-
-rn_xplat_cxx_library(
-    name = "JSCRuntime",
-    srcs = [
-        "JSCRuntime.cpp",
-    ],
-    header_namespace = "jsi",
-    exported_headers = [
-        "JSCRuntime.h",
-    ],
-    apple_sdks = (IOS, MACOSX),
-    compiler_flags_pedantic = True,
-    fbobjc_compiler_flags = [
-        "-Os",
-    ],
-    fbobjc_frameworks = [
-        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
-    ],
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-    ],
-    platforms = APPLE,
-    visibility = ["PUBLIC"],
-    xplat_mangled_args = {
-        "soname": "libjscjsi.$(ext)",
-    },
-    exported_deps = [
-        react_native_xplat_dep("jsi:jsi"),
-    ],
-)

ReactCommon/jsi/CMakeLists.txt

@@ -25,19 +25,3 @@ target_include_directories(jsi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(jsi
         folly_runtime
         glog)
-
-##################
-### jscruntime ###
-##################
-
-add_library(jscruntime STATIC
-        JSCRuntime.h
-        JSCRuntime.cpp)
-
-target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(jscruntime folly_runtime jsc glog)
-
-# TODO: Remove this flag when ready.
-# Android has this enabled by default, but the flag is still needed for iOS.
-target_compile_options(jscruntime PRIVATE -DRN_FABRIC_ENABLED)

packages/babel-plugin-codegen/index.js

@@ -14,14 +14,14 @@ let flowParser, typeScriptParser, RNCodegen;
 const {basename} = require('path');
 
 try {
-  flowParser = require('react-native-codegen/src/parsers/flow');
-  typeScriptParser = require('react-native-codegen/src/parsers/typescript');
-  RNCodegen = require('react-native-codegen/src/generators/RNCodegen');
+  flowParser = require('@react-native/codegen/src/parsers/flow');
+  typeScriptParser = require('@react-native/codegen/src/parsers/typescript');
+  RNCodegen = require('@react-native/codegen/src/generators/RNCodegen');
 } catch (e) {
   // Fallback to lib when source doesn't exit (e.g. when installed as a dev dependency)
-  flowParser = require('react-native-codegen/lib/parsers/flow');
-  typeScriptParser = require('react-native-codegen/lib/parsers/typescript');
-  RNCodegen = require('react-native-codegen/lib/generators/RNCodegen');
+  flowParser = require('@react-native/codegen/lib/parsers/flow');
+  typeScriptParser = require('@react-native/codegen/lib/parsers/typescript');
+  RNCodegen = require('@react-native/codegen/lib/generators/RNCodegen');
 }
 
 function parseFile(filename, code) {

packages/babel-plugin-codegen/package.json

@@ -11,7 +11,7 @@
     "index.js"
   ],
   "dependencies": {
-    "react-native-codegen": "*"
+    "@react-native/codegen": "*"
   },
   "devDependencies": {
     "@babel/core": "^7.14.0"

packages/eslint-plugin-specs/package.json

@@ -17,10 +17,10 @@
     "@babel/eslint-parser": "^7.18.2",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "@babel/preset-flow": "^7.17.12",
+    "@react-native/codegen": "*",
     "flow-parser": "^0.185.0",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
-    "react-native-codegen": "*",
     "source-map-support": "0.5.0"
   },
   "license": "MIT"

packages/eslint-plugin-specs/react-native-modules.js

@@ -26,26 +26,26 @@ let RNParserUtils;
 
 function requireModuleParser() {
   if (RNModuleParser == null || RNParserUtils == null) {
-    // If using this externally, we leverage react-native-codegen as published form
+    // If using this externally, we leverage @react-native/codegen as published form
     if (!PACKAGE_USAGE) {
       const config = {
         only: [/react-native-codegen\/src\//],
         plugins: [require('@babel/plugin-transform-flow-strip-types').default],
       };
 
       withBabelRegister(config, () => {
-        RNModuleParser = require('react-native-codegen/src/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/src/parsers/utils');
+        RNModuleParser = require('@react-native/codegen/src/parsers/flow/modules');
+        RNParserUtils = require('@react-native/codegen/src/parsers/utils');
       });
     } else {
       const config = {
-        only: [/react-native-codegen\/lib\//],
+        only: [/@react-native\/codegen\/lib\//],
         plugins: [require('@babel/plugin-transform-flow-strip-types').default],
       };
 
       withBabelRegister(config, () => {
-        RNModuleParser = require('react-native-codegen/lib/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/lib/parsers/utils');
+        RNModuleParser = require('@react-native/codegen/lib/parsers/flow/modules');
+        RNParserUtils = require('@react-native/codegen/lib/parsers/flow/utils');
       });
     }
   }

packages/react-native-codegen/README.md

@@ -1,17 +1,17 @@
-# react-native-codegen
+# @react-native/codegen
 
 [![Version][version-badge]][package]
 
 ## Installation
 
 ```
-yarn add --dev react-native-codegen
+yarn add --dev @react-native/codegen
 ```
 
 *Note: We're using `yarn` to install deps. Feel free to change commands to use `npm` 3+ and `npx` if you like*
 
-[version-badge]: https://img.shields.io/npm/v/react-native-codegen?style=flat-square
-[package]: https://www.npmjs.com/package/react-native-codegen
+[version-badge]: https://img.shields.io/npm/v/@react-native/codegen?style=flat-square
+[package]: https://www.npmjs.com/package/@react-native/codegen
 
 ## Testing
 

packages/react-native-codegen/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-native-codegen",
+  "name": "@react-native/codegen",
   "version": "0.72.0",
   "description": "⚛️ Code generation tools for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",

packages/react-native-codegen/src/parsers/typescript/modules/index.js

@@ -316,7 +316,7 @@ function translateTypeAnnotation(
 function isModuleInterface(node: $FlowFixMe) {
   return (
     node.type === 'TSInterfaceDeclaration' &&
-    node.extends.length === 1 &&
+    node.extends?.length === 1 &&
     node.extends[0].type === 'TSExpressionWithTypeArguments' &&
     node.extends[0].expression.name === 'TurboModule'
   );

packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt

@@ -31,7 +31,7 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   /**
    * The path to the react-native NPM package folder.
    *
-   * Default: ${rootProject.dir}/../node_modules/react-native-codegen
+   * Default: ${rootProject.dir}/../node_modules/react-native
    */
   val reactNativeDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/react-native"))
@@ -121,10 +121,10 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   /**
    * The path to the react-native-codegen NPM package folder.
    *
-   * Default: ${rootProject.dir}/../node_modules/react-native-codegen
+   * Default: ${rootProject.dir}/../node_modules/@react-native/codegen
    */
   val codegenDir: DirectoryProperty =
-      objects.directoryProperty().convention(root.dir("node_modules/react-native-codegen"))
+      objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
 
   /**
    * The root directory for all JS files for the app.