Merge pull request #422 from nksaraf/bump-nitro

chore: bump nitro to v2.10.4, h3 to v13.0
nksaraf · Dec 1, 2024 · 95eeef1 · 95eeef1
2 parents 9591adb + 2a29812
commit 95eeef1
Show file tree

Hide file tree

Showing 8 changed files with 1,489 additions and 390 deletions.
diff --git a/.changeset/tender-coats-repeat.md b/.changeset/tender-coats-repeat.md
@@ -0,0 +1,5 @@
+---
+"@fake-scope/fake-pkg": patch
+---
+
+chore: bump nitro to v2.10.4, h3 to v13.0
diff --git a/packages/vinxi/lib/app.js b/packages/vinxi/lib/app.js
@@ -12,7 +12,7 @@ import { resolveRouterConfig, routerSchema } from "./router-modes.js";
 	routers?: import("./router-modes.js").RouterSchemaInput[];
 	name?:
 	string;
-	server?: Omit<import('nitropack').NitroConfig, 'handlers' | 'devHandlers' | 'publicAssets' | 'scanDirs' | 'appConfigFiles' | 'imports' | 'virtual'> & { https?: import('@vinxi/listhen').HTTPSOptions | boolean };
+	server?: Omit<import('nitropack').NitroConfig, 'handlers' | 'scanDirs' | 'appConfigFiles' | 'imports' | 'virtual' | 'dev'  | 'buildDir'> & { https?: import('@vinxi/listhen').HTTPSOptions | boolean };
 	root?: string
 	mode?: string
 }} AppOptions */
