react-native 0.66.2 → 0.67.0-rc.3

package/android/com/facebook/react/react-native/0.67.0-rc.3/react-native-0.67.0-rc.3.pom.md5

@@ -0,0 +1 @@
+366c176f92ee056033fe7d71d4e28ff3

package/android/com/facebook/react/react-native/0.67.0-rc.3/react-native-0.67.0-rc.3.pom.sha1

@@ -0,0 +1 @@
+0d1ad039c0912c762525757725647c706941dacf

package/android/com/facebook/react/react-native/0.67.0-rc.3/react-native-0.67.0-rc.3.pom.sha256

@@ -0,0 +1 @@
+3cb6f4fe8693bfe8e9fc2e79a8a5e5b7e4c39e7f6546fa7a4e82e918d59823ef

package/android/com/facebook/react/react-native/0.67.0-rc.3/react-native-0.67.0-rc.3.pom.sha512

@@ -0,0 +1 @@
+757c4b6efb0e9ce269dbc55b76c13ac64594250ebf1bf34684d5681722a9d584d271089a2448ed30530457d765d7803705dd8df43bfab6cef19272e61c9e9d75

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.66.2</latest>
-    <release>0.66.2</release>
+    <latest>0.67.0-rc.3</latest>
+    <release>0.67.0-rc.3</release>
     <versions>
-      <version>0.66.2</version>
+      <version>0.67.0-rc.3</version>
     </versions>
-    <lastUpdated>20211104073910</lastUpdated>
+    <lastUpdated>20211105224134</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-d949b89b8c0f1697586a8d05b5510bf4
+8d1af4d13ebbd82903b5975831ca7653

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-91d86024909fe02db977fa273154402469ff1040
+ba21f562434c3df75615db495251eb3fa79836de

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-b212a820be75e6538fff1c2548aa988ff7a0b4b55ffc81132b638a78a342dfd9
+d458b940e549fb2004edac1a67a1b1ccf0da9b42bf97dc38de0b282324f3f29b

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-1f8f35579657a1168d3f7478eeea8b482c0955899ef1d4280ca8b96b55fd0449f6f31f19a765741f9896cec46716481647426cb290459629f80fe9ca65414e81
+110a5b0926649d43d4b578b440113296ce6f7b4208f7dc913065558078bbbf27b0f128c56ddd3bbda1e6a95198d9c57e33a1bd7f2eda27500ac0c8826b3e4f18

package/flow/global.js

@@ -16,8 +16,53 @@
  * writeability (`+`) when defining types.
  */
 declare var global: {
+  // setUpGlobals
+  +window: typeof global,
+  +self: typeof global,
+
+  // setXHR
+  +XMLHttpRequest: typeof XMLHttpRequest,
+  +FormData: typeof FormData,
+  +fetch: typeof fetch,
+  +Headers: typeof Headers,
+  +Request: typeof Request,
+  +Response: typeof Response,
+  +WebSocket: typeof WebSocket,
+  +Blob: typeof Blob,
+  +File: typeof File,
+  +FileReader: typeof FileReader,
+  +URL: typeof URL,
+  +URLSearchParams: typeof URLSearchParams,
+  +AbortController: typeof AbortController,
+  +AbortSignal: typeof AbortSignal,
+
+  // setUpAlert
+  +alert: typeof alert,
+
+  // setUpTimers
+  +clearInterval: typeof clearInterval,
+  +clearTimeout: typeof clearTimeout,
+  +setInterval: typeof setInterval,
+  +setTimeout: typeof setTimeout,
+  +requestAnimationFrame: typeof requestAnimationFrame,
+  +cancelAnimationFrame: typeof cancelAnimationFrame,
+  +requestIdleCallback: typeof requestIdleCallback,
+  +cancelIdleCallback: typeof cancelIdleCallback,
+  +setTimeout: typeof setTimeout,
+  // TODO(T97509743): use `typeof` when the next Flow release is available.
+  +queueMicrotask: <TArguments: Array<mixed>>(
+    jobCallback: (...args: TArguments) => mixed,
+  ) => void,
+
+  +console: typeof console,
+
+  // JavaScript environments specific
   +HermesInternal: ?$HermesInternalType,
 
+  // Internal-specific
+  +__DEV__?: boolean,
+  +RN$Bridgeless?: boolean,
+
   // Undeclared properties are implicitly `any`.
   [string | symbol]: any,
 };

