@nx/devkit 19.7.0-canary.20240827-61ecd4b → 19.7.0-canary.20240829-0ef6892

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.7.0-canary.20240827-61ecd4b",
+  "version": "19.7.0-canary.20240829-0ef6892",
   "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.7.0-canary.20240827-61ecd4b"
+    "@nrwl/devkit": "19.7.0-canary.20240829-0ef6892"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/generators/e2e-web-server-info-utils.d.ts

@@ -0,0 +1,23 @@
+import { type Tree } from 'nx/src/devkit-exports';
+interface E2EWebServerDefaultValues {
+    defaultServeTargetName: string;
+    defaultServeStaticTargetName: string;
+    defaultE2EWebServerAddress: string;
+    defaultE2ECiBaseUrl: string;
+    defaultE2EPort: number;
+}
+interface E2EWebServerPluginOptions {
+    plugin: string;
+    configFilePath: string;
+    serveTargetName: string;
+    serveStaticTargetName: string;
+}
+export interface E2EWebServerDetails {
+    e2eWebServerAddress: string;
+    e2eWebServerCommand: string;
+    e2eCiWebServerCommand: string;
+    e2eCiBaseUrl: string;
+    e2eDevServerTarget: string;
+}
+export declare function getE2EWebServerInfo(tree: Tree, projectName: string, pluginOptions: E2EWebServerPluginOptions, defaultValues: E2EWebServerDefaultValues, isPluginBeingAdded: boolean): Promise<E2EWebServerDetails>;
+export {};

package/src/generators/e2e-web-server-info-utils.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getE2EWebServerInfo = getE2EWebServerInfo;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const find_plugin_for_config_file_1 = require("../utils/find-plugin-for-config-file");
+async function getE2EWebServerInfo(tree, projectName, pluginOptions, defaultValues, isPluginBeingAdded) {
+    const pm = (0, devkit_exports_1.getPackageManagerCommand)();
+    if (isPluginBeingAdded) {
+        return await getE2EWebServerInfoForPlugin(tree, projectName, pluginOptions, defaultValues, pm);
+    }
+    else {
+        return {
+            e2eWebServerAddress: defaultValues.defaultE2EWebServerAddress,
+            e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${defaultValues.defaultServeTargetName}`,
+            e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:${defaultValues.defaultServeStaticTargetName}`,
+            e2eCiBaseUrl: defaultValues.defaultE2ECiBaseUrl,
+            e2eDevServerTarget: `${projectName}:${defaultValues.defaultServeTargetName}`,
+        };
+    }
+}
+async function getE2EWebServerInfoForPlugin(tree, projectName, pluginOptions, defaultValues, pm) {
+    const foundPlugin = await (0, find_plugin_for_config_file_1.findPluginForConfigFile)(tree, pluginOptions.plugin, pluginOptions.configFilePath);
+    if (!foundPlugin ||
+        typeof foundPlugin === 'string' ||
+        !foundPlugin?.options) {
+        return {
+            e2eWebServerAddress: defaultValues.defaultE2EWebServerAddress,
+            e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${defaultValues.defaultServeTargetName}`,
+            e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:${defaultValues.defaultServeStaticTargetName}`,
+            e2eCiBaseUrl: defaultValues.defaultE2ECiBaseUrl,
+            e2eDevServerTarget: `${projectName}:${defaultValues.defaultServeTargetName}`,
+        };
+    }
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    let e2ePort = defaultValues.defaultE2EPort ?? 4200;
+    if (nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+        defaultValues.defaultServeTargetName] &&
+        nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName].options?.port) {
+        e2ePort =
+            nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
+                defaultValues.defaultServeTargetName].options?.port;
+    }
+    const e2eWebServerAddress = defaultValues.defaultE2EWebServerAddress.replace(/:\d+/, `:${e2ePort}`);
+    return {
+        e2eWebServerAddress,
+        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName}`,
+        e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveStaticTargetName] ??
+            defaultValues.defaultServeStaticTargetName}`,
+        e2eCiBaseUrl: defaultValues.defaultE2ECiBaseUrl,
+        e2eDevServerTarget: `${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
+            defaultValues.defaultServeTargetName}`,
+    };
+}