@nx/rspack 0.0.0-pr-28808-ae8ea8d → 0.0.0-pr-28808-41aa4e0

package/app-plugin.d.ts

@@ -0,0 +1,2 @@
+export { NxAppRspackPlugin } from './src/plugins/nx-app-rspack-plugin/nx-app-rspack-plugin';
+export type { NxAppRspackPluginOptions } from './src/plugins/utils/models';

package/app-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxAppRspackPlugin = void 0;
+var nx_app_rspack_plugin_1 = require("./src/plugins/nx-app-rspack-plugin/nx-app-rspack-plugin");
+Object.defineProperty(exports, "NxAppRspackPlugin", { enumerable: true, get: function () { return nx_app_rspack_plugin_1.NxAppRspackPlugin; } });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "0.0.0-pr-28808-ae8ea8d",
+  "version": "0.0.0-pr-28808-41aa4e0",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,9 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "0.0.0-pr-28808-ae8ea8d",
-    "@nx/devkit": "0.0.0-pr-28808-ae8ea8d",
-    "@nx/web": "0.0.0-pr-28808-ae8ea8d",
+    "@nx/js": "0.0.0-pr-28808-41aa4e0",
+    "@nx/devkit": "0.0.0-pr-28808-41aa4e0",
+    "@nx/web": "0.0.0-pr-28808-41aa4e0",
+    "@nx/module-federation": "0.0.0-pr-28808-41aa4e0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.0.4",
     "@rspack/dev-server": "^1.0.4",

package/react-plugin.d.ts

@@ -0,0 +1 @@
+export { NxReactRspackPlugin } from './src/plugins/nx-react-rspack-plugin/nx-react-rspack-plugin';

package/react-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxReactRspackPlugin = void 0;
+var nx_react_rspack_plugin_1 = require("./src/plugins/nx-react-rspack-plugin/nx-react-rspack-plugin");
+Object.defineProperty(exports, "NxReactRspackPlugin", { enumerable: true, get: function () { return nx_react_rspack_plugin_1.NxReactRspackPlugin; } });

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

