@nx/angular 20.2.0-canary.20241115-3c6c387 → 20.2.0-canary.20241119-636cd77

package/migrations.json

@@ -266,6 +266,12 @@
       "version": "19.6.1-beta.0",
       "description": "Ensure Target Defaults are set correctly for Module Federation.",
       "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf"
+    },
+    "update-20-2-0-update-module-federation-config-import": {
+      "cli": "nx",
+      "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"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.2.0-canary.20241115-3c6c387",
+  "version": "20.2.0-canary.20241119-636cd77",
   "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": {
@@ -80,12 +80,13 @@
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
     "@module-federation/enhanced": "0.6.9",
-    "@nx/devkit": "20.2.0-canary.20241115-3c6c387",
-    "@nx/js": "20.2.0-canary.20241115-3c6c387",
-    "@nx/eslint": "20.2.0-canary.20241115-3c6c387",
-    "@nx/webpack": "20.2.0-canary.20241115-3c6c387",
-    "@nx/web": "20.2.0-canary.20241115-3c6c387",
-    "@nx/workspace": "20.2.0-canary.20241115-3c6c387",
+    "@nx/devkit": "20.2.0-canary.20241119-636cd77",
+    "@nx/js": "20.2.0-canary.20241119-636cd77",
+    "@nx/eslint": "20.2.0-canary.20241119-636cd77",
+    "@nx/webpack": "20.2.0-canary.20241119-636cd77",
+    "@nx/module-federation": "20.2.0-canary.20241119-636cd77",
+    "@nx/web": "20.2.0-canary.20241119-636cd77",
+    "@nx/workspace": "20.2.0-canary.20241119-636cd77",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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

@@ -1,4 +1,4 @@
 import { type Schema } from '../schema';
 import { type ExecutorContext } from '@nx/devkit';
-import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
+import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: Schema): Promise<Record<string, string>>;

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

@@ -1,6 +1,6 @@
 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';
+import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function startStaticRemotesFileServer(staticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncGenerator<{
     success: boolean;
     baseUrl: string;

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

@@ -6,16 +6,14 @@ const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
-const module_federation_2 = require("../../builders/utilities/module-federation");
+const module_federation_1 = require("../../builders/utilities/module-federation");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const start_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-remote-proxies");
-const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
 async function* moduleFederationDevServerExecutor(schema, context) {
     // Force Node to resolve to look for the nx binary that is inside node_modules
     const nxBin = require.resolve('nx/bin/nx');
@@ -44,7 +42,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     let pathToManifestFile;
     if (!options.pathToManifestFile) {
-        pathToManifestFile = (0, module_federation_2.getDynamicMfManifestFile)(project, context.root);
+        pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.root);
     }
     else {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
@@ -56,10 +54,10 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         }
         pathToManifestFile = userPathToManifestFile;
     }
-    (0, module_federation_2.validateDevRemotes)(options, workspaceProjects);
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
+    (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
     const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
-    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
+    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,
         projectGraph: context.projectGraph,
         root: context.root,
@@ -70,11 +68,11 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
         project.name.replace(/-/g, '_'),
     ]);
-    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await (0, lib_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await (0, lib_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context, 'serve');
     const staticRemotesIter = (0, lib_1.startStaticRemotesFileServer)(staticRemotesConfig, context, options);
-    (0, start_remote_proxies_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
+    (0, utils_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
         ? {
             pathToCert: options.sslCert,
             pathToKey: options.sslKey,

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

@@ -1,4 +1,4 @@
 import type { Schema } from '../schema';
 import { type ExecutorContext } from '@nx/devkit';
-import type { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
+import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function buildStaticRemotes(staticRemotesConfig: StaticRemotesConfig, nxBin: any, context: ExecutorContext, options: Schema): Promise<Record<string, string>>;

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

@@ -1,4 +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';
+import type { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function startStaticRemotes(ssrStaticRemotesConfig: StaticRemotesConfig, context: ExecutorContext, options: Schema): AsyncIterable<unknown>;

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

@@ -6,8 +6,7 @@ const fs_1 = require("fs");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const module_federation_1 = require("../../builders/utilities/module-federation");
-const module_federation_2 = require("@nx/webpack/src/utils/module-federation");
-const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
+const utils_1 = require("@nx/module-federation/src/utils");
 const build_static_remotes_1 = require("./lib/build-static-remotes");
 const start_dev_remotes_1 = require("./lib/start-dev-remotes");
 const start_static_remotes_1 = require("./lib/start-static-remotes");
@@ -16,7 +15,6 @@ const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const normalize_options_1 = require("./lib/normalize-options");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-const start_ssr_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-ssr-remote-proxies");
 const angular_version_utils_1 = require("../utilities/angular-version-utils");
 async function* moduleFederationSsrDevServerExecutor(schema, context) {
     const nxBin = require.resolve('nx/bin/nx');
@@ -50,15 +48,15 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
         pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.root);
     }
     (0, module_federation_1.validateDevRemotes)({ devRemotes: options.devRemotes }, workspaceProjects);
-    const moduleFederationConfig = (0, module_federation_2.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.root, project.root, 'angular');
     const remoteNames = options.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName);
-    const remotes = (0, module_federation_2.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
+    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,
         projectGraph: context.projectGraph,
         root: context.root,
     }, pathToManifestFile);
     options.staticRemotesPort ??= remotes.staticRemotePort;
-    const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
     // Set NX_MF_DEV_REMOTES for the Nx Runtime Library Control Plugin
     process.env.NX_MF_DEV_REMOTES = JSON.stringify([
@@ -67,7 +65,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     ]);
     const devRemotes = await (0, start_dev_remotes_1.startRemotes)(remotes.devRemotes, workspaceProjects, options, context);
     const staticRemotes = (0, start_static_remotes_1.startStaticRemotes)(staticRemotesConfig, context, options);
-    (0, start_ssr_remote_proxies_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
+    (0, utils_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
         ? { pathToCert: options.sslCert, pathToKey: options.sslKey }
         : undefined);
     const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/webpack';
+import { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= name %>',<% if(type === 'host') { %>

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

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

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateMfImportsToNewPackage;
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const MF_IMPORT_TO_UPDATE = 'ModuleFederationConfig';
+const MF_CONFIG_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=@nx/webpack]):has(Identifier[name=ModuleFederationConfig])`;
+const IMPORT_TOKENS_SELECTOR = `ImportClause ImportSpecifier`;
+const MF_CONFIG_IMPORT_SPECIFIER_SELECTOR = `ImportClause ImportSpecifier > Identifier[name=ModuleFederationConfig]`;
+const WEBPACK_IMPORT_SELECTOR = `ImportDeclaration > StringLiteral[value=@nx/webpack]`;
+async function migrateMfImportsToNewPackage(tree) {
+    const rootsToCheck = new Set();
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const [project, dependencies] of Object.entries(graph.dependencies)) {
+        const usesNxWebpack = dependencies.some((dep) => dep.target === 'npm:@nx/webpack');
+        if (usesNxWebpack) {
+            const root = graph.nodes[project].data.root;
+            rootsToCheck.add(root);
+        }
+    }
+    for (const root of rootsToCheck) {
+        (0, devkit_2.visitNotIgnoredFiles)(tree, root, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes(MF_IMPORT_TO_UPDATE)) {
+                return;
+            }
+            const ast = tsquery_1.tsquery.ast(contents);
+            const importNodes = (0, tsquery_1.tsquery)(ast, MF_CONFIG_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            const importNode = importNodes[0];
+            const importSpecifiers = (0, tsquery_1.tsquery)(importNode, IMPORT_TOKENS_SELECTOR);
+            if (importSpecifiers.length > 1) {
+                const mfConfigImportSpecifierNode = (0, tsquery_1.tsquery)(importNode, MF_CONFIG_IMPORT_SPECIFIER_SELECTOR)[0];
+                const end = contents.charAt(mfConfigImportSpecifierNode.getEnd()) === ','
+                    ? mfConfigImportSpecifierNode.getEnd() + 1
+                    : mfConfigImportSpecifierNode.getEnd();
+                contents = `import { ${MF_IMPORT_TO_UPDATE} } from '@nx/module-federation';
+      ${contents.slice(0, mfConfigImportSpecifierNode.getStart())}${contents.slice(end)}`;
+            }
+            else {
+                const nxWebpackImportStringNodes = (0, tsquery_1.tsquery)(ast, WEBPACK_IMPORT_SELECTOR);
+                if (nxWebpackImportStringNodes.length === 0) {
+                    return;
+                }
+                const nxWebpackImportStringNode = nxWebpackImportStringNodes[0];
+                contents = `${contents.slice(0, nxWebpackImportStringNode.getStart())}'@nx/module-federation'${contents.slice(nxWebpackImportStringNode.getEnd())}`;
+            }
+            tree.write(filePath, contents);
+        });
+    }
+    await (0, devkit_2.formatFiles)(tree);
+}

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

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/webpack/src/utils/module-federation';
+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[];
@@ -7,7 +7,7 @@ export declare function getModuleFederationConfig(mfConfig: ModuleFederationConf
     isServer: boolean;
     determineRemoteUrl?: (remote: string) => string;
 }): Promise<{
-    sharedLibraries: import("@nx/webpack/src/utils/module-federation").SharedWorkspaceLibraryConfig;
+    sharedLibraries: import("@nx/module-federation").SharedWorkspaceLibraryConfig;
     sharedDependencies: {
         [x: string]: SharedLibraryConfig;
     };

package/src/utils/mf/utils.js

@@ -4,7 +4,7 @@ exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOI
 exports.applyDefaultEagerPackages = applyDefaultEagerPackages;
 exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
 exports.getModuleFederationConfig = getModuleFederationConfig;
-const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+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) {

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

@@ -1,2 +1,2 @@
-import type { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+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

@@ -47,7 +47,7 @@ async function withModuleFederationForSSR(options, configOverride) {
                         ? [
                             ...(configOverride?.runtimePlugins ?? []),
                             require.resolve('@module-federation/node/runtimePlugin'),
-                            require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
+                            require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
                         ]
                         : [
                             ...(configOverride?.runtimePlugins ?? []),

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

@@ -1,2 +1,2 @@
-import type { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
+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

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