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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/migrations.json +6 -0
  2. package/package.json +6 -5
  3. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +5 -7
  4. package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +5 -7
  5. package/src/executors/module-federation-static-server/module-federation-static-server.impl.d.ts +1 -1
  6. package/src/executors/module-federation-static-server/module-federation-static-server.impl.js +4 -5
  7. package/src/generators/host/files/rspack-module-federation-ssr/module-federation.server.config.js__tmpl__ +1 -1
  8. package/src/generators/host/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +1 -1
  9. package/src/generators/host/files/rspack-module-federation-ts/module-federation.config.ts__tmpl__ +1 -1
  10. package/src/generators/host/files/rspack-module-federation-ts/rspack.config.prod.ts__tmpl__ +2 -1
  11. package/src/generators/host/files/rspack-module-federation-ts/rspack.config.ts__tmpl__ +2 -1
  12. package/src/generators/host/files/webpack-module-federation-ssr/module-federation.server.config.js__tmpl__ +1 -1
  13. package/src/generators/host/files/webpack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +1 -1
  14. package/src/generators/host/files/webpack-module-federation-ts/module-federation.config.ts__tmpl__ +1 -1
  15. package/src/generators/host/files/webpack-module-federation-ts/webpack.config.prod.ts__tmpl__ +1 -1
  16. package/src/generators/host/files/webpack-module-federation-ts/webpack.config.ts__tmpl__ +2 -1
  17. package/src/generators/remote/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +1 -1
  18. package/src/generators/remote/files/rspack-module-federation-ts/module-federation.config.ts__tmpl__ +1 -1
  19. package/src/generators/remote/files/webpack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +1 -1
  20. package/src/generators/remote/files/webpack-module-federation-ts/module-federation.config.ts__tmpl__ +1 -1
  21. package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.d.ts +2 -0
  22. package/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js +63 -0
  23. package/src/module-federation/utils.d.ts +3 -3
  24. package/src/module-federation/utils.js +1 -1
  25. package/src/module-federation/with-module-federation-ssr.d.ts +1 -1
  26. package/src/module-federation/with-module-federation-ssr.js +1 -1
  27. package/src/module-federation/with-module-federation.d.ts +1 -1
  28. package/src/module-federation/with-module-federation.js +1 -1
  29. package/src/module-federation/load-config.d.ts +0 -3
  30. package/src/module-federation/load-config.js +0 -15
  31. package/src/module-federation/models.d.ts +0 -24
  32. package/src/module-federation/models.js +0 -2
  33. package/src/module-federation/package-json.d.ts +0 -8
  34. package/src/module-federation/package-json.js +0 -12
package/migrations.json CHANGED
@@ -29,6 +29,12 @@
29
29
  "version": "19.6.1-beta.0",
30
30
  "description": "Ensure Target Defaults are set correctly for Module Federation.",
31
31
  "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf"
32
+ },
33
+ "update-20-2-0-update-module-federation-config-import": {
34
+ "cli": "nx",
35
+ "version": "20.2.0-beta.2",
36
+ "description": "Update the ModuleFederationConfig import use @nx/module-federation.",
37
+ "factory": "./src/migrations/update-20-2-0/migrate-mf-imports-to-new-package"
32
38
  }
33
39
  },
34
40
  "packageJsonUpdates": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/react",
3
- "version": "20.2.0-canary.20241115-3c6c387",
3
+ "version": "20.2.0-canary.20241119-636cd77",
4
4
  "private": false,
5
5
  "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
