@nx/react-native 17.3.0-beta.1 → 17.3.0-beta.2

package/migrations.json

@@ -546,6 +546,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.3",
+      "packages": {
+        "@types/node": {
+          "version": "18.16.9",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.3.0-beta.1",
+  "version": "17.3.0-beta.2",
   "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": [
@@ -36,14 +36,14 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/detox": "17.3.0-beta.1",
-    "@nx/devkit": "17.3.0-beta.1",
-    "@nx/jest": "17.3.0-beta.1",
-    "@nx/js": "17.3.0-beta.1",
-    "@nx/eslint": "17.3.0-beta.1",
-    "@nx/react": "17.3.0-beta.1",
-    "@nx/workspace": "17.3.0-beta.1",
-    "@nrwl/react-native": "17.3.0-beta.1"
+    "@nx/detox": "17.3.0-beta.2",
+    "@nx/devkit": "17.3.0-beta.2",
+    "@nx/jest": "17.3.0-beta.2",
+    "@nx/js": "17.3.0-beta.2",
+    "@nx/eslint": "17.3.0-beta.2",
+    "@nx/react": "17.3.0-beta.2",
+    "@nx/workspace": "17.3.0-beta.2",
+    "@nrwl/react-native": "17.3.0-beta.2"
   },
   "peerDependencies": {
     "react-native": ">= 0.72.0 < 0.73.0"

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodes, ReactNativePluginOptions } from './plugins/plugin';

package/plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = void 0;
+var plugin_1 = require("./plugins/plugin");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });

package/plugins/plugin.d.ts

@@ -0,0 +1,11 @@
+import { CreateDependencies, CreateNodes } from '@nx/devkit';
+export interface ReactNativePluginOptions {
+    startTargetName?: string;
+    runIosTargetName?: string;
+    runAndroidTargetName?: string;
+    buildIosTargetName?: string;
+    buildAndroidTargetName?: string;
+    bundleTargetName?: string;
+}
+export declare const createDependencies: CreateDependencies;
+export declare const createNodes: CreateNodes<ReactNativePluginOptions>;

package/plugins/plugin.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = exports.createDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const js_1 = require("@nx/js");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const fs_1 = require("fs");
+const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'react-native.hash');
+const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
+const calculatedTargets = {};
+function readTargetsCache() {
+    return (0, devkit_1.readJsonFile)(cachePath);
+}
+function writeTargetsToCache(targets) {
+    (0, devkit_1.writeJsonFile)(cachePath, targets);
+}
+const createDependencies = () => {
+    writeTargetsToCache(calculatedTargets);
+    return [];
+};
+exports.createDependencies = createDependencies;
+exports.createNodes = [
+    '**/app.{json,config.js}',
+    (configFilePath, options, context) => {
+        options = normalizeOptions(options);
+        const projectRoot = (0, path_1.dirname)(configFilePath);
+        // Do not create a project if package.json or project.json or metro.config.js isn't there.
+        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+        if (!siblingFiles.includes('package.json') ||
+            !siblingFiles.includes('project.json') ||
+            !siblingFiles.includes('metro.config.js')) {
+            return {};
+        }
+        const appConfig = getAppConfig(configFilePath, context);
+        if (appConfig.expo) {
+            return {};
+        }
+        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ]);
+        const targets = targetsCache[hash]
+            ? targetsCache[hash]
+            : buildReactNativeTargets(projectRoot, options, context);
+        calculatedTargets[hash] = targets;
+        return {
+            projects: {
+                [projectRoot]: {
+                    targets,
+                },
+            },
+        };
+    },
+];
+function buildReactNativeTargets(projectRoot, options, context) {
+    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const targets = {
+        [options.startTargetName]: {
+            command: `react-native start`,
+            options: { cwd: projectRoot },
+        },
+        [options.runIosTargetName]: {
+            command: `react-native run-ios`,
+            options: { cwd: projectRoot },
+        },
+        [options.runAndroidTargetName]: {
+            command: `react-native run-android`,
+            options: { cwd: projectRoot },
+        },
+        [options.buildIosTargetName]: {
+            command: `react-native build-ios`,
+            options: { cwd: projectRoot },
+            cache: true,
+            dependsOn: [`^${options.buildIosTargetName}`],
+            inputs: getInputs(namedInputs),
+            outputs: [getOutputs(projectRoot, 'ios/build/Build/Products')],
+        },
+        [options.buildAndroidTargetName]: {
+            command: `react-native build-android`,
+            options: { cwd: projectRoot },
+            cache: true,
+            dependsOn: [`^${options.buildAndroidTargetName}`],
+            inputs: getInputs(namedInputs),
+            outputs: [getOutputs(projectRoot, 'android/app/build/outputs')],
+        },
+        [options.bundleTargetName]: {
+            command: `react-native bundle`,
+            options: { cwd: projectRoot },
+            dependsOn: [`^${options.bundleTargetName}`],
+            inputs: getInputs(namedInputs),
+        },
+    };
+    return targets;
+}
+function getAppConfig(configFilePath, context) {
+    const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
+    let module = load(resolvedPath);
+    return module.default ?? module;
+}
+function getInputs(namedInputs) {
+    return [
+        ...('production' in namedInputs
+            ? ['default', '^production']
+            : ['default', '^default']),
+        {
+            externalDependencies: ['react-native'],
+        },
+    ];
+}
+function getOutputs(projectRoot, dir) {
+    if (projectRoot === '.') {
+        return `{projectRoot}/${dir}`;
+    }
+    else {
+        return `{workspaceRoot}/${projectRoot}/${dir}`;
+    }
+}
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+function load(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        for (const k of Object.keys(require.cache)) {
+            delete require.cache[k];
+        }
+    }
+    // Then require
+    return require(path);
+}
+function normalizeOptions(options) {
+    options ??= {};
+    options.startTargetName ??= 'start';
+    options.runIosTargetName ??= 'run-ios';
+    options.runAndroidTargetName ??= 'run-android';
+    options.buildIosTargetName ??= 'build-ios';
+    options.buildAndroidTargetName ??= 'build-android';
+    options.bundleTargetName ??= 'bundle';
+    return options;
+}

