react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/flow-typed/npm/react-test-renderer_v16.x.x.js

@@ -0,0 +1,79 @@
+// flow-typed signature: 7bac6c05f7415881918d3d510109e739
+// flow-typed version: fce74493f0/react-test-renderer_v16.x.x/flow_>=v0.104.x
+
+// Type definitions for react-test-renderer 16.x.x
+// Ported from: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-test-renderer
+
+type ReactComponentInstance = React$Component<any>;
+
+type ReactTestRendererJSON = {
+  type: string,
+  props: { [propName: string]: any, ... },
+  children: null | ReactTestRendererJSON[],
+  ...
+};
+
+type ReactTestRendererTree = ReactTestRendererJSON & {
+  nodeType: "component" | "host",
+  instance: ?ReactComponentInstance,
+  rendered: null | ReactTestRendererTree,
+  ...
+};
+
+type ReactTestInstance = {
+  instance: ?ReactComponentInstance,
+  type: string,
+  props: { [propName: string]: any, ... },
+  parent: null | ReactTestInstance,
+  children: Array<ReactTestInstance | string>,
+  find(predicate: (node: ReactTestInstance) => boolean): ReactTestInstance,
+  findByType(type: React$ElementType): ReactTestInstance,
+  findByProps(props: { [propName: string]: any, ... }): ReactTestInstance,
+  findAll(
+    predicate: (node: ReactTestInstance) => boolean,
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  findAllByType(
+    type: React$ElementType,
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  findAllByProps(
+    props: { [propName: string]: any, ... },
+    options?: { deep: boolean, ... }
+  ): ReactTestInstance[],
+  ...
+};
+
+type TestRendererOptions = { createNodeMock(element: React$Element<any>): any, ... };
+
+declare module "react-test-renderer" {
+  declare export type ReactTestRenderer = {
+    toJSON(): null | ReactTestRendererJSON,
+    toTree(): null | ReactTestRendererTree,
+    unmount(nextElement?: React$Element<any>): void,
+    update(nextElement: React$Element<any>): void,
+    getInstance(): ?ReactComponentInstance,
+    root: ReactTestInstance,
+    ...
+  };
+
+  declare type Thenable = { then(resolve: () => mixed, reject?: () => mixed): mixed, ... };
+
+  declare function create(
+    nextElement: React$Element<any>,
+    options?: TestRendererOptions
+  ): ReactTestRenderer;
+
+  declare function act(callback: () => void | Promise<void>): Thenable;
+}
+
+declare module "react-test-renderer/shallow" {
+  declare export default class ShallowRenderer {
+    static createRenderer(): ShallowRenderer;
+    getMountedInstance(): ReactTestInstance;
+    getRenderOutput<E: React$Element<any>>(): E;
+    getRenderOutput(): React$Element<any>;
+    render(element: React$Element<any>, context?: any): void;
+    unmount(): void;
+  }
+}

package/index.js

@@ -23,8 +23,6 @@ import typeof InputAccessoryView from './Libraries/Components/TextInput/InputAcc
 import typeof KeyboardAvoidingView from './Libraries/Components/Keyboard/KeyboardAvoidingView';
 import typeof MaskedViewIOS from './Libraries/Components/MaskedView/MaskedViewIOS';
 import typeof Modal from './Libraries/Modal/Modal';
-import typeof Picker from './Libraries/Components/Picker/Picker';
-import typeof PickerIOS from './Libraries/Components/Picker/PickerIOS';
 import typeof Pressable from './Libraries/Components/Pressable/Pressable';
 import typeof ProgressBarAndroid from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
 import typeof ProgressViewIOS from './Libraries/Components/ProgressViewIOS/ProgressViewIOS';
@@ -57,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';
@@ -79,7 +76,6 @@ import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof PushNotificationIOS from './Libraries/PushNotificationIOS/PushNotificationIOS';
 import typeof Settings from './Libraries/Settings/Settings';
 import typeof Share from './Libraries/Share/Share';
-import typeof StatusBarIOS from './Libraries/Components/StatusBar/StatusBarIOS';
 import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
 import typeof Systrace from './Libraries/Performance/Systrace';
 import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
@@ -153,7 +149,8 @@ module.exports = {
     return require('./Libraries/Components/TextInput/InputAccessoryView');
   },
   get KeyboardAvoidingView(): KeyboardAvoidingView {
-    return require('./Libraries/Components/Keyboard/KeyboardAvoidingView');
+    return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
+      .default;
   },
   get MaskedViewIOS(): MaskedViewIOS {
     warnOnce(
@@ -167,25 +164,6 @@ module.exports = {
   get Modal(): Modal {
     return require('./Libraries/Modal/Modal');
   },
-  get Picker(): Picker {
-    warnOnce(
-      'picker-moved',
-      'Picker has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
-        'See https://github.com/react-native-picker/picker',
-    );
-    return require('./Libraries/Components/Picker/Picker');
-  },
-  // $FlowFixMe[value-as-type]
-  get PickerIOS(): PickerIOS {
-    warnOnce(
-      'pickerios-moved',
-      'PickerIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
-        'See https://github.com/react-native-picker/picker',
-    );
-    return require('./Libraries/Components/Picker/PickerIOS');
-  },
   get Pressable(): Pressable {
     return require('./Libraries/Components/Pressable/Pressable').default;
   },
@@ -318,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');
   },
@@ -404,13 +373,6 @@ module.exports = {
   get Share(): Share {
     return require('./Libraries/Share/Share');
   },
-  get StatusBarIOS(): StatusBarIOS {
-    warnOnce(
-      'StatusBarIOS-merged',
-      'StatusBarIOS has been merged with StatusBar and will be removed in a future release. Use StatusBar for mutating the status bar',
-    );
-    return require('./Libraries/Components/StatusBar/StatusBarIOS');
-  },
   get StyleSheet(): StyleSheet {
     return require('./Libraries/StyleSheet/StyleSheet');
   },
@@ -697,4 +659,67 @@ if (__DEV__) {
       );
     },
   });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access StatusBarIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access StatusBarIOS. */
+  Object.defineProperty(module.exports, 'StatusBarIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'StatusBarIOS has been removed from React Native. ' +
+          'Has been merged with StatusBar. ' +
+          'See https://reactnative.dev/docs/statusbar',
+      );
+    },
+  });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access PickerIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access PickerIOS. */
+  Object.defineProperty(module.exports, 'PickerIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'PickerIOS has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
+          'See https://github.com/react-native-picker/picker',
+      );
+    },
+  });
+
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access Picker. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access Picker. */
+  Object.defineProperty(module.exports, 'Picker', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'Picker has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-picker/picker' instead of 'react-native'. " +
+          'See https://github.com/react-native-picker/picker',
+      );
+    },
+  });
+  /* $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/preprocessor.js

@@ -13,10 +13,42 @@
 'use strict';
 
 const babelRegisterOnly = require('metro-babel-register');
+const nullthrows = require('nullthrows');
 const createCacheKeyFunction = require('@jest/create-cache-key-function')
   .default;
+const t = require('@babel/types');
+const {statements} = require('@babel/template').default;
 
-const {transformSync: babelTransformSync} = require('@babel/core');
+const importDefault = '__importDefault__';
+const importAll = '__importAll__';
+
+// prelude
+const importPrelude = statements(`
+  function ${importDefault}(moduleId) {
+    const exports = require(moduleId);
+
+    if (exports && exports.__esModule) {
+      return exports.default;
+    }
+
+    return exports;
+  };
+
+  function ${importAll}(moduleId) {
+    const exports = require(moduleId);
+
+    if (exports && exports.__esModule) {
+      return exports;
+    }
+
+    return Object.assign({}, exports, {default: exports});
+  };
+`);
+
+const {
+  transformSync: babelTransformSync,
+  transformFromAstSync: babelTransformFromAstSync,
+} = require('@babel/core');
 const generate = require('@babel/generator').default;
 
 const nodeFiles = new RegExp(
@@ -41,13 +73,13 @@ module.exports = {
       }).code;
     }
 
-    const {ast} = transformer.transform({
+    let {ast} = transformer.transform({
       filename: file,
       options: {
         ast: true, // needed for open source (?) https://github.com/facebook/react-native/commit/f8d6b97140cffe8d18b2558f94570c8d1b410d5c#r28647044
         dev: true,
         enableBabelRuntime: false,
-        experimentalImportSupport: false,
+        experimentalImportSupport: true,
         globalPrefix: '',
         hot: false,
         inlineRequires: true,
@@ -79,10 +111,6 @@ module.exports = {
         [require('@babel/plugin-transform-regenerator')],
         [require('@babel/plugin-transform-sticky-regex')],
         [require('@babel/plugin-transform-unicode-regex')],
-        [
-          require('@babel/plugin-transform-modules-commonjs'),
-          {strict: false, allowTopLevelThis: true},
-        ],
         [require('@babel/plugin-transform-classes')],
         [require('@babel/plugin-transform-arrow-functions')],
         [require('@babel/plugin-transform-spread')],
@@ -99,6 +127,46 @@ module.exports = {
       ],
     });
 
+    // We're not using @babel/plugin-transform-modules-commonjs so
+    // we need to add 'use strict' manually
+    const directives = ast.program.directives;
+
+    if (
+      ast.program.sourceType === 'module' &&
+      (directives == null ||
+        directives.findIndex(d => d.value.value === 'use strict') === -1)
+    ) {
+      ast.program.directives = [
+        ...(directives || []),
+        t.directive(t.directiveLiteral('use strict')),
+      ];
+    }
+
+    // Postprocess the transformed module to handle ESM and inline requires.
+    // We need to do this in a separate pass to avoid issues tracking references.
+    const babelTransformResult = babelTransformFromAstSync(ast, src, {
+      ast: true,
+      retainLines: true,
+      plugins: [
+        [
+          require('metro-transform-plugins').importExportPlugin,
+          {importDefault, importAll},
+        ],
+        [
+          require('babel-preset-fbjs/plugins/inline-requires.js'),
+          {inlineableCalls: [importDefault, importAll]},
+        ],
+      ],
+      sourceType: 'module',
+    });
+
+    ast = nullthrows(babelTransformResult.ast);
+
+    // Inject import helpers *after* running the inline-requires transform,
+    // because otherwise it will assume they are user code and bail out of
+    // inlining calls to them.
+    ast.program.body.unshift(...importPrelude());
+
     return generate(
       ast,
       // $FlowFixMe[prop-missing] Error found when improving flow typing for libs

package/jest/renderer.js

@@ -9,14 +9,10 @@
  * @flow
  */
 
