@nuxt/rspack-builder 3.21.1 → 3.21.2

package/dist/index.mjs

@@ -3,13 +3,12 @@ import pify from "pify";
 import webpackDevMiddleware from "webpack-dev-middleware";
 import webpackHotMiddleware from "webpack-hot-middleware";
 import { defu } from "defu";
-import { joinURL, parseURL, withTrailingSlash } from "ufo";
+import { joinURL, withTrailingSlash } from "ufo";
 import { directoryToURL, logger, resolveAlias, useNitro, useNuxt } from "@nuxt/kit";
 import { createUnplugin } from "unplugin";
 import MagicString from "magic-string";
 import { MiniCssExtractPlugin, TsCheckerPlugin, WebpackBarPlugin, builder, webpack } from "#builder";
 import { existsSync, readFileSync } from "node:fs";
-import { pathToFileURL } from "node:url";
 import { isAbsolute, join, normalize, relative, resolve } from "pathe";
 import { genArrayFromRaw, genObjectFromRawEntries, genString } from "knitwork";
 import { compileStyle, parse } from "@vue/compiler-sfc";
@@ -33,6 +32,7 @@ import { normalizeWebpackManifest, precomputeDependencies } from "vue-bundle-ren
 import { hash } from "ohash";
 import { serialize } from "seroval";
 import { parseNodeModulePath } from "mlly";
+//#region ../webpack/src/plugins/dynamic-base.ts
 const defaults = {
 	globalPublicPath: "__webpack_public_path__",
 	sourcemap: true
@@ -62,6 +62,8 @@ const DynamicBasePlugin = createUnplugin((options = {}) => {
 		}
 	};
 });
