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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.7.0-canary.20240827-61ecd4b",
+  "version": "19.7.0-canary.20240829-0ef6892",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,14 +79,14 @@
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
     "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "19.7.0-canary.20240827-61ecd4b",
-    "@nx/js": "19.7.0-canary.20240827-61ecd4b",
-    "@nx/eslint": "19.7.0-canary.20240827-61ecd4b",
-    "@nx/webpack": "19.7.0-canary.20240827-61ecd4b",
-    "@nx/web": "19.7.0-canary.20240827-61ecd4b",
-    "@nx/workspace": "19.7.0-canary.20240827-61ecd4b",
+    "@nx/devkit": "19.7.0-canary.20240829-0ef6892",
+    "@nx/js": "19.7.0-canary.20240829-0ef6892",
+    "@nx/eslint": "19.7.0-canary.20240829-0ef6892",
+    "@nx/webpack": "19.7.0-canary.20240829-0ef6892",
+    "@nx/web": "19.7.0-canary.20240829-0ef6892",
+    "@nx/workspace": "19.7.0-canary.20240829-0ef6892",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.7.0-canary.20240827-61ecd4b"
+    "@nrwl/angular": "19.7.0-canary.20240829-0ef6892"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

package/src/generators/application/lib/add-e2e.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<void>;

package/src/generators/application/lib/add-e2e.js

@@ -10,10 +10,11 @@ async function addE2e(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
+    const e2eWebServerInfo = getAngularE2EWebServerInfo(tree, options.name, options.port);
+    // TODO: This can call `@nx/web:static-config` generator when ready
+    addFileServerTarget(tree, options, 'serve-static', e2eWebServerInfo.e2ePort);
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        // TODO: This can call `@nx/web:static-config` generator when ready
-        addFileServerTarget(tree, options, 'serve-static');
         (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
             projectType: 'application',
             root: options.e2eProjectRoot,
@@ -28,8 +29,14 @@ async function addE2e(tree, options) {
             linter: options.linter,
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
-            devServerTarget: `${options.name}:${options.e2eWebServerTarget}:development`,
-            baseUrl: options.e2eWebServerAddress,
+            devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
+            baseUrl: e2eWebServerInfo.e2eWebServerAddress,
+            webServerCommands: {
+                default: e2eWebServerInfo.e2eWebServerCommand,
+                production: e2eWebServerInfo.e2eCiWebServerCommand,
+            },
+            ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
             rootProject: options.rootProject,
             addPlugin,
         });
@@ -54,8 +61,8 @@ async function addE2e(tree, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-            webServerAddress: options.e2eWebServerAddress,
+            webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
+            webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
             rootProject: options.rootProject,
             addPlugin,
         });
@@ -64,7 +71,7 @@ async function addE2e(tree, options) {
         }
     }
 }
-function addFileServerTarget(tree, options, targetName) {
+function addFileServerTarget(tree, options, targetName, e2ePort) {
     if (!options.skipPackageJson) {
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion });
     }
@@ -75,7 +82,7 @@ function addFileServerTarget(tree, options, targetName) {
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,
-            port: options.e2ePort,
+            port: e2ePort,
             staticFilePath: isUsingApplicationBuilder
                 ? (0, devkit_1.joinPathFragments)(options.outputPath, 'browser')
                 : undefined,
@@ -84,3 +91,23 @@ function addFileServerTarget(tree, options, targetName) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
 }
+function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = portOverride ?? 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        (nxJson.targetDefaults?.['serve'].options?.port ||
+            nxJson.targetDefaults?.['serve'].options?.env?.PORT)) {
+        e2ePort =
+            nxJson.targetDefaults?.['serve'].options?.port ||
+                nxJson.targetDefaults?.['serve'].options?.env?.PORT;
+    }
+    const pm = (0, devkit_1.getPackageManagerCommand)();
+    return {
+        e2eCiBaseUrl: 'http://localhost:4200',
+        e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:serve-static`,
+        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:serve`,
+        e2eWebServerAddress: `http://localhost:${e2ePort}`,
+        e2eDevServerTarget: `${projectName}:serve`,
+        e2ePort,
+    };
+}

package/src/generators/application/lib/normalize-options.js

@@ -18,18 +18,8 @@ async function normalizeOptions(host, options) {
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
-    let e2eWebServerTarget = 'serve';
-    let e2ePort = options.port ?? 4200;
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        (nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.[e2eWebServerTarget].options?.port ||
-                nxJson.targetDefaults?.[e2eWebServerTarget].options?.env?.PORT;
-    }
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -58,9 +48,6 @@ async function normalizeOptions(host, options) {
         appProjectSourceRoot: `${appProjectRoot}/src`,
         e2eProjectRoot,
         e2eProjectName,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
         parsedTags,
         bundler,
         outputPath: (0, devkit_1.joinPathFragments)('dist', !options.rootProject ? appProjectRoot : appProjectName),

package/src/generators/application/lib/normalized-schema.d.ts

@@ -10,9 +10,6 @@ export interface NormalizedSchema extends Schema {
     appProjectSourceRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    e2eWebServerAddress: string;
-    e2eWebServerTarget: string;
-    e2ePort: number;
     parsedTags: string[];
     outputPath: string;
 }