@nuxt/webpack-builder-nightly 5.0.0-29735165.f2e25d33 → 5.0.0-29735167.d597a4e3

package/dist/index.mjs

@@ -1,5 +1,7 @@
 import { createRequire } from "node:module";
 import pify from "pify";
+import webpackDevMiddleware from "webpack-dev-middleware";
+import webpackHotMiddleware from "webpack-hot-middleware";
 import { defu } from "defu";
 import { pathToFileURL } from "node:url";
 import { basename, isAbsolute, join, normalize, relative, resolve } from "pathe";
@@ -1292,9 +1294,6 @@ function clientNodeCompat(ctx) {
 }
 function clientHMR(ctx) {
 	if (!ctx.isDev) return;
-	ctx.config.plugins ||= [];
-	ctx.config.plugins.push(new webpack.HotModuleReplacementPlugin());
-	if (builder === "rspack") return;
 	const clientOptions = ctx.userConfig.hotMiddleware?.client || {};
 	const hotMiddlewareClientOptions = {
 		reload: true,
@@ -1307,6 +1306,8 @@ function clientHMR(ctx) {
 	};
 	const hotMiddlewareClientOptionsStr = querystring.stringify(hotMiddlewareClientOptions);
 	ctx.config.entry.app.unshift(`webpack-hot-middleware/client?${hotMiddlewareClientOptionsStr}`);
+	ctx.config.plugins ||= [];
+	ctx.config.plugins.push(new webpack.HotModuleReplacementPlugin());
 }
 function clientOptimization(ctx) {
 	if (!ctx.nuxt.options.features.inlineStyles) return;
@@ -1489,6 +1490,7 @@ const bundle = async (nuxt) => {
 		if (existingPlugin >= 0) plugins.splice(existingPlugin, 1);
 	});
 	await nuxt.callHook(`${builder}:config`, webpackConfigs);
+	const mfs = nuxt.options.dev ? createMFS() : null;
 	if (nuxt.options.ssr && !nuxt.options.dev) {
 		const serverEntryFile = pathToFileURL(resolve(nuxt.options.buildDir, "dist/server/server.mjs")).href;
 		setBuildOutput("serverEntry", () => `export { default } from ${JSON.stringify(serverEntryFile)}`);
@@ -1500,21 +1502,7 @@ const bundle = async (nuxt) => {
 		if (ssrStylesPlugin) config.plugins.push(ssrStylesPlugin);
 	}
 	await nuxt.callHook(`${builder}:configResolved`, webpackConfigs);
-	if (builder === "rspack" && createRsbuild) {
-		const rsbuild = await createRsbuildInstance(webpackConfigs, nuxt);
-		if (nuxt.options.dev) {
-			await startRsbuildDevServer(rsbuild, nuxt);
-			return;
-		}
-		const compilers = await getRsbuildCompilers(rsbuild);
-		nuxt.hook("close", async () => {
-			for (const compiler of compilers) await new Promise((resolve) => compiler.close(resolve));
-		});
-		for (const c of compilers) await compile(c);
-		return;
-	}
-	const mfs = nuxt.options.dev ? createMFS() : null;
-	const compilers = webpackConfigs.map((config) => webpack(config));
+	const compilers = builder === "rspack" && createRsbuild ? await createRsbuildCompilers(webpackConfigs, nuxt) : webpackConfigs.map((config) => webpack(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));
@@ -1525,106 +1513,27 @@ const bundle = async (nuxt) => {
 	}
 	for (const c of compilers) await compile(c);
 };
-function createRsbuildInstance(configs, nuxt) {
+async function createRsbuildCompilers(configs, nuxt) {
 	const environments = {};
-	for (const config of configs) {
-		const isServer = config.name === "server";
-		if (nuxt.options.dev && !isServer) config.target ??= "web";
-		environments[config.name] = {
-			output: {
-				target: isServer ? "node" : "web",
-				distPath: { root: config.output.path }
-			},
-			tools: { rspack: () => config }
-		};
-	}
-	return createRsbuild({
+	for (const config of configs) environments[config.name] = {
+		output: { target: config.name === "server" ? "node" : "web" },
+		tools: { rspack: () => config }
+	};
+	const compiler = await (await createRsbuild({
 		callerName: "nuxt",
 		cwd: nuxt.options.rootDir,
 		config: {
 			root: nuxt.options.rootDir,
 			mode: nuxt.options.dev ? "development" : "production",
 			logLevel: "silent",
-			environments,
-			...nuxt.options.dev ? {
-				server: { middlewareMode: true },
-				dev: { client: { path: joinURL(nuxt.options.app.baseURL, nuxt.options.app.buildAssetsDir, "rsbuild-hmr") } }
-			} : {}
+			environments
 		}
-	});
-}
-async function getRsbuildCompilers(rsbuild) {
-	const compiler = await rsbuild.createCompiler();
+	})).createCompiler();
 	return "compilers" in compiler ? compiler.compilers : [compiler];
 }
-async function startRsbuildDevServer(rsbuild, nuxt) {
-	const firstCompiles = [];
-	rsbuild.onAfterCreateCompiler(({ compiler }) => {
-		const compilers = "compilers" in compiler ? compiler.compilers : [compiler];
-		for (const c of compilers) {
-			const name = c.options.name;
-			nuxt.callHook(`${builder}:compile`, {
-				name,
-				compiler: c
-			});
-			let settled = false;
-			firstCompiles.push(new Promise((resolve, reject) => {
-				c.hooks.done.tap("load-resources", (stats) => {
-					nuxt.callHook(`${builder}:compiled`, {
-						name,
-						compiler: c,
-						stats
-					});
-					if (!settled) {
-						settled = true;
-						resolve();
-					}
-				});
-				c.hooks.failed.tap("nuxt-errorlog", (err) => {
-					if (!settled) {
-						settled = true;
-						reject(err);
-					}
-				});
-			}));
-		}
-	});
-	const devServer = await rsbuild.createDevServer();
-	nuxt.hook("close", () => devServer.close());
-	nuxt.hook("listen", (server) => {
-		devServer.connectWebSocket({ server });
-		devServer.afterListen();
-	});
-	await nuxt.callHook("server:devHandler", rsbuildToH3Handler(devServer.middlewares), { cors: () => true });
-	await Promise.all(firstCompiles);
-}
-function rsbuildToH3Handler(middlewares) {
-	return defineEventHandler(async (event) => {
-		const { req, res } = "runtime" in event ? event.runtime.node : event.node;
-		if (!isSameOriginRequest(req)) {
-			res.statusCode = 403;
-			res.end("Forbidden");
-			return;
-		}
-		await new Promise((resolve) => {
-			let settled = false;
-			const done = () => {
-				if (!settled) {
-					settled = true;
-					resolve();
-				}
-			};
-			res.on("finish", done);
-			res.on("close", done);
-			middlewares(req, res, () => done());
-		});
-	});
-}
 async function createDevMiddleware(compiler) {
 	const nuxt = useNuxt();
 	logger.debug("Creating webpack middleware...");
-	const { default: webpackDevMiddleware } = await import("webpack-dev-middleware");
-	const { default: webpackHotMiddleware } = await import("webpack-hot-middleware");
 	const devMiddleware = webpackDevMiddleware(compiler, {
 		publicPath: joinURL(nuxt.options.app.baseURL, nuxt.options.app.buildAssetsDir),
 		outputFileSystem: compiler.outputFileSystem,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack-builder-nightly",
-  "version": "5.0.0-29735165.f2e25d33",
+  "version": "5.0.0-29735167.d597a4e3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@nuxt/friendly-errors-webpack-plugin": "^2.6.0",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29735165.f2e25d33",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29735167.d597a4e3",
     "@vue/compiler-sfc": "3.5.39",
     "autoprefixer": "^10.5.2",
     "css-loader": "^7.1.4",
@@ -71,7 +71,7 @@
     "webpackbar": "^7.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29735165.f2e25d33",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29735167.d597a4e3",
     "@rspack/core": "2.1.3",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.12",
@@ -82,7 +82,7 @@
     "vue": "3.5.39"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@5.0.0-29735165.f2e25d33",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29735167.d597a4e3",
     "vue": "^3.3.4"
   },
   "engines": {