package/src/generators/application/application.js

@@ -20,9 +20,9 @@ async function reactNativeApplicationGenerator(host, schema) {
 exports.reactNativeApplicationGenerator = reactNativeApplicationGenerator;
 async function reactNativeApplicationGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
-    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,

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

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
 function addProject(host, options) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/react-native/plugin'
+        : p.plugin === '@nx/react-native/plugin');
     const project = {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
-        targets: { ...getTargets(options) },
+        targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
     (0, devkit_1.addProjectConfiguration)(host, options.projectName, {

package/src/generators/init/init.js

@@ -31,6 +31,9 @@ async function reactNativeInitGenerator(host, schema) {
         });
         tasks.push(detoxTask);
     }
+    if (process.env.NX_PCV3 === 'true') {
+        addPlugin(host);
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -76,4 +79,27 @@ exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
     return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react-native'], []);
 }
+function addPlugin(host) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.plugins ??= [];
+    for (const plugin of nxJson.plugins) {
+        if (typeof plugin === 'string'
+            ? plugin === '@nx/react-native/plugin'
+            : plugin.plugin === '@nx/react-native/plugin') {
+            return;
+        }
+    }
+    nxJson.plugins.push({
+        plugin: '@nx/react-native/plugin',
+        options: {
+            startTargetName: 'start',
+            bundleTargetName: 'bundle',
+            runIosTargetName: 'run-ios',
+            runAndroidTargetName: 'run-android',
+            buildIosTargetName: 'build-ios',
+            buildAndroidTargetName: 'build-android',
+        },
+    });
+    (0, devkit_1.updateNxJson)(host, nxJson);
+}
 exports.default = reactNativeInitGenerator;

package/src/generators/library/library.spec.ts

@@ -35,7 +35,6 @@ describe('lib', () => {
       expect(projectConfiguration.targets.build).toBeUndefined();
       expect(projectConfiguration.targets.lint).toEqual({
         executor: '@nx/eslint:lint',
-        outputs: ['{options.outputFile}'],
       });
       expect(projectConfiguration.tags).toEqual(['one', 'two']);
     });
@@ -156,7 +155,6 @@ describe('lib', () => {
       expect(projectConfiguration.root).toEqual('my-dir');
       expect(projectConfiguration.targets.lint).toEqual({
         executor: '@nx/eslint:lint',
-        outputs: ['{options.outputFile}'],
       });
     });
 
@@ -235,7 +233,6 @@ describe('lib', () => {
       expect(projectConfiguration.targets.test).toBeUndefined();
       expect(projectConfiguration.targets.lint).toMatchObject({
         executor: '@nx/eslint:lint',
-        outputs: ['{options.outputFile}'],
       });
     });
 

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
 export declare const reactNativeVersion = "0.72.6";
-export declare const typesNodeVersion = "18.14.4";
+export declare const typesNodeVersion = "18.16.9";
 export declare const metroVersion = "0.76.8";
 export declare const reactNativeMetroConfigVersion = "^0.72.11";
 export declare const reactNativeCommunityCli = "11.3.7";

package/src/utils/versions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeSafeAreaContextVersion = exports.reactNativeAsyncStorageVersion = exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.reactNativeCommunityCliAndroid = exports.reactNativeCommunityCliIos = exports.reactNativeCommunityCli = exports.reactNativeMetroConfigVersion = exports.metroVersion = exports.typesNodeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.reactNativeVersion = '0.72.6';
-exports.typesNodeVersion = '18.14.4';
+exports.typesNodeVersion = '18.16.9';
 exports.metroVersion = '0.76.8';
 exports.reactNativeMetroConfigVersion = '^0.72.11';
 exports.reactNativeCommunityCli = '11.3.7';