+//#endregion
+//#region ../webpack/src/plugins/chunk.ts
 const pluginName = "ChunkErrorPlugin";
 var ChunkErrorPlugin = class {
 	apply(compiler) {
@@ -93,19 +95,40 @@ if (typeof ${ensureChunk} !== "undefined") {
 `;
 	}
 };
+//#endregion
+//#region ../nuxt/src/core/utils/plugins.ts
+/**
+* Split a bundler module ID into its pathname and search (query) parts.
+*
+* Module IDs from Vite/webpack are already-normalized filesystem paths
+* that may carry query strings (e.g. `?vue&type=style&lang=css`).
+*/
+function parseModuleId(id) {
+	const qIndex = id.indexOf("?");
+	if (qIndex === -1) return {
+		pathname: id,
+		search: ""
+	};
+	return {
+		pathname: id.slice(0, qIndex),
+		search: id.slice(qIndex)
+	};
+}
+//#endregion
+//#region ../webpack/src/plugins/ssr-styles.ts
 const CSS_URL_RE = /url\((['"]?)(\/[^)]+?)\1\)/g;
 const isVueFile = (id) => /\.vue(?:\?|$)/.test(id);
 const isCSSLike = (name) => /\.(?:css|scss|sass|less|styl(?:us)?|postcss|pcss)(?:\?|$)/.test(name);
 function normalizePath(nuxt, id) {
 	if (!id) return null;
-	const { pathname } = parseURL(decodeURIComponent(pathToFileURL(id).href));
+	const { pathname } = parseModuleId(id);
 	const rel = relative(nuxt.options.srcDir, pathname);
 	if (rel.startsWith("..")) return null;
 	return rel;
 }
 function resolveFilePath(id) {
 	if (!id) return null;
-	return parseURL(decodeURIComponent(pathToFileURL(id).href)).pathname || null;
+	return parseModuleId(normalize(id)).pathname || null;
 }
 function sanitizeStyleAssetName(rel) {
 	return rel.replace(/[\\/]/g, "_").replace(/\.{2,}/g, "_");
@@ -232,11 +255,6 @@ var SSRStylesPlugin = class {
 		}
 		return null;
 	}
-	normalizeResourcePath(resource) {
-		if (!resource) return null;
-		const withoutQuery = resource.split("?")[0];
-		return resolveFilePath(withoutQuery);
-	}
 	apply(compiler) {
 		if (this.nuxt.options.dev) return;
 		const isClient = compiler.options.name === "client";
@@ -410,6 +428,8 @@ var SSRStylesPlugin = class {
 		return cssChunks;
 	}
 };
+//#endregion
+//#region ../webpack/src/utils/mfs.ts
 function createMFS() {
 	const _fs = { ...createFsFromVolume(new Volume()) };
 	_fs.join = join;
@@ -417,9 +437,14 @@ function createMFS() {
 	_fs.readFile = pify(_fs.readFile);
 	return _fs;
 }
+//#endregion
+//#region ../webpack/src/utils/index.ts
+/** @since 3.9.0 */
 function toArray(value) {
 	return Array.isArray(value) ? value : [value];
 }
+//#endregion
+//#region ../webpack/src/utils/config.ts
 function createWebpackConfigContext(nuxt) {
 	return {
 		nuxt,
@@ -447,6 +472,8 @@ function fileName(ctx, key) {
 	}
 	return fileName;
 }
+//#endregion
+//#region ../webpack/src/presets/assets.ts
 function assets(ctx) {
 	ctx.config.module.rules.push({
 		test: /\.(png|jpe?g|gif|svg|webp)$/i,
@@ -477,6 +504,8 @@ function assets(ctx) {
 		}]
 	});
 }
+//#endregion
+//#region ../webpack/src/plugins/warning-ignore.ts
 var WarningIgnorePlugin = class {
 	filter;
 	constructor(filter) {
@@ -488,6 +517,12 @@ var WarningIgnorePlugin = class {
 		});
 	}
 };
+//#endregion
+//#region ../webpack/src/plugins/vue/util.ts
+/**
+* This file is based on Vue.js (MIT) webpack plugins
+* https://github.com/vuejs/vue/blob/dev/src/server/webpack-plugin/util.js
+*/
 const validate = (compiler) => {
 	if (compiler.options.target !== "node") logger.warn("webpack config `target` should be \"node\".");
 	if (!compiler.options.externals) logger.info("It is recommended to externalize dependencies in the server build for better build performance.");
@@ -498,10 +533,17 @@ const extractQueryPartJS = (file) => isJSRegExp.exec(file)?.[1];
 const isCSSRegExp = /\.css(?:\?[^.]+)?$/;
 const isCSS = (file) => isCSSRegExp.test(file);
 const isHotUpdate = (file) => file.includes("hot-update");
+//#endregion
+//#region ../webpack/src/plugins/rollup-compat-dynamic-import.ts
 const DYNAMIC_IMPORT_RE = /import\([^)]*\+\s*__webpack_require__[^+]*\)\.then/;
 const DYNAMIC_IMPORT_REPLACE_RE = /import\([^)]*\+\s*(__webpack_require__[^+]*)\)\.then/g;
 const HELPER_FILENAME = "_dynamic-import-helper.mjs";
 const HELPER_IMPORT = `import { _rollupDynamicImport } from "./${HELPER_FILENAME}";\n`;
+/**
+* Webpack plugin that generates rollup-compatible dynamic imports.
+* This plugin uses webpack's native compilation hooks to override dynamic import generation
+* and create rollup-compatible code directly during webpack's compilation process.
+*/
 var RollupCompatDynamicImportPlugin = class {
 	apply(compiler) {
 		compiler.hooks.compilation.tap("RollupCompatDynamicImportPlugin", (compilation) => {
@@ -569,6 +611,8 @@ export function _rollupDynamicImport(chunkId) {
 `;
 	}
 };
+//#endregion
+//#region ../webpack/src/presets/base.ts
 async function base(ctx) {
 	await applyPresets(ctx, [
 		baseAlias,
@@ -739,6 +783,8 @@ const statsMap = {
 	info: "normal",
 	verbose: "verbose"
 };
+//#endregion
+//#region ../webpack/src/presets/esbuild.ts
 function esbuild(ctx) {
 	const target = ctx.isServer ? "es2020" : "chrome85";
 	ctx.config.optimization.minimizer.push(new EsbuildPlugin());
@@ -766,6 +812,8 @@ function esbuild(ctx) {
 		}
 	});
 }
+//#endregion
+//#region ../webpack/src/presets/pug.ts
 function pug(ctx) {
 	ctx.config.module.rules.push({
 		test: /\.pug$/i,
@@ -781,6 +829,8 @@ function pug(ctx) {
 		}] }]
 	});
 }
+//#endregion
+//#region ../webpack/src/utils/postcss.ts
 const isPureObject = (obj) => obj !== null && !Array.isArray(obj) && typeof obj === "object";
 function sortPlugins({ plugins, order }) {
 	const names = Object.keys(plugins);
@@ -826,6 +876,8 @@ async function getPostcssConfig(nuxt) {
 		postcssOptions
 	};
 }
