@nx/react-native 20.0.8 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "20.0.8",
+  "version": "20.1.0-beta.0",
   "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,12 +36,12 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.8",
-    "@nx/jest": "20.0.8",
-    "@nx/js": "20.0.8",
-    "@nx/eslint": "20.0.8",
-    "@nx/react": "20.0.8",
-    "@nx/workspace": "20.0.8"
+    "@nx/devkit": "20.1.0-beta.0",
+    "@nx/jest": "20.1.0-beta.0",
+    "@nx/js": "20.1.0-beta.0",
+    "@nx/eslint": "20.1.0-beta.0",
+    "@nx/react": "20.1.0-beta.0",
+    "@nx/workspace": "20.1.0-beta.0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugin.d.ts

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

package/plugin.js

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

package/plugins/plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface ReactNativePluginOptions {
     startTargetName?: string;
     podInstallTargetName?: string;
@@ -10,5 +10,5 @@ export interface ReactNativePluginOptions {
     syncDepsTargetName?: string;
     upgradeTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<ReactNativePluginOptions>;
 export declare const createNodes: CreateNodes<ReactNativePluginOptions>;

package/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodes = exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const js_1 = require("@nx/js");
@@ -9,49 +9,69 @@ 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 config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'react-native.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+const devkit_internals_1 = require("nx/src/devkit-internals");
+function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
+function writeTargetsToCache(cachePath, targetsCache) {
+    const oldCache = readTargetsCache(cachePath);
     (0, devkit_1.writeJsonFile)(cachePath, {
         ...oldCache,
-        ...targetsCache,
+        targetsCache,
     });
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
-exports.createNodes = [
-    '**/app.{json,config.js}',
-    async (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('metro.config.js')) {
-            return {};
+exports.createNodesV2 = [
+    '**/app.{json,config.js,config.ts}',
+    async (configFiles, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `expo-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
         }
-        const appConfig = await getAppConfig(configFilePath, context);
-        if (appConfig.expo) {
-            return {};
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        targetsCache[hash] ??= buildReactNativeTargets(projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    targets: targetsCache[hash],
-                },
-            },
-        };
     },
 ];
+exports.createNodes = [
+    '**/app.{json,config.js,config.ts}',
+    async (configFilePath, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-native-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        const result = await createNodesInternal(configFilePath, options, context, targetsCache);
+        writeTargetsToCache(cachePath, targetsCache);
+        return result;
+    },
+];
+async function createNodesInternal(configFile, options, context, targetsCache) {
+    options = normalizeOptions(options);
+    const projectRoot = (0, path_1.dirname)(configFile);
+    // 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('metro.config.js')) {
+        return {};
+    }
+    // Check if it's an Expo project
+    const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
+    const appConfig = await getAppConfig(configFile, context);
+    if (appConfig.expo ||
+        packageJson.dependencies?.['expo'] ||
+        packageJson.devDependencies?.['expo']) {
+        return {};
+    }
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    targetsCache[hash] ??= buildReactNativeTargets(projectRoot, options, context);
+    return {
+        projects: {
+            [projectRoot]: {
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 function buildReactNativeTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {

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

@@ -11,7 +11,7 @@ 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, {
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/react-native/plugin', plugin_1.createNodesV2, {
         buildAndroidTargetName: 'build-android',
         buildIosTargetName: 'build-ios',
         bundleTargetName: 'bundle',

package/src/generators/library/library.js

@@ -35,11 +35,11 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     if (!options.skipPackageJson) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
     }
+    createFiles(host, options);
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
         tasks.push(addProjectTask);
     }
-    createFiles(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectName: options.name,