6
6
  "repository": {
@@ -39,10 +39,11 @@
39
39
  "picocolors": "^1.1.0",
40
40
  "tslib": "^2.3.0",
41
41
  "@module-federation/enhanced": "0.6.9",
42
- "@nx/devkit": "20.2.0-canary.20241115-3c6c387",
43
- "@nx/js": "20.2.0-canary.20241115-3c6c387",
44
- "@nx/eslint": "20.2.0-canary.20241115-3c6c387",
45
- "@nx/web": "20.2.0-canary.20241115-3c6c387",
42
+ "@nx/devkit": "20.2.0-canary.20241119-636cd77",
43
+ "@nx/js": "20.2.0-canary.20241119-636cd77",
44
+ "@nx/eslint": "20.2.0-canary.20241119-636cd77",
45
+ "@nx/web": "20.2.0-canary.20241119-636cd77",
46
+ "@nx/module-federation": "20.2.0-canary.20241119-636cd77",
46
47
  "express": "^4.19.2",
47
48
  "http-proxy-middleware": "^3.0.3"
48
49
  },
@@ -4,13 +4,11 @@ exports.default = moduleFederationDevServer;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
6
6
  const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
7
- const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
7
+ const utils_1 = require("@nx/module-federation/src/utils");
8
8
  const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
9
9
  const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
10
10
  const fs_1 = require("fs");
11
11
  const path_1 = require("path");
12
- const start_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-remote-proxies");
13
- const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
14
12
  const build_static_remotes_1 = require("../../utils/build-static.remotes");