+//#endregion
+//#region ../webpack/src/presets/style.ts
 async function style(ctx) {
 	await applyPresets(ctx, [
 		loaders,
@@ -905,6 +957,12 @@ async function createPostcssLoadersRule(ctx) {
 		options: config
 	};
 }
+//#endregion
+//#region ../webpack/src/plugins/vue/client.ts
+/**
+* This file is based on Vue.js (MIT) webpack plugins
+* https://github.com/vuejs/vue/blob/dev/src/server/webpack-plugin/client.js
+*/
 var VueSSRClientPlugin = class {
 	serverDist;
 	nuxt;
@@ -987,6 +1045,8 @@ var VueSSRClientPlugin = class {
 		});
 	}
 };
+//#endregion
+//#region ../webpack/src/plugins/vue/server.ts
 const JS_MAP_RE = /\.js\.map$/;
 var VueSSRServerPlugin = class {
 	options;
@@ -1035,6 +1095,8 @@ var VueSSRServerPlugin = class {
 		});
 	}
 };
+//#endregion
+//#region ../webpack/src/presets/vue.ts
 function vue(ctx) {
 	ctx.config.plugins.push(new (VueLoaderPlugin.default || VueLoaderPlugin)());
 	ctx.config.module.rules.push({
@@ -1064,6 +1126,8 @@ function vue(ctx) {
 		"__VUE_PROD_HYDRATION_MISMATCH_DETAILS__": ctx.nuxt.options.debug && ctx.nuxt.options.debug.hydration
 	}));
 }
+//#endregion
+//#region ../webpack/src/presets/nuxt.ts
 async function nuxt(ctx) {
 	await applyPresets(ctx, [
 		base,
@@ -1074,6 +1138,8 @@ async function nuxt(ctx) {
 		vue
 	]);
 }
+//#endregion
+//#region ../webpack/src/configs/client.ts
 async function client(ctx) {
 	ctx.name = "client";
 	ctx.isClient = true;
@@ -1179,6 +1245,8 @@ function clientPlugins(ctx) {
 		if (!ctx.nuxt.options.test && (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev)) ctx.config.plugins.push(new TsCheckerPlugin({ logger }));
 	}
 }
+//#endregion
+//#region ../webpack/src/presets/node.ts
 function node(ctx) {
 	ctx.config.target = "node";
 	ctx.config.node = false;
@@ -1207,6 +1275,8 @@ function node(ctx) {
 		maxAssetSize: Number.POSITIVE_INFINITY
 	};
 }
+//#endregion
+//#region ../webpack/src/configs/server.ts
 const assetPattern = /\.(?:css|s[ca]ss|png|jpe?g|gif|svg|woff2?|eot|ttf|otf|webp|webm|mp4|ogv)(?:\?.*)?$/i;
 const VIRTUAL_RE = /^\0?virtual:(?:nuxt:)?/;
 async function server(ctx) {
@@ -1296,6 +1366,8 @@ function serverPlugins(ctx) {
 	}));
 	if (!ctx.nuxt.options.test && (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev)) ctx.config.plugins.push(new TsCheckerPlugin({ logger }));
 }
