@nx/rspack 23.1.0 → 23.1.1

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/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/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/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.1",
   "type": "commonjs",
   "files": [
     "dist",
@@ -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.1",
+    "@nx/web": "23.1.1",
+    "@nx/module-federation": "23.1.1",
+    "@nx/js": "23.1.1"
   },
   "devDependencies": {
-    "nx": "23.1.0",
-    "@nx/nest": "23.1.0"
+    "nx": "23.1.1",
+    "@nx/nest": "23.1.1"
   },
   "peerDependencies": {
     "@rspack/cli": "^1.0.0 || ^2.0.0",