@nx/react-native 17.0.5 → 17.0.6

package/.eslintrc.json

@@ -32,13 +32,7 @@
               "react-native",
               // These are in ensurePackage
               "@nx/rollup",
-              "@nx/storybook",
-              "@nx/vite",
-              "@nx/webpack",
-              "@nx/detox",
-              "@nx/cypress",
-              "@nx/playwright",
-              "ajv"
+              "@nx/storybook"
             ]
           }
         ]

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2023 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -1,9 +1,4 @@
-<p style="text-align: center;">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
-  </picture>
-</p>
+<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
 <div style="text-align: center;">
 
@@ -20,9 +15,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart, Fast and Extensible Build System
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a next generation build system with first class monorepo support and powerful integrations.
 
 This package is a [React Native plugin for Nx](https://nx.dev/packages/react-native).
 
@@ -64,5 +59,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
 

package/executors.json

@@ -49,11 +49,6 @@
       "implementation": "./src/executors/pod-install/pod-install.impl",
       "schema": "./src/executors/pod-install/schema.json",
       "description": "Run `pod install` in the `ios` directory."
-    },
-    "upgrade": {
-      "implementation": "./src/executors/upgrade/upgrade.impl",
-      "schema": "./src/executors/upgrade/schema.json",
-      "description": "upgrade executor"
     }
   }
 }

package/generators.json