+//#endregion
+//#region ../webpack/src/webpack.ts
 const bundle = async (nuxt) => {
 	const webpackConfigs = await Promise.all([client, ...nuxt.options.ssr ? [server] : []].map(async (preset) => {
 		const ctx = createWebpackConfigContext(nuxt);
@@ -1303,6 +1375,7 @@ const bundle = async (nuxt) => {
 		await applyPresets(ctx, preset);
 		return ctx.config;
 	}));
+	/** Remove Nitro rollup plugin for handling dynamic imports from webpack chunks */
 	if (!nuxt.options.dev) useNitro().hooks.hook("rollup:before", (_nitro, config) => {
 		const plugins = config.plugins;
 		const existingPlugin = plugins.findIndex((i) => i && "name" in i && i.name === "dynamic-require");
@@ -1365,10 +1438,6 @@ function wdmToH3Handler(devMiddleware) {
 			res.end("Forbidden");
 			return;
 		}
-		event.context.webpack = {
-			...event.context.webpack,
-			devMiddleware: devMiddleware.context
-		};
 		return await new Promise((resolve, reject) => {
 			res.stream = (stream) => {
 				resolve(stream);
@@ -1433,4 +1502,5 @@ async function compile(compiler) {
 function defineEventHandler(handler) {
 	return Object.assign(handler, { __is_handler__: true });
 }
+//#endregion
 export { bundle };

package/dist/loaders/vue-module-identifier.mjs

@@ -1,4 +1,5 @@
 import { normalize, relative } from "pathe";
+//#region ../webpack/src/loaders/vue-module-identifier.ts
 const vueModuleIdentifierLoader = function(source) {
 	this.cacheable?.();
 	const { srcDir } = this.getOptions() || {};
@@ -8,4 +9,5 @@ const vueModuleIdentifierLoader = function(source) {
 	const moduleId = normalize(context ? relative(context, resourcePath) : resourcePath).replace(/^\.\//, "").replace(/\\/g, "/");
 	return source + `\n;__exports__.__moduleIdentifier = ${JSON.stringify(moduleId)};`;
 };
+//#endregion
 export { vueModuleIdentifierLoader as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/rspack-builder",
-  "version": "3.21.1",
+  "version": "3.21.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -25,12 +25,12 @@
   ],
   "dependencies": {
     "@nuxt/friendly-errors-webpack-plugin": "^2.6.0",
-    "@rspack/core": "^1.7.5",
-    "@vue/compiler-sfc": "3.5.27",
-    "autoprefixer": "^10.4.24",
-    "css-loader": "^7.1.3",
-    "css-minimizer-webpack-plugin": "^7.0.4",
-    "cssnano": "^7.1.2",
+    "@rspack/core": "^1.7.8",
+    "@vue/compiler-sfc": "3.5.30",
+    "autoprefixer": "^10.4.27",
+    "css-loader": "^7.1.4",
+    "css-minimizer-webpack-plugin": "^8.0.0",
+    "cssnano": "^7.1.3",
     "defu": "^6.1.4",
     "esbuild-loader": "^4.4.2",
     "escape-string-regexp": "^5.0.0",
@@ -39,21 +39,21 @@
     "jiti": "^2.6.1",
     "knitwork": "^1.3.0",
     "magic-string": "^0.30.21",
-    "memfs": "^4.56.10",
-    "mlly": "^1.8.0",
+    "memfs": "^4.56.11",
+    "mlly": "^1.8.1",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "pify": "^6.1.0",
-    "postcss": "^8.5.6",
+    "postcss": "^8.5.8",
     "postcss-import": "^16.1.1",
     "postcss-import-resolver": "^2.0.0",
-    "postcss-loader": "^8.2.0",
+    "postcss-loader": "^8.2.1",
     "postcss-url": "^10.1.3",
     "pug-plain-loader": "^1.1.0",
-    "seroval": "^1.5.0",
-    "std-env": "^3.10.0",
+    "seroval": "^1.5.1",
+    "std-env": "^4.0.0",
     "time-fix-plugin": "^2.0.7",
-    "ts-checker-rspack-plugin": "^1.2.6",
+    "ts-checker-rspack-plugin": "^1.3.0",
     "ufo": "^1.6.3",
     "unenv": "^2.0.0-rc.24",
     "unplugin": "^3.0.0",
@@ -64,22 +64,22 @@
     "webpack-dev-middleware": "^7.4.5",
     "webpack-hot-middleware": "^2.26.1",
     "webpackbar": "^7.0.0",
-    "@nuxt/kit": "3.21.1"
+    "@nuxt/kit": "3.21.2"
   },
   "devDependencies": {
     "@types/pify": "6.1.0",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.12",
-    "h3": "1.15.5",
-    "h3-next": "npm:h3@2.0.1-rc.14",
-    "obuild": "0.4.27",
-    "rollup": "4.57.1",
-    "vue": "3.5.27",
-    "@nuxt/schema": "3.21.1"
+    "h3": "1.15.6",
+    "h3-next": "npm:h3@2.0.1-rc.16",
+    "obuild": "0.4.32",
+    "rollup": "4.59.0",
+    "vue": "3.5.30",
+    "@nuxt/schema": "3.21.2"
   },
   "peerDependencies": {
     "vue": "^3.3.4",
-    "nuxt": "3.21.1"
+    "nuxt": "3.21.2"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"