@nx/angular 20.2.0-canary.20241121-60a9f81 → 20.2.0-canary.20241123-128778e

package/migrations.json

@@ -272,6 +272,12 @@
       "version": "20.2.0-beta.2",
       "description": "Update the ModuleFederationConfig import use @nx/module-federation.",
       "factory": "./src/migrations/update-20-2-0/migrate-mf-imports-to-new-package"
+    },
+    "update-20-2-0-update-with-module-federation-import": {
+      "cli": "nx",
+      "version": "20.2.0-beta.2",
+      "description": "Update the withModuleFederation import use @nx/module-federation/angular.",
+      "factory": "./src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package"
     }
   },
   "packageJsonUpdates": {

package/module-federation/index.d.ts

@@ -1,2 +1,5 @@
-export { withModuleFederation } from '../src/utils/mf/with-module-federation';
-export { withModuleFederationForSSR } from '../src/utils/mf/with-module-federation-ssr';
+import { withModuleFederation, withModuleFederationForSSR } from '@nx/module-federation/angular';
+/**
+ * @deprecated Update the import path to `@nx/module-federation/angular` instead. This import path will be removed in Nx v22.
+ */
+export { withModuleFederation, withModuleFederationForSSR };

package/module-federation/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = exports.withModuleFederation = void 0;
-var with_module_federation_1 = require("../src/utils/mf/with-module-federation");
-Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
-var with_module_federation_ssr_1 = require("../src/utils/mf/with-module-federation-ssr");
-Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return with_module_federation_ssr_1.withModuleFederationForSSR; } });
+const angular_1 = require("@nx/module-federation/angular");
+Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return angular_1.withModuleFederation; } });
+Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return angular_1.withModuleFederationForSSR; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.2.0-canary.20241121-60a9f81",
+  "version": "20.2.0-canary.20241123-128778e",
   "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,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "webpack": "^5.88.0",
-    "@module-federation/enhanced": "0.7.6",
-    "@nx/devkit": "20.2.0-canary.20241121-60a9f81",
-    "@nx/js": "20.2.0-canary.20241121-60a9f81",
-    "@nx/eslint": "20.2.0-canary.20241121-60a9f81",
-    "@nx/webpack": "20.2.0-canary.20241121-60a9f81",
-    "@nx/module-federation": "20.2.0-canary.20241121-60a9f81",
-    "@nx/web": "20.2.0-canary.20241121-60a9f81",
-    "@nx/workspace": "20.2.0-canary.20241121-60a9f81",
+    "@nx/devkit": "20.2.0-canary.20241123-128778e",
+    "@nx/js": "20.2.0-canary.20241123-128778e",
+    "@nx/eslint": "20.2.0-canary.20241123-128778e",
+    "@nx/webpack": "20.2.0-canary.20241123-128778e",
+    "@nx/module-federation": "20.2.0-canary.20241123-128778e",
+    "@nx/web": "20.2.0-canary.20241123-128778e",
+    "@nx/workspace": "20.2.0-canary.20241123-128778e",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/host/files/js/webpack.server.config.js__tmpl__