@@ -4,9 +4,9 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#reactNativeInitGeneratorInternal",
+      "factory": "./src/generators/init/init#reactNativeInitGenerator",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nx/react-native` plugin.",
+      "description": "Initialize the `@nrwl/react-native` plugin.",
       "hidden": true
     },
     "application": {
@@ -30,29 +30,28 @@
       "aliases": ["c"]
     },
     "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGeneratorInternal",
+      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGenerator",
       "schema": "./src/generators/storybook-configuration/schema.json",
-      "description": "Set up Storybook for a React Native application or library."
+      "description": "Set up Storybook for a React-native application or library.",
+      "hidden": false
     },
     "component-story": {
       "factory": "./src/generators/component-story/component-story#componentStoryGenerator",
       "schema": "./src/generators/component-story/schema.json",
-      "description": "Generate Storybook story for a React Native component."
+      "description": "Generate Storybook story for a React-native component.",
+      "hidden": false
     },
     "stories": {
       "factory": "./src/generators/stories/stories#storiesGenerator",
       "schema": "./src/generators/stories/schema.json",
-      "description": "Create stories for all components declared in an application or library."
+      "description": "Create stories/specs for all components declared in an application or library.",
+      "hidden": false
     },
     "upgrade-native": {
       "factory": "./src/generators/upgrade-native/upgrade-native#reactNativeUpgradeNativeGenerator",
       "schema": "./src/generators/upgrade-native/schema.json",
-      "description": "Destructive command to upgrade native iOS and Android code to latest."
-    },
-    "web-configuration": {
-      "factory": "./src/generators/web-configuration/web-configuration#webConfigurationGenerator",
-      "schema": "./src/generators/web-configuration/schema.json",
-      "description": "Set up web configuration for a React Native app"
+      "description": "Destructive command to upgrade native iOS and Android code to latest.",
+      "hidden": false
     }
   }
 }

package/migrations.json

@@ -41,42 +41,6 @@
       "version": "16.9.0-beta.1",
       "description": "Remove @types/react-native from package.json",
       "implementation": "./src/migrations/update-16-9-0/remove-types-react-native"
-    },
-    "update-18-0-0-add-web-configuration": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Add web configuration to react native projects",
-      "implementation": "./src/migrations/update-18-0-0/add-web-configuration"
-    },
-    "update-18-0-0-change-storybook-targets": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Upgrade react native storybook target to use web",
-      "implementation": "./src/migrations/update-18-0-0/change-storybook-targets"
-    },
-    "update-18-0-0-remove-block-list": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove blockList in metro.config.js.",
-      "implementation": "./src/migrations/update-18-0-0/remove-block-list"
-    },
-    "update-18-0-0-remove-metro": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove metro-* and @react-native-community/cli-* from package.json devDependencies",
-      "implementation": "./src/migrations/update-18-0-0/remove-metro"
-    },
-    "update-18-0-0-remove-symlink-target": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Remove ensure-symlink target",
-      "implementation": "./src/migrations/update-18-0-0/remove-symlink-target"
-    },
-    "update-18-0-0-add-upgrade-target": {
-      "cli": "nx",
-      "version": "18.0.0-beta.0",
-      "description": "Add upgrade target to react native projects",
-      "implementation": "./src/migrations/update-18-0-0/add-upgrade-target"
     }
   },
   "packageJsonUpdates": {
@@ -537,96 +501,6 @@
           "alwaysAddToPackageJson": false
         }
       }
-    },
-    "17.1.0": {
-      "version": "17.1.0-beta.1",
-      "packages": {
-        "react-native": {
-          "version": "0.72.6",
-          "alwaysAddToPackageJson": false
-        },
-        "metro": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-resolver": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-config": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-react-native-babel-preset": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-babel-register": {
-          "version": "0.76.8",
-          "alwaysAddToPackageJson": false
-        },
-        "metro-react-native-babel-transformer": {
-          "version": "0.76.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-android": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-ios": {
-          "version": "11.3.7",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "17.3.0": {
-      "version": "17.3.0-beta.3",
-      "packages": {
-        "@types/node": {
-          "version": "18.16.9"
-        }
-      }
-    },
-    "18.0.0": {
-      "version": "18.0.0-beta.0",
-      "packages": {
-        "react-native": {
-          "version": "0.73.2",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native/babel-preset": {
-          "version": "^0.73.18",
-          "addToPackageJson": "devDependencies"
-        },
-        "@react-native/metro-config": {
-          "version": "^0.73.2",
-          "addToPackageJson": "devDependencies"
-        },
-        "@types/react": {
-          "version": "~18.2.45",
-          "alwaysAddToPackageJson": false
-        },
-        "@testing-library/react-native": {
-          "version": "~12.4.2",
-          "alwaysAddToPackageJson": false
-        },
-        "react-native-svg-transformer": {
-          "version": "1.2.0",
-          "alwaysAddToPackageJson": false
-        },
-        "react-native-svg": {
-          "version": "14.1.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@react-native-community/cli-platform-android": {
-          "version": "12.3.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.0.5",
+  "version": "v17.0.6",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -25,24 +25,28 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
     "glob": "7.1.4",
     "ignore": "^5.0.4",
-    "metro-config": "~0.80.4",
-    "metro-resolver": "~0.80.4",
+    "metro-config": "0.76.7",
+    "metro-resolver": "0.76.7",
+    "minimatch": "3.0.5",
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.5",
-    "@nx/jest": "17.0.5",
-    "@nx/js": "17.0.5",
-    "@nx/eslint": "17.0.5",
-    "@nx/react": "17.0.5",
-    "@nx/workspace": "17.0.5",
-    "@nrwl/react-native": "17.0.5"
+    "@nx/detox": "v17.0.6",
+    "@nx/devkit": "v17.0.6",
+    "@nx/jest": "v17.0.6",
+    "@nx/js": "v17.0.6",
+    "@nx/eslint": "v17.0.6",
+    "@nx/react": "v17.0.6",
+    "@nx/workspace": "v17.0.6",
+    "@nrwl/react-native": "v17.0.6"
+  },
+  "peerDependencies": {
+    "react-native": ">= 0.72.0 < 0.73.0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/metro-resolver.js

@@ -27,9 +27,6 @@ function getResolveRequest(extensions) {
         if (resolvedPath) {
             return resolvedPath;
         }
-        if (debug) {
-            console.log(chalk.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
-        }
         throw new Error(`Cannot resolve ${chalk.bold(realModuleName)}`);
     };
 }
@@ -87,7 +84,7 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     }
     catch {
         if (debug) {
-            console.log(chalk.cyan(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
+            console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
             console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
         }
     }

package/plugins/with-nx-metro.js

@@ -11,18 +11,14 @@ async function withNxMetro(userConfig, opts = {}) {
         process.env.NX_REACT_NATIVE_DEBUG = 'true';
     if (opts.extensions)
         extensions.push(...opts.extensions);
-    let watchFolders = (0, fs_extra_1.readdirSync)(devkit_1.workspaceRoot)
-        .filter((fileName) => !['dist', 'e2e'].includes(fileName) && !fileName.startsWith('.'))
-        .map((fileName) => (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, fileName))
-        .filter((filePath) => (0, fs_extra_1.statSync)(filePath).isDirectory());
+    let watchFolders = [devkit_1.workspaceRoot];
     if (opts.watchFolders?.length) {
         watchFolders = watchFolders.concat(opts.watchFolders);
     }
-    watchFolders = [...new Set(watchFolders)].filter((folder) => (0, fs_extra_1.existsSync)(folder));
+    watchFolders = watchFolders.filter((folder) => (0, fs_extra_1.existsSync)(folder));
     const nxConfig = {
         resolver: {
             resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions),
-            nodeModulesPaths: [(0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules')],
         },
         watchFolders,
     };

package/src/executors/build-android/build-android.impl.js

@@ -6,14 +6,18 @@ const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-f
 const get_cli_options_1 = require("../../utils/get-cli-options");
 async function* buildAndroidExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(context.root, projectRoot, 'android'));
+    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(projectRoot, 'android'));
     await runCliBuild(context.root, projectRoot, options);
     yield { success: true };
 }
 exports.default = buildAndroidExecutor;
 function runCliBuild(workspaceRoot, projectRoot, options) {
     return new Promise((res, reject) => {
-        const childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['build-android', ...createBuildAndroidOptions(options)], {
+        /**
+         * Call the react native cli with option `--no-packager`
+         * Not passing '--packager' due to cli will launch start command from the project root
+         */
+        const childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['build-android', ...createBuildAndroidOptions(options), '--no-packager'], {
             stdio: 'inherit',
             cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
             env: { ...process.env, RCT_METRO_PORT: options.port.toString() },

package/src/executors/build-android/build-android.impl.ts

@@ -15,7 +15,7 @@ export default async function* buildAndroidExecutor(
 ): AsyncGenerator<ReactNativeBuildOutput> {
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  chmodAndroidGradlewFiles(join(context.root, projectRoot, 'android'));
+  chmodAndroidGradlewFiles(join(projectRoot, 'android'));
 
   await runCliBuild(context.root, projectRoot, options);
   yield { success: true };
@@ -27,9 +27,13 @@ function runCliBuild(
   options: ReactNativeBuildAndroidOptions
 ) {
   return new Promise<ChildProcess>((res, reject) => {
+    /**
+     * Call the react native cli with option `--no-packager`
+     * Not passing '--packager' due to cli will launch start command from the project root
+     */
     const childProcess = fork(
       require.resolve('react-native/cli.js'),
-      ['build-android', ...createBuildAndroidOptions(options)],
+      ['build-android', ...createBuildAndroidOptions(options), '--no-packager'],
       {
         stdio: 'inherit',
         cwd: pathResolve(workspaceRoot, projectRoot),

package/src/executors/build-android/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeBuildAndroid",
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "title": "Release Build for Android",
   "description": "Build target options for Android.",
   "type": "object",

package/src/executors/build-ios/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "version": 2,
   "cli": "nx",
   "title": "React Native Build iOS executor",

package/src/executors/bundle/schema.d.ts

@@ -1,4 +1,4 @@
-// options form https://github.com/facebook/react-native/tree/main/packages/community-cli-plugin#bundle
+// options form https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
 export interface ReactNativeBundleOptions {
   entryFile: string;
   platform: string;

package/src/executors/bundle/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeBundle",
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "title": "Offline JS Bundle for React Native",
   "description": "JS Bundle target options.",
   "type": "object",

package/src/executors/ensure-symlink/ensure-symlink.impl.d.ts

@@ -2,8 +2,4 @@ import { ExecutorContext } from '@nx/devkit';
 export interface ReactNativeEnsureSymlinkOutput {
     success: boolean;
 }
-/**
- * TODO (@xiongemi): remove this function in v19.
- * @deprecated It is no longer needed for react native 73.
- */
 export default function ensureSymlinkExecutor(_: any, context: ExecutorContext): AsyncGenerator<ReactNativeEnsureSymlinkOutput>;

package/src/executors/ensure-symlink/ensure-symlink.impl.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
-/**
- * TODO (@xiongemi): remove this function in v19.
- * @deprecated It is no longer needed for react native 73.
- */
 async function* ensureSymlinkExecutor(_, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);

package/src/executors/ensure-symlink/ensure-symlink.impl.ts

@@ -5,10 +5,6 @@ export interface ReactNativeEnsureSymlinkOutput {
   success: boolean;
 }
 
-/**
- * TODO (@xiongemi): remove this function in v19.
- * @deprecated It is no longer needed for react native 73.
- */
 export default async function* ensureSymlinkExecutor(
   _,
   context: ExecutorContext

package/src/executors/ensure-symlink/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeEnsureSymlink",
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "title": "Ensure Symlink for React Native",
   "description": "Ensure workspace node_modules is symlink under app's node_modules folder.",
   "type": "object",

package/src/executors/pod-install/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativePodInstall",
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "title": "Run Pod Install for React Native iOS Project",
   "description": "Run `pod install` for React Native iOS Project.",
   "type": "object",

package/src/executors/run-android/run-android.impl.js

@@ -8,16 +8,28 @@ const get_cli_options_1 = require("../../utils/get-cli-options");
 let childProcess;
 async function* runAndroidExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(context.root, projectRoot, 'android'));
-    const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
+    (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(projectRoot, 'android'));
     if (options.mode !== 'Release') {
-        tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {
+        const startResults = (0, start_impl_1.default)({
             port: options.port,
             resetCache: options.resetCache,
             interactive: true,
-        }));
+        }, context);
+        for await (const result of startResults) {
+            if (result.success) {
+                await runCliRunAndroid(context.root, projectRoot, options);
+                yield {
+                    success: true,
+                };
+            }
+            else {
+                return result;
+            }
+        }
+    }
+    else {
+        await runCliRunAndroid(context.root, projectRoot, options);
     }
-    await Promise.all(tasks);
     yield { success: true };
 }
 exports.default = runAndroidExecutor;

package/src/executors/run-android/run-android.impl.ts

@@ -3,7 +3,7 @@ import { join, resolve as pathResolve } from 'path';
 import { ChildProcess, fork } from 'child_process';
 
 import { ReactNativeRunAndroidOptions } from './schema';
-import { runCliStart } from '../start/start.impl';
+import startExecutor from '../start/start.impl';
 import { chmodAndroidGradlewFiles } from '../../utils/chmod-android-gradle-files';
 import { getCliOptions } from '../../utils/get-cli-options';
 
@@ -19,22 +19,31 @@ export default async function* runAndroidExecutor(
 ): AsyncGenerator<ReactNativeRunAndroidOutput> {
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  chmodAndroidGradlewFiles(join(context.root, projectRoot, 'android'));
-
-  const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
+  chmodAndroidGradlewFiles(join(projectRoot, 'android'));
 
   if (options.mode !== 'Release') {
-    tasks.push(
-      runCliStart(context.root, projectRoot, {
+    const startResults = startExecutor(
+      {
         port: options.port,
         resetCache: options.resetCache,
         interactive: true,
-      })
+      },
+      context
     );
+    for await (const result of startResults) {
+      if (result.success) {
+        await runCliRunAndroid(context.root, projectRoot, options);
+        yield {
+          success: true,
+        };
+      } else {
+        return result;
+      }
+    }
+  } else {
+    await runCliRunAndroid(context.root, projectRoot, options);
   }
 
-  await Promise.all(tasks);
-
   yield { success: true };
 }
 

package/src/executors/run-android/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeRunAndroid",
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "title": "Run Android application",
   "description": "Run Android target options.",
   "type": "object",

package/src/executors/run-ios/run-ios.impl.js

@@ -10,15 +10,27 @@ async function* runIosExecutor(options, context) {
         throw new Error(`The run-ios build requires Mac to run`);
     }
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    const tasks = [runCliRunIOS(context.root, projectRoot, options)];
     if (options.mode !== 'Release') {
-        tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {
+        const startResults = (0, start_impl_1.default)({
             port: options.port,
             resetCache: options.resetCache,
             interactive: true,
-        }));
+        }, context);
+        for await (const result of startResults) {
+            if (result.success) {
+                await runCliRunIOS(context.root, projectRoot, options);
+                yield {
+                    success: true,
+                };
+            }
+            else {
+                return result;
+            }
+        }
+    }
+    else {
+        await runCliRunIOS(context.root, projectRoot, options);
     }
-    await Promise.all(tasks);
     yield { success: true };
 }
 exports.default = runIosExecutor;