Merge branch 'v3' into sevalla-nitro

Author: pi0

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 {
   "name": "nitro-devcontainer",
   "forwardPorts": [3000],
-  "image": "node:22",
+  "image": "node:lts",
   "features": {},
   "customizations": {
     "vscode": {

CONTRIBUTING.md

@@ -8,7 +8,7 @@
 
 You can involve in discussions using:
 
-- [Github Discussions](discussions)
+- [GitHub Discussions](discussions)
 - [Nitro Discord](https://discord.nitro.build)
 
 ## Contribute to the Code

docs/1.guide/9.plugins.md

@@ -97,8 +97,8 @@ You can use plugins to register a hook that can run on request lifecycle:
 
 ```ts
 export default defineNitroPlugin((nitroApp) => {
-  nitroApp.hooks.hook("request", (event) => {
-    console.log("on request", event.path);
+  nitroApp.hooks.hook("request", (req) => {
+    console.log("on request", req.url);
   });
 
   nitroApp.hooks.hook("beforeResponse", (event, { body }) => {

docs/2.deploy/20.providers/deno-deploy.md

@@ -21,7 +21,7 @@ cd .output
 deployctl deploy --project=my-project server/index.ts
 ```
 
-## Deploy within CI/CD using gitHub actions
+## Deploy within CI/CD using GitHub actions
 
 You just need to include the deployctl GitHub Action as a step in your workflow.
 

package.json

@@ -81,7 +81,7 @@
     "fs-extra": "^11.3.1",
     "globby": "^14.1.0",
     "gzip-size": "^7.0.0",
-    "h3": "2.0.0-beta.3",
+    "h3": "2.0.0-beta.4",
     "hookable": "^5.5.3",
     "httpxy": "^0.1.7",
     "ioredis": "^5.7.0",
@@ -107,7 +107,7 @@
     "serve-placeholder": "^2.0.2",
     "serve-static": "^2.2.0",
     "source-map": "^0.7.6",
-    "srvx": "^0.8.6",
+    "srvx": "^0.8.7",
     "std-env": "^3.9.0",
     "ufo": "^1.6.1",
     "ultrahtml": "^1.6.0",

pnpm-lock.yaml

@@ -248,6 +248,19 @@ function nitroServicePlugin(ctx: NitroPluginContext): VitePlugin {
           return id;
         }
 
+        // Run rollup resolve hooks in dev (VFS support)
+        if (ctx.nitro?.options.dev) {
+          for (const plugin of ctx.rollupConfig!.config
+            .plugins as RollupPlugin[]) {
+            if (typeof plugin.resolveId !== "function") continue;
+            // prettier-ignore
+            const resolved = await plugin.resolveId.call(this, id, importer, options);
+            if (resolved) {
+              return resolved;
+            }
+          }
+        }
+
         // Resolve built-in deps
         if (
           runtimeDependencies.some(
@@ -310,6 +323,18 @@ function nitroServicePlugin(ctx: NitroPluginContext): VitePlugin {
           }
           return `export const findService = ${rou3Compiler.compileRouterToString(router)};`;
         }
+
+        // Run rollup load hooks in dev (VFS support)
+        if (ctx.nitro?.options.dev) {
+          for (const plugin of ctx.rollupConfig!.config
+            .plugins as RollupPlugin[]) {
+            if (typeof plugin.load !== "function") continue;
+            const resolved = await plugin.load.call(this, id);
+            if (resolved) {
+              return resolved;
+            }
+          }
+        }
       },
     },
   };

src/build/vite/plugin.ts

@@ -29,7 +29,7 @@ parentPort?.on("message", (msg) => {
 
 const nitroApp = useNitroApp();
 
-const server = new Server(toNodeHandler(nitroApp.h3App.fetch));
+const server = new Server(toNodeHandler(nitroApp.fetch));
 let listener: Server | undefined;
 
 listen()
@@ -47,7 +47,7 @@ if (import.meta._websocket) {
 }
 
 // Register tasks handlers
-nitroApp.h3App.get(
+nitroApp._h3?.get(
   "/_nitro/tasks",
   defineHandler(async (event) => {
     const _tasks = await Promise.all(
@@ -63,7 +63,7 @@ nitroApp.h3App.get(
   })
 );
 
-nitroApp.h3App.use(
+nitroApp._h3?.use(
   "/_nitro/tasks/:name",
   defineHandler(async (event) => {
     const name = getRouterParam(event, "name") as string;

src/presets/_nitro/runtime/nitro-dev.ts

@@ -12,16 +12,15 @@ export const closePrerenderer = () => nitroApp.hooks.callHook("close");
 
 nitroApp.hooks.hook("error", (error, context) => {
   if (
-    isEvent(context.event) &&
     !(error as HTTPError).unhandled &&
     (error as HTTPError).status >= 500 &&
+    context.event?.req?.headers instanceof Headers &&
     context.event.req.headers.get("x-nitro-prerender")
   ) {
-    const url = getRequestURL(context.event).href;
     consola.error(
       `[prerender error]`,
       `[${context.event.req.method}]`,
-      `[${url}]`,
+      `[${context.event.req.url}]`,
       error
     );
   }

src/presets/_nitro/runtime/nitro-prerenderer.ts

@@ -6,7 +6,7 @@ import { toNodeHandler } from "srvx/node";
 
 const nitroApp = useNitroApp();
 
-const server = new Server(toNodeHandler(nitroApp.h3App.fetch));
+const server = new Server(toNodeHandler(nitroApp.fetch));
 
 // @ts-ignore
 server.listen(3000, (err) => {