@@ -1,4 +1,4 @@
-const { withModuleFederationForSSR } = require('@nx/angular/module-federation');
+const { withModuleFederationForSSR } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 /**
  * DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support for Module Federation

package/src/generators/host/files/ts/webpack.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederationForSSR } from '@nx/angular/module-federation';
+import { withModuleFederationForSSR } from '@nx/module-federation/angular';
 import config from './module-federation.config';
 
 /**

package/src/generators/remote/files/base/webpack.server.config.js__tmpl__

@@ -1,4 +1,4 @@
-const { withModuleFederationForSSR } = require('@nx/angular/module-federation');
+const { withModuleFederationForSSR } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 
 /**

package/src/generators/remote/files/base-ts/webpack.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederationForSSR } from '@nx/angular/module-federation';
+import { withModuleFederationForSSR } from '@nx/module-federation/angular';
 import config from './module-federation.config';
 
 /**

package/src/generators/scam-to-standalone/lib/replace-module-usages-with-component.js

@@ -10,7 +10,9 @@ function replaceModuleUsagesWithComponent(tree, moduleName, componentName) {
         }
         const fileContents = tree.read(path, 'utf-8');
         if (fileContents.includes(moduleName)) {
-            const moduleNameRegex = new RegExp(moduleName, 'g');
+            // Word boundary \b ensures that other modules won't be affected.
+            // E.g. "MapIconModule" would not be affected when "IconModule" is being migrated.
+            const moduleNameRegex = new RegExp(`\\b${moduleName}\\b`, 'g');
             const newFileContents = fileContents.replace(moduleNameRegex, componentName);
             tree.write(path, newFileContents);
         }

package/src/generators/setup-mf/files/ts-webpack/webpack.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederation } from '@nx/angular/module-federation';
+import { withModuleFederation } from '@nx/module-federation/angular';
 import config from './module-federation.config';
 
 /**

package/src/generators/setup-mf/files/ts-webpack/webpack.prod.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederation } from '@nx/angular/module-federation';
+import { withModuleFederation } from '@nx/module-federation/angular';
 import config from './module-federation.config';
 
 /**

package/src/generators/setup-mf/files/webpack/webpack.config.js__tmpl__

@@ -1,4 +1,4 @@
-const { withModuleFederation } = require('@nx/angular/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 
 /**

package/src/generators/setup-mf/files/webpack/webpack.prod.config.js__tmpl__

@@ -1,4 +1,4 @@
-const { withModuleFederation } = require('@nx/angular/module-federation');
+const { withModuleFederation } = require('@nx/module-federation/angular');
 const config = require('./module-federation.config');
 
 /**

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function migrateWithMfImport(tree: Tree): Promise<void>;

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateWithMfImport;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/angular/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/angular/module-federation]';
+const NEW_IMPORT_PATH = `'@nx/module-federation/angular'`;
+async function migrateWithMfImport(tree) {
+    const projects = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        projects.add(projectConfig.root);
+    });
+    for (const projectRoot of projects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectRoot, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes('@nx/angular/module-federation')) {
+                return;
+            }
+            const ast = tsquery_1.tsquery.ast(contents);
+            const importNodes = (0, tsquery_1.tsquery)(ast, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            const importPathNode = importNodes[0];
+            contents = `${contents.slice(0, importPathNode.getStart())}${NEW_IMPORT_PATH}${contents.slice(importPathNode.getEnd())}`;
+            tree.write(filePath, contents);
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/utils/mf/utils.d.ts

@@ -1,15 +0,0 @@
-import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/module-federation';
-export declare function applyDefaultEagerPackages(sharedConfig: Record<string, SharedLibraryConfig>): void;
-export declare const DEFAULT_NPM_PACKAGES_TO_AVOID: string[];
-export declare const DEFAULT_ANGULAR_PACKAGES_TO_SHARE: string[];
-export declare function getFunctionDeterminateRemoteUrl(isServer?: boolean): (remote: string) => string;
-export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, options?: {
-    isServer: boolean;
-    determineRemoteUrl?: (remote: string) => string;
-}): Promise<{
-    sharedLibraries: import("@nx/module-federation").SharedWorkspaceLibraryConfig;
-    sharedDependencies: {
-        [x: string]: SharedLibraryConfig;
-    };
-    mappedRemotes: Record<string, string>;
-}>;

package/src/utils/mf/utils.js

@@ -1,101 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = void 0;
-exports.applyDefaultEagerPackages = applyDefaultEagerPackages;
-exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
-exports.getModuleFederationConfig = getModuleFederationConfig;
-const module_federation_1 = require("@nx/module-federation");
-const devkit_1 = require("@nx/devkit");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-function applyDefaultEagerPackages(sharedConfig) {
-    const DEFAULT_PACKAGES_TO_LOAD_EAGERLY = [
-        '@angular/localize',
-        '@angular/localize/init',
-    ];
-    for (const pkg of DEFAULT_PACKAGES_TO_LOAD_EAGERLY) {
-        if (!sharedConfig[pkg]) {
-            continue;
-        }
-        sharedConfig[pkg] = { ...sharedConfig[pkg], eager: true };
-    }
-}
-exports.DEFAULT_NPM_PACKAGES_TO_AVOID = [
-    'zone.js',
-    '@nx/angular/mf',
-    '@nrwl/angular/mf',
-];
-exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = [
-    '@angular/core',
-    '@angular/animations',
-    '@angular/common',
-];
-function getFunctionDeterminateRemoteUrl(isServer = false) {
-    const target = 'serve';
-    const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.mjs';
-    return function (remote) {
-        const mappedStaticRemotesFromEnv = process.env
-            .NX_MF_DEV_SERVER_STATIC_REMOTES
-            ? JSON.parse(process.env.NX_MF_DEV_SERVER_STATIC_REMOTES)
-            : undefined;
-        if (mappedStaticRemotesFromEnv && mappedStaticRemotesFromEnv[remote]) {
-            return `${mappedStaticRemotesFromEnv[remote]}/${remoteEntry}`;
-        }
-        let remoteConfiguration = null;
-        try {
-            remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
-        }
-        catch (e) {
-            throw new Error(`Cannot find remote "${remote}". Check that the remote name is correct in your module federation config file.\n`);
-        }
-        const serveTarget = remoteConfiguration?.targets?.[target];
-        if (!serveTarget) {
-            throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve" target.\n
-      You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
-        }
-        const host = serveTarget.options?.host ??
-            `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
-        const port = serveTarget.options?.port ?? 4201;
-        return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/${remoteEntry}`;
-    };
-}
-async function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
-    let projectGraph;
-    try {
-        projectGraph = (0, devkit_1.readCachedProjectGraph)();
-    }
-    catch (e) {
-        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    }
-    if (!projectGraph.nodes[mfConfig.name]?.data) {
-        throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
-    }
-    const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
-    if (mfConfig.shared) {
-        dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
-        dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
-    }
-    const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
-    const npmPackages = (0, module_federation_1.sharePackages)(Array.from(new Set([
-        ...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
-        ...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
-    ])));
-    exports.DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
-        if (pkgName in npmPackages) {
-            delete npmPackages[pkgName];
-        }
-    });
-    const sharedDependencies = {
-        ...sharedLibraries.getLibraries(projectGraph.nodes[mfConfig.name].data.root),
-        ...npmPackages,
-    };
-    applyDefaultEagerPackages(sharedDependencies);
-    (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
-    (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
-    const determineRemoteUrlFn = options.determineRemoteUrl ||
-        getFunctionDeterminateRemoteUrl(options.isServer);
-    const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
-    const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
-        ? {}
-        : mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrlFn);
-    return { sharedLibraries, sharedDependencies, mappedRemotes };
-}

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

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

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

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withModuleFederationForSSR = withModuleFederationForSSR;
-const utils_1 = require("./utils");
-async function withModuleFederationForSSR(options, configOverride) {
-    if (global.NX_GRAPH_CREATION) {
-        return (config) => config;
-    }
-    const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
-        isServer: true,
-    });
-    return (config) => {
-        const updatedConfig = {
-            ...(config ?? {}),
-            target: 'async-node',
-            output: {
-                ...(config.output ?? {}),
-                uniqueName: options.name,
-            },
-            optimization: {
-                ...(config.optimization ?? {}),
-                runtimeChunk: false,
-            },
-            resolve: {
-                ...(config.resolve ?? {}),
-                alias: {
-                    ...(config.resolve?.alias ?? {}),
-                    ...sharedLibraries.getAliases(),
-                },
-            },
-            plugins: [
-                ...(config.plugins ?? []),
-                new (require('@module-federation/enhanced').ModuleFederationPlugin)({
-                    name: options.name.replace(/-/g, '_'),
-                    filename: 'remoteEntry.js',
-                    exposes: options.exposes,
-                    remotes: mappedRemotes,
-                    shared: {
-                        ...sharedDependencies,
-                    },
-                    /**
-                     * Apply user-defined config override
-                     */
-                    ...(configOverride ? configOverride : {}),
-                    runtimePlugins: process.env.NX_MF_DEV_REMOTES &&
-                        !options.disableNxRuntimeLibraryControlPlugin
-                        ? [
-                            ...(configOverride?.runtimePlugins ?? []),
-                            require.resolve('@module-federation/node/runtimePlugin'),
-                            require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
-                        ]
-                        : [
-                            ...(configOverride?.runtimePlugins ?? []),
-                            require.resolve('@module-federation/node/runtimePlugin'),
-                        ],
-                    virtualRuntimeEntry: true,
-                }, {}),
-                sharedLibraries.getReplacementPlugin(),
-            ],
-        };
-        // The env var is only set from the module-federation-dev-server
-        // Attach the runtime plugin
-        updatedConfig.plugins.push(new (require('webpack').DefinePlugin)({
-            'process.env.NX_MF_DEV_REMOTES': process.env.NX_MF_DEV_REMOTES,
-        }));
-        return updatedConfig;
-    };
-}

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

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

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

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withModuleFederation = withModuleFederation;
-const utils_1 = require("./utils");
-const webpack_1 = require("@module-federation/enhanced/webpack");
-async function withModuleFederation(options, configOverride) {
-    if (global.NX_GRAPH_CREATION) {
-        return (config) => config;
-    }
-    const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
-    return (config) => {
-        const updatedConfig = {
-            ...(config ?? {}),
-            output: {
-                ...(config.output ?? {}),
-                uniqueName: options.name,
-                publicPath: 'auto',
-            },
-            optimization: {
-                ...(config.optimization ?? {}),
-                runtimeChunk: false,
-            },
-            resolve: {
-                ...(config.resolve ?? {}),
-                alias: {
-                    ...(config.resolve?.alias ?? {}),
-                    ...sharedLibraries.getAliases(),
-                },
-            },
-            experiments: {
-                ...(config.experiments ?? {}),
-                outputModule: true,
-            },
-            plugins: [
-                ...(config.plugins ?? []),
-                new webpack_1.ModuleFederationPlugin({
-                    name: options.name.replace(/-/g, '_'),
-                    filename: 'remoteEntry.mjs',
-                    exposes: options.exposes,
-                    remotes: mappedRemotes,
-                    shared: {
-                        ...sharedDependencies,
-                    },
-                    library: {
-                        type: 'module',
-                    },
-                    /**
-                     * Apply user-defined config override
-                     */
-                    ...(configOverride ? configOverride : {}),
-                    runtimePlugins: process.env.NX_MF_DEV_REMOTES &&
-                        !options.disableNxRuntimeLibraryControlPlugin
-                        ? [
-                            ...(configOverride?.runtimePlugins ?? []),
-                            require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
-                        ]
-                        : configOverride?.runtimePlugins,
-                    virtualRuntimeEntry: true,
-                }),
-                sharedLibraries.getReplacementPlugin(),
-            ],
-        };
-        // The env var is only set from the module-federation-dev-server
-        // Attach the runtime plugin
-        updatedConfig.plugins.push(new (require('webpack').DefinePlugin)({
-            'process.env.NX_MF_DEV_REMOTES': process.env.NX_MF_DEV_REMOTES,
-        }));
-        return updatedConfig;
-    };
-}