@nx/expo 20.0.8 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "20.0.8",
+  "version": "20.1.0-beta.0",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -28,13 +28,13 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "20.0.8",
-    "@nx/eslint": "20.0.8",
-    "@nx/jest": "20.0.8",
-    "@nx/js": "20.0.8",
-    "@nx/react": "20.0.8",
-    "@nx/web": "20.0.8",
-    "@nx/webpack": "20.0.8",
+    "@nx/devkit": "20.1.0-beta.0",
+    "@nx/eslint": "20.1.0-beta.0",
+    "@nx/jest": "20.1.0-beta.0",
+    "@nx/js": "20.1.0-beta.0",
+    "@nx/react": "20.1.0-beta.0",
+    "@nx/web": "20.1.0-beta.0",
+    "@nx/webpack": "20.1.0-beta.0",
     "enhanced-resolve": "^5.8.3",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, createDependencies, ExpoPluginOptions, } from './plugins/plugin';
+export { createNodes, createNodesV2, ExpoPluginOptions, } 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 ExpoPluginOptions {
     startTargetName?: string;
     serveTargetName?: string;
@@ -10,5 +10,5 @@ export interface ExpoPluginOptions {
     buildTargetName?: string;
     submitTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<ExpoPluginOptions>;
 export declare const createNodes: CreateNodes<ExpoPluginOptions>;

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");
@@ -8,51 +8,69 @@ 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 devkit_internals_1 = require("nx/src/devkit-internals");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'expo.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+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,
     });
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
-exports.createNodes = [
+exports.createNodesV2 = [
     '**/app.{json,config.js,config.ts}',
-    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 {};
+    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 is not defined
-        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] ??= buildExpoTargets(projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    targets: targetsCache[hash],
-                },
-            },
-        };
     },
 ];
+exports.createNodes = [
+    '**/app.{json,config.js,config.ts}',
+    async (configFilePath, options, context) => {
+        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
+        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);
+        return createNodesInternal(configFilePath, options, context, targetsCache);
+    },
+];
+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] ??= buildExpoTargets(projectRoot, options, context);
+    return {
+        projects: {
+            [projectRoot]: {
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 function buildExpoTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {

package/src/executors/build/build.impl.js

@@ -103,6 +103,15 @@ function copyPackageJsonAndLock(packageManager, workspaceRoot, projectRoot) {
     };
     projectPackageJson.dependencies = rootPackageJsonDependencies;
     projectPackageJson.devDependencies = rootPackageJsonDevDependencies;
+    const projectOverrides = projectPackageJson.overrides;
+    const projectResolutions = projectPackageJson.resolutions;
+    if (rootPackageJson.overrides) {
+        projectPackageJson.overrides = rootPackageJson.overrides;
+    }
+    // if overrides exists, give precedence to it over resolutions
+    if (!rootPackageJson.overrides && rootPackageJson.resolutions) {
+        projectPackageJson.resolutions = rootPackageJson.resolutions;
+    }
     // Copy dependencies from root package.json to project package.json
     (0, devkit_1.writeJsonFile)(packageJsonProject, projectPackageJson);
     // Copy lock file from root to project
@@ -111,6 +120,18 @@ function copyPackageJsonAndLock(packageManager, workspaceRoot, projectRoot) {
         // Reset project package.json to original state
         projectPackageJson.dependencies = projectPackageJsonDependencies;
         projectPackageJson.devDependencies = projectPackageJsonDevDependencies;
+        if (projectOverrides) {
+            projectPackageJson.overrides = projectOverrides;
+        }
+        else {
+            delete projectPackageJson.overrides;
+        }
+        if (projectResolutions) {
+            projectPackageJson.resolutions = projectResolutions;
+        }
+        else {
+            delete projectPackageJson.resolutions;
+        }
         (0, node_fs_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
         // Remove lock file from project
         (0, node_fs_1.rmSync)(lockFileProject, { recursive: true, force: true });

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

@@ -46,7 +46,7 @@ function createInstallOptions(options) {
                 acc.push(`--${(0, devkit_1.names)(k).fileName}`);
             }
         }
-        else {
+        else if (v !== undefined) {
             acc.push(`--${(0, devkit_1.names)(k).fileName}`, v);
         }
         return acc;

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

@@ -18,7 +18,7 @@ async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migrationLogs = new aggregate_log_util_1.AggregatedLog();
     const projects = (0, devkit_1.getProjects)(tree);
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPluginV1)(tree, projectGraph, '@nx/expo/plugin', plugin_1.createNodes, {
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/expo/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         exportTargetName: 'export',
         installTargetName: 'install',

package/src/generators/library/library.js

@@ -38,11 +38,11 @@ async function expoLibraryGeneratorInternal(host, schema) {
         tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
     }
     (0, init_root_babel_config_1.initRootBabelConfig)(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,