@nx/angular 18.3.0-canary.20240402-120cde6 → 18.3.0-canary.20240404-3b182e4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.3.0-canary.20240402-120cde6",
+  "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": {
@@ -23,7 +23,7 @@
     "./executors": "./executors.js",
     "./tailwind": "./tailwind.js",
     "./module-federation": "./module-federation/index.js",
-    "./src/utils": "./src/utils/public-api.js",
+    "./src/utils": "./src/utils/index.js",
     "./plugins/component-testing": "./plugins/component-testing.js",
     "./src/generators/utils": "./src/generators/utils/index.js",
     "./src/generators/move/move-impl": "./src/generators/move/move-impl.js",
@@ -78,14 +78,14 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.3.0-canary.20240402-120cde6",
-    "@nx/js": "18.3.0-canary.20240402-120cde6",
-    "@nx/eslint": "18.3.0-canary.20240402-120cde6",
-    "@nx/webpack": "18.3.0-canary.20240402-120cde6",
-    "@nx/web": "18.3.0-canary.20240402-120cde6",
-    "@nx/workspace": "18.3.0-canary.20240402-120cde6",
+    "@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.20240402-120cde6"
+    "@nrwl/angular": "18.3.0-canary.20240404-3b182e4"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/builders/dev-server/lib/validate-options.js

@@ -6,7 +6,7 @@ const semver_1 = require("semver");
 const angular_version_utils_1 = require("../../../executors/utilities/angular-version-utils");
 function validateOptions(options) {
     const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    if ((0, semver_1.lt)(angularVersion, '16.1.0') && options.forceEsbuild !== undefined) {
+    if ((0, semver_1.lt)(angularVersion, '16.1.0') && options.forceEsbuild) {
         throw new Error((0, devkit_1.stripIndents) `The "forceEsbuild" option is only supported in Angular >= 16.1.0. You are currently using "${angularVersion}".
       You can resolve this error by removing the "forceEsbuild" option or by migrating to Angular 16.1.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;
 }

package/src/generators/library/library.js

@@ -44,7 +44,11 @@ async function libraryGeneratorInternal(tree, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const { libraryOptions } = options;
     const pkgVersions = (0, version_utils_1.versions)(tree);
-    await (0, js_1.initGenerator)(tree, { ...options, js: false, skipFormat: true });
+    await (0, js_1.initGenerator)(tree, {
+        ...libraryOptions,
+        js: false,
+        skipFormat: true,
+    });
     await (0, init_1.default)(tree, { ...libraryOptions, skipFormat: true });
     (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     const project = (0, add_project_1.addProject)(tree, libraryOptions);
@@ -65,6 +69,7 @@ async function libraryGeneratorInternal(tree, schema) {
         await (0, setup_tailwind_1.default)(tree, {
             project: libraryOptions.name,
             skipFormat: true,
+            skipPackageJson: libraryOptions.skipPackageJson,
         });
     }
     if (libraryOptions.buildable || libraryOptions.publishable) {

package/src/utils/{public-api.d.ts → index.d.ts}

@@ -1,2 +1,7 @@
+/**
+ * Note to developers: STOP! These exports end up as the public API of @nx/angular/src/utils.
+ *
+ * Try hard to not add to this API to reduce the surface area we need to maintain.
+ */
 export { isStandalone, addImportToComponent, addImportToDirective, addImportToPipe, addImportToModule, addProviderToBootstrapApplication, addProviderToAppConfig, addProviderToComponent, addProviderToModule, } from './nx-devkit/ast-utils';
 export { addRoute, addProviderToRoute } from './nx-devkit/route-utils';

package/src/utils/{public-api.js → index.js}

@@ -1,4 +1,9 @@
 "use strict";
+/**
+ * Note to developers: STOP! These exports end up as the public API of @nx/angular/src/utils.
+ *
+ * Try hard to not add to this API to reduce the surface area we need to maintain.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProviderToRoute = exports.addRoute = exports.addProviderToModule = exports.addProviderToComponent = exports.addProviderToAppConfig = exports.addProviderToBootstrapApplication = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.isStandalone = void 0;
 var ast_utils_1 = require("./nx-devkit/ast-utils");