@@ -21,7 +21,7 @@ import { resolveRouterConfig, routerSchema } from "./router-modes.js";
 	config: {
 		name: string;
 		devtools: boolean;
-		server: Omit<import('nitropack').NitroConfig, 'handlers' | 'devHandlers' | 'publicAssets' | 'scanDirs' | 'appConfigFiles' | 'imports' | 'virtual'> & { https?: import('@vinxi/listhen').HTTPSOptions | boolean };
+		server: Omit<import('nitropack').NitroConfig, 'handlers' | 'scanDirs' | 'appConfigFiles' | 'imports' | 'virtual' | 'dev' | 'buildDir'> & { https?: import('@vinxi/listhen').HTTPSOptions | boolean };
 		routers: import("./router-mode.js").Router[];
 		root: string;
 		mode?: string;

diff --git a/packages/vinxi/lib/build.js b/packages/vinxi/lib/build.js
@@ -91,9 +91,9 @@ export async function createBuild(app, buildConfig) {
 	const nitro = await createNitro({
 		...app.config.server,
 		dev: false,
-
+		compatibilityDate: "2024-12-01",
+		rootDir: "",
 		logLevel: +(process.env.NITRO_LOG_LEVEL || 1),
-
 		preset:
 			buildConfig.preset ??
 			process.env.TARGET ??

diff --git a/packages/vinxi/lib/dev-error.js b/packages/vinxi/lib/dev-error.js
@@ -0,0 +1,53 @@
+import {
+	getResponseStatus,
+	getResponseStatusText,
+	send,
+	setResponseHeader,
+	setResponseStatus,
+} from "h3";
+
+function errorHandler(error, event) {
+	setResponseHeader(event, "Content-Type", "text/html; charset=UTF-8");
+	setResponseStatus(event, 503, "Server Unavailable");
+
+	let body;
+	let title;
+	if (error) {
+		title = `${getResponseStatus(event)} ${getResponseStatusText(event)}`;
+		body = `<code><pre>${error.stack}</pre></code>`;
+	} else {
+		title = "Reloading server...";
+		body =
+			"<progress></progress><script>document.querySelector('progress').indeterminate=true</script>";
+	}
+
+	return send(
+		event,
+		`<!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    ${error ? "" : '<meta http-equiv="refresh" content="2">'}
+    <title>${title}</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico/css/pico.min.css">
+  </head>
+  <body>
+    <main class="container">
+      <article>
+        <header>
+          <h2>${title}</h2>
+        </header>
+        ${body}
+        <footer>
+          Check console logs for more information.
+        </footer>
+      </article>
+  </main>
+  </body>
+</html>
+`,
+	);
+}
+
+export default errorHandler;
diff --git a/packages/vinxi/lib/dev-server.js b/packages/vinxi/lib/dev-server.js
@@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
 
 import { consola, withLogger } from "./logger.js";
 import { join, normalize } from "./path.js";
+import { resolve } from "./resolve.js";
 
 export * from "./router-dev-plugins.js";
 
@@ -130,8 +131,9 @@ export async function createDevServer(
 	const { createNitro, writeTypes } = await import("nitropack");
 
 	const nitro = await createNitro({
-		...app.config.server,
+		compatibilityDate: "2024-12-01",
 		rootDir: "",
+		...app.config.server,
 		dev: true,
 		preset: "nitro-dev",
 		publicAssets: [
@@ -169,8 +171,9 @@ export async function createDevServer(
 					(asset) => Boolean(asset),
 				)
 				.flat(),
+			...(app.config.server.devHandlers ?? []),
 		],
-		handlers: [...(app.config.server.handlers ?? [])],
+		// handlers: [...(app.config.server.handlers ?? [])],
 		plugins: [...(app.config.server.plugins ?? [])],
 	});
 

diff --git a/packages/vinxi/lib/nitro-dev.js b/packages/vinxi/lib/nitro-dev.js
@@ -2,13 +2,14 @@ import { listen } from "@vinxi/listhen";
 import { watch } from "chokidar";
 import wsAdapter from "crossws/adapters/node";
 import {
-	H3Event,
 	createApp,
 	eventHandler,
 	fromNodeMiddleware,
+	isEvent,
 	promisifyNodeListener,
 	toNodeListener,
 } from "h3";
+import { createHooks } from "hookable";
 import httpProxy from "http-proxy";
 import { servePlaceholder } from "serve-placeholder";
 import serveStatic from "serve-static";
@@ -19,8 +20,7 @@ import {
 	createFetch as createLocalFetch,
 } from "unenv/runtime/fetch/index";
 
-import { createServerResponse } from "./http-stream.js";
-import { resolve } from "./path.js";
+import errorHandler from "./dev-error.js";
 import { createRouteRulesHandler } from "./route-rules.js";
 
 // import { createVFSHandler } from './vfs'
@@ -132,8 +132,48 @@ export async function createDevServer(nitro) {
 	// });
 	// nitro.hooks.hook("dev:reload", reload);
 
+	const hooks = createHooks();
+
+	const captureError = (error, context = {}) => {
+		const promise = hooks
+			.callHookParallel("error", error, context)
+			.catch((error_) => {
+				console.error("Error while capturing another error", error_);
+			});
+		if (context.event && isEvent(context.event)) {
+			const errors = context.event.context.nitro?.errors;
+			if (errors) {
+				errors.push({ error, context });
+			}
+			if (context.event.waitUntil) {
+				context.event.waitUntil(promise);
+			}
+		}
+	};
+
 	// App
-	const app = createApp();
+	const app = createApp({
+		debug: Boolean(process.env.DEBUG),
+		onError: (error, event) => {
+			captureError(error, { event, tags: ["request"] });
+			return errorHandler(error, event);
+		},
+		onRequest: async (event) => {
+			await hooks.callHook("request", event).catch((error) => {
+				captureError(error, { event, tags: ["request"] });
+			});
+		},
+		onBeforeResponse: async (event, response) => {
+			await hooks.callHook("beforeResponse", event, response).catch((error) => {
+				captureError(error, { event, tags: ["request", "response"] });
+			});
+		},
+		onAfterResponse: async (event, response) => {
+			await hooks.callHook("afterResponse", event, response).catch((error) => {
+				captureError(error, { event, tags: ["request", "response"] });
+			});
+		},
+	});
 
 	// Create local fetch callers
 	const localCall = createCall(promisifyNodeListener(toNodeListener(app)));
@@ -325,6 +365,8 @@ export async function createDevServer(nitro) {
 		localCall,
 		localFetch,
 		close,
+		hooks,
+		captureError,
 		// watcher,
 	};
 }

diff --git a/packages/vinxi/package.json b/packages/vinxi/package.json
@@ -191,18 +191,18 @@
     "chokidar": "^3.5.3",
     "citty": "^0.1.4",
     "consola": "^3.2.3",
-    "crossws": "^0.2.4",
+    "crossws": "^0.3.1",
     "dax-sh": "^0.39.1",
     "defu": "^6.1.2",
     "es-module-lexer": "^1.3.0",
     "esbuild": "^0.20.2",
     "fast-glob": "^3.3.1",
     "get-port-please": "^3.1.1",
-    "h3": "1.11.1",
+    "h3": "1.13.0",
     "hookable": "^5.5.3",
     "http-proxy": "^1.18.1",
     "micromatch": "^4.0.5",
-    "nitropack": "^2.9.1",
+    "nitropack": "^2.10.4",
     "node-fetch-native": "^1.4.0",
     "path-to-regexp": "^6.2.1",
     "pathe": "^1.1.1",