@nx/react-native 19.5.7 → 19.6.0-beta.1

package/src/generators/application/lib/add-e2e.js

@@ -14,6 +14,8 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
+                e2eCiWebServerTarget: options.e2eWebServerTarget,
+                e2eCiBaseUrl: options.e2eWebServerAddress,
             });
         case 'playwright':
             return (0, add_e2e_1.addE2e)(host, {
@@ -23,6 +25,8 @@ async function addE2e(host, options) {
                 styledModule: null,
                 hasStyles: false,
                 unitTestRunner: 'none',
+                e2eCiWebServerTarget: options.e2eWebServerTarget,
+                e2eCiBaseUrl: options.e2eWebServerAddress,
             });
         case 'detox':
             const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);

package/src/generators/application/lib/create-application-files.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from './normalize-options';
-export declare function createApplicationFiles(host: Tree, options: NormalizedSchema): void;
+export declare function createApplicationFiles(host: Tree, options: NormalizedSchema): Promise<void>;

package/src/generators/application/lib/create-application-files.js

@@ -4,13 +4,24 @@ exports.createApplicationFiles = createApplicationFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
-function createApplicationFiles(host, options) {
+const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
+async function createApplicationFiles(host, options) {
+    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(host, options.nxCloudToken);
+    const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
+        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.appProjectRoot, {
         ...options,
         entryFileIos: 'src/main',
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot),
     });
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/nx-welcome/${onBoardingStatus}`), options.appProjectRoot, {
+        ...options,
+        connectCloudUrl,
+        entryFileIos: 'src/main',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot),
+    });
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `/src/app/App.spec.tsx`));
     }

package/src/generators/application/schema.d.ts

@@ -20,4 +20,5 @@ export interface Schema {
   install: boolean; // default is true
   skipPackageJson?: boolean; //default is false
   addPlugin?: boolean;
+  nxCloudToken?: string;
 }

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -0,0 +1,7 @@
+import { type Tree } from '@nx/devkit';
+interface Schema {
+    project?: string;
+    skipFormat?: boolean;
+}
+export declare function convertToInferred(tree: Tree, options: Schema): Promise<() => void>;
+export default convertToInferred;

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToInferred = convertToInferred;
+const devkit_1 = require("@nx/devkit");
+const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
+const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
+const plugin_1 = require("../../../plugins/plugin");
+const post_target_transformer_1 = require("./lib/post-target-transformer");
+const process_start_options_1 = require("./lib/process-start-options");
+const create_process_options_1 = require("./lib/create-process-options");
+async function convertToInferred(tree, options) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    const migrationLogs = new aggregate_log_util_1.AggregatedLog();
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPluginV1)(tree, projectGraph, '@nx/react-native/plugin', plugin_1.createNodes, {
+        buildAndroidTargetName: 'build-android',
+        buildIosTargetName: 'build-ios',
+        bundleTargetName: 'bundle',
+        podInstallTargetName: 'pod-install',
+        runAndroidTargetName: 'run-android',
+        runIosTargetName: 'run-ios',
+        startTargetName: 'start',
+        syncDepsTargetName: 'sync-deps',
+        upgradeTargetName: 'upgrade',
+    }, [
+        {
+            executors: ['@nx/react-native:build-android'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs, (0, create_process_options_1.createProcessOptions)('@nx/react-native:build-android', ['port', 'resetCache'], [])),
+            targetPluginOptionMapper: (targetName) => ({
+                buildAndroidTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:build-ios'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs, (0, create_process_options_1.createProcessOptions)('@nx/react-native:build-ios', ['port', 'resetCache'], ['buildFolder'])),
+            targetPluginOptionMapper: (targetName) => ({
+                buildIosTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:run-android'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs, (0, create_process_options_1.createProcessOptions)('@nx/react-native:run-android', ['port', 'resetCache'], ['appId', 'appIdSuffix', 'deviceId'])),
+            targetPluginOptionMapper: (targetName) => ({
+                runAndroidTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:pod-install'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs),
+            targetPluginOptionMapper: (targetName) => ({
+                podInstallTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:run-ios'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs, (0, create_process_options_1.createProcessOptions)('@nx/react-native:run-ios', ['port', 'resetCache'], ['buildFolder'])),
+            targetPluginOptionMapper: (targetName) => ({
+                runIosTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:start'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs, process_start_options_1.processStartOptions),
+            targetPluginOptionMapper: (targetName) => ({
+                startTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:sync-deps'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs),
+            targetPluginOptionMapper: (targetName) => ({
+                startTargetName: targetName,
+            }),
+        },
+        {
+            executors: ['@nx/react-native:upgrade'],
+            postTargetTransformer: (0, post_target_transformer_1.postTargetTransformer)(migrationLogs),
+            targetPluginOptionMapper: (targetName) => ({
+                upgradeTargetName: targetName,
+            }),
+        },
+    ], options.project);
+    if (migratedProjects.size === 0) {
+        throw new Error('Could not find any targets to migrate.');
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        migrationLogs.flushLogs();
+    };
+}
+exports.default = convertToInferred;

package/src/generators/convert-to-inferred/lib/create-process-options.d.ts

@@ -0,0 +1,6 @@
+import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+/**
+ * Logic copied from `packages/react-native/src/utils/get-cli-options.ts`,
+ * which was used by most executors to map their options to CLI options.
+ */
+export declare function createProcessOptions(executorName: string, optionKeysToIgnore: string[], optionKeysInCamelName: string[]): (projectName: string, options: any, migrationLogs: AggregatedLog) => void;

package/src/generators/convert-to-inferred/lib/create-process-options.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProcessOptions = createProcessOptions;
+const devkit_1 = require("@nx/devkit");
+/**
+ * Logic copied from `packages/react-native/src/utils/get-cli-options.ts`,
+ * which was used by most executors to map their options to CLI options.
+ */
+function createProcessOptions(executorName, optionKeysToIgnore, optionKeysInCamelName) {
+    return (projectName, options, migrationLogs) => {
+        const args = [];
+        for (const optionKey of Object.keys(options)) {
+            const optionValue = options[optionKey];
+            delete options[optionKey];
+            if (optionKeysToIgnore.includes(optionKey)) {
+                migrationLogs.addLog({
+                    project: projectName,
+                    executorName,
+                    log: `Unable to migrate '${optionKey}' to inferred target configuration.`,
+                });
+                continue;
+            }
+            const cliKey = optionKeysInCamelName.includes(optionKey)
+                ? (0, devkit_1.names)(optionKey).propertyName
+                : (0, devkit_1.names)(optionKey).fileName; // cli uses kebab case as default
+            if (Array.isArray(optionValue)) {
+                args.push(`--${cliKey}`, optionValue.join(','));
+            }
+            else if (typeof optionValue === 'boolean' && optionValue) {
+                // no need to pass in the value when it is true, just the flag name
+                args.push(`--${cliKey}`);
+            }
+            else {
+                args.push(`--${cliKey}`, optionValue);
+            }
+        }
+        options.args = args;
+    };
+}

package/src/generators/convert-to-inferred/lib/post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+import type { TargetConfiguration, Tree } from '@nx/devkit';
+import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+export declare function postTargetTransformer(migrationLogs: AggregatedLog, processOptions?: (projectName: string, options: any, migrationLogs: AggregatedLog) => void): (target: TargetConfiguration, _tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration<any>;

package/src/generators/convert-to-inferred/lib/post-target-transformer.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postTargetTransformer = postTargetTransformer;
+const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+function postTargetTransformer(migrationLogs, processOptions) {
+    return (target, _tree, projectDetails, inferredTargetConfiguration) => {
+        if (target.options && processOptions) {
+            processOptions(projectDetails.projectName, target.options, migrationLogs);
+        }
+        if (target.configurations && processOptions) {
+            for (const configurationName in target.configurations) {
+                const configuration = target.configurations[configurationName];
+                processOptions(projectDetails.projectName, configuration, migrationLogs);
+            }
+            if (Object.keys(target.configurations).length === 0) {
+                if ('defaultConfiguration' in target) {
+                    delete target.defaultConfiguration;
+                }
+                delete target.configurations;
+            }
+            if ('defaultConfiguration' in target &&
+                !target.configurations[target.defaultConfiguration]) {
+                delete target.defaultConfiguration;
+            }
+        }
+        if (target.outputs) {
+            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+                projectName: projectDetails.projectName,
+                projectRoot: projectDetails.root,
+            });
+        }
+        return target;
+    };
+}

package/src/generators/convert-to-inferred/lib/process-start-options.d.ts

@@ -0,0 +1,2 @@
+import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+export declare function processStartOptions(_projectName: string, options: any, _migrationLogs: AggregatedLog): void;

package/src/generators/convert-to-inferred/lib/process-start-options.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processStartOptions = processStartOptions;
+function processStartOptions(_projectName, options, _migrationLogs) {
+    const args = [];
+    for (const k of Object.keys(options)) {
+        if (k === 'resetCache') {
+            if (options[k] === true) {
+                args.push(`--reset-cache`);
+            }
+        }
+        else if (k === 'interactive') {
+            if (options[k] === false) {
+                args.push(`--no-interactive`);
+            }
+        }
+        else {
+            args.push(`--${k}`, options[k]);
+        }
+        delete options[k];
+    }
+    options.args = args;
+}

package/src/generators/convert-to-inferred/schema.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxReactNativeConvertToInferred",
+  "description": "Convert existing React Native project(s) using `@nx/react-native:*` executors to use `@nx/react-native/plugin`. Defaults to migrating all projects. Pass '--project' to migrate only one target.",
+  "title": "Convert React Native project from executor to plugin",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The project to convert from using the `@nx/react-native:*` executors to use `@nx/react-native/plugin`.",
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Whether to format files at the end of the migration.",
+      "default": false
+    }
+  }
+}

package/src/generators/init/init.js

@@ -23,7 +23,7 @@ async function reactNativeInitGeneratorInternal(host, schema) {
     if (schema.addPlugin) {
         await (0, add_plugin_1.addPluginV1)(host, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react-native/plugin', plugin_1.createNodes, {
             startTargetName: ['start', 'react-native:start', 'react-native-start'],
-            upgradeTargetname: [
+            upgradeTargetName: [
                 'update',
                 'react-native:update',
                 'react-native-update',

package/src/migrations/update-19-6-0/rename-upgrade-target-name.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '@nx/devkit';
+/**
+ * There was a typo in @nx/react-native/plugin, where "upgradeTargetName" was "upgradeTargetname"
+ */
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-19-6-0/rename-upgrade-target-name.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+/**
+ * There was a typo in @nx/react-native/plugin, where "upgradeTargetName" was "upgradeTargetname"
+ */
+async function update(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let updated = false;
+    for (const plugin of nxJson.plugins) {
+        if (typeof plugin === 'string')
+            continue;
+        if (plugin.plugin !== '@nx/react-native/plugin')
+            continue;
+        if (plugin.options['upgradeTargetname']) {
+            plugin.options['upgradeTargetName'] = plugin.options['upgradeTargetname'];
+            delete plugin.options['upgradeTargetname'];
+            updated = true;
+        }
+    }
+    if (updated)
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}