@nx/angular 17.0.2 → 17.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.0.2",
+  "version": "17.0.3",
   "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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,15 +79,15 @@
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
     "enquirer": "^2.3.6",
-    "@nx/devkit": "17.0.2",
-    "@nx/cypress": "17.0.2",
-    "@nx/jest": "17.0.2",
-    "@nx/js": "17.0.2",
-    "@nx/eslint": "17.0.2",
-    "@nx/webpack": "17.0.2",
-    "@nx/web": "17.0.2",
-    "@nx/workspace": "17.0.2",
-    "@nrwl/angular": "17.0.2"
+    "@nx/devkit": "17.0.3",
+    "@nx/cypress": "17.0.3",
+    "@nx/jest": "17.0.3",
+    "@nx/js": "17.0.3",
+    "@nx/eslint": "17.0.3",
+    "@nx/webpack": "17.0.3",
+    "@nx/web": "17.0.3",
+    "@nx/workspace": "17.0.3",
+    "@nrwl/angular": "17.0.3"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",

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

@@ -23,6 +23,7 @@ async function addE2e(tree, options) {
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
             devServerTarget: `${options.name}:serve:development`,
+            rootProject: options.rootProject,
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
@@ -44,6 +45,7 @@ async function addE2e(tree, options) {
             setParserOptionsProject: options.setParserOptionsProject,
             webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
             webServerAddress: `http://localhost:${options.port ?? 4200}`,
+            rootProject: options.rootProject,
         });
     }
 }

package/src/generators/federate-module/schema.json

@@ -12,22 +12,22 @@
   ],
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the module.",
+    "path": {
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "description": "The path to locate the federated module.",
+      "x-prompt": "What is the path to the module to be federated?"
+    },
+    "name": {
+      "description": "The name of the module.",
+      "type": "string",
       "x-prompt": "What name would you like to use for the module?",
       "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "path": {
-      "type": "string",
-      "description": "The path to locate the federated module.",
-      "x-prompt": "What is the path to the module to be federated?"
-    },
     "remote": {
       "type": "string",
       "description": "The name of the remote.",

package/src/generators/utils/project.js

@@ -6,11 +6,11 @@ const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
     // Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
     // to it and let it fall through to the Angular schematic to handle it
-    // https://github.com/angular/angular-cli/blob/1c634cd327e5a850553b258aa2d5e6a6b2c75c65/packages/schematics/angular/component/index.ts#L130
-    const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
+    // https://github.com/angular/angular-cli/blob/aa9f0528f174e856a4923cb24861fdf6e6f96b48/packages/schematics/angular/component/index.ts#L64
+    const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
     if (prefix) {
         if (!htmlSelectorRegex.test(prefix)) {
-            throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes. When adding a dash the segment after the dash must also start with a letter.');
+            throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes.');
         }
         return prefix;
     }
@@ -23,7 +23,7 @@ There are two options that can be followed to resolve this issue:
 
 If you encountered this error when creating a new Nx Workspace, the workspace name or "npmScope" is invalid to use as the selector prefix for the application being generated.
 
-Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes. When adding a dash the segment after the dash must also start with a letter.`);
+Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes.`);
     }
     return npmScope || fallbackPrefix;
 }