15
13
  function getBuildOptions(buildTarget, context) {
16
14
  const target = (0, devkit_1.parseTargetString)(buildTarget, context);
@@ -120,9 +118,9 @@ async function* moduleFederationDevServer(options, context) {
120
118
  if (!options.isInitialHost) {
121
119
  return yield* currIter;
122
120
  }
123
- const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
121
+ const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
124
122
  const remoteNames = options.devRemotes?.map((r) => typeof r === 'string' ? r : r.remoteName);
125
- const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
123
+ const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
126
124
  projectName: context.projectName,
127
125
  projectGraph: context.projectGraph,
128
126
  root: context.root,
@@ -133,11 +131,11 @@ async function* moduleFederationDevServer(options, context) {
133
131
  ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
134
132
  p.name.replace(/-/g, '_'),
135
133
  ]);
136
- const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
134
+ const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
137
135
  const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
138
136
  const devRemoteIters = await startRemotes(remotes.devRemotes, context, options, 'serve');
139
137
  const staticRemotesIter = startStaticRemotesFileServer(staticRemotesConfig, context, options);
140
- (0, start_remote_proxies_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
138
+ (0, utils_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
141
139
  ? {
142
140
  pathToCert: (0, path_1.join)(devkit_1.workspaceRoot, options.sslCert),
143
141
  pathToKey: (0, path_1.join)(devkit_1.workspaceRoot, options.sslKey),
@@ -4,14 +4,12 @@ exports.default = moduleFederationSsrDevServer;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const ssr_dev_server_impl_1 = require("@nx/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl");
6
6
  const path_1 = require("path");
7
- const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
7
+ const utils_1 = require("@nx/module-federation/src/utils");
8
8
  const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
9
9
  const child_process_1 = require("child_process");
10
10
  const fs_1 = require("fs");
11
- const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
12
11
  const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
13
12
  const cache_directory_1 = require("nx/src/utils/cache-directory");
14
- const start_ssr_remote_proxies_1 = require("@nx/webpack/src/utils/module-federation/start-ssr-remote-proxies");
15
13
  const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
16
14
  function normalizeOptions(options) {
17
15
  return {
@@ -155,9 +153,9 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
155
153
  if (!options.isInitialHost) {
156
154
  return yield* iter;
157
155
  }
158
- const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
156
+ const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
159
157
  const remoteNames = options.devRemotes?.map((remote) => typeof remote === 'string' ? remote : remote.remoteName);
160
- const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
158
+ const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
161
159
  projectName: context.projectName,
162
160
  projectGraph: context.projectGraph,
163
161
  root: context.root,
@@ -167,11 +165,11 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
167
165
  ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
168
166
  projectConfig.name.replace(/-/g, '_'),
169
167
  ]);
170
- const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
168
+ const staticRemotesConfig = (0, utils_1.parseStaticSsrRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
171
169
  const mappedLocationsOfStaticRemotes = await buildSsrStaticRemotes(staticRemotesConfig, nxBin, context, options);
172
170
  const devRemoteIters = await startRemotes(remotes.devRemotes, context, options);
173
171
  const staticRemotesIter = startSsrStaticRemotesFileServer(staticRemotesConfig, context, options);
174
- (0, start_ssr_remote_proxies_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
172
+ (0, utils_1.startSsrRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
175
173
  ? {
176
174
  pathToCert: options.sslCert,
177
175
  pathToKey: options.sslKey,
@@ -1,7 +1,7 @@
1
1
  import { ModuleFederationStaticServerSchema } from './schema';
2
2
  import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
3
3
  import { ExecutorContext } from 'nx/src/config/misc-interfaces';
4
- import { StaticRemotesConfig } from '@nx/webpack/src/utils/module-federation/parse-static-remotes-config';
4
+ import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
5
5
  export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {
6
6
  pathToCert: string;
7
7
  pathToKey: string;
@@ -5,8 +5,7 @@ exports.default = moduleFederationStaticServer;
5
5
  const path_1 = require("path");
6
6
  const devkit_1 = require("@nx/devkit");
7
7
  const fs_1 = require("fs");
8
- const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
9
- const parse_static_remotes_config_1 = require("@nx/webpack/src/utils/module-federation/parse-static-remotes-config");
8
+ const utils_1 = require("@nx/module-federation/src/utils");
10
9
  const build_static_remotes_1 = require("../../utils/build-static.remotes");
11
10
  const child_process_1 = require("child_process");
12
11
  const process = require("node:process");
@@ -164,13 +163,13 @@ async function* moduleFederationStaticServer(schema, context) {
164
163
  // Get the remotes from the module federation config
165
164
  const p = context.projectsConfigurations.projects[context.projectName];
166
165
  const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
167
- const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
168
- const remotes = (0, module_federation_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
166
+ const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
167
+ const remotes = (0, utils_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
169
168
  projectName: context.projectName,
170
169
  projectGraph: context.projectGraph,
171
170
  root: context.root,
172
171
  }, options.pathToManifestFile);
173
- const staticRemotesConfig = (0, parse_static_remotes_config_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
172
+ const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
174
173
  options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
175
174
  const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
176
175
  // Build the host
@@ -1,7 +1,7 @@
1
1
  // @ts-check
2
2
 
3
3
  /**
4
- * @type {import('@nx/rspack/module-federation').ModuleFederationConfig}
4
+ * @type {import('@nx/module-federation').ModuleFederationConfig}
5
5
  **/
6
6
  const moduleFederationConfig = {
7
7
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import { ModuleFederationConfig } from '@nx/rspack/module-federation';
1
+ import { ModuleFederationConfig } from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import { ModuleFederationConfig } from '@nx/rspack/module-federation';
1
+ import { ModuleFederationConfig } from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,5 +1,6 @@
1
1
  import { composePlugins, withNx, withReact } from '@nx/rspack';
2
- import { withModuleFederation, ModuleFederationConfig } from '@nx/rspack/module-federation';
2
+ import { withModuleFederation } from '@nx/rspack/module-federation';
3
+ import { ModuleFederationConfig } from '@nx/module-federation';
3
4
 
4
5
  import baseConfig from './module-federation.config';
5
6
 
@@ -1,5 +1,6 @@
1
1
  import {composePlugins, withNx, withReact} from '@nx/rspack';
2
- import {withModuleFederation, ModuleFederationConfig} from '@nx/rspack/module-federation';
2
+ import { withModuleFederation } from '@nx/rspack/module-federation';
3
+ import { ModuleFederationConfig } from '@nx/module-federation';
3
4
 
4
5
  import baseConfig from './module-federation.config';
5
6
 
@@ -1,7 +1,7 @@
1
1
  // @ts-check
2
2
 
3
3
  /**
4
- * @type {import('@nx/webpack').ModuleFederationConfig}
4
+ * @type {import('@nx/module-federation').ModuleFederationConfig}
5
5
  **/
6
6
  const moduleFederationConfig = {
7
7
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import { ModuleFederationConfig } from '@nx/webpack';
1
+ import { ModuleFederationConfig } from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import { ModuleFederationConfig } from '@nx/webpack';
1
+ import { ModuleFederationConfig } from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,7 +1,7 @@
1
1
  import { composePlugins, withNx } from '@nx/webpack';
2
2
  import { withReact } from '@nx/react';
3
3
  import { withModuleFederation } from '@nx/react/module-federation';
4
- import { ModuleFederationConfig } from '@nx/webpack';
4
+ import { ModuleFederationConfig } from '@nx/module-federation';
5
5
 
6
6
  import baseConfig from './module-federation.config';
7
7
 
@@ -1,6 +1,7 @@
1
- import {composePlugins, withNx, ModuleFederationConfig} from '@nx/webpack';
1
+ import {composePlugins, withNx} from '@nx/webpack';
2
2
  import {withReact} from '@nx/react';
3
3
  import {withModuleFederation} from '@nx/react/module-federation';
4
+ import { ModuleFederationConfig } from '@nx/module-federation';
4
5
 
5
6
  import baseConfig from './module-federation.config';
6
7
 
@@ -1,4 +1,4 @@
1
- import {ModuleFederationConfig} from '@nx/rspack/module-federation';
1
+ import {ModuleFederationConfig} from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import {ModuleFederationConfig} from '@nx/rspack/module-federation';
1
+ import {ModuleFederationConfig} from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import {ModuleFederationConfig} from '@nx/webpack';
1
+ import {ModuleFederationConfig} from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -1,4 +1,4 @@
1
- import {ModuleFederationConfig} from '@nx/webpack';
1
+ import {ModuleFederationConfig} from '@nx/module-federation';
2
2
 
3
3
  const config: ModuleFederationConfig = {
4
4
  name: '<%= projectName %>',
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nx/devkit';
2
+ export default function migrateMfImportsToNewPackage(tree: Tree): Promise<void>;
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.default = migrateMfImportsToNewPackage;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const devkit_2 = require("@nx/devkit");
6
+ const tsquery_1 = require("@phenomnomnominal/tsquery");
7
+ const MF_IMPORT_TO_UPDATE = 'ModuleFederationConfig';
8
+ const MF_CONFIG_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=@nx/webpack]):has(Identifier[name=ModuleFederationConfig]),ImportDeclaration:has(StringLiteral[value=@nx/rspack/module-federation]):has(Identifier[name=ModuleFederationConfig])`;
9
+ const IMPORT_TOKENS_SELECTOR = `ImportClause ImportSpecifier`;
10
+ const MF_CONFIG_IMPORT_SPECIFIER_SELECTOR = `ImportClause ImportSpecifier > Identifier[name=ModuleFederationConfig]`;
11
+ const WEBPACK_IMPORT_SELECTOR = `ImportDeclaration > StringLiteral[value=@nx/webpack]`;
12
+ const RSPACK_IMPORT_SELECTOR = `ImportDeclaration > StringLiteral[value=@nx/rspack/module-federation]`;
13
+ async function migrateMfImportsToNewPackage(tree) {
14
+ const rootsToCheck = new Set();
15
+ const graph = await (0, devkit_1.createProjectGraphAsync)();
16
+ for (const [project, dependencies] of Object.entries(graph.dependencies)) {
17
+ const usesNxWebpackOrRspack = dependencies.some((dep) => dep.target === 'npm:@nx/webpack' || dep.target === 'npm:@nx/rspack');
18
+ if (usesNxWebpackOrRspack) {
19
+ const root = graph.nodes[project].data.root;
20
+ rootsToCheck.add(root);
21
+ }
22
+ }
23
+ for (const root of rootsToCheck) {
24
+ (0, devkit_2.visitNotIgnoredFiles)(tree, root, (filePath) => {
25
+ if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
26
+ return;
27
+ }
28
+ let contents = tree.read(filePath, 'utf-8');
29
+ if (!contents.includes(MF_IMPORT_TO_UPDATE)) {
30
+ return;
31
+ }
32
+ const ast = tsquery_1.tsquery.ast(contents);
33
+ const importNodes = (0, tsquery_1.tsquery)(ast, MF_CONFIG_IMPORT_SELECTOR);
34
+ if (importNodes.length === 0) {
35
+ return;
36
+ }
37
+ const importNode = importNodes[0];
38
+ const importSpecifiers = (0, tsquery_1.tsquery)(importNode, IMPORT_TOKENS_SELECTOR);
39
+ if (importSpecifiers.length > 1) {
40
+ const mfConfigImportSpecifierNode = (0, tsquery_1.tsquery)(importNode, MF_CONFIG_IMPORT_SPECIFIER_SELECTOR)[0];
41
+ const end = contents.charAt(mfConfigImportSpecifierNode.getEnd()) === ','
42
+ ? mfConfigImportSpecifierNode.getEnd() + 1
43
+ : mfConfigImportSpecifierNode.getEnd();
44
+ contents = `import { ${MF_IMPORT_TO_UPDATE} } from '@nx/module-federation';
45
+ ${contents.slice(0, mfConfigImportSpecifierNode.getStart())}${contents.slice(end)}`;
46
+ }
47
+ else {
48
+ const nxWebpackImportStringNodes = (0, tsquery_1.tsquery)(importNode, WEBPACK_IMPORT_SELECTOR);
49
+ const nxRspackImportStringNodes = (0, tsquery_1.tsquery)(importNode, RSPACK_IMPORT_SELECTOR);
50
+ if (nxWebpackImportStringNodes.length === 0 &&
51
+ nxRspackImportStringNodes.length === 0) {
52
+ return;
53
+ }
54
+ const bundlerImportStringNode = nxWebpackImportStringNodes.length
55
+ ? nxWebpackImportStringNodes[0]
56
+ : nxRspackImportStringNodes[0];
57
+ contents = `${contents.slice(0, bundlerImportStringNode.getStart())}'@nx/module-federation'${contents.slice(bundlerImportStringNode.getEnd())}`;
58
+ }
59
+ tree.write(filePath, contents);
60
+ });
61
+ }
62
+ await (0, devkit_2.formatFiles)(tree);
63
+ }
@@ -1,12 +1,12 @@
1
- import { ModuleFederationConfig } from '@nx/webpack/src/utils/module-federation';
1
+ import { ModuleFederationConfig } from '@nx/module-federation';
2
2
  export declare function getFunctionDeterminateRemoteUrl(isServer?: boolean): (remote: string) => string;
3
3
  export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, options?: {
4
4
  isServer: boolean;
5
5
  determineRemoteUrl?: (remote: string) => string;
6
6
  }): Promise<{
7
- sharedLibraries: import("@nx/webpack/src/utils/module-federation").SharedWorkspaceLibraryConfig;
7
+ sharedLibraries: import("@nx/module-federation").SharedWorkspaceLibraryConfig;
8
8
  sharedDependencies: {
9
- [x: string]: import("@nx/webpack/src/utils/module-federation").SharedLibraryConfig;
9
+ [x: string]: import("@nx/module-federation").SharedLibraryConfig;
10
10
  };
11
11
  mappedRemotes: {};
12
12
  }>;
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
4
4
  exports.getModuleFederationConfig = getModuleFederationConfig;
5
- const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
5
+ const module_federation_1 = require("@nx/module-federation");
6
6
  const devkit_1 = require("@nx/devkit");
7
7
  const project_graph_1 = require("nx/src/project-graph/project-graph");
8
8
  function getFunctionDeterminateRemoteUrl(isServer = false) {
@@ -1,2 +1,2 @@
1
- import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
1
+ import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/module-federation';
2
2
  export declare function withModuleFederationForSSR(options: ModuleFederationConfig, configOverride?: NxModuleFederationConfigOverride): Promise<(config: any) => any>;
@@ -32,7 +32,7 @@ async function withModuleFederationForSSR(options, configOverride) {
32
32
  !options.disableNxRuntimeLibraryControlPlugin
33
33
  ? [
34
34
  ...(configOverride?.runtimePlugins ?? []),
35
- require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
35
+ require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
36
36
  ]
37
37
  : [
38
38
  ...(configOverride?.runtimePlugins ?? []),
@@ -1,4 +1,4 @@
1
- import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/webpack/src/utils/module-federation';
1
+ import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/module-federation';
2
2
  import type { AsyncNxComposableWebpackPlugin } from '@nx/webpack';
3
3
  /**
4
4
  * @param {ModuleFederationConfig} options
@@ -48,7 +48,7 @@ async function withModuleFederation(options, configOverride) {
48
48
  !options.disableNxRuntimeLibraryControlPlugin
49
49
  ? [
50
50
  ...(configOverride?.runtimePlugins ?? []),
51
- require.resolve('@nx/webpack/src/utils/module-federation/plugins/runtime-library-control.plugin.js'),
51
+ require.resolve('@nx/module-federation/src/utils/plugins/runtime-library-control.plugin.js'),
52
52
  ]
53
53
  : configOverride?.runtimePlugins,
54
54
  virtualRuntimeEntry: true,
@@ -1,3 +0,0 @@
1
- import { ExecutorContext } from '@nx/devkit';
2
- import { ModuleFederationConfig } from './models';
3
- export declare function loadModuleFederationConfigFromContext(context: ExecutorContext): ModuleFederationConfig;
@@ -1,15 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadModuleFederationConfigFromContext = loadModuleFederationConfigFromContext;
4
- const path_1 = require("path");
5
- function loadModuleFederationConfigFromContext(context) {
6
- const p = context.projectsConfigurations.projects[context.projectName];
7
- const moduleFederationConfigPath = (0, path_1.join)(context.root, p.root, 'module-federation.config.js');
8
- try {
9
- return require(moduleFederationConfigPath);
10
- }
11
- catch {
12
- // TODO(jack): Add a link to guide
13
- throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`);
14
- }
15
- }
@@ -1,24 +0,0 @@
1
- export type ModuleFederationLibrary = {
2
- type: string;
3
- name: string;
4
- };
5
- export type Remotes = string[] | [remoteName: string, remoteUrl: string][];
6
- export interface SharedLibraryConfig {
7
- singleton?: boolean;
8
- strictVersion?: boolean;
9
- requiredVersion?: false | string;
10
- eager?: boolean;
11
- }
12
- export type SharedFunction = (libraryName: string, sharedConfig: SharedLibraryConfig) => undefined | false | SharedLibraryConfig;
13
- export type AdditionalSharedConfig = Array<string | [libraryName: string, sharedConfig: SharedLibraryConfig] | {
14
- libraryName: string;
15
- sharedConfig: SharedLibraryConfig;
16
- }>;
17
- export interface ModuleFederationConfig {
18
- name: string;
19
- remotes?: Remotes;
20
- library?: ModuleFederationLibrary;
21
- exposes?: Record<string, string>;
22
- shared?: SharedFunction;
23
- additionalShared?: AdditionalSharedConfig;
24
- }
@@ -1,2 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
@@ -1,8 +0,0 @@
1
- export declare function readRootPackageJson(): {
2
- dependencies?: {
3
- [key: string]: string;
4
- };
5
- devDependencies?: {
6
- [key: string]: string;
7
- };
8
- };
@@ -1,12 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.readRootPackageJson = readRootPackageJson;
4
- const devkit_1 = require("@nx/devkit");
5
- const fs_1 = require("fs");
6
- function readRootPackageJson() {
7
- const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
8
- if (!(0, fs_1.existsSync)(pkgJsonPath)) {
9
- throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
10
- }
11
- return (0, devkit_1.readJsonFile)(pkgJsonPath);
12
- }