package/index.js

@@ -55,7 +55,6 @@ import typeof AppState from './Libraries/AppState/AppState';
 import typeof AsyncStorage from './Libraries/Storage/AsyncStorage';
 import typeof BackHandler from './Libraries/Utilities/BackHandler';
 import typeof Clipboard from './Libraries/Components/Clipboard/Clipboard';
-import typeof DatePickerAndroid from './Libraries/Components/DatePickerAndroid/DatePickerAndroid';
 import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
 import typeof DevSettings from './Libraries/Utilities/DevSettings';
 import typeof Dimensions from './Libraries/Utilities/Dimensions';
@@ -297,15 +296,6 @@ module.exports = {
     );
     return require('./Libraries/Components/Clipboard/Clipboard');
   },
-  get DatePickerAndroid(): DatePickerAndroid {
-    warnOnce(
-      'DatePickerAndroid-merged',
-      'DatePickerAndroid has been merged with DatePickerIOS and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-community/datetimepicker' instead of 'react-native'. " +
-        'See https://github.com/react-native-datetimepicker/datetimepicker',
-    );
-    return require('./Libraries/Components/DatePickerAndroid/DatePickerAndroid');
-  },
   get DeviceInfo(): DeviceInfo {
     return require('./Libraries/Utilities/DeviceInfo');
   },
@@ -717,4 +707,19 @@ if (__DEV__) {
       );
     },
   });
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access DatePickerAndroid. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access DatePickerAndroid. */
+  Object.defineProperty(module.exports, 'DatePickerAndroid', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'DatePickerAndroid has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-community/datetimepicker' instead of 'react-native'. " +
+          'See https://github.com/react-native-datetimepicker/datetimepicker',
+      );
+    },
+  });
 }

package/jest/mockModal.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ */
+
+/* eslint-env jest */
+
+'use strict';
+
+const React = require('react');
+const Modal = require('../Libraries/Modal/Modal');
+
+function mockModal(BaseComponent: $FlowFixMe) {
+  class ModalMock extends BaseComponent {
+    render(): React.Element<typeof Modal> {
+      return (
+        <BaseComponent {...this.props}>
+          {this.props.visible !== true ? null : this.props.children}
+        </BaseComponent>
+      );
+    }
+  }
+  return ModalMock;
+}
+
+module.exports = (mockModal: $FlowFixMe);

package/jest/setup.js

@@ -110,9 +110,11 @@ jest
       getNativeRef: jest.fn(),
     }),
   )
