@nx/detox 20.0.8 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/detox",
-  "version": "20.0.8",
+  "version": "20.1.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Detox contains executors and generators for allowing your workspace to use the powerful Detox integration testing capabilities.",
   "keywords": [
@@ -27,11 +27,11 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@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/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",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {

package/plugin.d.ts

@@ -1 +1 @@
-export { createNodes, createDependencies, DetoxPluginOptions, } from './src/plugins/plugin';
+export { createNodes, createNodesV2, DetoxPluginOptions, } from './src/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("./src/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/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -11,7 +11,7 @@ const process_test_options_1 = require("./lib/process-test-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/detox/plugin', plugin_1.createNodes, {
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/detox/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         startTargetName: 'start',
         testTargetName: 'test',

package/src/plugins/plugin.d.ts

@@ -1,8 +1,8 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface DetoxPluginOptions {
     buildTargetName?: string;
     startTargetName?: string;
     testTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<DetoxPluginOptions>;
 export declare const createNodes: CreateNodes<DetoxPluginOptions>;

package/src/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,40 +8,55 @@ 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.workspaceDataDirectory, 'detox.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() {
-    (0, devkit_1.writeJsonFile)(cachePath, targetsCache);
+function writeTargetsToCache(cachePath, targetsCache) {
+    const oldCache = readTargetsCache(cachePath);
+    (0, devkit_1.writeJsonFile)(cachePath, {
+        ...oldCache,
+        targetsCache,
+    });
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
+exports.createNodesV2 = [
+    '**/{detox.config,.detoxrc}.{json,js}',
+    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);
+        }
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
+        }
+    },
+];
 exports.createNodes = [
     '**/{detox.config,.detoxrc}.{json,js}',
     async (configFilePath, options, context) => {
-        options = normalizeOptions(options);
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        // Do not create a project if project.json isn't there.
-        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-        if (!siblingFiles.includes('project.json')) {
-            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] ??= buildDetoxTargets(projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    targets: targetsCache[hash],
-                },
-            },
-        };
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `detox-${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);
+    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] ??= buildDetoxTargets(projectRoot, options, context);
+    return {
+        projects: {
+            [projectRoot]: {
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 function buildDetoxTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {