@nx/rspack 23.1.0 → 23.1.2

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

@@ -1,5 +1,5 @@
+import { ExecutorContext } from '@nx/devkit';
 import { StaticRemotesConfig } from '@nx/module-federation/internal';
-import { ExecutorContext } from 'nx/src/config/misc-interfaces';
 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/dist/src/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -1,5 +1,4 @@
-import { type Tree } from '@nx/devkit';
-import { logger as devkitLogger } from 'nx/src/devkit-exports';
+import { type Tree, logger as devkitLogger } from '@nx/devkit';
 interface Schema {
     project?: string;
     skipFormat?: boolean;

package/dist/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -8,7 +8,6 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const utils_1 = require("./utils");
-const devkit_exports_1 = require("nx/src/devkit-exports");
 const assert_supported_rspack_version_1 = require("../../utils/assert-supported-rspack-version");
 async function convertToInferred(tree, options) {
     (0, assert_supported_rspack_version_1.assertSupportedRspackVersion)(tree);
@@ -97,12 +96,12 @@ function createCollectingLogger() {
         loggedMessages.forEach((messages, method) => {
             messages.forEach((message) => {
                 if (!filter || filter(message)) {
-                    devkit_exports_1.logger[method](message);
+                    devkit_1.logger[method](message);
                 }
             });
         });
     };
-    return new Proxy({ ...devkit_exports_1.logger, loggedMessages, flushLogs }, {
+    return new Proxy({ ...devkit_1.logger, loggedMessages, flushLogs }, {
         get(target, property) {
             const originalMethod = target[property];
             if (typeof originalMethod === 'function') {

package/dist/src/plugins/plugin.js

@@ -6,9 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const package_manager_1 = require("nx/src/utils/package-manager");
 const path_1 = require("path");
 const read_rspack_options_1 = require("../utils/read-rspack-options");
 const resolve_user_defined_rspack_config_1 = require("../utils/resolve-user-defined-rspack-config");
@@ -20,12 +17,12 @@ const rspackConfigGlob = '**/rspack.config.{js,ts,mjs,mts,cjs,cts}';
 exports.createNodes = [
     rspackConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, file_hasher_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `rspack-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `rspack-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
-        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFilePaths, options, context);
@@ -52,12 +49,12 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
     }
     const normalizedOptions = normalizeOptions(options);
-    const lockFileHash = (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
-    const nodeHash = (0, file_hasher_1.hashArray)([
-        (0, file_hasher_1.hashFile)((0, path_1.join)(context.workspaceRoot, configFilePath)),
+    const lockFileHash = (0, internal_1.hashFile)((0, path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
+    const nodeHash = (0, devkit_1.hashArray)([
+        (0, internal_1.hashFile)((0, path_1.join)(context.workspaceRoot, configFilePath)),
         lockFileHash,
-        (0, file_hasher_1.hashObject)({ ...options, isTsSolutionSetup }),
-        (0, file_hasher_1.hashObject)(packageJson),
+        (0, internal_1.hashObject)({ ...options, isTsSolutionSetup }),
+        (0, internal_1.hashObject)(packageJson),
     ]);
     // We do not want to alter how the hash is calculated, so appending the config file path to the hash
     // to prevent vite/vitest files overwriting the target cache created by the other

package/dist/src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLegacyNxPlugin = useLegacyNxPlugin;
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../utils/plugins/normalize-options");
-const configuration_1 = require("nx/src/config/configuration");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * This function is used to wrap the legacy plugin function to be used with the `composePlugins` function.
  * Initially the rspack config would be passed to the legacy plugin function and the options would be passed as a second argument.
@@ -44,7 +44,7 @@ async function useLegacyNxPlugin(fn, executorOptions) {
         root: devkit_1.workspaceRoot,
         projectGraph,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         target: project.data.targets[targetName],
         targetName: targetName,
         projectName: projectName,

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

@@ -6,6 +6,7 @@ const path = tslib_1.__importStar(require("path"));
 const license_webpack_plugin_1 = require("license-webpack-plugin");
 const js_1 = require("@nx/js");
 const version_utils_1 = require("../../utils/version-utils");
+const load_rspack_core_1 = require("../../utils/load-rspack-core");
 const stats_json_plugin_1 = require("./plugins/stats-json-plugin");
 const generate_package_json_plugin_1 = require("./plugins/generate-package-json-plugin");
 const hash_format_1 = require("./hash-format");
@@ -36,10 +37,8 @@ function applyBaseConfig(options, config = {}, { useNormalizedEntry, compiler, }
     options.progress ??= true;
     options.outputHashing ??= 'all';
     // Lazy-require avoids loading @rspack/core (pure ESM in v2) at module
-    // parse time, so Jest can still load this file.
-    const rspackCore = compiler
-        ? compiler.rspack
-        : require('@rspack/core');
+    // parse time, so Jest can still load this file. See load-rspack-core.ts.
+    const rspackCore = (0, load_rspack_core_1.loadRspackCore)(compiler);
     applyNxIndependentConfig(options, config, rspackCore);
     // Some of the options only work during actual tasks, not when reading the rspack config during CreateNodes.
     if (global.NX_GRAPH_CREATION)

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

@@ -8,15 +8,15 @@ const hash_format_1 = require("./hash-format");
 const instantiate_script_plugins_1 = require("./instantiate-script-plugins");
 const stylesheet_loaders_1 = require("./loaders/stylesheet-loaders");
 const normalize_entry_1 = require("./normalize-entry");
+const load_rspack_core_1 = require("../../utils/load-rspack-core");
 function applyWebConfig(options, config = {}, { useNormalizedEntry, compiler, } = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
     // Prefer compiler.rspack when available; otherwise lazy-require
     // @rspack/core (works on Node 22.12+ via require(esm), and keeps the
     // file Jest-loadable since the require is inside the function body).
-    const rspackCore = compiler
-        ? compiler.rspack
-        : require('@rspack/core');
+    // See load-rspack-core.ts.
+    const rspackCore = (0, load_rspack_core_1.loadRspackCore)(compiler);
     const { CssExtractRspackPlugin, DefinePlugin, EnvironmentPlugin, HtmlRspackPlugin, LightningCssMinimizerRspackPlugin, } = rspackCore;
     const cssExtractLoader = CssExtractRspackPlugin.loader;
     // Defaults that was applied from executor schema previously.

package/dist/src/plugins/utils/get-non-buildable-libs.js

@@ -16,12 +16,24 @@ function resolveConditionalExport(target) {
     if (typeof target === 'string') {
         return target;
     }
+    // Fallback arrays: take the first non-empty target. Node resolves them in
+    // order on disk; for the allowlist any valid target marks the subpath.
+    if (Array.isArray(target)) {
+        for (const candidate of target) {
+            const resolved = resolveConditionalExport(candidate);
+            if (resolved) {
+                return resolved;
+            }
+        }
+        return null;
+    }
     if (typeof target === 'object' && target !== null) {
         // Priority order for conditions
         const conditions = ['development', 'import', 'require', 'default'];
         for (const condition of conditions) {
-            if (target[condition] && typeof target[condition] === 'string') {
-                return target[condition];
+            const resolved = resolveConditionalExport(target[condition]);
+            if (resolved) {
+                return resolved;
             }
         }
     }

package/dist/src/plugins/utils/loaders/stylesheet-loaders.d.ts

@@ -12,6 +12,8 @@ export declare function getCommonLoadersForCssModules(options: any, includePaths
         modules: {
             mode: string;
             getLocalIdent: typeof getCSSModuleLocalIdent;
+            namedExport: boolean;
+            exportLocalsConvention: string;
         };
         importLoaders: number;
         implementation?: undefined;

package/dist/src/plugins/utils/loaders/stylesheet-loaders.js

@@ -24,6 +24,11 @@ function getCommonLoadersForCssModules(options, includePaths, cssExtractLoader)
                 modules: {
                     mode: 'local',
                     getLocalIdent: get_css_module_local_ident_1.getCSSModuleLocalIdent,
+                    // css-loader 7 defaults namedExport to true, and to camel-case-only
+                    // locals when it is off. Generated components import the default
+                    // export and reference class names as authored, so pin both.
+                    namedExport: false,
+                    exportLocalsConvention: 'asIs',
                 },
                 importLoaders: 1,
             },

package/dist/src/plugins/utils/plugins/postcss-cli-resources.js

@@ -4,7 +4,6 @@ exports.PostcssCliResources = PostcssCliResources;
 const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
 const path = tslib_1.__importStar(require("path"));
-const url_1 = require("url");
 function wrapUrl(url) {
     let wrappedUrl;
     const hasSingleQuotes = url.indexOf("'") >= 0;
@@ -80,14 +79,19 @@ function PostcssCliResources(options) {
         // Separate URL query/hash from the file path before resolving
         const [, filePath, urlSuffix] = inputUrl.match(/^([^?#]*)(.*)$/);
         const resolvedPath = path.resolve(context, filePath.replace(/\\/g, '/'));
-        const { pathname } = (0, url_1.pathToFileURL)(resolvedPath);
+        // Resolve a relative filesystem path, not a file:// URL pathname: on Windows the
+        // pathname is `/C:/...` (spaces as %20), which the resolver cannot find. Relative
+        // (not absolute) lets `resolve()`'s `./`-prefixed lookup succeed on the first try.
+        const resolveRequest = path
+            .relative(context, resolvedPath)
+            .replace(/\\/g, '/');
         let hash = '';
         let search = '';
         if (urlSuffix) {
             ({ hash, search } = new URL(`file:///dummy${urlSuffix}`));
         }
         const resolver = (file, base) => new Promise((resolve, reject) => {
-            loader.resolve(base, decodeURI(file), (err, result) => {
+            loader.resolve(base, file, (err, result) => {
                 if (err) {
                     reject(err);
                     return;
@@ -95,7 +99,7 @@ function PostcssCliResources(options) {
                 resolve(result);
             });
         });
-        const result = await resolve(pathname, context, resolver);
+        const result = await resolve(resolveRequest, context, resolver);
         return new Promise((resolve, reject) => {
             loader.fs.readFile(result, (err, content) => {
                 if (err) {

package/dist/src/plugins/utils/plugins/rspack-nx-build-coordination-plugin.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RspackNxBuildCoordinationPlugin = void 0;
 const child_process_1 = require("child_process");
-const client_1 = require("nx/src/daemon/client/client");
-const watch_1 = require("nx/src/command-line/watch/watch");
-const output_1 = require("nx/src/utils/output");
+const internal_1 = require("@nx/devkit/internal");
+const devkit_1 = require("@nx/devkit");
 class RspackNxBuildCoordinationPlugin {
     constructor(buildCmd, skipInitialBuild) {
         this.buildCmd = buildCmd;
@@ -13,11 +12,11 @@ class RspackNxBuildCoordinationPlugin {
         if (!skipInitialBuild) {
             this.buildChangedProjects();
         }
-        if ((0, client_1.isDaemonEnabled)()) {
+        if ((0, devkit_1.isDaemonEnabled)()) {
             this.startWatchingBuildableLibs();
         }
         else {
-            output_1.output.warn({
+            devkit_1.output.warn({
                 title: 'Nx Daemon is not enabled. Buildable libs will not be rebuilt on file changes.',
             });
         }
@@ -65,8 +64,8 @@ class RspackNxBuildCoordinationPlugin {
         }
     }
     createFileWatcher() {
-        const runner = new watch_1.BatchFunctionRunner(() => this.buildChangedProjects());
-        return client_1.daemonClient.registerFileWatcher({
+        const runner = new internal_1.BatchFunctionRunner(() => this.buildChangedProjects());
+        return internal_1.daemonClient.registerFileWatcher({
             watchProjects: 'all',
         }, (err, { changedProjects, changedFiles }) => {
             if (err === 'reconnecting') {
@@ -78,13 +77,13 @@ class RspackNxBuildCoordinationPlugin {
                 return;
             }
             else if (err === 'closed') {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: 'Failed to reconnect to daemon after multiple attempts',
                 });
                 process.exit(1);
             }
             else if (err) {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: `Watch error: ${err?.message ?? 'Unknown'}`,
                 });
             }

package/dist/src/utils/config.js

@@ -6,8 +6,8 @@ exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
-const configuration_1 = require("nx/src/config/configuration");
 const deprecation_1 = require("./deprecation");
+const internal_2 = require("@nx/devkit/internal");
 exports.nxRspackComposablePlugin = 'nxRspackComposablePlugin';
 function isNxRspackComposablePlugin(a) {
     return a?.[exports.nxRspackComposablePlugin] === true;
@@ -80,7 +80,7 @@ function ensureNxRspackExecutionContext(ctx) {
         targetName,
         configurationName,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_2.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         cwd: process.cwd(),
         root: devkit_1.workspaceRoot,
         isVerbose: process.env['NX_VERBOSE_LOGGING'] === 'true',

package/dist/src/utils/create-compiler.d.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import { type Compiler, type MultiCompiler } from '@rspack/core';
+import type { Compiler, MultiCompiler } from '@rspack/core';
 import { NormalizedRspackExecutorSchema } from '../executors/rspack/schema';
 export declare function createCompiler(options: NormalizedRspackExecutorSchema & {
     devServer?: any;

package/dist/src/utils/create-compiler.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompiler = createCompiler;
 exports.isMultiCompiler = isMultiCompiler;
-const core_1 = require("@rspack/core");
 const config_1 = require("../executors/rspack/lib/config");
+const load_rspack_core_1 = require("./load-rspack-core");
 async function createCompiler(options, context) {
     const config = await (0, config_1.getRspackConfigs)(options, context);
     if (!options.standardRspackConfigFunction) {
         validateConfig(config);
     }
-    return (0, core_1.rspack)(config);
+    // Lazy-loaded to avoid resolving @rspack/core (pure ESM) before a build runs; see load-rspack-core.ts.
+    const { rspack } = (0, load_rspack_core_1.loadRspackCore)();
+    return rspack(config);
 }
 function isMultiCompiler(compiler) {
     return 'compilers' in compiler;

package/dist/src/utils/load-rspack-core.d.ts

@@ -0,0 +1,2 @@
+import type { Compiler } from '@rspack/core';
+export declare function loadRspackCore(compiler?: Pick<Compiler, 'rspack'>): typeof import('@rspack/core');

package/dist/src/utils/load-rspack-core.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadRspackCore = loadRspackCore;
+// @rspack/core v2 is pure ESM; lazy-require avoids resolving it before a Compiler exists.
+function loadRspackCore(compiler) {
+    // Reuse the compiler's already-resolved module to avoid ending up with a second, possibly different copy.
+    return compiler
+        ? compiler.rspack
+        : require('@rspack/core');
+}

package/dist/src/utils/read-rspack-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRspackOptions = readRspackOptions;
 const devkit_1 = require("@nx/devkit");
 const config_1 = require("./config");
-const devkit_internals_1 = require("nx/src/devkit-internals");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * Reads the Rspack options from a give Rspack configuration. The configuration can be:
  * 1. A single standard config object
@@ -36,7 +36,7 @@ async function readRspackOptions(rspackConfig) {
                     root: devkit_1.workspaceRoot,
                     cwd: undefined,
                     isVerbose: false,
-                    nxJsonConfiguration: (0, devkit_internals_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
+                    nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
                     projectGraph: null,
                     projectsConfigurations: null,
                 },

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": "23.1.0",
+  "version": "23.1.2",
   "type": "commonjs",
   "files": [
     "dist",
@@ -130,10 +130,10 @@
     "@phenomnomnominal/tsquery": "~6.2.0",
     "autoprefixer": "^10.4.9",
     "browserslist": "^4.26.0",
-    "css-loader": "^6.4.0",
+    "css-loader": "^7.1.4",
     "enquirer": "~2.3.6",
     "express": "^4.21.2",
-    "http-proxy-middleware": "^3.0.5",
+    "http-proxy-middleware": "^3.0.7",
     "less-loader": "^12.2.0",
     "license-webpack-plugin": "^4.0.2",
     "loader-utils": "^2.0.3",
@@ -152,14 +152,14 @@
     "tslib": "^2.3.0",
     "webpack": "5.105.2",
     "webpack-node-externals": "^3.0.0",
-    "@nx/devkit": "23.1.0",
-    "@nx/js": "23.1.0",
-    "@nx/module-federation": "23.1.0",
-    "@nx/web": "23.1.0"
+    "@nx/devkit": "23.1.2",
+    "@nx/module-federation": "23.1.2",
+    "@nx/web": "23.1.2",
+    "@nx/js": "23.1.2"
   },
   "devDependencies": {
-    "nx": "23.1.0",
-    "@nx/nest": "23.1.0"
+    "nx": "23.1.2",
+    "@nx/nest": "23.1.2"
   },
   "peerDependencies": {
     "@rspack/cli": "^1.0.0 || ^2.0.0",