@nuxt/webpack-builder-nightly 5.0.0-29743829.e99b20d2 → 5.0.0-29745181.e6d3afa3

package/dist/index.d.mts

@@ -1,3 +1,7 @@
+import VueLoaderPlugin from "vue-loader/dist/pluginWebpack5.js";
+import webpack from "webpack";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import TsCheckerPlugin from "fork-ts-checker-webpack-plugin";
 import webpackDevMiddleware, { IncomingMessage, ServerResponse } from "webpack-dev-middleware";
 import { NuxtBuilder } from "@nuxt/schema";
 //#region src/webpack.d.ts

package/dist/index.mjs

@@ -1,4 +1,11 @@
 import { createRequire } from "node:module";
+import { resolveModulePath } from "exsolve";
+import hashSum from "hash-sum";
+import VueLoaderPlugin from "vue-loader/dist/pluginWebpack5.js";
+import webpack from "webpack";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import WebpackBarPlugin from "webpackbar";
+import TsCheckerPlugin from "fork-ts-checker-webpack-plugin";
 import pify from "pify";
 import { defu } from "defu";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -7,7 +14,6 @@ import { joinURL, withTrailingSlash } from "ufo";
 import { DEFAULT_JS_FILE_EXTENSIONS, bundlerDiagnostics, configDiagnostics, directoryToURL, logger, resolveAlias, setBuildOutput, useNitro, useNuxt } from "@nuxt/kit";
 import { createUnplugin } from "unplugin";
 import { generateTransform, rolldownString } from "rolldown-string";
-import { MiniCssExtractPlugin, TsCheckerPlugin, VueLoaderPlugin, WebpackBarPlugin, builder, createRsbuild, getVueLoaderHash, vueLoader, webpack } from "#builder";
 import { existsSync, readFileSync } from "node:fs";
 import process from "node:process";
 import { genArrayFromRaw, genObjectFromRawEntries, genString } from "knitwork";
@@ -17,7 +23,6 @@ import querystring from "node:querystring";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import { defineEnv } from "unenv";
 import { parseNodeModulePath } from "mlly";
-import { resolveModulePath } from "exsolve";
 import TimeFixPlugin from "time-fix-plugin";
 import FriendlyErrorsWebpackPlugin from "@nuxt/friendly-errors-webpack-plugin";
 import escapeRegExp from "escape-string-regexp";
@@ -29,6 +34,35 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { normalizeWebpackManifest, precomputeDependencies } from "vue-bundle-renderer";
 import { hash } from "ohash";
 import { serialize } from "seroval";