-const React = require('react');
+import * as React from 'react';
+import TestRenderer from 'react-test-renderer';
+import ShallowRenderer from 'react-shallow-renderer';
 
-const ShallowRenderer = require('react-shallow-renderer');
-const TestRenderer = require('react-test-renderer');
-
-/* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
- * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
- * delete this comment and run Flow. */
 const renderer = new ShallowRenderer();
 
 export const shallow = (Component: React.Element<any>): any => {

package/jest/setup.js

@@ -12,7 +12,7 @@
 const MockNativeMethods = jest.requireActual('./MockNativeMethods');
 const mockComponent = jest.requireActual('./mockComponent');
 
-jest.requireActual('@react-native/polyfills/Object.es7');
+jest.requireActual('@react-native/polyfills/Object.es8');
 jest.requireActual('@react-native/polyfills/error-guard');
 
 global.__DEV__ = true;
@@ -23,6 +23,7 @@ global.performance = {
 
 global.Promise = jest.requireActual('promise');
 global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime');
+global.window = global;
 
 global.requestAnimationFrame = function(callback) {
   return setTimeout(callback, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.0.0-263478b91",
+  "version": "0.0.0-268efb102",
   "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",
@@ -67,7 +66,7 @@
     "prettier": "prettier --write \"./**/*.{js,md,yml}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
     "update-lock": "npx yarn-deduplicate",
-    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:3.2",
+    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:4.0",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
@@ -84,24 +83,24 @@
     "react": "17.0.2"
   },
   "dependencies": {
-    "@jest/create-cache-key-function": "^26.5.0",
-    "@react-native-community/cli": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-android": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-ios": "^5.0.1-alpha.0",
+    "@jest/create-cache-key-function": "^27.0.1",
+    "@react-native-community/cli": "^6.0.0",
+    "@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/polyfills": "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",
     "base64-js": "^1.1.2",
     "event-target-shim": "^5.0.1",
-    "hermes-engine": "~0.8.0",
+    "hermes-engine": "~0.9.0",
     "invariant": "^2.2.4",
-    "jsc-android": "^245459.0.0",
-    "metro-babel-register": "0.66.0",
-    "metro-react-native-babel-transformer": "0.66.0",
-    "metro-runtime": "0.66.0",
-    "metro-source-map": "0.66.0",
+    "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",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
@@ -109,15 +108,55 @@
     "react-devtools-core": "^4.13.0",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.20.1",
+    "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.150.0",
-    "react": "17.0.2"
+    "flow-bin": "^0.160.2",
+    "react": "17.0.2",
+    "@babel/core": "^7.14.0",
+    "@babel/generator": "^7.14.0",
+    "@babel/template": "^7.0.0",
+    "@babel/types": "^7.0.0",
+    "@react-native-community/eslint-plugin": "*",
+    "@reactions/component": "^2.0.2",
+    "async": "^2.4.0",
+    "babel-eslint": "^10.1.0",
+    "babel-preset-fbjs": "^3.4.0",
+    "clang-format": "^1.2.4",
+    "connect": "^3.6.5",
+    "coveralls": "^3.0.2",
+    "detox": "16.7.2",
+    "eslint": "7.12.0",
+    "eslint-config-fb-strict": "^24.9.0",
+    "eslint-config-fbjs": "2.1.0",
+    "eslint-config-prettier": "^6.0.0",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-eslint-comments": "^3.1.1",
+    "eslint-plugin-flowtype": "2.50.3",
+    "eslint-plugin-jest": "22.4.1",
+    "eslint-plugin-jsx-a11y": "6.2.1",
+    "eslint-plugin-prettier": "2.6.2",
+    "eslint-plugin-react": "7.21.5",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react-native": "3.10.0",
+    "eslint-plugin-relay": "1.8.1",
+    "jest": "^26.6.3",
+    "jest-junit": "^10.0.0",
+    "jscodeshift": "^0.11.0",
+    "metro-transform-plugins": "^0.66.2",
+    "mkdirp": "^0.5.1",
+    "prettier": "1.19.1",
+    "react-shallow-renderer": "16.14.1",
+    "react-test-renderer": "17.0.2",
+    "shelljs": "^0.7.8",
+    "signedsource": "^1.0.0",
+    "ws": "^6.1.4",
+    "yargs": "^15.3.1"
   },
   "detox": {
     "test-runner": "jest",

package/react.gradle

@@ -26,19 +26,13 @@ def detectEntryFile(config) {
  */
 def detectCliPath(config) {
     if (config.cliPath) {
-        return config.cliPath
+        return "${projectDir}/${config.cliPath}"
     }
-
-    def cliPath = ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim()
-
-    if (cliPath) {
-        return cliPath
-    } else if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
+    if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
         return "${projectDir}/../../node_modules/react-native/cli.js"
-    } else {
-        throw new Exception("Couldn't determine CLI location. " +
-            "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
     }
+    throw new Exception("Couldn't determine CLI location. " +
+             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
 }
 
 def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
@@ -290,18 +284,24 @@ afterEvaluate {
                 into(file(config."jsBundleDir${targetName}"))
             } else {
                 into ("$buildDir/intermediates")
-                into ("assets/${targetPath}") {
-                    from(jsBundleDir)
-                }
+                if (isAndroidLibrary) {
+                    into ("library_assets/${variant.name}/out") {
+                        from(jsBundleDir)
+                    }
+                } else {
+                    into ("assets/${targetPath}") {
+                        from(jsBundleDir)
+                    }
 
-                // Workaround for Android Gradle Plugin 3.2+ new asset directory
-                into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
-                    from(jsBundleDir)
-                }
+                    // Workaround for Android Gradle Plugin 3.2+ new asset directory
+                    into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
+                        from(jsBundleDir)
+                    }
 
-                // Workaround for Android Gradle Plugin 3.4+ new asset directory
-                into ("merged_assets/${variant.name}/out") {
-                    from(jsBundleDir)
+                    // Workaround for Android Gradle Plugin 3.4+ new asset directory
+                    into ("merged_assets/${variant.name}/out") {
+                        from(jsBundleDir)
+                    }
                 }
             }
 
@@ -309,6 +309,7 @@ afterEvaluate {
             dependsOn(variant.mergeAssetsProvider.get())
 
             enabled(currentBundleTask.enabled)
+            dependsOn(currentBundleTask)
         }
 
         // mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
@@ -328,8 +329,8 @@ afterEvaluate {
         // 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 vmSelectionAction = { libDir ->
             fileTree(libDir).matching {
                 if (enableHermes) {
                     // For Hermes, delete all the libjsc* files
@@ -339,19 +340,27 @@ afterEvaluate {
                         // 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 (isRelease) {
+                        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()
                 }
             }
@@ -359,7 +368,20 @@ afterEvaluate {
 
         if (enableVmCleanup) {
             def task = tasks.findByName("package${targetName}")
-            task.doFirst(vmSelectionAction)
+            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,12 @@
 
 set -e
 
+# Support Homebrew on M1
+HOMEBREW_M1_BIN=/opt/homebrew/bin
+if [[ -d $HOMEBREW_M1_BIN && ! $PATH =~ $HOMEBREW_M1_BIN ]]; then
+  export PATH="$HOMEBREW_M1_BIN:$PATH"
+fi
+
 # Define NVM_DIR and source the nvm.sh setup script
 [ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"