@nx/angular 19.5.0-canary.20240705-653cad2 → 19.5.0-canary.20240709-92e09d9

package/migrations.json

@@ -1933,6 +1933,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.5.0-module-federation": {
+      "version": "19.5.0-beta.0",
+      "packages": {
+        "@module-federation/node": {
+          "version": "^2.3.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/ng-package.json

@@ -9,6 +9,7 @@
     "@nx/",
     "@angular-devkit",
     "@angular-eslint/",
+    "@module-federation/enhanced",
     "@schematics",
     "@phenomnomnominal/tsquery",
     "@typescript-eslint/",
@@ -20,7 +21,6 @@
     "ts-node",
     "tsconfig-paths",
     "semver",
-    "webpack",
     "http-server",
     "magic-string",
     "enquirer",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "19.5.0-canary.20240705-653cad2",
+  "version": "19.5.0-canary.20240709-92e09d9",
   "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": {
@@ -77,16 +77,16 @@
     "minimatch": "9.0.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "19.5.0-canary.20240705-653cad2",
-    "@nx/js": "19.5.0-canary.20240705-653cad2",
-    "@nx/eslint": "19.5.0-canary.20240705-653cad2",
-    "@nx/webpack": "19.5.0-canary.20240705-653cad2",
-    "@nx/web": "19.5.0-canary.20240705-653cad2",
-    "@nx/workspace": "19.5.0-canary.20240705-653cad2",
+    "@module-federation/enhanced": "~0.2.3",
+    "@nx/devkit": "19.5.0-canary.20240709-92e09d9",
+    "@nx/js": "19.5.0-canary.20240709-92e09d9",
+    "@nx/eslint": "19.5.0-canary.20240709-92e09d9",
+    "@nx/webpack": "19.5.0-canary.20240709-92e09d9",
+    "@nx/web": "19.5.0-canary.20240709-92e09d9",
+    "@nx/workspace": "19.5.0-canary.20240709-92e09d9",
     "piscina": "^4.4.0",
-    "@nrwl/angular": "19.5.0-canary.20240705-653cad2"
+    "@nrwl/angular": "19.5.0-canary.20240709-92e09d9"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",

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

@@ -12,7 +12,14 @@ const operators_2 = require("rxjs/operators");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 function shouldSkipInitialTargetRun(projectGraph, project, target) {
-    const projectDependencyConfigs = (0, utils_1.getDependencyConfigs)({ project, target }, {}, projectGraph);
+    const allTargetNames = new Set();
+    for (const projectName in projectGraph.nodes) {
+        const project = projectGraph.nodes[projectName];
+        for (const targetName in project.data.targets ?? {}) {
+            allTargetNames.add(targetName);
+        }
+    }
+    const projectDependencyConfigs = (0, utils_1.getDependencyConfigs)({ project, target }, {}, projectGraph, Array.from(allTargetNames));
     // if the task runner already ran the target, skip the initial run
     return projectDependencyConfigs.some((d) => d.target === target && d.projects === 'dependencies');
 }

package/src/generators/host/lib/update-ssr-setup.js

@@ -26,6 +26,12 @@ async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
     project.targets.server.options.customWebpackConfig = {
         path: (0, devkit_1.joinPathFragments)(project.root, `webpack.server.config.${pathToTemplateFiles}`),
     };
+    if (project.targets.server.configurations &&
+        project.targets.server.configurations.development) {
+        if ('vendorChunk' in project.targets.server.configurations.development) {
+            delete project.targets.server.configurations.development.vendorChunk;
+        }
+    }
     project.targets['serve-ssr'].executor =
         '@nx/angular:module-federation-dev-ssr';
     (0, devkit_1.updateProjectConfiguration)(tree, appName, project);

package/src/generators/remote/lib/update-ssr-setup.js

@@ -36,6 +36,12 @@ async function updateSsrSetup(tree, { appName, port, standalone, typescriptConfi
     project.targets.server.options.customWebpackConfig = {
         path: (0, devkit_1.joinPathFragments)(project.root, `webpack.server.config.${typescriptConfiguration ? 'ts' : 'js'}`),
     };
+    if (project.targets.server.configurations &&
+        project.targets.server.configurations.development) {
+        if ('vendorChunk' in project.targets.server.configurations.development) {
+            delete project.targets.server.configurations.development.vendorChunk;
+        }
+    }
     project.targets['serve-ssr'].options = {
         ...(project.targets['serve-ssr'].options ?? {}),
         port,

package/src/generators/setup-mf/setup-mf.js

@@ -19,7 +19,11 @@ async function setupMf(tree, rawOptions) {
         (0, lib_1.removeDeadCodeFromRemote)(tree, options);
         (0, lib_1.setupTspathForRemote)(tree, options);
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/web': versions_1.nxVersion, '@nx/webpack': versions_1.nxVersion });
+            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                '@nx/web': versions_1.nxVersion,
+                '@nx/webpack': versions_1.nxVersion,
+                '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
+            });
         }
     }
     const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
@@ -39,7 +43,10 @@ async function setupMf(tree, rawOptions) {
             });
         }
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
+            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                '@nx/webpack': versions_1.nxVersion,
+                '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
+            });
         }
     }
     (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);

