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

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

@@ -4,42 +4,49 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const os_1 = require("os");
-const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
-const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
-const pod_install_task_1 = require("../../utils/pod-install-task");
 const start_impl_1 = require("../start/start.impl");
 const get_cli_options_1 = require("../../utils/get-cli-options");
-let childProcess;
 function runIosExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runIosExecutor_1() {
+        var _a, e_1, _b, _c;
         if ((0, os_1.platform)() !== 'darwin') {
             throw new Error(`The run-ios build requires Mac to run`);
         }
         const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
-        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)));
-        }
-        if (options.install) {
-            yield tslib_1.__await((0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios'), options.buildFolder));
-        }
-        try {
-            const tasks = [runCliRunIOS(context.root, projectRoot, options)];
-            if (options.packager && options.mode !== 'Release') {
-                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(runCliRunIOS(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(runCliRunIOS(context.root, projectRoot, options));
+        }
+        yield yield tslib_1.__await({ success: true });
     });
 }
 exports.default = runIosExecutor;
@@ -49,19 +56,28 @@ function runCliRunIOS(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-ios', ...createRunIOSOptions(options), '--no-packager'], {
-            cwd: (0, path_1.join)(workspaceRoot, projectRoot),
+        const childProcess = (0, child_process_1.fork)(require.resolve('react-native/cli.js'), ['run-ios', ...createRunIOSOptions(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-ios/run-ios.impl.ts

@@ -1,24 +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 { ReactNativeRunIosOptions } from './schema';
-import { runCliStart } from '../start/start.impl';
+import startExecutor from '../start/start.impl';
 import { getCliOptions } from '../../utils/get-cli-options';
 
+import { ReactNativeRunIosOptions } from './schema';
 export interface ReactNativeRunIosOutput {
   success: boolean;
 }
 
-let childProcess: ChildProcess;
-
 export default async function* runIosExecutor(
   options: ReactNativeRunIosOptions,
   context: ExecutorContext
@@ -28,77 +20,71 @@ 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
+  if (options.packager && options.mode !== 'Release') {
+    const startResults = startExecutor(
+      {
+        port: options.port,
+        resetCache: options.resetCache,
+        interactive: true,
+      },
+      context
     );
-  }
-
-  try {
-    const tasks = [runCliRunIOS(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();
+    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);
   }
+
+  yield { success: true };
 }
 
 function runCliRunIOS(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeRunIosOptions
-) {
-  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'),
+    const childProcess = fork(
+      require.resolve('react-native/cli.js'),
       ['run-ios', ...createRunIOSOptions(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-ios/schema.d.ts

@@ -4,7 +4,7 @@ import { ReactNativeStartOptions } from '../start/schema';
 // part of options form https://github.com/react-native-community/cli/blob/main/packages/cli-platform-ios/src/commands/runIOS/index.ts
 export interface ReactNativeRunIosOptions extends ReactNativeBuildIosOptions {
   /**
-   * @deprecated use mode instead, will be removed in nx 17.
+   * @deprecated TODO(v17) use mode instead, will be removed in nx 17.
    */
   xcodeConfiguration?: string;
 

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

@@ -19,10 +19,6 @@
     {
       "name": "Run iOS on a device with udid",
       "keys": ["udid"]
-    },
-    {
-      "name": "Run `pod install` before building iOS app",
-      "keys": ["install"]
     }
   ],
   "properties": {
@@ -87,17 +83,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.",
-      "default": true
+      "default": true,
+      "x-deprecated": "Add `pod-install` to dependsOn for this target in project.json instead."
     },
     "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": {

package/src/executors/start/start.impl.d.ts

@@ -1,8 +1,10 @@
+/// <reference types="node" />
 import { ExecutorContext } from '@nx/devkit';
+import { ChildProcess } from 'child_process';
 import { ReactNativeStartOptions } from './schema';
 export interface ReactNativeStartOutput {
-    baseUrl?: string;
+    port?: number;
     success: boolean;
 }
 export default function startExecutor(options: ReactNativeStartOptions, context: ExecutorContext): AsyncGenerator<ReactNativeStartOutput>;
-export declare function runCliStart(workspaceRoot: string, projectRoot: string, options: ReactNativeStartOptions): Promise<void>;
+export declare function runCliStart(workspaceRoot: string, projectRoot: string, options: ReactNativeStartOptions): Promise<ChildProcess>;

package/src/executors/start/start.impl.js

@@ -2,33 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCliStart = void 0;
 const tslib_1 = require("tslib");
-const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
 const is_packager_running_1 = require("./lib/is-packager-running");
-let childProcess;
 function startExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* startExecutor_1() {
         const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
-        try {
-            const baseUrl = `http://localhost:${options.port}`;
-            const appName = context.projectName;
-            devkit_1.logger.info(chalk.cyan(`Packager is ready at ${baseUrl}`));
-            devkit_1.logger.info(`Use ${chalk.bold(`nx run-android ${appName}`)} or ${chalk.bold(`nx run-ios ${appName}`)} to run the native app.`);
-            yield tslib_1.__await(runCliStart(context.root, projectRoot, options));
-            yield yield tslib_1.__await({
-                baseUrl,
-                success: true,
-            });
-        }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
+        const startProcess = yield tslib_1.__await(runCliStart(context.root, projectRoot, options));
+        yield yield tslib_1.__await({
+            port: options.port,
+            success: true,
+        });
+        if (!startProcess) {
+            return yield tslib_1.__await(void 0);
         }
+        yield tslib_1.__await(new Promise((resolve) => {
+            const processExitListener = (signal) => () => {
+                startProcess.kill(signal);
+                resolve();
+                process.exit();
+            };
+            process.once('exit', (signal) => startProcess.kill(signal));
+            process.once('SIGTERM', processExitListener);
+            process.once('SIGINT', processExitListener);
+            process.once('SIGQUIT', processExitListener);
+        }));
     });
 }
 exports.default = startExecutor;
@@ -40,7 +41,7 @@ function runCliStart(workspaceRoot, projectRoot, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const result = yield (0, is_packager_running_1.isPackagerRunning)(options.port);
         if (result === 'running') {
-            devkit_1.logger.info('JS server already running.');
+            devkit_1.logger.info(`JS server already running on port ${options.port}.`);
         }
         else if (result === 'unrecognized') {
             devkit_1.logger.warn('JS server not recognized.');
@@ -49,7 +50,7 @@ function runCliStart(workspaceRoot, projectRoot, options) {
             // result === 'not_running'
             devkit_1.logger.info('Starting JS server...');
             try {
-                yield startAsync(workspaceRoot, projectRoot, options);
+                return yield startAsync(workspaceRoot, projectRoot, options);
             }
             catch (error) {
                 devkit_1.logger.error(`Failed to start the packager server. Error details: ${error.message}`);
@@ -61,16 +62,26 @@ function runCliStart(workspaceRoot, projectRoot, options) {
 exports.runCliStart = runCliStart;
 function startAsync(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['start', ...createStartOptions(options)], { 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'), ['start', ...createStartOptions(options)], {
+            cwd: (0, path_1.resolve)(workspaceRoot, projectRoot),
+            env: process.env,
+            stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
+        });
+        childProcess.stdout.on('data', (data) => {
+            process.stdout.write(data);
+            if (data.toString().includes('reload the app')) {
+                resolve(childProcess);
+            }
+        });
+        childProcess.stderr.on('data', (data) => {
+            process.stderr.write(data);
+        });
         childProcess.on('error', (err) => {
             reject(err);
         });
         childProcess.on('exit', (code) => {
             if (code === 0) {
-                resolve(code);
+                resolve(childProcess);
             }
             else {
                 reject(code);

package/src/executors/start/start.impl.ts

@@ -1,18 +1,15 @@
-import * as chalk from 'chalk';
 import { ExecutorContext, logger } from '@nx/devkit';
 import { ChildProcess, fork } from 'child_process';
-import { join } from 'path';
+import { resolve as pathResolve } from 'path';
 import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
 import { isPackagerRunning } from './lib/is-packager-running';
 import { ReactNativeStartOptions } from './schema';
 
 export interface ReactNativeStartOutput {
-  baseUrl?: string;
+  port?: number;
   success: boolean;
 }
 
-let childProcess: ChildProcess;
-
 export default async function* startExecutor(
   options: ReactNativeStartOptions,
   context: ExecutorContext
@@ -21,27 +18,27 @@ export default async function* startExecutor(
     context.projectsConfigurations.projects[context.projectName].root;
   ensureNodeModulesSymlink(context.root, projectRoot);
 
-  try {
-    const baseUrl = `http://localhost:${options.port}`;
-    const appName = context.projectName;
-    logger.info(chalk.cyan(`Packager is ready at ${baseUrl}`));
-    logger.info(
-      `Use ${chalk.bold(`nx run-android ${appName}`)} or ${chalk.bold(
-        `nx run-ios ${appName}`
-      )} to run the native app.`
-    );
+  const startProcess = await runCliStart(context.root, projectRoot, options);
 
-    await runCliStart(context.root, projectRoot, options);
+  yield {
+    port: options.port,
+    success: true,
+  };
 
-    yield {
-      baseUrl,
-      success: true,
-    };
-  } finally {
-    if (childProcess) {
-      childProcess.kill();
-    }
+  if (!startProcess) {
+    return;
   }
+  await new Promise<void>((resolve) => {
+    const processExitListener = (signal?: number | NodeJS.Signals) => () => {
+      startProcess.kill(signal);
+      resolve();
+      process.exit();
+    };
+    process.once('exit', (signal) => startProcess.kill(signal));
+    process.once('SIGTERM', processExitListener);
+    process.once('SIGINT', processExitListener);
+    process.once('SIGQUIT', processExitListener);
+  });
 }
 
 /*
@@ -52,10 +49,10 @@ export async function runCliStart(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeStartOptions
-): Promise<void> {
+): Promise<ChildProcess> {
   const result = await isPackagerRunning(options.port);
   if (result === 'running') {
-    logger.info('JS server already running.');
+    logger.info(`JS server already running on port ${options.port}.`);
   } else if (result === 'unrecognized') {
     logger.warn('JS server not recognized.');
   } else {
@@ -63,7 +60,7 @@ export async function runCliStart(
     logger.info('Starting JS server...');
 
     try {
-      await startAsync(workspaceRoot, projectRoot, options);
+      return await startAsync(workspaceRoot, projectRoot, options);
     } catch (error) {
       logger.error(
         `Failed to start the packager server. Error details: ${error.message}`
@@ -77,24 +74,34 @@ function startAsync(
   workspaceRoot: string,
   projectRoot: string,
   options: ReactNativeStartOptions
-): Promise<number> {
-  return new Promise((resolve, reject) => {
-    childProcess = fork(
-      join(workspaceRoot, './node_modules/react-native/cli.js'),
+): Promise<ChildProcess> {
+  return new Promise<ChildProcess>((resolve, reject) => {
+    const childProcess = fork(
+      require.resolve('react-native/cli.js'),
       ['start', ...createStartOptions(options)],
-      { cwd: join(workspaceRoot, projectRoot), env: process.env }
+      {
+        cwd: pathResolve(workspaceRoot, projectRoot),
+        env: process.env,
+        stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
+      }
     );
 
-    // Ensure the child process is killed when the parent exits
-    process.on('exit', () => childProcess.kill());
-    process.on('SIGTERM', () => childProcess.kill());
+    childProcess.stdout.on('data', (data) => {
+      process.stdout.write(data);
+      if (data.toString().includes('reload the app')) {
+        resolve(childProcess);
+      }
+    });
+    childProcess.stderr.on('data', (data) => {
+      process.stderr.write(data);
+    });
 
     childProcess.on('error', (err) => {
       reject(err);
     });
     childProcess.on('exit', (code) => {
       if (code === 0) {
-        resolve(code);
+        resolve(childProcess);
       } else {
         reject(code);
       }

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

@@ -3,7 +3,7 @@ export interface ReactNativeStorybookOptions {
   outputFile: string;
   pattern: string;
   /**
-   * @deprecated going to be removed in 17
+   * @deprecated TODO(v17) no longer used going to be removed in 17
    */
   silent: boolean;
 }

package/src/generators/application/application.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeApplicationSchematic = exports.reactNativeApplicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const pod_install_task_1 = require("../../utils/pod-install-task");
 const symlink_task_1 = require("../../utils/symlink-task");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
@@ -25,12 +24,11 @@ function reactNativeApplicationGenerator(host, schema) {
         const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
         const detoxTask = yield (0, add_detox_1.addDetox)(host, options);
         const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
-        const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, devkit_1.joinPathFragments)(host.root, options.iosProjectRoot), options.install);
         const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }
-        return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, podInstallTask, chmodTaskGradlew);
+        return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, chmodTaskGradlew);
     });
 }
 exports.reactNativeApplicationGenerator = reactNativeApplicationGenerator;

package/src/generators/application/files/app/Gemfile.template

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby File.read(File.join(__dir__, '.ruby-version')).strip
+ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.3'
+gem 'cocoapods', '~> 1.12'