-  .mock('../Libraries/Modal/Modal', () =>
-    mockComponent('../Libraries/Modal/Modal'),
-  )
+  .mock('../Libraries/Modal/Modal', () => {
+    const baseComponent = mockComponent('../Libraries/Modal/Modal');
+    const mockModal = jest.requireActual('./mockModal');
+    return mockModal(baseComponent);
+  })
   .mock('../Libraries/Components/View/View', () =>
     mockComponent('../Libraries/Components/View/View', MockNativeMethods),
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.66.2",
+  "version": "0.67.0-rc.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -38,7 +38,6 @@
     "rn-get-polyfills.js",
     "scripts/compose-source-maps.js",
     "scripts/find-node.sh",
-    "scripts/generate-specs.sh",
     "scripts/generate-specs-cli.js",
     "scripts/ios-configure-glog.sh",
     "scripts/launchPackager.bat",
@@ -89,7 +88,7 @@
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
     "@react-native/assets": "1.0.0",
-    "@react-native/normalize-color": "1.0.0",
+    "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
@@ -98,7 +97,6 @@
     "hermes-engine": "~0.9.0",
     "invariant": "^2.2.4",
     "jsc-android": "^250230.2.1",
-    "metro-babel-register": "0.66.2",
     "metro-react-native-babel-transformer": "0.66.2",
     "metro-runtime": "0.66.2",
     "metro-source-map": "0.66.2",
@@ -106,18 +104,18 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
-    "react-devtools-core": "^4.13.0",
-    "react-native-codegen": "^0.0.7",
+    "react-devtools-core": "4.19.1",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.20.2",
     "stacktrace-parser": "^0.1.3",
     "use-subscription": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
-    "ws": "^6.1.4"
+    "ws": "^6.1.4",
+    "react-native-codegen": "^0.0.8"
   },
   "devDependencies": {
-    "flow-bin": "^0.158.0",
+    "flow-bin": "^0.162.0",
     "react": "17.0.2",
     "@babel/core": "^7.14.0",
     "@babel/generator": "^7.14.0",
@@ -149,7 +147,8 @@
     "jest": "^26.6.3",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.11.0",
-    "metro-transform-plugins": "^0.66.0",
+    "metro-babel-register": "0.66.2",
+    "metro-transform-plugins": "^0.66.2",
     "mkdirp": "^0.5.1",
     "prettier": "1.19.1",
     "react-shallow-renderer": "16.14.1",

package/react.gradle

@@ -26,7 +26,7 @@ def detectEntryFile(config) {
  */
 def detectCliPath(config) {
     if (config.cliPath) {
-        return config.cliPath
+        return "${projectDir}/${config.cliPath}"
     }
     if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
         return "${projectDir}/../../node_modules/react-native/cli.js"
@@ -83,6 +83,28 @@ def enableHermesForVariant = config.enableHermesForVariant ?: {
     def variant -> config.enableHermes ?: false
 }
 
+// Set hermesFlagsForVariant to a function to configure per variant,
+// or set `hermesFlagsRelease` and `hermesFlagsDebug` to an array
+def hermesFlagsForVariant = config.hermesFlagsForVariant ?: {
+    def variant ->
+        def hermesFlags;
+        if (variant.name.toLowerCase().contains("release")) {
+            // Can't use ?: since that will also substitute valid empty lists
+            hermesFlags = config.hermesFlagsRelease
+            if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
+        } else {
+            hermesFlags = config.hermesFlagsDebug
+            if (hermesFlags == null) hermesFlags = []
+        }
+        return hermesFlags
+}
+
+// Set deleteDebugFilesForVariant to a function to configure per variant,
+// defaults to True for Release variants and False for debug variants
+def deleteDebugFilesForVariant = config.deleteDebugFilesForVariant ?: {
+    def variant -> variant.name.toLowerCase().contains("release")
+}
+
 android {
     buildTypes.all {
         resValue "integer", "react_native_dev_server_port", reactNativeDevServerPort()
@@ -177,18 +199,9 @@ afterEvaluate {
 
             if (enableHermes) {
                 doLast {
-                    def hermesFlags;
+                    def hermesFlags = hermesFlagsForVariant(variant)
                     def hbcTempFile = file("${jsBundleFile}.hbc")
                     exec {
-                        if (targetName.toLowerCase().contains("release")) {
-                            // Can't use ?: since that will also substitute valid empty lists
-                            hermesFlags = config.hermesFlagsRelease
-                            if (hermesFlags == null) hermesFlags = ["-O", "-output-source-map"]
-                        } else {
-                            hermesFlags = config.hermesFlagsDebug
-                            if (hermesFlags == null) hermesFlags = []
-                        }
-
                         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                             commandLine("cmd", "/c", getHermesCommand(), "-emit-binary", "-out", hbcTempFile, jsBundleFile, *hermesFlags)
                         } else {
@@ -328,38 +341,60 @@ afterEvaluate {
         // This should really be done by packaging all Hermes related libs into
         // two separate HermesDebug and HermesRelease AARs, but until then we'll
         // kludge it by deleting the .so files out of the /transforms/ directory.
-        def isRelease = targetName.toLowerCase().contains("release")
-        def libDir = "$buildDir/intermediates/transforms/"
-        def vmSelectionAction = {
+        def cleanup = deleteDebugFilesForVariant(variant)
+
+        def vmSelectionAction = { libDir ->
             fileTree(libDir).matching {
                 if (enableHermes) {
                     // For Hermes, delete all the libjsc* files
                     include "**/libjsc*.so"
 
-                    if (isRelease) {
+                    if (cleanup) {
                         // Reduce size by deleting the debugger/inspector
                         include '**/libhermes-inspector.so'
                         include '**/libhermes-executor-debug.so'
+                        include '**/libhermes-executor-common-debug.so'
                     } else {
                         // Release libs take precedence and must be removed
                         // to allow debugging
                         include '**/libhermes-executor-release.so'
+                        include '**/libhermes-executor-common-release.so'
                     }
                 } else {
                     // For JSC, delete all the libhermes* files
                     include "**/libhermes*.so"
+                    // Delete the libjscexecutor from release build
+                    if (cleanup) {
+                        include "**/libjscexecutor.so"
+                    }
                 }
             }.visit { details ->
-                def targetVariant = ".*/transforms/[^/]*/${targetPath}/.*"
+                def targetVariant1 = ".*/transforms/[^/]*/${targetPath}/.*"
+                def targetVariant2 = ".*/merged_native_libs/${targetPath}/out/lib/.*"
+                def targetVariant3 = ".*/stripped_native_libs/${targetPath}/out/lib/.*"
                 def path = details.file.getAbsolutePath().replace(File.separatorChar, '/' as char)
-                if (path.matches(targetVariant) && details.file.isFile()) {
+                if ((path.matches(targetVariant1) || path.matches(targetVariant2) || path.matches(targetVariant3)) && details.file.isFile()) {
                     details.file.delete()
                 }
             }
         }
 
         if (enableVmCleanup) {
-            packageTask.doFirst(vmSelectionAction)
+            def task = tasks.findByName("package${targetName}")
+            def transformsLibDir = "$buildDir/intermediates/transforms/"
+            task.doFirst { vmSelectionAction(transformsLibDir) }
+
+            def sTask = tasks.findByName("strip${targetName}DebugSymbols")
+            if (sTask != null) {
+                def strippedLibDir = "$buildDir/intermediates/stripped_native_libs/${targetPath}/out/lib/"
+                sTask.doLast { vmSelectionAction(strippedLibDir) }
+            }
+
+            def mTask = tasks.findByName("merge${targetName}NativeLibs")
+            if (mTask != null) {
+                def mergedLibDir = "$buildDir/intermediates/merged_native_libs/${targetPath}/out/lib/"
+                mTask.doLast { vmSelectionAction(mergedLibDir) }
+            }
         }
     }
 }

package/scripts/find-node.sh

@@ -6,6 +6,10 @@
 
 set -e
 
+# remove global prefix if it's already set
+# the running shell process will choose a node binary and a global package directory breaks version managers
+unset PREFIX
+
 # Support Homebrew on M1
 HOMEBREW_M1_BIN=/opt/homebrew/bin
 if [[ -d $HOMEBREW_M1_BIN && ! $PATH =~ $HOMEBREW_M1_BIN ]]; then
@@ -37,3 +41,12 @@ if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
     eval "$(anyenv init -)"
   fi
 fi
+
+# Set up asdf-vm if present
+if [[ -f "$HOME/.asdf/asdf.sh" ]]; then
+  # shellcheck source=/dev/null
+  . "$HOME/.asdf/asdf.sh"
+elif [[ -x "$(command -v brew)" && -f "$(brew --prefix asdf)/asdf.sh" ]]; then
+  # shellcheck source=/dev/null
+  . "$(brew --prefix asdf)/asdf.sh"
+fi

package/scripts/generate-specs-cli.js

@@ -79,6 +79,24 @@ function generateSpec(
         fs.renameSync(`${outputDirectory}/${f}`, `${jniOutputDirectory}/${f}`);
       });
   }
+
+  if (platform === 'ios') {
+    const files = fs.readdirSync(outputDirectory);
+    const componentsOutputDirectory = `${outputDirectory}/react/renderer/components/${libraryName}`;
+    mkdirp.sync(componentsOutputDirectory);
+    files
+      .filter(
+        f =>
+          (f.endsWith('.h') && !f.startsWith(libraryName)) ||
+          f.endsWith('.cpp'),
+      )
+      .forEach(f => {
+        fs.renameSync(
+          `${outputDirectory}/${f}`,
+          `${componentsOutputDirectory}/${f}`,
+        );
+      });
+  }
 }
 
 function main() {

package/scripts/ios-configure-glog.sh

@@ -28,6 +28,10 @@ if [ -h "test-driver" ]; then
     rm test-driver
 fi
 
+# Manually disable gflags include to fix issue https://github.com/facebook/react-native/issues/28446
+sed -i '' 's/\@ac_cv_have_libgflags\@/0/' src/glog/logging.h.in
+sed -i '' 's/HAVE_LIB_GFLAGS/HAVE_LIB_GFLAGS_DISABLED/' src/config.h.in
+
 ./configure --host arm-apple-darwin
 
 cat << EOF >> src/config.h

package/scripts/react-native-xcode.sh

@@ -96,7 +96,7 @@ fi
 
 if [[ $USE_HERMES == true && ! -f "$HERMES_CLI_PATH" ]]; then
   echo "error: USE_HERMES is set to true but the hermesc binary could not be " \
-       "found at ${HERMES_CLI_PATH}. Perhaps you need to run pod install or otherwise " \
+       "found at ${HERMES_CLI_PATH}. Perhaps you need to run 'bundle exec pod install' or otherwise " \
        "point the HERMES_CLI_PATH variable to your custom location." >&2
   exit 2
 fi
@@ -117,7 +117,7 @@ fi
 
 BUNDLE_FILE="$CONFIGURATION_BUILD_DIR/main.jsbundle"
 
-EXTRA_ARGS=
+EXTRA_ARGS=()
 
 case "$PLATFORM_NAME" in
   "macosx")
@@ -144,12 +144,12 @@ if [[ $EMIT_SOURCEMAP == true ]]; then
   else
     PACKAGER_SOURCEMAP_FILE="$SOURCEMAP_FILE"
   fi
-  EXTRA_ARGS="$EXTRA_ARGS --sourcemap-output $PACKAGER_SOURCEMAP_FILE"
+  EXTRA_ARGS+=("--sourcemap-output" "$PACKAGER_SOURCEMAP_FILE")
 fi
 
 # Hermes doesn't require JS minification.
 if [[ $USE_HERMES == true && $DEV == false ]]; then
-  EXTRA_ARGS="$EXTRA_ARGS --minify false"
+  EXTRA_ARGS+=("--minify" "false")
 fi
 
 "$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
@@ -160,8 +160,8 @@ fi
   --reset-cache \
   --bundle-output "$BUNDLE_FILE" \
   --assets-dest "$DEST" \
-  $EXTRA_ARGS \
-  $EXTRA_PACKAGER_ARGS
+  "${EXTRA_ARGS[@]}" \
+  "${EXTRA_PACKAGER_ARGS[@]}"
 
 if [[ $USE_HERMES != true ]]; then
   cp "$BUNDLE_FILE" "$DEST/"