@nx/angular 19.7.0-canary.20240904-f39b995 → 19.7.0-canary.20240906-a3c2db8

package/migrations.json

@@ -2122,6 +2122,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.7.0": {
+      "version": "19.7.0-beta.0",
+      "packages": {
+        "@module-federation/enhanced": {
+          "version": "~0.6.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@module-federation/node": {
+          "version": "~2.5.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.7.0-canary.20240904-f39b995",
+  "version": "19.7.0-canary.20240906-a3c2db8",
   "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": {
@@ -78,15 +78,15 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "19.7.0-canary.20240904-f39b995",
-    "@nx/js": "19.7.0-canary.20240904-f39b995",
-    "@nx/eslint": "19.7.0-canary.20240904-f39b995",
-    "@nx/webpack": "19.7.0-canary.20240904-f39b995",
-    "@nx/web": "19.7.0-canary.20240904-f39b995",
-    "@nx/workspace": "19.7.0-canary.20240904-f39b995",
+    "@module-federation/enhanced": "~0.6.0",
+    "@nx/devkit": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/js": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/eslint": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/webpack": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/web": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/workspace": "19.7.0-canary.20240906-a3c2db8",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.7.0-canary.20240904-f39b995"
+    "@nrwl/angular": "19.7.0-canary.20240906-a3c2db8"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

package/src/builders/webpack-server/webpack-server.impl.js

@@ -33,9 +33,7 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
             // Therefore, if the build is an MF Server build, remove the auto-includes from
             // the base webpack config from Angular
             let mergedConfig = await (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
-            if (mergedConfig.plugins
-                .map((p) => p.constructor.name)
-                .includes('UniversalFederationPlugin')) {
+            if (mergedConfig.target === 'async-node') {
                 mergedConfig.entry.main = mergedConfig.entry.main.filter((m) => !m.startsWith('@angular/platform-server/init'));
                 mergedConfig.module.rules = mergedConfig.module.rules.filter((m) => !m.loader
                     ? true

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

@@ -1,9 +1,4 @@
 import { type ExecutorContext } from '@nx/devkit';
 import { type Schema } from '../schema';
 import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
-export declare function startStaticRemotes(ssrStaticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncGenerator<{
-    success: boolean;
-    baseUrl: string;
-}, {
-    success: boolean;
-}, unknown>;
+export declare function startStaticRemotes(ssrStaticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncIterable<unknown>;

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

@@ -6,9 +6,13 @@ const devkit_1 = require("@nx/devkit");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const path_1 = require("path");
 const fs_1 = require("fs");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 function startStaticRemotes(ssrStaticRemotesConfig, context, options) {
     if (ssrStaticRemotesConfig.remotes.length === 0) {
-        return;
+        return (0, async_iterable_1.createAsyncIterable)(({ next, done }) => {
+            next({ success: true });
+            done();
+        });
     }
     // The directories are usually generated with /browser and /server suffixes so we need to copy them to a common directory
     const commonOutputDirectory = (0, path_1.join)(devkit_1.workspaceRoot, 'tmp/static-remotes');

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.d.ts

@@ -1,4 +1,4 @@
 import { type ExecutorContext } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function moduleFederationSsrDevServerExecutor(schema: Schema, context: ExecutorContext): AsyncGenerator<any, any, undefined>;
+export declare function moduleFederationSsrDevServerExecutor(schema: Schema, context: ExecutorContext): AsyncGenerator<unknown, any, undefined>;
 export default moduleFederationSsrDevServerExecutor;

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

@@ -74,7 +74,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
         ...v,
         baseUrl: undefined,
     }));
-    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemotes.map(removeBaseUrlEmission), ...(staticRemotes ? [removeBaseUrlEmission(staticRemotes)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const combined = (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotes), ...(devRemotes ? devRemotes.map(removeBaseUrlEmission) : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;
@@ -94,6 +94,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
                 retryDelay: 2500,
                 host: 'localhost',
             })));
+            next({ success: true, baseUrl: `http://localhost:${options.port}` });
         }
         catch (error) {
             throw new Error(`Failed to start remotes. Check above for any errors.`, {
@@ -104,5 +105,15 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
             done();
         }
     }));
+    let refs = 2 + (devRemotes?.length ?? 0);
+    for await (const result of combined) {
+        if (result.success === false)
+            throw new Error('Remotes failed to start');
+        if (result.success)
+            refs--;
+        if (refs === 0)
+            break;
+    }
+    return yield* currIter;
 }
 exports.default = moduleFederationSsrDevServerExecutor;

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -22,6 +22,7 @@ function addMfEnvToTargetDefaultInputs(tree) {
     }
     if (!mfEnvVarExists) {
         nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
-        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
+    nxJson.targetDefaults[webpackExecutor].cache = true;
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/src/utils/mf/with-module-federation-ssr.js

@@ -12,7 +12,7 @@ async function withModuleFederationForSSR(options, configOverride) {
     return (config) => {
         const updatedConfig = {
             ...(config ?? {}),
-            target: false,
+            target: 'async-node',
             output: {
                 ...(config.output ?? {}),
                 uniqueName: options.name,
@@ -30,7 +30,7 @@ async function withModuleFederationForSSR(options, configOverride) {
             },
             plugins: [
                 ...(config.plugins ?? []),
-                new (require('@module-federation/node').UniversalFederationPlugin)({
+                new (require('@module-federation/enhanced').ModuleFederationPlugin)({
                     name: options.name,
                     filename: 'remoteEntry.js',
                     exposes: options.exposes,
@@ -38,10 +38,6 @@ async function withModuleFederationForSSR(options, configOverride) {
                     shared: {
                         ...sharedDependencies,
                     },
-                    library: {
-                        type: 'commonjs-module',
-                    },
-                    isServer: true,
                     /**
                      * Apply user-defined config override
                      */
@@ -50,9 +46,14 @@ async function withModuleFederationForSSR(options, configOverride) {
                         !options.disableNxRuntimeLibraryControlPlugin
                         ? [
                             ...(configOverride?.runtimePlugins ?? []),
+                            require.resolve('@module-federation/node/runtimePlugin'),
                             require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
                         ]
-                        : configOverride?.runtimePlugins,
+                        : [
+                            ...(configOverride?.runtimePlugins ?? []),
+                            require.resolve('@module-federation/node/runtimePlugin'),
+                        ],
+                    virtualRuntimeEntry: true,
                 }, {}),
                 sharedLibraries.getReplacementPlugin(),
             ],

package/src/utils/mf/with-module-federation.js

@@ -55,6 +55,7 @@ async function withModuleFederation(options, configOverride) {
                             require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
                         ]
                         : configOverride?.runtimePlugins,
+                    virtualRuntimeEntry: true,
                 }),
                 sharedLibraries.getReplacementPlugin(),
             ],

package/src/utils/versions.d.ts

@@ -12,8 +12,8 @@ export declare const typesCorsVersion = "~2.8.5";
 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.4.0";
-export declare const moduleFederationEnhancedVersion = "~0.2.3";
+export declare const moduleFederationNodeVersion = "~2.5.0";
+export declare const moduleFederationEnhancedVersion = "~0.6.0";
 export declare const angularEslintVersion = "^18.0.1";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -15,8 +15,8 @@ exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
-exports.moduleFederationNodeVersion = '~2.4.0';
-exports.moduleFederationEnhancedVersion = '~0.2.3';
+exports.moduleFederationNodeVersion = '~2.5.0';
+exports.moduleFederationEnhancedVersion = '~0.6.0';
 exports.angularEslintVersion = '^18.0.1';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';