@nx/angular 20.1.0-canary.20241011-37a7eb1 → 20.1.0-canary.20241015-1badac8

package/migrations.json

@@ -1127,6 +1127,10 @@
         "ng-packagr": {
           "version": "~18.2.0",
           "alwaysAddToPackageJson": false
+        },
+        "zone.js": {
+          "version": "~0.14.10",
+          "alwaysAddToPackageJson": false
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.1.0-canary.20241011-37a7eb1",
+  "version": "20.1.0-canary.20241015-1badac8",
   "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,13 +79,13 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "0.6.6",
-    "@nx/devkit": "20.1.0-canary.20241011-37a7eb1",
-    "@nx/js": "20.1.0-canary.20241011-37a7eb1",
-    "@nx/eslint": "20.1.0-canary.20241011-37a7eb1",
-    "@nx/webpack": "20.1.0-canary.20241011-37a7eb1",
-    "@nx/web": "20.1.0-canary.20241011-37a7eb1",
-    "@nx/workspace": "20.1.0-canary.20241011-37a7eb1",
+    "@module-federation/enhanced": "0.6.9",
+    "@nx/devkit": "20.1.0-canary.20241015-1badac8",
+    "@nx/js": "20.1.0-canary.20241015-1badac8",
+    "@nx/eslint": "20.1.0-canary.20241015-1badac8",
+    "@nx/webpack": "20.1.0-canary.20241015-1badac8",
+    "@nx/web": "20.1.0-canary.20241015-1badac8",
+    "@nx/workspace": "20.1.0-canary.20241015-1badac8",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/ngrx-root-store/lib/add-imports.js

@@ -87,14 +87,14 @@ function addImportsToModule(tree, options) {
         sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
         sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
     }
-    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     sourceFile = addRootEffectsImport(tree, isParentStandalone, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot);
+    if (options.addDevTools) {
+        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
+    }
+    sourceFile = addRootStoreImport(tree, isParentStandalone, sourceFile, parentPath, provideRootStore, storeForRoot);
     // this is just a heuristic
     const hasRouter = sourceText.indexOf('RouterModule') > -1;
     if (hasRouter && !isParentStandalone) {
         sourceFile = addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRouterModule);
     }
-    if (options.addDevTools) {
-        sourceFile = addStoreDevTools(tree, sourceFile, parentPath, isParentStandalone, addImport);
-    }
 }

package/src/generators/remote/remote.js

@@ -24,6 +24,14 @@ async function remote(tree, schema) {
         projectType: 'application',
         directory: options.directory,
     });
+    const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
+    const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
+    if (!remoteNameRegex.test(remoteProjectName)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${remoteProjectName}. Remote project names must:
+       - Start with a letter, dollar sign ($) or underscore (_)
+       - Followed by any valid character (letters, digits, underscores, or dollar signs)
+      The regular expression used is ${REMOTE_NAME_REGEX}.`);
+    }
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -86,8 +86,8 @@ function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
         ? 'remoteRoutes'
         : 'RemoteEntryModule';
     const routeToAdd = hostFederationType === 'dynamic'
-        ? `loadRemoteModule('${options.appName}', './${routePathName}')`
-        : `import('${options.appName}/${routePathName}')`;
+        ? `loadRemoteModule('${options.appName.replace(/-/g, '_')}', './${routePathName}')`
+        : `import('${options.appName.replace(/-/g, '_')}/${routePathName}')`;
     (0, route_utils_1.addRoute)(tree, pathToHostRootRouting, `{
     path: '${options.appName}',
     loadChildren: () => ${routeToAdd}.then(m => m.${exportedRemote})

package/src/generators/setup-mf/lib/setup-tspath-for-remote.js

@@ -9,7 +9,7 @@ function setupTspathForRemote(tree, options) {
         ? `./src/app/remote-entry/entry.routes.ts`
         : `./src/app/remote-entry/entry.module.ts`;
     const exportName = options.standalone ? 'Routes' : 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${options.appName}/${exportName}`, [
+    (0, js_1.addTsConfigPath)(tree, `${options.appName.replace(/-/g, '_')}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),
     ]);
 }

package/src/utils/versions.d.ts

@@ -13,7 +13,7 @@ export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
 export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "~2.5.0";
-export declare const moduleFederationEnhancedVersion = "0.6.6";
+export declare const moduleFederationEnhancedVersion = "0.6.9";
 export declare const angularEslintVersion = "^18.3.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -16,7 +16,7 @@ exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '~2.5.0';
-exports.moduleFederationEnhancedVersion = '0.6.6';
+exports.moduleFederationEnhancedVersion = '0.6.9';
 exports.angularEslintVersion = '^18.3.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';