@nuxt/vite-builder-nightly 4.3.0-29466372.7f503428 → 4.3.0-29466464.139ef2bd

package/dist/index.mjs

@@ -18,7 +18,6 @@ import { mkdir, readFile, rm, unlink, writeFile } from "node:fs/promises";
 import net from "node:net";
 import os from "node:os";
 import { Buffer } from "node:buffer";
-import { createError, defineEventHandler, defineLazyEventHandler, handleCors, setHeader } from "h3";
 import { ViteNodeServer } from "vite-node/server";
 import { normalizeViteManifest, precomputeDependencies } from "vue-bundle-renderer";
 import { hasTTY, isCI, provider } from "std-env";
@@ -328,19 +327,19 @@ function createViteNodeSocketServer(nuxt, ssrServer, clientServer, invalidates,
 					}
 					case "resolve": {
 						const { id: resolveId, importer } = request.payload;
-						if (!resolveId) throw createError({
+						if (!resolveId) throw {
 							status: 400,
 							message: "Missing id for resolve"
-						});
+						};
 						const resolvedResult = await (nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.ssr.pluginContainer : getNode(ssrServer)).resolveId(resolveId, importer).catch(() => null);
 						sendResponse(socket, request.id, resolvedResult);
 						return;
 					}
 					case "module": {
-						if (request.payload.moduleId === "/") throw createError({
+						if (request.payload.moduleId === "/") throw {
 							status: 400,
 							message: "Invalid moduleId"
-						});
+						};
 						const response = await (nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.ssr : getNode(ssrServer)).fetchModule(request.payload.moduleId).catch(async (err) => {
 							const errorData = {
 								code: "VITE_ERROR",
@@ -352,18 +351,18 @@ function createViteNodeSocketServer(nuxt, ssrServer, clientServer, invalidates,
 							if (!errorData.frame && err.code === "PARSE_ERROR") try {
 								errorData.frame = await (nuxt.options.experimental.viteEnvironmentApi ? ssrServer.environments.client : getNode(ssrServer)).transformRequest(request.payload.moduleId).then((res) => `${err.message || ""}\n${res?.code}`).catch(() => void 0);
 							} catch {}
-							throw createError({
+							throw {
 								data: errorData,
 								message: err.message || "Error fetching module"
-							});
+							};
 						});
 						sendResponse(socket, request.id, response);
 						return;
 					}
-					default: throw createError({
+					default: throw {
 						status: 400,
 						message: `Unknown request type: ${request.type}`
-					});
+					};
 				}
 			} catch (error) {
 				sendError(socket, request.id, error);
@@ -822,7 +821,9 @@ function DevServerPlugin(nuxt) {
 			for (const folder of nitro.options.publicAssets) if (folder.baseURL && folder.baseURL !== "/" && folder.baseURL.startsWith(nuxt.options.app.buildAssetsDir)) staticBases.push(folder.baseURL.replace(/\/?$/, "/"));
 			const devHandlerRegexes = [];
 			for (const handler of nuxt.options.devServerHandlers) if (handler.route && handler.route !== "/" && handler.route.startsWith(nuxt.options.app.buildAssetsDir)) devHandlerRegexes.push(/* @__PURE__ */ new RegExp(`^${handler.route.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/:[^/]+/g, "[^/]+").replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*")}$`));
-			const viteMiddleware = defineLazyEventHandler(() => {
+			let _isProxyPath;
+			function isProxyPath(url) {
+				if (_isProxyPath) return _isProxyPath(url);
 				const proxyConfig = viteServer.config.server.proxy;
 				const proxyPatterns = [];
 				if (proxyConfig) for (const key in proxyConfig) if (key.startsWith("^")) try {
@@ -835,39 +836,46 @@ function DevServerPlugin(nuxt) {
 					type: "string",
 					value: key
 				});
-				function isProxyPath(path) {
+				_isProxyPath = function isProxyPath$1(path) {
 					for (const pattern of proxyPatterns) if (pattern.type === "regex" && pattern.value.test(path)) return true;
 					else if (pattern.type === "string" && path.startsWith(pattern.value)) return true;
 					return false;
-				}
-				return defineEventHandler(async (event) => {
-					let isViteRoute = event.path.startsWith(viteServer.config.base);
-					if (!isViteRoute) {
-						for (const viteRoute of viteServer.middlewares.stack) if (viteRoute.route.length > 1 && event.path.startsWith(viteRoute.route)) {
-							isViteRoute = true;
-							break;
-						}
-						isViteRoute ||= isProxyPath(event.path);
-					}
-					if (!isViteRoute) event.node.req._skip_transform = true;
-					else if (!useViteCors) {
-						if (handleCors(event, nuxt.options.devServer.cors)) return null;
-						setHeader(event, "Vary", "Origin");
+				};
+				return _isProxyPath(url);
+			}
+			const viteMiddleware = defineEventHandler(async (event) => {
+				const url = "url" in event ? event.url.pathname + event.url.search + event.url.hash : event.path;
+				let isViteRoute = url.startsWith(viteServer.config.base);
+				if (!isViteRoute) {
+					for (const viteRoute of viteServer.middlewares.stack) if (viteRoute.route.length > 1 && url.startsWith(viteRoute.route)) {
+						isViteRoute = true;
+						break;
 					}
-					const _originalPath = event.node.req.url;
-					await new Promise((resolve$1, reject) => {
-						viteServer.middlewares.handle(event.node.req, event.node.res, (err) => {
-							event.node.req.url = _originalPath;
-							return err ? reject(err) : resolve$1(null);
-						});
+					isViteRoute ||= isProxyPath(url);
+				}
+				const { req, res } = "runtime" in event ? event.runtime.node : event.node;
+				if (!isViteRoute) req._skip_transform = true;
+				const _originalPath = req.url;
+				await new Promise((resolve$1, reject) => {
+					viteServer.middlewares.handle(req, res, (err) => {
+						req.url = _originalPath;
+						return err ? reject(err) : resolve$1(null);
 					});
-					if (!(event.node.res.writableEnded || event.handled) && event.path.startsWith(nuxt.options.app.buildAssetsDir) && !staticBases.some((baseURL) => event.path.startsWith(baseURL)) && !devHandlerRegexes.some((regex) => regex.test(event.path))) throw createError({ status: 404 });
 				});
+				if (url.startsWith(nuxt.options.app.buildAssetsDir) && !staticBases.some((baseURL) => url.startsWith(baseURL)) && !devHandlerRegexes.some((regex) => regex.test(url))) throw { status: 404 };
 			});
-			await nuxt.callHook("server:devHandler", viteMiddleware);
+			await nuxt.callHook("server:devHandler", viteMiddleware, { cors: (url) => {
+				if (useViteCors) return false;
+				if (url.startsWith(viteServer.config.base)) return true;
+				for (const viteRoute of viteServer.middlewares.stack) if (viteRoute.route.length > 1 && url.startsWith(viteRoute.route)) return true;
+				return isProxyPath(url);
+			} });
 		}
 	};
 }
+function defineEventHandler(handler) {
+	return Object.assign(handler, { __is_handler__: true });
+}
 
 //#endregion
 //#region src/plugins/vite-plugin-checker.ts

package/dist/vite-node-entry.mjs

@@ -1,6 +1,5 @@
 import { performance } from "node:perf_hooks";
 import process from "node:process";
-import { createError } from "h3";
 import { ViteNodeRunner } from "vite-node/client";
 import { consola } from "consola";
 import { viteNodeFetch, viteNodeOptions } from "#vite-node";
@@ -36,20 +35,20 @@ function createRunner() {
 				let _err;
 				try {
 					const { message, stack } = formatViteError(errorData, id);
-					_err = createError({
+					_err = {
 						statusText: "Vite Error",
 						message,
 						stack
-					});
+					};
 				} catch (formatError) {
 					consola.warn("Internal nuxt error while formatting vite-node error. Please report this!", formatError);
 					const message = `[vite-node] [TransformError] ${errorData?.message || "-"}`;
 					consola.error(message, errorData);
-					throw createError({
+					throw {
 						statusText: "Vite Error",
 						message,
 						stack: `${message}\nat ${id}\n` + (errorData?.stack || "")
-					});
+					};
 				}
 				throw _err;
 			});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.3.0-29466372.7f503428",
+  "version": "4.3.0-29466464.139ef2bd",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -22,7 +22,9 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29466372.7f503428",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29466464.139ef2bd",
+    "h3": "^1.15.4",
+    "h3-next": "npm:h3@^2.0.1-rc.7",
     "nitropack": "2.12.9",
     "obuild": "0.4.14",
     "rolldown": "1.0.0-beta.58",
@@ -30,7 +32,7 @@
     "vue": "3.5.26"
   },
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29466372.7f503428",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29466464.139ef2bd",
     "@rollup/plugin-replace": "^6.0.3",
     "@vitejs/plugin-vue": "^6.0.3",
     "@vitejs/plugin-vue-jsx": "^5.1.3",
@@ -42,7 +44,6 @@
     "escape-string-regexp": "^5.0.0",
     "exsolve": "^1.0.8",
     "get-port-please": "^3.2.0",
-    "h3": "^1.15.4",
     "jiti": "^2.6.1",
     "knitwork": "^1.3.0",
     "magic-string": "^0.30.21",
@@ -62,7 +63,7 @@
     "vue-bundle-renderer": "^2.2.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.3.0-29466372.7f503428",
+    "nuxt": "npm:nuxt-nightly@4.3.0-29466464.139ef2bd",
     "rolldown": "^1.0.0-beta.38",
     "vue": "^3.3.4"
   },