@@ -8,10 +8,8 @@ const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executor
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const module_federation_1 = require("../../utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const build_static_remotes_1 = require("../../utils/module-federation/build-static.remotes");
-const parse_static_remotes_config_1 = require("../../utils/module-federation/parse-static-remotes-config");
-const start_remote_proxies_1 = require("../../utils/module-federation/start-remote-proxies");
 const dev_server_impl_1 = tslib_1.__importDefault(require("../dev-server/dev-server.impl"));
 function getBuildOptions(buildTarget, context) {
     const target = (0, devkit_1.parseTargetString)(buildTarget, context);
@@ -121,9 +119,9 @@ async function* moduleFederationDevServer(options, context) {
     if (!options.isInitialHost) {
         return yield* currIter;
     }
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, p.root, 'react');
     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: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
@@ -134,11 +132,11 @@ async function* moduleFederationDevServer(options, context) {
         ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
         p.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, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await startRemotes(remotes.devRemotes, context, options, 'serve');
     const staticRemotesIter = startStaticRemotesFileServer(staticRemotesConfig, context, options);
-    (0, start_remote_proxies_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
+    (0, utils_1.startRemoteProxies)(staticRemotesConfig, mappedLocationsOfStaticRemotes, options.ssl
         ? {
             pathToCert: (0, path_1.join)(devkit_1.workspaceRoot, options.sslCert),
             pathToKey: (0, path_1.join)(devkit_1.workspaceRoot, options.sslKey),

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

@@ -4,16 +4,14 @@ exports.default = moduleFederationSsrDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const module_federation_1 = require("../../utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const ssr_dev_server_impl_1 = tslib_1.__importDefault(require("../ssr-dev-server/ssr-dev-server.impl"));
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const parse_static_remotes_config_1 = require("../../utils/module-federation/parse-static-remotes-config");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
-const start_ssr_remote_proxies_1 = require("../../utils/module-federation/start-ssr-remote-proxies");
 function normalizeOptions(options) {
     return {
         ...options,
@@ -159,9 +157,9 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     if (!options.isInitialHost) {
         return yield* iter;
     }
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(buildOptions.tsConfig, context.root, projectConfig.root, 'react');
     const remoteNames = options.devRemotes?.map((remote) => typeof remote === 'string' ? remote : remote.remoteName);
-    const remotes = (0, module_federation_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
+    const remotes = (0, utils_1.getRemotes)(remoteNames, options.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
@@ -171,11 +169,11 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
         ...(remotes.devRemotes.map((r) => typeof r === 'string' ? r : r.remoteName) ?? []).map((r) => r.replace(/-/g, '_')),
         projectConfig.name.replace(/-/g, '_'),
     ]);
-    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 buildSsrStaticRemotes(staticRemotesConfig, nxBin, context, options);
     const devRemoteIters = await startRemotes(remotes.devRemotes, context, options);
     const staticRemotesIter = startSsrStaticRemotesFileServer(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,

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

@@ -1,5 +1,5 @@
 import { ExecutorContext } from 'nx/src/config/misc-interfaces';
-import { StaticRemotesConfig } from '../../utils/module-federation/parse-static-remotes-config';
+import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
 import { ModuleFederationStaticServerSchema } from './schema';
 export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {

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

@@ -10,9 +10,8 @@ const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const module_federation_1 = require("../../utils/module-federation");
+const utils_1 = require("@nx/module-federation/src/utils");
 const build_static_remotes_1 = require("../../utils/module-federation/build-static.remotes");
-const parse_static_remotes_config_1 = require("../../utils/module-federation/parse-static-remotes-config");
 function getBuildAndServeOptionsFromServeTarget(serveTarget, context) {
     const target = (0, devkit_1.parseTargetString)(serveTarget, context);
     const serveOptions = (0, devkit_1.readTargetOptions)(target, context);
@@ -170,13 +169,13 @@ async function* moduleFederationStaticServer(schema, context) {
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, module_federation_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = (0, utils_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    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);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
     const mappedLocationsOfStaticRemotes = await (0, build_static_remotes_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host

package/src/executors/rspack/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Mode } from '@rspack/core';
+import type { DevTool, Mode } from '@rspack/core';
 
 export interface RspackExecutorSchema {
   additionalEntryPoints?: AdditionalEntryPoint[];
@@ -32,7 +32,7 @@ export interface RspackExecutorSchema {
   runtimeChunk?: boolean;
   scripts?: Array<ExtraEntryPointClass | string>;
   skipTypeChecking?: boolean;
-  sourceMap?: boolean | string;
+  sourceMap?: boolean | DevTool;
   standardRspackConfigFunction?: boolean;
   statsJson?: boolean;
   stylePreprocessorOptions?: any;

package/src/plugins/nx-app-rspack-plugin/nx-app-rspack-plugin.d.ts

@@ -0,0 +1,16 @@
+import type { Compiler } from '@rspack/core';
+import type { NxAppRspackPluginOptions } from '../utils/models';
+/**
+ * This plugin provides features to build Node and Web applications.
+ * - TS Support (including tsconfig paths
+ * - Assets handling
+ * - Stylesheets handling
+ * - index.html and package.json generation
+ *
+ * Web-only features, such as stylesheets and images, are only supported when `target` is `web` or `webworker`.
+ */
+export declare class NxAppRspackPlugin {
+    private readonly options;
+    constructor(options?: NxAppRspackPluginOptions);
+    apply(compiler: Compiler): void;
+}

package/src/plugins/nx-app-rspack-plugin/nx-app-rspack-plugin.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxAppRspackPlugin = void 0;
+const normalize_options_1 = require("../utils/plugins/normalize-options");
+const apply_base_config_1 = require("../utils/apply-base-config");
+const apply_web_config_1 = require("../utils/apply-web-config");
+const delete_output_path_1 = require("../utils/delete-output-path");
+/**
+ * This plugin provides features to build Node and Web applications.
+ * - TS Support (including tsconfig paths
+ * - Assets handling
+ * - Stylesheets handling
+ * - index.html and package.json generation
+ *
+ * Web-only features, such as stylesheets and images, are only supported when `target` is `web` or `webworker`.
+ */
+class NxAppRspackPlugin {
+    constructor(options = {}) {
+        // If we're building inferred targets, skip normalizing the build options
+        if (!global.NX_GRAPH_CREATION) {
+            this.options = (0, normalize_options_1.normalizeOptions)(options);
+        }
+    }
+    apply(compiler) {
+        // Default's to web
+        const target = this.options.target ?? compiler.options.target;
+        this.options.outputPath ??= compiler.options.output?.path;
+        if (typeof target === 'string') {
+            this.options.target = target;
+        }
+        (0, apply_base_config_1.applyBaseConfig)(this.options, compiler.options, {
+            useNormalizedEntry: true,
+        });
+        if (compiler.options.target) {
+            this.options.target = compiler.options.target;
+        }
+        if (this.options.target === 'web' || this.options.target === 'webworker') {
+            (0, apply_web_config_1.applyWebConfig)(this.options, compiler.options, {
+                useNormalizedEntry: true,
+            });
+        }
+        if (this.options.deleteOutputPath) {
+            (0, delete_output_path_1.deleteOutputDir)(this.options.root, this.options.outputPath);
+        }
+    }
+}
+exports.NxAppRspackPlugin = NxAppRspackPlugin;

package/src/plugins/nx-react-rspack-plugin/nx-react-rspack-plugin.d.ts

@@ -0,0 +1,8 @@
+import type { Compiler } from '@rspack/core';
+export declare class NxReactRspackPlugin {
+    private options;
+    constructor(options?: {
+        svgr?: boolean;
+    });
+    apply(compiler: Compiler): void;
+}

package/src/plugins/nx-react-rspack-plugin/nx-react-rspack-plugin.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxReactRspackPlugin = void 0;
+const apply_react_config_1 = require("../utils/apply-react-config");
+class NxReactRspackPlugin {
+    constructor(options = {}) {
+        this.options = options;
+    }
+    apply(compiler) {
+        (0, apply_react_config_1.applyReactConfig)(this.options, compiler.options);
+    }
+}
+exports.NxReactRspackPlugin = NxReactRspackPlugin;

package/src/plugins/utils/apply-base-config.js

@@ -59,11 +59,7 @@ function applyNxIndependentConfig(options, config) {
     // So to mitigate this we enable in memory caching when target is Node and in watch mode.
     config.cache = options.target === 'node' && options.watch ? true : undefined;
     config.devtool =
-        options.sourceMap === 'hidden'
-            ? 'hidden-source-map'
-            : options.sourceMap
-                ? 'source-map'
-                : false;
+        options.sourceMap === true ? 'source-map' : options.sourceMap;
     config.output = {
         ...(config.output ?? {}),
         libraryTarget: config.output?.libraryTarget ??

package/src/plugins/utils/apply-web-config.d.ts

@@ -1,5 +1,5 @@
-import { type Configuration } from '@rspack/core';
+import { type Configuration, RspackOptionsNormalized } from '@rspack/core';
 import { NormalizedNxAppRspackPluginOptions } from './models';
-export declare function applyWebConfig(options: NormalizedNxAppRspackPluginOptions, config?: Configuration, { useNormalizedEntry, }?: {
+export declare function applyWebConfig(options: NormalizedNxAppRspackPluginOptions, config?: Partial<RspackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
     useNormalizedEntry?: boolean;
 }): void;

package/src/plugins/utils/apply-web-config.js

@@ -70,13 +70,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             const resolvedPath = style.input.startsWith('.')
                 ? style.input
                 : (0, path_1.resolve)(options.root, style.input);
-            // Add style entry points.
-            if (entries[style.bundleName]) {
-                entries[style.bundleName].import.push(resolvedPath);
-            }
-            else {
-                entries[style.bundleName] = { import: [resolvedPath] };
-            }
             // Add global css paths.
             globalStylePaths.push(resolvedPath);
         });
@@ -290,7 +283,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         }
     });
     config.optimization = !isProd
-        ? undefined
+        ? {}
         : {
             ...(config.optimization ?? {}),
             minimizer: [...(config.optimization?.minimizer ?? []), ...minimizer],

package/src/plugins/utils/delete-output-path.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Delete an output directory, but error out if it's the root of the project.
+ */
+export declare function deleteOutputDir(root: string, outputPath: string): void;

package/src/plugins/utils/delete-output-path.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteOutputDir = deleteOutputDir;
+const fs_1 = require("fs");
+const path_1 = require("path");
+/**
+ * Delete an output directory, but error out if it's the root of the project.
+ */
+function deleteOutputDir(root, outputPath) {
+    const resolvedOutputPath = (0, path_1.resolve)(root, outputPath);
+    if (resolvedOutputPath === root) {
+        throw new Error('Output path MUST not be project root directory!');
+    }
+    (0, fs_1.rmSync)(resolvedOutputPath, { recursive: true, force: true });
+}

package/src/plugins/utils/models.d.ts

@@ -1,4 +1,4 @@
-import type { Mode } from '@rspack/core';
+import type { DevTool, Mode } from '@rspack/core';
 import type { ProjectGraph } from '@nx/devkit';
 import type { AssetGlob } from '@nx/js/src/utils/assets/assets';
 export interface SvgrOptions {
@@ -171,7 +171,7 @@ export interface NxAppRspackPluginOptions {
     /**
      * Generate source maps.
      */
-    sourceMap?: boolean | string;
+    sourceMap?: boolean | DevTool;
     /**
      * When `true`, `process.env.NODE_ENV` will be excluded from the bundle. Useful for building a web application to run in a Node environment.
      */

package/src/plugins/utils/plugins/normalize-options.js

@@ -81,7 +81,7 @@ function normalizeOptions(options) {
         sourceMap: combinedPluginAndMaybeExecutorOptions.sourceMap ?? !isProd,
         sourceRoot,
         styles: combinedPluginAndMaybeExecutorOptions.styles ?? [],
-        target: combinedPluginAndMaybeExecutorOptions.target,
+        target: combinedPluginAndMaybeExecutorOptions.target ?? 'web',
         targetName,
         vendorChunk: combinedPluginAndMaybeExecutorOptions.vendorChunk ?? !isProd,
     };

package/src/plugins/utils/plugins/nx-tsconfig-paths-rspack-plugin.js

@@ -16,7 +16,7 @@ class NxTsconfigPathsRspackPlugin {
     apply(compiler) {
         // TODO(Colum): Investigate the best way to handle this, currently it is not working and affecting HMR
         // // If we are not building libs from source, we need to remap paths so tsconfig may be updated.
-        // this.handleBuildLibsFromSource(compiler.options, this.options);
+        this.handleBuildLibsFromSource(compiler.options, this.options);
         const pathToTsconfig = !path.isAbsolute(this.options.tsConfig)
             ? path.join(devkit_1.workspaceRoot, this.options.tsConfig)
             : this.options.tsConfig;
@@ -44,7 +44,8 @@ class NxTsconfigPathsRspackPlugin {
         if (!options.buildLibsFromSource && options.targetName) {
             const remappedTarget = options.targetName === 'serve' ? 'build' : options.targetName;
             const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
-            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
+            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies, true // There is an issue with Rspack that requires the baseUrl to be set in the generated tsconfig
+            );
             this.tmpTsConfigPath = options.tsConfig;
             if (options.targetName === 'serve') {
                 const buildableDependencies = dependencies

package/src/utils/module-federation/build-static.remotes.d.ts

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

package/src/utils/module-federation/public-api.d.ts

@@ -1,8 +1,3 @@
-import { AdditionalSharedConfig, ModuleFederationConfig, ModuleFederationLibrary, Remotes, SharedFunction, SharedLibraryConfig, SharedWorkspaceLibraryConfig, WorkspaceLibrary, WorkspaceLibrarySecondaryEntryPoint } from './models';
-import { applyAdditionalShared, applySharedFunction, getNpmPackageSharedConfig, sharePackages, shareWorkspaceLibraries } from './share';
-import { mapRemotes, mapRemotesForSSR } from './remotes';
-import { getDependentPackagesForProject } from './dependencies';
-import { readRootPackageJson } from './package-json';
 import { withModuleFederation } from './with-module-federation/with-module-federation';
 import { withModuleFederationForSSR } from './with-module-federation/with-module-federation-ssr';
-export { AdditionalSharedConfig, applyAdditionalShared, applySharedFunction, getDependentPackagesForProject, getNpmPackageSharedConfig, mapRemotes, mapRemotesForSSR, ModuleFederationConfig, ModuleFederationLibrary, readRootPackageJson, Remotes, SharedFunction, SharedLibraryConfig, SharedWorkspaceLibraryConfig, sharePackages, shareWorkspaceLibraries, withModuleFederation, withModuleFederationForSSR, WorkspaceLibrary, WorkspaceLibrarySecondaryEntryPoint, };
+export { withModuleFederation, withModuleFederationForSSR };

package/src/utils/module-federation/public-api.js

@@ -1,19 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withModuleFederationForSSR = exports.withModuleFederation = exports.shareWorkspaceLibraries = exports.sharePackages = exports.readRootPackageJson = exports.mapRemotesForSSR = exports.mapRemotes = exports.getNpmPackageSharedConfig = exports.getDependentPackagesForProject = exports.applySharedFunction = exports.applyAdditionalShared = void 0;
-const share_1 = require("./share");
-Object.defineProperty(exports, "applyAdditionalShared", { enumerable: true, get: function () { return share_1.applyAdditionalShared; } });
-Object.defineProperty(exports, "applySharedFunction", { enumerable: true, get: function () { return share_1.applySharedFunction; } });
-Object.defineProperty(exports, "getNpmPackageSharedConfig", { enumerable: true, get: function () { return share_1.getNpmPackageSharedConfig; } });
-Object.defineProperty(exports, "sharePackages", { enumerable: true, get: function () { return share_1.sharePackages; } });
-Object.defineProperty(exports, "shareWorkspaceLibraries", { enumerable: true, get: function () { return share_1.shareWorkspaceLibraries; } });
-const remotes_1 = require("./remotes");
-Object.defineProperty(exports, "mapRemotes", { enumerable: true, get: function () { return remotes_1.mapRemotes; } });
-Object.defineProperty(exports, "mapRemotesForSSR", { enumerable: true, get: function () { return remotes_1.mapRemotesForSSR; } });
-const dependencies_1 = require("./dependencies");
-Object.defineProperty(exports, "getDependentPackagesForProject", { enumerable: true, get: function () { return dependencies_1.getDependentPackagesForProject; } });
-const package_json_1 = require("./package-json");
-Object.defineProperty(exports, "readRootPackageJson", { enumerable: true, get: function () { return package_json_1.readRootPackageJson; } });
+exports.withModuleFederationForSSR = exports.withModuleFederation = void 0;
 const with_module_federation_1 = require("./with-module-federation/with-module-federation");
 Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
 const with_module_federation_ssr_1 = require("./with-module-federation/with-module-federation-ssr");

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

@@ -1,12 +1,12 @@
-import { ModuleFederationConfig } from '../models';
+import { ModuleFederationConfig } from '@nx/module-federation';
 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("../models").SharedWorkspaceLibraryConfig;
+    sharedLibraries: import("@nx/module-federation").SharedWorkspaceLibraryConfig;
     sharedDependencies: {
-        [x: string]: import("../models").SharedLibraryConfig;
+        [x: string]: import("@nx/module-federation").SharedLibraryConfig;
     };
     mappedRemotes: {};
 }>;

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

@@ -4,9 +4,7 @@ exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
 exports.getModuleFederationConfig = getModuleFederationConfig;
 const devkit_1 = require("@nx/devkit");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
-const dependencies_1 = require("../dependencies");
-const remotes_1 = require("../remotes");
-const share_1 = require("../share");
+const module_federation_1 = require("@nx/module-federation");
 function getFunctionDeterminateRemoteUrl(isServer = false) {
     const target = 'serve';
     const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
@@ -48,21 +46,21 @@ async function getModuleFederationConfig(mfConfig, options = { isServer: false }
     if (!project) {
         throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
     }
-    const dependencies = (0, dependencies_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
+    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, share_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
-    const npmPackages = (0, share_1.sharePackages)(dependencies.npmPackages);
+    const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
+    const npmPackages = (0, module_federation_1.sharePackages)(dependencies.npmPackages);
     const sharedDependencies = {
         ...sharedLibraries.getLibraries(project.root),
         ...npmPackages,
     };
-    (0, share_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
-    (0, share_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
+    (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
+    (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
     // Choose the correct mapRemotes function based on the server state.
-    const mapRemotesFunction = options.isServer ? remotes_1.mapRemotesForSSR : remotes_1.mapRemotes;
+    const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
     // Determine the URL function, either from provided options or by using a default.
     const determineRemoteUrlFunction = options.determineRemoteUrl
         ? options.determineRemoteUrl
@@ -70,7 +68,7 @@ async function getModuleFederationConfig(mfConfig, options = { isServer: false }
     // Map the remotes if they exist, otherwise default to an empty object.
     let mappedRemotes = {};
     if (mfConfig.remotes && mfConfig.remotes.length > 0) {
-        mappedRemotes = mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFunction);
+        mappedRemotes = mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFunction, true);
     }
     return { sharedLibraries, sharedDependencies, mappedRemotes };
 }

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

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

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

@@ -44,7 +44,7 @@ async function withModuleFederationForSSR(options, configOverride) {
                 ? [
                     ...(configOverride?.runtimePlugins ?? []),
                     require.resolve('@module-federation/node/runtimePlugin'),
-                    require.resolve('@nx/rspack/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/module-federation/with-module-federation/with-module-federation.d.ts

@@ -1,5 +1,5 @@
 import type { Configuration } from '@rspack/core';
-import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '../models';
+import { ModuleFederationConfig, NxModuleFederationConfigOverride } from '@nx/module-federation';
 import { NxRspackExecutionContext } from '../../config';
 /**
  * @param {ModuleFederationConfig} options

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

@@ -55,7 +55,7 @@ async function withModuleFederation(options, configOverride) {
                 !options.disableNxRuntimeLibraryControlPlugin
                 ? [
                     ...(configOverride?.runtimePlugins ?? []),
-                    require.resolve('@nx/rspack/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,

package/src/utils/module-federation/dependencies.d.ts

@@ -1,6 +0,0 @@
-import type { ProjectGraph } from '@nx/devkit';
-import type { WorkspaceLibrary } from './models';
-export declare function getDependentPackagesForProject(projectGraph: ProjectGraph, name: string): {
-    workspaceLibraries: WorkspaceLibrary[];
-    npmPackages: string[];
-};

package/src/utils/module-federation/dependencies.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependentPackagesForProject = getDependentPackagesForProject;
-const typescript_1 = require("./typescript");
-const devkit_1 = require("@nx/devkit");
-function getDependentPackagesForProject(projectGraph, name) {
-    const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
-    return {
-        workspaceLibraries: [...workspaceLibraries.values()],
-        npmPackages: [...npmPackages],
-    };
-}
-function collectDependencies(projectGraph, name, dependencies = {
-    workspaceLibraries: new Map(),
-    npmPackages: new Set(),
-}, seen = new Set()) {
-    if (seen.has(name)) {
-        return dependencies;
-    }
-    seen.add(name);
-    (projectGraph.dependencies[name] ?? []).forEach((dependency) => {
-        if (dependency.target.startsWith('npm:')) {
-            dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
-        }
-        else {
-            dependencies.workspaceLibraries.set(dependency.target, {
-                name: dependency.target,
-                root: projectGraph.nodes[dependency.target].data.root,
-                importKey: getLibraryImportPath(dependency.target, projectGraph),
-            });
-            collectDependencies(projectGraph, dependency.target, dependencies, seen);
-        }
-    });
-    return dependencies;
-}
-function getLibraryImportPath(library, projectGraph) {
-    let buildLibsFromSource = true;
-    if (process.env.NX_BUILD_LIBS_FROM_SOURCE) {
-        buildLibsFromSource = process.env.NX_BUILD_LIBS_FROM_SOURCE === 'true';
-    }
-    const libraryNode = projectGraph.nodes[library];
-    let sourceRoots = [libraryNode.data.sourceRoot];
-    if (!buildLibsFromSource && process.env.NX_BUILD_TARGET) {
-        const buildTarget = (0, devkit_1.parseTargetString)(process.env.NX_BUILD_TARGET, projectGraph);
-        sourceRoots = (0, devkit_1.getOutputsForTargetAndConfiguration)(buildTarget, {}, libraryNode);
-    }
-    const tsConfigPathMappings = (0, typescript_1.readTsPathMappings)();
-    for (const [key, value] of Object.entries(tsConfigPathMappings)) {
-        for (const src of sourceRoots) {
-            if (value.find((path) => path.startsWith(src))) {
-                return key;
-            }
-        }
-    }
-    return undefined;
-}

package/src/utils/module-federation/get-remotes-for-host.d.ts

@@ -1,16 +0,0 @@
-import { type ProjectGraph } from '@nx/devkit';
-import { ModuleFederationConfig } from './models';
-interface ModuleFederationExecutorContext {
-    projectName: string;
-    projectGraph: ProjectGraph;
-    root: string;
-}
-export declare function getRemotes(devRemotes: string[], skipRemotes: string[], config: ModuleFederationConfig, context: ModuleFederationExecutorContext, pathToManifestFile?: string): {
-    staticRemotes: string[];
-    devRemotes: any[];
-    dynamicRemotes: any[];
-    remotePorts: any[];
-    staticRemotePort: number;
-};
-export declare function getModuleFederationConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, pluginName?: 'react' | 'angular'): any;
-export {};