@nx/angular 18.3.0-canary.20240403-270788e → 18.3.0-canary.20240404-3b182e4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.3.0-canary.20240403-270788e",
+  "version": "18.3.0-canary.20240404-3b182e4",
   "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, 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": {
@@ -78,14 +78,14 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.3.0-canary.20240403-270788e",
-    "@nx/js": "18.3.0-canary.20240403-270788e",
-    "@nx/eslint": "18.3.0-canary.20240403-270788e",
-    "@nx/webpack": "18.3.0-canary.20240403-270788e",
-    "@nx/web": "18.3.0-canary.20240403-270788e",
-    "@nx/workspace": "18.3.0-canary.20240403-270788e",
+    "@nx/devkit": "18.3.0-canary.20240404-3b182e4",
+    "@nx/js": "18.3.0-canary.20240404-3b182e4",
+    "@nx/eslint": "18.3.0-canary.20240404-3b182e4",
+    "@nx/webpack": "18.3.0-canary.20240404-3b182e4",
+    "@nx/web": "18.3.0-canary.20240404-3b182e4",
+    "@nx/workspace": "18.3.0-canary.20240404-3b182e4",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "18.3.0-canary.20240403-270788e"
+    "@nrwl/angular": "18.3.0-canary.20240404-3b182e4"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

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

@@ -27,8 +27,8 @@ async function addE2e(tree, options) {
             linter: options.linter,
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
-            devServerTarget: `${options.name}:serve:development`,
-            baseUrl: 'http://localhost:4200',
+            devServerTarget: `${options.name}:${options.e2eWebServerTarget}:development`,
+            baseUrl: options.e2eWebServerAddress,
             rootProject: options.rootProject,
             addPlugin,
         });
@@ -50,8 +50,8 @@ async function addE2e(tree, options) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
-            webServerAddress: `http://localhost:${options.port ?? 4200}`,
+            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+            webServerAddress: options.e2eWebServerAddress,
             rootProject: options.rootProject,
             addPlugin,
         });
@@ -67,7 +67,7 @@ function addFileServerTarget(tree, options, targetName) {
         executor: '@nx/web:file-server',
         options: {
             buildTarget: `${options.name}:build`,
-            port: options.port,
+            port: options.e2ePort,
             staticFilePath: isUsingApplicationBuilder
                 ? (0, devkit_1.joinPathFragments)(options.outputPath, 'browser')
                 : undefined,

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

@@ -17,8 +17,19 @@ 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())
         : [];
@@ -47,6 +58,9 @@ 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,6 +10,9 @@ export interface NormalizedSchema extends Schema {
     appProjectSourceRoot: string;
     e2eProjectName: string;
     e2eProjectRoot: string;
+    e2eWebServerAddress: string;
+    e2eWebServerTarget: string;
+    e2ePort: number;
     parsedTags: string[];
     outputPath: string;
 }