@nx/devkit 19.6.0-canary.20240806-a3869a8 → 19.6.0-canary.20240808-333ab77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.6.0-canary.20240806-a3869a8",
+  "version": "19.6.0-canary.20240808-333ab77",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -36,7 +36,7 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.6.0-canary.20240806-a3869a8"
+    "@nrwl/devkit": "19.6.0-canary.20240808-333ab77"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/generators/target-defaults-utils.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from 'nx/src/devkit-exports';
+export declare function addBuildTargetDefaults(tree: Tree, executorName: string, buildTargetName?: string): void;
+export declare function addE2eCiTargetDefaults(tree: Tree, e2ePlugin: string, buildTarget: string, pathToE2EConfigFile: string): Promise<void>;

package/src/generators/target-defaults-utils.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addBuildTargetDefaults = addBuildTargetDefaults;
+exports.addE2eCiTargetDefaults = addE2eCiTargetDefaults;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build') {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[executorName] ??= {
+        cache: true,
+        dependsOn: [`^${buildTargetName}`],
+        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
+            ? ['production', '^production']
+            : ['default', '^default'],
+    };
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
+}
+async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2EConfigFile) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    if (!nxJson.plugins) {
+        return;
+    }
+    const e2ePluginRegistrations = nxJson.plugins.filter((p) => typeof p === 'string' ? p === e2ePlugin : p.plugin === e2ePlugin);
+    if (!e2ePluginRegistrations.length) {
+        return;
+    }
+    const resolvedE2ePlugin = await Promise.resolve(`${e2ePlugin}`).then(s => require(s));
+    const e2ePluginGlob = resolvedE2ePlugin.createNodesV2?.[0] ?? resolvedE2ePlugin.createNodes?.[0];
+    let foundPluginForApplication;
+    for (let i = 0; i < e2ePluginRegistrations.length; i++) {
+        let candidatePluginForApplication = e2ePluginRegistrations[i];
+        if (typeof candidatePluginForApplication === 'string') {
+            foundPluginForApplication = candidatePluginForApplication;
+            break;
+        }
+        const matchingConfigFiles = (0, devkit_internals_1.findMatchingConfigFiles)([pathToE2EConfigFile], e2ePluginGlob, candidatePluginForApplication.include, candidatePluginForApplication.exclude);
+        if (matchingConfigFiles.length) {
+            foundPluginForApplication = candidatePluginForApplication;
+            break;
+        }
+    }
+    if (!foundPluginForApplication) {
+        return;
+    }
+    const ciTargetName = typeof foundPluginForApplication === 'string'
+        ? 'e2e-ci'
+        : foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci';
+    const ciTargetNameGlob = `${ciTargetName}--**/*`;
+    nxJson.targetDefaults ??= {};
+    const e2eCiTargetDefaults = nxJson.targetDefaults[ciTargetNameGlob];
+    if (!e2eCiTargetDefaults) {
+        nxJson.targetDefaults[ciTargetNameGlob] = {
+            dependsOn: [buildTarget],
+        };
+    }
+    else {
+        e2eCiTargetDefaults.dependsOn ??= [];
+        if (!e2eCiTargetDefaults.dependsOn.includes(buildTarget)) {
+            e2eCiTargetDefaults.dependsOn.push(buildTarget);
+        }
+    }
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
+}

package/src/utils/find-plugin-for-config-file.d.ts

@@ -0,0 +1,2 @@
+import { type Tree, type PluginConfiguration } from 'nx/src/devkit-exports';
+export declare function findPluginForConfigFile(tree: Tree, pluginName: string, pathToConfigFile: string): Promise<PluginConfiguration>;

package/src/utils/find-plugin-for-config-file.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPluginForConfigFile = findPluginForConfigFile;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+async function findPluginForConfigFile(tree, pluginName, pathToConfigFile) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    if (!nxJson.plugins) {
+        return;
+    }
+    const pluginRegistrations = nxJson.plugins.filter((p) => (typeof p === 'string' ? p === pluginName : p.plugin === pluginName));
+    for (const plugin of pluginRegistrations) {
+        if (typeof plugin === 'string') {
+            return plugin;
+        }
+        if (!plugin.include && !plugin.exclude) {
+            return plugin;
+        }
+        if (plugin.include || plugin.exclude) {
+            const resolvedPlugin = await Promise.resolve(`${pluginName}`).then(s => require(s));
+            const pluginGlob = resolvedPlugin.createNodesV2?.[0] ?? resolvedPlugin.createNodes?.[0];
+            const matchingConfigFile = (0, devkit_internals_1.findMatchingConfigFiles)([pathToConfigFile], pluginGlob, plugin.include, plugin.exclude);
+            if (matchingConfigFile.length) {
+                return plugin;
+            }
+        }
+    }
+}

package/src/generators/add-build-target-defaults.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from 'nx/src/devkit-exports';
-export declare function addBuildTargetDefaults(tree: Tree, executorName: string, buildTargetName?: string): void;

package/src/generators/add-build-target-defaults.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addBuildTargetDefaults = addBuildTargetDefaults;
-const devkit_exports_1 = require("nx/src/devkit-exports");
-function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build') {
-    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[executorName] ??= {
-        cache: true,
-        dependsOn: [`^${buildTargetName}`],
-        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? ['production', '^production']
-            : ['default', '^default'],
-    };
-    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
-}