@nx/angular 18.3.0-canary.20240404-3b182e4 → 18.3.0-canary.20240406-a9e554f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.3.0-canary.20240404-3b182e4",
+  "version": "18.3.0-canary.20240406-a9e554f",
   "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.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",
+    "@nx/devkit": "18.3.0-canary.20240406-a9e554f",
+    "@nx/js": "18.3.0-canary.20240406-a9e554f",
+    "@nx/eslint": "18.3.0-canary.20240406-a9e554f",
+    "@nx/webpack": "18.3.0-canary.20240406-a9e554f",
+    "@nx/web": "18.3.0-canary.20240406-a9e554f",
+    "@nx/workspace": "18.3.0-canary.20240406-a9e554f",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "18.3.0-canary.20240404-3b182e4"
+    "@nrwl/angular": "18.3.0-canary.20240406-a9e554f"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/executors/module-federation-dev-server/lib/start-dev-remotes.d.ts

@@ -1,9 +1,5 @@
 import { type Schema } from '../schema';
 import { type ExecutorContext, type ProjectConfiguration } from '@nx/devkit';
-export declare function startDevRemotes(remotes: {
-    remotePorts: any[];
-    staticRemotes: string[];
-    devRemotes: string[];
-}, workspaceProjects: Record<string, ProjectConfiguration>, options: Schema, context: ExecutorContext): Promise<AsyncIterable<{
+export declare function startRemotes(remotes: string[], workspaceProjects: Record<string, ProjectConfiguration>, options: Schema, context: ExecutorContext, target?: 'serve' | 'serve-static'): Promise<AsyncIterable<{
     success: boolean;
 }>[]>;

package/src/executors/module-federation-dev-server/lib/start-dev-remotes.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startDevRemotes = void 0;
+exports.startRemotes = void 0;
 const devkit_1 = require("@nx/devkit");
-async function startDevRemotes(remotes, workspaceProjects, options, context) {
-    const devRemotesIters = [];
-    for (const app of remotes.devRemotes) {
-        if (!workspaceProjects[app].targets?.['serve']) {
-            throw new Error(`Could not find "serve" target in "${app}" project.`);
+async function startRemotes(remotes, workspaceProjects, options, context, target = 'serve') {
+    const remoteIters = [];
+    for (const app of remotes) {
+        if (!workspaceProjects[app].targets?.[target]) {
+            throw new Error(`Could not find "${target}" target in "${app}" project.`);
         }
-        else if (!workspaceProjects[app].targets?.['serve'].executor) {
-            throw new Error(`Could not find executor for "serve" target in "${app}" project.`);
+        else if (!workspaceProjects[app].targets?.[target].executor) {
+            throw new Error(`Could not find executor for "${target}" target in "${app}" project.`);
         }
-        const [collection, executor] = workspaceProjects[app].targets['serve'].executor.split(':');
+        const [collection, executor] = workspaceProjects[app].targets[target].executor.split(':');
         const isUsingModuleFederationDevServerExecutor = executor.includes('module-federation-dev-server');
-        devRemotesIters.push(await (0, devkit_1.runExecutor)({
+        remoteIters.push(await (0, devkit_1.runExecutor)({
             project: app,
-            target: 'serve',
+            target,
             configuration: context.configurationName,
         }, {
-            verbose: options.verbose ?? false,
+            ...(target === 'serve' ? { verbose: options.verbose ?? false } : {}),
             ...(isUsingModuleFederationDevServerExecutor
                 ? { isInitialHost: false }
                 : {}),
         }, context));
     }
-    return devRemotesIters;
+    return remoteIters;
 }
-exports.startDevRemotes = startDevRemotes;
+exports.startRemotes = startRemotes;

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -70,7 +70,8 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     const staticRemotesConfig = (0, lib_1.parseStaticRemotesConfig)(remotes.staticRemotes, context);
     await (0, lib_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
-    const devRemoteIters = await (0, lib_1.startDevRemotes)(remotes, workspaceProjects, options, context);
+    const devRemoteIters = await (0, lib_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context, 'serve');
+    const dynamicRemoteIters = await (0, lib_1.startRemotes)(remotes.dynamicRemotes, workspaceProjects, options, context, 'serve-static');
     const staticRemotesIter = remotes.staticRemotes.length > 0
         ? (0, lib_1.startStaticRemotesFileServer)(staticRemotesConfig, context, options)
         : undefined;
@@ -78,7 +79,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         ...v,
         baseUrl: undefined,
     }));
-    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...dynamicRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;