@nx/react-native 16.6.0-beta.3 → 16.6.0-beta.5

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

@@ -1,25 +1,16 @@
 import { ExecutorContext } from '@nx/devkit';
-import { join } from 'path';
+import { resolve as pathResolve } from 'path';
 import { ChildProcess, fork } from 'child_process';
 import { platform } from 'os';
 
-import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
-import {
-  displayNewlyAddedDepsMessage,
-  syncDeps,
-} from '../sync-deps/sync-deps.impl';
-import { podInstall } from '../../utils/pod-install-task';
 import { ReactNativeBuildIosOptions } from './schema';
-import { runCliStart } from '../start/start.impl';
 import { getCliOptions } from '../../utils/get-cli-options';
 
 export interface ReactNativeBuildIosOutput {
   success: boolean;
 }
 
-let childProcess: ChildProcess;
-
-export default async function* runIosExecutor(
+export default async function* buildIosExecutor(
   options: ReactNativeBuildIosOptions,
   context: ExecutorContext
 ): AsyncGenerator<ReactNativeBuildIosOutput> {
@@ -28,77 +19,48 @@ export default async function* runIosExecutor(
   }
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  ensureNodeModulesSymlink(context.root, projectRoot);
-  if (options.sync) {
-    displayNewlyAddedDepsMessage(
-      context.projectName,
-      await syncDeps(
-        context.projectName,
-        projectRoot,
-        context.root,
-        context.projectGraph
-      )
-    );
-  }
-
-  if (options.install) {
-    await podInstall(
-      join(context.root, projectRoot, 'ios'),
-      options.buildFolder
-    );
-  }
-
-  try {
-    const tasks = [runCliBuildIOS(context.root, projectRoot, options)];
-    if (options.packager && options.mode !== 'Release') {
-      tasks.push(
-        runCliStart(context.root, projectRoot, {
-          port: options.port,
-          resetCache: options.resetCache,
-          interactive: options.interactive,
-        })
-      );
-    }
 
-    await Promise.all(tasks);
-
-    yield { success: true };
-  } finally {
-    if (childProcess) {
-      childProcess.kill();
-    }
-  }
+  await runCliBuildIOS(context.root, projectRoot, options);
+  return { success: true };
 }
 
 function runCliBuildIOS(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeBuildIosOptions
-) {
-  return new Promise((resolve, reject) => {
-    /**
-     * Call the react native cli with option `--no-packager`
-     * Not passing '--packager' due to cli will launch start command from the project root
-     */
-    childProcess = fork(
-      join(workspaceRoot, './node_modules/react-native/cli.js'),
-      ['build-ios', ...createBuildIOSOptions(options)],
+): Promise<ChildProcess> {
+  return new Promise<ChildProcess>((resolve, reject) => {
+    const childProcess = fork(
+      require.resolve('react-native/cli.js'),
+      [
+        'build-ios',
+        ...createBuildIOSOptions(options),
+        ...(process.env.NX_VERBOSE_LOGGING === 'true' ? ['--verbose'] : []),
+      ],
       {
-        cwd: join(workspaceRoot, projectRoot),
+        cwd: pathResolve(workspaceRoot, projectRoot),
         env: { ...process.env, RCT_METRO_PORT: options.port.toString() },
       }
     );
 
-    // Ensure the child process is killed when the parent exits
-    process.on('exit', () => childProcess.kill());
-    process.on('SIGTERM', () => childProcess.kill());
+    /**
+     * Ensure the child process is killed when the parent exits
+     */
+    const processExitListener = (signal?: number | NodeJS.Signals) => () => {
+      childProcess.kill(signal);
+      process.exit();
+    };
+    process.once('exit', (signal) => childProcess.kill(signal));
+    process.once('SIGTERM', processExitListener);
+    process.once('SIGINT', processExitListener);
+    process.once('SIGQUIT', processExitListener);
 
     childProcess.on('error', (err) => {
       reject(err);
     });
     childProcess.on('exit', (code) => {
       if (code === 0) {
-        resolve(code);
+        resolve(childProcess);
       } else {
         reject(code);
       }

package/src/executors/build-ios/schema.d.ts

@@ -16,7 +16,10 @@ export interface ReactNativeBuildIosOptions extends ReactNativeStartOptions {
   extraParams?: string;
 
   // nx options
+  // @deprecated, no longer used
   packager: boolean; // default is true
+  // @deprecated, add to pod-install to dependsOn
   install: boolean; // default is true
+  // @deprecated, add to sync-deps to dependsOn
   sync: boolean; // default is true
 }

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

@@ -17,10 +17,6 @@
     {
       "name": "Build iOS for a device with udid",
       "keys": ["udid"]
-    },
-    {
-      "name": "Run `pod install` before building iOS app",
-      "keys": ["install"]
     }
   ],
   "properties": {
@@ -78,17 +74,22 @@
       "description": "Explicitly select which scheme and configuration to use before running a build"
     },
     "extraParams": {
-      "type": "string",
+      "oneOf": [
+        { "type": "array", "items": { "type": "string" } },
+        { "type": "string" }
+      ],
       "description": "Custom params that will be passed to xcodebuild command."
     },
     "install": {
       "type": "boolean",
       "description": "Runs `pod install` for native modules before building iOS app.",
+      "x-deprecated": "Add pod-install to dependsOn in project.json for this target instead",
       "default": true
     },
     "sync": {
       "type": "boolean",
       "description": "Syncs npm dependencies to `package.json` (for React Native autolink).",
+      "x-deprecated": "Add sync-deps to dependsOn in project.json for this target instead",
       "default": true
     },
     "resetCache": {
@@ -99,7 +100,8 @@
     "packager": {
       "type": "boolean",
       "description": "Launch packager while building",
-      "default": true
+      "default": true,
+      "x-deprecated": "Run `nx run <project>:start` instead. Will be removed in Nx 17."
     }
   },
   "required": [],

package/src/executors/bundle/bundle.impl.js

@@ -5,39 +5,41 @@ const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
-const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
-let childProcess;
 function bundleExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* bundleExecutor_1() {
         const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         options.bundleOutput = (0, path_1.join)(context.root, options.bundleOutput);
         (0, fileutils_1.createDirectory)((0, path_1.dirname)(options.bundleOutput));
-        (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
-        try {
-            yield tslib_1.__await(runCliBuild(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
-        }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
+        yield tslib_1.__await(runCliBuild(context.root, projectRoot, options));
+        yield yield tslib_1.__await({ success: true });
     });
 }
 exports.default = bundleExecutor;
 function runCliBuild(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
         const cliOptions = createBundleOptions(options);
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['bundle', ...cliOptions], { cwd: (0, path_1.join)(workspaceRoot, projectRoot), env: process.env });
-        // Ensure the child process is killed when the parent exits
-        process.on('exit', () => childProcess.kill());
-        process.on('SIGTERM', () => childProcess.kill());
+        const childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['bundle', ...cliOptions], {
+            stdio: 'inherit',
+            cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
+            env: process.env,
+        });
+        /**
+         * Ensure the child process is killed when the parent exits
+         */
+        const processExitListener = (signal) => () => {
+            childProcess.kill(signal);
+            process.exit();
+        };
+        process.once('exit', (signal) => childProcess.kill(signal));
+        process.once('SIGTERM', processExitListener);
+        process.once('SIGINT', processExitListener);
+        process.once('SIGQUIT', processExitListener);
         childProcess.on('error', (err) => {
             reject(err);
         });
         childProcess.on('exit', (code) => {
             if (code === 0) {
-                resolve(code);
+                resolve(childProcess);
             }
             else {
                 reject(code);

package/src/executors/bundle/bundle.impl.ts

@@ -1,18 +1,14 @@
 import { createDirectory } from '@nx/workspace/src/utilities/fileutils';
 import { names, ExecutorContext } from '@nx/devkit';
-import { dirname, join } from 'path';
+import { dirname, join, resolve as pathResolve } from 'path';
 import { ChildProcess, fork } from 'child_process';
 
-import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
-
 import { ReactNativeBundleOptions } from './schema';
 
 export interface ReactNativeBundleOutput {
   success: boolean;
 }
 
-let childProcess: ChildProcess;
-
 export default async function* bundleExecutor(
   options: ReactNativeBundleOptions,
   context: ExecutorContext
@@ -23,41 +19,46 @@ export default async function* bundleExecutor(
   options.bundleOutput = join(context.root, options.bundleOutput);
 
   createDirectory(dirname(options.bundleOutput));
-  ensureNodeModulesSymlink(context.root, projectRoot);
 
-  try {
-    await runCliBuild(context.root, projectRoot, options);
-    yield { success: true };
-  } finally {
-    if (childProcess) {
-      childProcess.kill();
-    }
-  }
+  await runCliBuild(context.root, projectRoot, options);
+  yield { success: true };
 }
 
 function runCliBuild(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeBundleOptions
-) {
-  return new Promise((resolve, reject) => {
+): Promise<ChildProcess> {
+  return new Promise<ChildProcess>((resolve, reject) => {
     const cliOptions = createBundleOptions(options);
-    childProcess = fork(
-      join(workspaceRoot, './node_modules/react-native/cli.js'),
+    const childProcess = fork(
+      require.resolve('react-native/cli.js'),
       ['bundle', ...cliOptions],
-      { cwd: join(workspaceRoot, projectRoot), env: process.env }
+      {
+        stdio: 'inherit',
+        cwd: pathResolve(workspaceRoot, projectRoot),
+        env: process.env,
+      }
     );
 
-    // Ensure the child process is killed when the parent exits
-    process.on('exit', () => childProcess.kill());
-    process.on('SIGTERM', () => childProcess.kill());
+    /**
+     * Ensure the child process is killed when the parent exits
+     */
+    const processExitListener = (signal?: number | NodeJS.Signals) => () => {
+      childProcess.kill(signal);
+      process.exit();
+    };
+    process.once('exit', (signal) => childProcess.kill(signal));
+    process.once('SIGTERM', processExitListener);
+    process.once('SIGINT', processExitListener);
+    process.once('SIGQUIT', processExitListener);
 
     childProcess.on('error', (err) => {
       reject(err);
     });
     childProcess.on('exit', (code) => {
       if (code === 0) {
-        resolve(code);
+        resolve(childProcess);
       } else {
         reject(code);
       }

package/src/executors/pod-install/pod-install.impl.js

@@ -7,7 +7,7 @@ function podInstall(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* podInstall_1() {
         const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         const iosDirectory = (0, path_1.join)(context.root, projectRoot, 'ios');
-        yield tslib_1.__await((0, pod_install_task_1.runPodInstall)(iosDirectory, true, options.buildFolder)());
+        yield tslib_1.__await((0, pod_install_task_1.runPodInstall)(iosDirectory, true, options)());
         yield yield tslib_1.__await({ success: true });
     });
 }

package/src/executors/pod-install/pod-install.impl.ts

@@ -15,7 +15,7 @@ export default async function* podInstall(
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
   const iosDirectory = join(context.root, projectRoot, 'ios');
-  await runPodInstall(iosDirectory, true, options.buildFolder)();
+  await runPodInstall(iosDirectory, true, options)();
 
   yield { success: true };
 }

package/src/executors/pod-install/schema.d.ts

@@ -1,3 +1,5 @@
 export interface ReactNativePodInstallOptions {
-  buildFolder: string;
+  buildFolder: string; // default is './build'
+  repoUpdate: boolean; // default is false
+  deployment: boolean; // default is false
 }

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

@@ -9,9 +9,19 @@
   "type": "object",
   "properties": {
     "buildFolder": {
-      "description": "Location for iOS build artifacts. Corresponds to Xcode's \"-derivedDataPath\". Relative to ios directory",
+      "description": "Location for iOS build artifacts. Corresponds to Xcode's \"-derivedDataPath\". Relative to ios directory.",
       "type": "string",
       "default": "./build"
+    },
+    "repoUpdate": {
+      "description": "Force running `pod repo update` before install.",
+      "type": "boolean",
+      "default": false
+    },
+    "deployment": {
+      "description": "Disallow any changes to the Podfile or the Podfile.lock during installation.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": ["buildFolder"]

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

@@ -3,37 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
-const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
-const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 const start_impl_1 = require("../start/start.impl");
 const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
 const get_cli_options_1 = require("../../utils/get-cli-options");
 let childProcess;
 function runAndroidExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runAndroidExecutor_1() {
+        var _a, e_1, _b, _c;
         const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         (0, chmod_android_gradle_files_1.chmodAndroidGradlewFiles)((0, path_1.join)(projectRoot, 'android'));
-        if (options.sync) {
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph)));
-        }
-        try {
-            const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
-            if (options.packager) {
-                tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {
-                    port: options.port,
-                    resetCache: options.resetCache,
-                    interactive: options.interactive,
-                }));
+        if (options.packager && options.mode !== 'Release') {
+            const startResults = (0, start_impl_1.default)({
+                port: options.port,
+                resetCache: options.resetCache,
+                interactive: true,
+            }, context);
+            try {
+                for (var _d = true, startResults_1 = tslib_1.__asyncValues(startResults), startResults_1_1; startResults_1_1 = yield tslib_1.__await(startResults_1.next()), _a = startResults_1_1.done, !_a; _d = true) {
+                    _c = startResults_1_1.value;
+                    _d = false;
+                    const result = _c;
+                    if (result.success) {
+                        yield tslib_1.__await(runCliRunAndroid(context.root, projectRoot, options));
+                        yield yield tslib_1.__await({
+                            success: true,
+                        });
+                    }
+                    else {
+                        return yield tslib_1.__await(result);
+                    }
+                }
             }
-            yield tslib_1.__await(Promise.all(tasks));
-            yield yield tslib_1.__await({ success: true });
-        }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = startResults_1.return)) yield tslib_1.__await(_b.call(startResults_1));
+                }
+                finally { if (e_1) throw e_1.error; }
             }
         }
+        else {
+            yield tslib_1.__await(runCliRunAndroid(context.root, projectRoot, options));
+        }
+        yield yield tslib_1.__await({ success: true });
     });
 }
 exports.default = runAndroidExecutor;
@@ -43,19 +55,28 @@ function runCliRunAndroid(workspaceRoot, projectRoot, options) {
          * Call the react native cli with option `--no-packager`
          * Not passing '--packager' due to cli will launch start command from the project root
          */
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['run-android', ...createRunAndroidOptions(options), '--no-packager'], {
-            cwd: (0, path_1.join)(workspaceRoot, projectRoot),
+        childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['run-android', ...createRunAndroidOptions(options), '--no-packager'], {
+            stdio: 'inherit',
+            cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
             env: Object.assign(Object.assign({}, process.env), { RCT_METRO_PORT: options.port.toString() }),
         });
-        // Ensure the child process is killed when the parent exits
-        process.on('exit', () => childProcess.kill());
-        process.on('SIGTERM', () => childProcess.kill());
+        /**
+         * Ensure the child process is killed when the parent exits
+         */
+        const processExitListener = (signal) => () => {
+            childProcess.kill(signal);
+            process.exit();
+        };
+        process.once('exit', (signal) => childProcess.kill(signal));
+        process.once('SIGTERM', processExitListener);
+        process.once('SIGINT', processExitListener);
+        process.once('SIGQUIT', processExitListener);
         childProcess.on('error', (err) => {
             reject(err);
         });
         childProcess.on('exit', (code) => {
             if (code === 0) {
-                resolve(code);
+                resolve(childProcess);
             }
             else {
                 reject(code);

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

@@ -1,14 +1,9 @@
 import { ExecutorContext } from '@nx/devkit';
-import { join } from 'path';
+import { join, resolve as pathResolve } from 'path';
 import { ChildProcess, fork } from 'child_process';
 
-import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
-import {
-  displayNewlyAddedDepsMessage,
-  syncDeps,
-} from '../sync-deps/sync-deps.impl';
 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';
 
@@ -24,72 +19,72 @@ export default async function* runAndroidExecutor(
 ): AsyncGenerator<ReactNativeRunAndroidOutput> {
   const projectRoot =
     context.projectsConfigurations.projects[context.projectName].root;
-  ensureNodeModulesSymlink(context.root, projectRoot);
   chmodAndroidGradlewFiles(join(projectRoot, 'android'));
 
-  if (options.sync) {
-    displayNewlyAddedDepsMessage(
-      context.projectName,
-      await syncDeps(
-        context.projectName,
-        projectRoot,
-        context.root,
-        context.projectGraph
-      )
+  if (options.packager && options.mode !== 'Release') {
+    const startResults = startExecutor(
+      {
+        port: options.port,
+        resetCache: options.resetCache,
+        interactive: true,
+      },
+      context
     );
-  }
-
-  try {
-    const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
-    if (options.packager) {
-      tasks.push(
-        runCliStart(context.root, projectRoot, {
-          port: options.port,
-          resetCache: options.resetCache,
-          interactive: options.interactive,
-        })
-      );
-    }
-
-    await Promise.all(tasks);
-
-    yield { success: true };
-  } finally {
-    if (childProcess) {
-      childProcess.kill();
+    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);
   }
+
+  yield { success: true };
 }
 
 function runCliRunAndroid(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeRunAndroidOptions
-) {
-  return new Promise((resolve, reject) => {
+): Promise<ChildProcess> {
+  return new Promise<ChildProcess>((resolve, reject) => {
     /**
      * Call the react native cli with option `--no-packager`
      * Not passing '--packager' due to cli will launch start command from the project root
      */
     childProcess = fork(
-      join(workspaceRoot, './node_modules/react-native/cli.js'),
+      require.resolve('react-native/cli.js'),
       ['run-android', ...createRunAndroidOptions(options), '--no-packager'],
       {
-        cwd: join(workspaceRoot, projectRoot),
+        stdio: 'inherit',
+        cwd: pathResolve(workspaceRoot, projectRoot),
         env: { ...process.env, RCT_METRO_PORT: options.port.toString() },
       }
     );
 
-    // Ensure the child process is killed when the parent exits
-    process.on('exit', () => childProcess.kill());
-    process.on('SIGTERM', () => childProcess.kill());
+    /**
+     * Ensure the child process is killed when the parent exits
+     */
+    const processExitListener = (signal?: number | NodeJS.Signals) => () => {
+      childProcess.kill(signal);
+      process.exit();
+    };
+    process.once('exit', (signal) => childProcess.kill(signal));
+    process.once('SIGTERM', processExitListener);
+    process.once('SIGINT', processExitListener);
+    process.once('SIGQUIT', processExitListener);
 
     childProcess.on('error', (err) => {
       reject(err);
     });
     childProcess.on('exit', (code) => {
       if (code === 0) {
-        resolve(code);
+        resolve(childProcess);
       } else {
         reject(code);
       }

package/src/executors/run-android/schema.d.ts

@@ -5,11 +5,11 @@ import { ReactNativeStartOptions } from '../start/schema';
 export interface ReactNativeRunAndroidOptions
   extends ReactNativeBuildAndroidOptions {
   /**
-   * @deprecated use mode instead
+   * @deprecated TODO(v17) use mode instead
    */
   variant: string;
   /**
-   * @deprecated no longer supported in react native cli
+   * @deprecated TODO(v17) no longer supported in react native cli
    * https://github.com/react-native-community/cli/commit/7c003f2b1d9d80ec5c167614ba533a004272c685
    */
   jetifier: boolean;

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

@@ -77,10 +77,10 @@
       "default": 8081
     },
     "tasks": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
+      "oneOf": [
+        { "type": "array", "items": { "type": "string" } },
+        { "type": "string" }
+      ],
       "description": "Run custom Gradle tasks. By default it's \"assembleDebug\". Will override passed mode and variant arguments.",
       "examples": [
         "assembleDebug",
@@ -97,7 +97,10 @@
       "default": false
     },
     "extraParams": {
-      "type": "string",
+      "oneOf": [
+        { "type": "array", "items": { "type": "string" } },
+        { "type": "string" }
+      ],
       "description": "Custom params passed to gradle build command"
     },
     "interactive": {
@@ -107,6 +110,7 @@
     "sync": {
       "type": "boolean",
       "description": "Syncs npm dependencies to `package.json` (for React Native autolink).",
+      "x-deprecated": "Add sync-deps to dependsOn for this target in project.json instead",
       "default": true
     },
     "resetCache": {