package/src/utils/backward-compatible-versions.js

@@ -17,7 +17,8 @@ exports.backwardCompatibleVersions = {
         expressVersion: '~4.18.2',
         typesExpressVersion: '4.17.14',
         browserSyncVersion: '^3.0.0',
-        moduleFederationNodeVersion: '~1.0.5',
+        moduleFederationNodeVersion: '~2.3.0',
+        moduleFederationEnhancedVersion: '~0.2.3',
         angularEslintVersion: '~16.0.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',
@@ -43,7 +44,8 @@ exports.backwardCompatibleVersions = {
         expressVersion: '~4.18.2',
         typesExpressVersion: '4.17.14',
         browserSyncVersion: '^3.0.0',
-        moduleFederationNodeVersion: '~1.0.5',
+        moduleFederationNodeVersion: '~2.3.0',
+        moduleFederationEnhancedVersion: '~0.2.3',
         angularEslintVersion: '~17.3.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',

package/src/utils/mf/with-module-federation-ssr.d.ts

@@ -1,2 +1,2 @@
-import { ModuleFederationConfig } from '@nx/webpack/src/utils/module-federation';
-export declare function withModuleFederationForSSR(options: ModuleFederationConfig): Promise<(config: any) => any>;
+import type { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+export declare function withModuleFederationForSSR(options: ModuleFederationConfig, configOverride?: NxModuleFederationConfigOverride): Promise<(config: any) => any>;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
 const utils_1 = require("./utils");
-async function withModuleFederationForSSR(options) {
+async function withModuleFederationForSSR(options, configOverride) {
     if (global.NX_GRAPH_CREATION) {
         return (config) => config;
     }
@@ -41,6 +41,10 @@ async function withModuleFederationForSSR(options) {
                     type: 'commonjs-module',
                 },
                 isServer: true,
+                /**
+                 * Apply user-defined config override
+                 */
+                ...(configOverride ? configOverride : {}),
             }, {}),
             sharedLibraries.getReplacementPlugin(),
         ],

package/src/utils/mf/with-module-federation.d.ts

@@ -1,2 +1,2 @@
-import { ModuleFederationConfig } from '@nx/webpack/src/utils/module-federation';
-export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
+import type { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+export declare function withModuleFederation(options: ModuleFederationConfig, configOverride?: NxModuleFederationConfigOverride): Promise<(config: any) => any>;

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederation = void 0;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
-const ModuleFederationPlugin_1 = tslib_1.__importDefault(require("webpack/lib/container/ModuleFederationPlugin"));
-async function withModuleFederation(options) {
+const webpack_1 = require("@module-federation/enhanced/webpack");
+async function withModuleFederation(options, configOverride) {
     if (global.NX_GRAPH_CREATION) {
         return (config) => config;
     }
@@ -33,7 +32,7 @@ async function withModuleFederation(options) {
         },
         plugins: [
             ...(config.plugins ?? []),
-            new ModuleFederationPlugin_1.default({
+            new webpack_1.ModuleFederationPlugin({
                 name: options.name,
                 filename: 'remoteEntry.mjs',
                 exposes: options.exposes,
@@ -44,6 +43,10 @@ async function withModuleFederation(options) {
                 library: {
                     type: 'module',
                 },
+                /**
+                 * Apply user-defined config override
+                 */
+                ...(configOverride ? configOverride : {}),
             }),
             sharedLibraries.getReplacementPlugin(),
         ],

package/src/utils/versions.d.ts

@@ -12,7 +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 = "~1.0.5";
+export declare const moduleFederationNodeVersion = "^2.3.0";
+export declare const moduleFederationEnhancedVersion = "~0.2.3";
 export declare const angularEslintVersion = "^18.0.1";
 export declare const typescriptEslintVersion = "^8.0.0-alpha.28";
 export declare const tailwindVersion = "^3.0.2";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~18.0.0';
 exports.angularDevkitVersion = '~18.0.0';
@@ -15,7 +15,8 @@ exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.browserSyncVersion = '^3.0.0';
-exports.moduleFederationNodeVersion = '~1.0.5';
+exports.moduleFederationNodeVersion = '^2.3.0';
+exports.moduleFederationEnhancedVersion = '~0.2.3';
 exports.angularEslintVersion = '^18.0.1';
 exports.typescriptEslintVersion = '^8.0.0-alpha.28';
 exports.tailwindVersion = '^3.0.2';