+//#region src/builder-registry.ts
+let _impl;
+/**
+* Injects the bundler implementation used by all modules in this package.
+*
+* Must be called before `builder.ts` is evaluated. Each builder package does
+* this by importing its `impl.ts` (which calls `setBuilderImpl` as a side
+* effect) as the first import of its entry module.
+*/
+function setBuilderImpl(impl) {
+	_impl = impl;
+}
+function getBuilderImpl() {
+	if (!_impl) throw new Error("Builder implementation is not set. Import the builder package entry (or its `impl.ts`) before any module that uses the builder bindings.");
+	return _impl;
+}
+setBuilderImpl({
+	builder: "webpack",
+	webpack,
+	createRsbuild: void 0,
+	WebpackBarPlugin,
+	MiniCssExtractPlugin,
+	TsCheckerPlugin,
+	VueLoaderPlugin,
+	getVueLoaderHash: hashSum,
+	vueLoader: "vue-loader",
+	vueModuleIdentifierLoader: resolveModulePath("#vue-module-identifier", { from: import.meta.url })
+});
+//#endregion
 //#region src/plugins/dynamic-base.ts
 const ENTRY_RE = /import ["']#build\/css["'];/;
 const DynamicBasePlugin = createUnplugin(() => {
@@ -49,23 +83,26 @@ const DynamicBasePlugin = createUnplugin(() => {
 	};
 });
 //#endregion
+//#region src/builder.ts
+const { builder, webpack: webpack$1, createRsbuild, WebpackBarPlugin: WebpackBarPlugin$1, MiniCssExtractPlugin: MiniCssExtractPlugin$1, TsCheckerPlugin: TsCheckerPlugin$1, VueLoaderPlugin: VueLoaderPlugin$1, getVueLoaderHash, vueLoader, vueModuleIdentifierLoader } = getBuilderImpl();
+//#endregion
 //#region src/plugins/chunk.ts
 const pluginName = "ChunkErrorPlugin";
 var ChunkErrorPlugin = class {
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-			compilation.hooks.runtimeRequirementInTree.for(webpack.RuntimeGlobals.ensureChunk).tap(pluginName, (chunk) => {
+			compilation.hooks.runtimeRequirementInTree.for(webpack$1.RuntimeGlobals.ensureChunk).tap(pluginName, (chunk) => {
 				compilation.addRuntimeModule(chunk, new ChunkErrorRuntimeModule());
 			});
 		});
 	}
 };
-var ChunkErrorRuntimeModule = class extends webpack.RuntimeModule {
+var ChunkErrorRuntimeModule = class extends webpack$1.RuntimeModule {
 	constructor() {
-		super("chunk preload error handler", webpack.RuntimeModule.STAGE_ATTACH);
+		super("chunk preload error handler", webpack$1.RuntimeModule.STAGE_ATTACH);
 	}
 	generate() {
-		const { ensureChunk } = webpack.RuntimeGlobals;
+		const { ensureChunk } = webpack$1.RuntimeGlobals;
 		return `
 if (typeof ${ensureChunk} !== "undefined") {
   var _ensureChunk = ${ensureChunk};
@@ -716,13 +753,13 @@ function basePlugins(ctx) {
 	}
 	ctx.config.plugins.push(...ctx.userConfig.plugins || []);
 	if (ctx.nuxt.options.builder !== "@nuxt/rspack-builder") ctx.config.plugins.push(new WarningIgnorePlugin(getWarningIgnoreFilter(ctx)));
-	ctx.config.plugins.push(new webpack.DefinePlugin(getEnv(ctx)));
+	ctx.config.plugins.push(new webpack$1.DefinePlugin(getEnv(ctx)));
 	if (ctx.isServer || ctx.isDev && ctx.userConfig.friendlyErrors) ctx.config.plugins.push(new FriendlyErrorsWebpackPlugin({
 		clearConsole: false,
 		reporter: "consola",
 		logLevel: "ERROR"
 	}));
-	if (ctx.nuxt.options.webpack.profile) ctx.config.plugins.push(new WebpackBarPlugin({
+	if (ctx.nuxt.options.webpack.profile) ctx.config.plugins.push(new WebpackBarPlugin$1({
 		name: ctx.name,
 		color: {
 			client: "green",
@@ -1004,7 +1041,7 @@ function extractCSS(ctx) {
 	const config = ctx.userConfig.extractCSS;
 	if (!config) return;
 	const filename = fileName(ctx, "css");
-	ctx.config.plugins.push(new MiniCssExtractPlugin({
+	ctx.config.plugins.push(new MiniCssExtractPlugin$1({
 		filename,
 		chunkFilename: filename,
 		...config === true ? {} : config
@@ -1056,7 +1093,7 @@ function createCssLoadersRule(ctx, cssLoaderOptions) {
 			if (cssLoader.options.modules) cssLoader.options.modules.exportOnlyLocals ??= true;
 			return [cssLoader];
 		}
-		return [{ loader: MiniCssExtractPlugin.loader }, cssLoader];
+		return [{ loader: MiniCssExtractPlugin$1.loader }, cssLoader];
 	}
 	return [cssLoader];
 }
@@ -1182,7 +1219,7 @@ var VueSSRServerPlugin = class {
 		compiler.hooks.make.tap("VueSSRServerPlugin", (compilation) => {
 			compilation.hooks.processAssets.tapAsync({
 				name: "VueSSRServerPlugin",
-				stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
+				stage: webpack$1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
 			}, (assets, cb) => {
 				const stats = compilation.getStats().toJson({
 					assets: true,
@@ -1227,7 +1264,7 @@ var VueSSRServerPlugin = class {
 function vue(ctx) {
 	ctx.nuxt.hooks.hookOnce(`${builder}:config`, () => {
 		ctx.nuxt.hook(`${builder}:configResolved`, (configs) => {
-			for (const config of configs) config.plugins.unshift(new (VueLoaderPlugin.default || VueLoaderPlugin)());
+			for (const config of configs) config.plugins.unshift(new (VueLoaderPlugin$1.default || VueLoaderPlugin$1)());
 		});
 	});
 	ctx.config.module.rules.push({
@@ -1241,17 +1278,16 @@ function vue(ctx) {
 	if (ctx.isClient) ctx.config.plugins.push(new VueSSRClientPlugin({ nuxt: ctx.nuxt }));
 	else {
 		ctx.config.plugins.push(new VueSSRServerPlugin({ filename: `${ctx.name}.manifest.json` }));
-		const loaderPath = resolveModulePath("#vue-module-identifier", { from: import.meta.url });
 		ctx.config.module.rules.push({
 			test: /\.vue$/i,
 			enforce: "post",
 			use: [{
-				loader: loaderPath,
+				loader: vueModuleIdentifierLoader,
 				options: { srcDir: ctx.nuxt.options.srcDir }
 			}]
 		});
 	}
-	ctx.config.plugins.push(new webpack.DefinePlugin({
+	ctx.config.plugins.push(new webpack$1.DefinePlugin({
 		"__VUE_OPTIONS_API__": "true",
 		"__VUE_PROD_DEVTOOLS__": "false",
 		"__VUE_PROD_HYDRATION_MISMATCH_DETAILS__": ctx.nuxt.options.debug && ctx.nuxt.options.debug.hydration
@@ -1305,7 +1341,7 @@ function clientPerformance(ctx) {
 }
 function clientNodeCompat(ctx) {
 	if (!ctx.nuxt.options.experimental.clientNodeCompat) return;
-	ctx.config.plugins.push(new webpack.DefinePlugin({ global: "globalThis" }));
+	ctx.config.plugins.push(new webpack$1.DefinePlugin({ global: "globalThis" }));
 	ctx.config.resolve ||= {};
 	ctx.config.resolve.fallback = {
 		...defineEnv({
@@ -1314,14 +1350,14 @@ function clientNodeCompat(ctx) {
 		}).env.alias,
 		...ctx.config.resolve.fallback
 	};
-	ctx.config.plugins.unshift(new webpack.NormalModuleReplacementPlugin(/node:/, (resource) => {
+	ctx.config.plugins.unshift(new webpack$1.NormalModuleReplacementPlugin(/node:/, (resource) => {
 		resource.request = resource.request.replace(/^node:/, "");
 	}));
 }
 function clientHMR(ctx) {
 	if (!ctx.isDev) return;
 	ctx.config.plugins ||= [];
-	ctx.config.plugins.push(new webpack.HotModuleReplacementPlugin());
+	ctx.config.plugins.push(new webpack$1.HotModuleReplacementPlugin());
 	if (builder === "rspack") return;
 	const clientOptions = ctx.userConfig.hotMiddleware?.client || {};
 	const hotMiddlewareClientOptions = {
@@ -1374,7 +1410,7 @@ function clientPlugins(ctx) {
 		}));
 	}
 	if (!ctx.nuxt.options.ssr) {
-		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 }));
+		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$1({ logger }));
 	}
 }
 //#endregion
@@ -1495,11 +1531,11 @@ function serverStandalone(ctx) {
 }
 function serverPlugins(ctx) {
 	ctx.config.plugins ||= [];
-	if (ctx.userConfig.serverURLPolyfill) ctx.config.plugins.push(new webpack.ProvidePlugin({
+	if (ctx.userConfig.serverURLPolyfill) ctx.config.plugins.push(new webpack$1.ProvidePlugin({
 		URL: [ctx.userConfig.serverURLPolyfill, "URL"],
 		URLSearchParams: [ctx.userConfig.serverURLPolyfill, "URLSearchParams"]
 	}));
-	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 }));
+	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$1({ logger }));
 }
 //#endregion
 //#region src/webpack.ts
@@ -1542,7 +1578,7 @@ const bundle = async (nuxt) => {
 		return;
 	}
 	const mfs = nuxt.options.dev ? createMFS() : null;
-	const compilers = webpackConfigs.map((config) => webpack(config));
+	const compilers = webpackConfigs.map((config) => webpack$1(config));
 	if (nuxt.options.dev) for (const compiler of compilers) compiler.outputFileSystem = mfs;
 	nuxt.hook("close", async () => {
 		for (const compiler of compilers) await new Promise((resolve) => compiler.close(resolve));
@@ -1624,28 +1660,38 @@ async function startRsbuildDevServer(rsbuild, nuxt) {
 		devServer.connectWebSocket({ server: listener });
 		await devServer.afterListen();
 	} else bundlerDiagnostics.NUXT_B7017();
-	await nuxt.callHook("server:devHandler", rsbuildToH3Handler(devServer.middlewares), { cors: () => true });
+	const buildAssetsPrefix = joinURL(nuxt.options.app.baseURL, nuxt.options.app.buildAssetsDir);
+	const nitroBuildsPrefix = joinURL(buildAssetsPrefix, "builds");
+	await nuxt.callHook("server:devHandler", rsbuildToH3Handler(devServer.middlewares, buildAssetsPrefix, nitroBuildsPrefix), { cors: () => true });
 	await Promise.all(firstCompiles);
 }
-function rsbuildToH3Handler(middlewares) {
-	return defineEventHandler(async (event) => {
+const kHandled = /* @__PURE__ */ Symbol.for("h3.handled");
+function rsbuildToH3Handler(middlewares, buildAssetsPrefix, nitroBuildsPrefix) {
+	return defineEventHandler((event) => {
 		const { req, res } = "runtime" in event ? event.runtime.node : event.node;
 		if (!isSameOriginRequest(req)) {
 			res.statusCode = 403;
 			res.end("Forbidden");
-			return;
+			return kHandled;
 		}
-		await new Promise((resolve) => {
+		return new Promise((resolve) => {
 			let settled = false;
-			const done = () => {
+			const done = (result) => {
 				if (!settled) {
 					settled = true;
-					resolve();
+					resolve(result);
 				}
 			};
-			res.on("finish", done);
-			res.on("close", done);
-			middlewares(req, res, () => done());
+			res.on("finish", () => done(kHandled));
+			res.on("close", () => done(kHandled));
+			middlewares(req, res, () => {
+				const url = req.url;
+				if (url && url.startsWith(buildAssetsPrefix) && !url.startsWith(nitroBuildsPrefix)) {
+					res.statusCode = 404;
+					res.end();
+					done(kHandled);
+				} else done(void 0);
+			});
 		});
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder-nightly",
-  "version": "5.0.0-29743829.e99b20d2",
+  "version": "5.0.0-29745181.e6d3afa3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -12,7 +12,6 @@
   "type": "module",
   "types": "./dist/index.d.mts",
   "imports": {
-    "#builder": "./builder.mjs",
     "#vue-module-identifier": "./dist/loaders/vue-module-identifier.mjs"
   },
   "exports": {
@@ -21,12 +20,11 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "builder.mjs"
+    "dist"
   ],
   "dependencies": {
     "@nuxt/friendly-errors-webpack-plugin": "^2.6.0",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29743829.e99b20d2",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29745181.e6d3afa3",
     "@vue/compiler-sfc": "3.5.40",
     "autoprefixer": "^10.5.4",
     "css-loader": "^7.1.4",
@@ -70,8 +68,9 @@
     "webpackbar": "^7.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29743829.e99b20d2",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29745181.e6d3afa3",
     "@rspack/core": "2.1.4",
+    "@types/hash-sum": "1.0.2",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.12",
     "h3": "1.15.11",
@@ -81,7 +80,7 @@
     "vue": "^3.5.40"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@5.0.0-29743829.e99b20d2",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29745181.e6d3afa3",
     "vue": "^3.3.4"
   },
   "engines": {

package/builder.mjs

@@ -1,12 +0,0 @@
-import hashSum from 'hash-sum'
-import VueLoaderPlugin from 'vue-loader/dist/pluginWebpack5.js'
-
-export const builder = 'webpack'
-export const createRsbuild = undefined
-export { default as webpack } from 'webpack'
-export { default as MiniCssExtractPlugin } from 'mini-css-extract-plugin'
-export { default as WebpackBarPlugin } from 'webpackbar'
-export { default as TsCheckerPlugin } from 'fork-ts-checker-webpack-plugin'
-export { VueLoaderPlugin }
-export const getVueLoaderHash = hashSum
-export const vueLoader = 'vue-loader'