nitropack-nightly 2.11.1-20250305-120252.94a73b50 → 2.11.2-20250305-134511.9f4dffdb

package/dist/core/index.mjs

@@ -1925,6 +1925,75 @@ function matchesIgnorePattern(path, pattern) {
   return false;
 }
 
+const NEGATION_RE = /^(!?)(.*)$/;
+const PARENT_DIR_GLOB_RE = /!?\.\.\//;
+async function scanUnprefixedPublicAssets(nitro) {
+  const scannedPaths = [];
+  for (const asset of nitro.options.publicAssets) {
+    if (asset.baseURL && asset.baseURL !== "/" && !asset.fallthrough) {
+      continue;
+    }
+    if (!await isDirectory(asset.dir)) {
+      continue;
+    }
+    const includePatterns = getIncludePatterns(nitro, asset.dir);
+    const publicAssets = await globby(includePatterns, {
+      cwd: asset.dir,
+      absolute: false,
+      dot: true
+    });
+    scannedPaths.push(
+      ...publicAssets.map((file) => join(asset.baseURL || "/", file))
+    );
+  }
+  return scannedPaths;
+}
+async function copyPublicAssets(nitro) {
+  if (nitro.options.noPublicDir) {
+    return;
+  }
+  for (const asset of nitro.options.publicAssets) {
+    const srcDir = asset.dir;
+    const dstDir = join(nitro.options.output.publicDir, asset.baseURL);
+    if (await isDirectory(srcDir)) {
+      const includePatterns = getIncludePatterns(nitro, srcDir);
+      const publicAssets = await globby(includePatterns, {
+        cwd: srcDir,
+        absolute: false,
+        dot: true
+      });
+      await Promise.all(
+        publicAssets.map(async (file) => {
+          const src = join(srcDir, file);
+          const dst = join(dstDir, file);
+          if (!existsSync(dst)) {
+            await promises.cp(src, dst);
+          }
+        })
+      );
+    }
+  }
+  if (nitro.options.compressPublicAssets) {
+    await compressPublicAssets(nitro);
+  }
+  nitro.logger.success(
+    "Generated public " + prettyPath(nitro.options.output.publicDir)
+  );
+}
+function getIncludePatterns(nitro, srcDir) {
+  return [
+    "**",
+    ...nitro.options.ignore.map((p) => {
+      const [_, negation, pattern] = p.match(NEGATION_RE) || [];
+      return (
+        // Convert ignore to include patterns
+        (negation ? "" : "!") + // Make non-glob patterns relative to publicAssetDir
+        (pattern.startsWith("*") ? pattern : relative(srcDir, resolve(nitro.options.srcDir, pattern)))
+      );
+    })
+  ].filter((p) => !PARENT_DIR_GLOB_RE.test(p));
+}
+
 const JsonSigRx = /^\s*["[{]|^\s*-?\d{1,16}(\.\d{1,17})?([Ee][+-]?\d+)?\s*$/;
 const linkParents = /* @__PURE__ */ new Map();
 async function prerender(nitro) {
@@ -1982,6 +2051,10 @@ async function prerender(nitro) {
   const failedRoutes = /* @__PURE__ */ new Set();
   const skippedRoutes = /* @__PURE__ */ new Set();
   const displayedLengthWarns = /* @__PURE__ */ new Set();
+  const publicAssetBases = nitro.options.publicAssets.filter(
+    (a) => !!a.baseURL && a.baseURL !== "/" && !a.fallthrough
+  ).map((a) => withTrailingSlash(a.baseURL));
+  const scannedPublicAssets = nitro.options.prerender.ignoreUnprefixedPublicAssets ? new Set(await scanUnprefixedPublicAssets(nitro)) : /* @__PURE__ */ new Set();
   const canPrerender = (route = "/") => {
     if (generatedRoutes.has(route) || skippedRoutes.has(route)) {
       return false;
@@ -1991,6 +2064,12 @@ async function prerender(nitro) {
         return false;
       }
     }
+    if (publicAssetBases.some((base) => route.startsWith(base))) {
+      return false;
+    }
+    if (scannedPublicAssets.has(route)) {
+      return false;
+    }
     if (_getRouteRules(route).prerender === false) {
       return false;
     }
@@ -2824,51 +2903,6 @@ $1`
   }
 }
 
-const NEGATION_RE = /^(!?)(.*)$/;
-const PARENT_DIR_GLOB_RE = /!?\.\.\//;
-async function copyPublicAssets(nitro) {
-  if (nitro.options.noPublicDir) {
-    return;
-  }
-  for (const asset of nitro.options.publicAssets) {
-    const srcDir = asset.dir;
-    const dstDir = join(nitro.options.output.publicDir, asset.baseURL);
-    if (await isDirectory(srcDir)) {
-      const includePatterns = [
-        "**",
-        ...nitro.options.ignore.map((p) => {
-          const [_, negation, pattern] = p.match(NEGATION_RE) || [];
-          return (
-            // Convert ignore to include patterns
-            (negation ? "" : "!") + // Make non-glob patterns relative to publicAssetDir
-            (pattern.startsWith("*") ? pattern : relative(srcDir, resolve(nitro.options.srcDir, pattern)))
-          );
-        })
-      ].filter((p) => !PARENT_DIR_GLOB_RE.test(p));
-      const publicAssets = await globby(includePatterns, {
-        cwd: srcDir,
-        absolute: false,
-        dot: true
-      });
-      await Promise.all(
-        publicAssets.map(async (file) => {
-          const src = join(srcDir, file);
-          const dst = join(dstDir, file);
-          if (!existsSync(dst)) {
-            await promises.cp(src, dst);
-          }
-        })
-      );
-    }
-  }
-  if (nitro.options.compressPublicAssets) {
-    await compressPublicAssets(nitro);
-  }
-  nitro.logger.success(
-    "Generated public " + prettyPath(nitro.options.output.publicDir)
-  );
-}
-
 async function prepare(nitro) {
   await prepareDir(nitro.options.output.dir);
   if (!nitro.options.noPublicDir) {

package/dist/kit/index.d.mts

@@ -1,5 +1,5 @@
 import { NitroPreset, NitroPresetMeta, Nitro } from 'nitropack/types';
-import { N as NitroModule } from '../shared/nitro.BSXIveQI.mjs';
+import { N as NitroModule } from '../shared/nitro.0NUDI83a.mjs';
 import 'consola';
 import 'h3';
 import 'hookable';

package/dist/kit/index.d.ts

@@ -1,5 +1,5 @@
 import { NitroPreset, NitroPresetMeta, Nitro } from 'nitropack/types';
-import { N as NitroModule } from '../shared/nitro.BSXIveQI.js';
+import { N as NitroModule } from '../shared/nitro.0NUDI83a.js';
 import 'consola';
 import 'h3';
 import 'hookable';

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.1-20250305-120252.94a73b50";
+const version = "2.11.2-20250305-134511.9f4dffdb";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.1-20250305-120252.94a73b50";
+const version = "2.11.2-20250305-134511.9f4dffdb";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.1-20250305-120252.94a73b50";
+const version = "2.11.2-20250305-134511.9f4dffdb";
 
 export { version };

package/dist/runtime/internal/app.mjs

@@ -2,7 +2,6 @@ import destr from "destr";
 import {
   createApp,
   createRouter,
-  eventHandler,
   fetchWithEvent,
   isEvent,
   lazyEventHandler,
@@ -46,6 +45,27 @@ function createNitroApp() {
       return errorHandler(error, event);
     },
     onRequest: async (event) => {
+      event.context.nitro = event.context.nitro || { errors: [] };
+      const envContext = event.node.req?.__unenv__;
+      if (envContext) {
+        Object.assign(event.context, envContext);
+      }
+      event.fetch = (req, init) => fetchWithEvent(event, req, init, { fetch: localFetch });
+      event.$fetch = (req, init) => fetchWithEvent(event, req, init, {
+        fetch: $fetch
+      });
+      event.waitUntil = (promise) => {
+        if (!event.context.nitro._waitUntilPromises) {
+          event.context.nitro._waitUntilPromises = [];
+        }
+        event.context.nitro._waitUntilPromises.push(promise);
+        if (envContext?.waitUntil) {
+          envContext.waitUntil(promise);
+        }
+      };
+      event.captureError = (error, context) => {
+        captureError(error, { event, ...context });
+      };
       await nitroApp.hooks.callHook("request", event).catch((error) => {
         captureError(error, { event, tags: ["request"] });
       });
@@ -83,31 +103,6 @@ function createNitroApp() {
   });
   globalThis.$fetch = $fetch;
   h3App.use(createRouteRulesHandler({ localFetch }));
-  h3App.use(
-    eventHandler((event) => {
-      event.context.nitro = event.context.nitro || { errors: [] };
-      const envContext = event.node.req?.__unenv__;
-      if (envContext) {
-        Object.assign(event.context, envContext);
-      }
-      event.fetch = (req, init) => fetchWithEvent(event, req, init, { fetch: localFetch });
-      event.$fetch = (req, init) => fetchWithEvent(event, req, init, {
-        fetch: $fetch
-      });
-      event.waitUntil = (promise) => {
-        if (!event.context.nitro._waitUntilPromises) {
-          event.context.nitro._waitUntilPromises = [];
-        }
-        event.context.nitro._waitUntilPromises.push(promise);
-        if (envContext?.waitUntil) {
-          envContext.waitUntil(promise);
-        }
-      };
-      event.captureError = (error, context) => {
-        captureError(error, { event, ...context });
-      };
-    })
-  );
   for (const h of handlers) {
     let handler = h.lazy ? lazyEventHandler(h.handler) : h.handler;
     if (h.middleware || !h.route) {

package/dist/shared/{nitro.BSXIveQI.d.mts → nitro.0NUDI83a.d.mts}

@@ -485,6 +485,7 @@ interface NitroOptions extends PresetOptions {
         crawlLinks: boolean;
         failOnError: boolean;
         ignore: Array<string | RegExp | ((path: string) => undefined | null | boolean)>;
+        ignoreUnprefixedPublicAssets: boolean;
         routes: string[];
         /**
          * Amount of retries. Pass Infinity to retry indefinitely.

package/dist/shared/{nitro.BSXIveQI.d.ts → nitro.0NUDI83a.d.ts}

@@ -485,6 +485,7 @@ interface NitroOptions extends PresetOptions {
         crawlLinks: boolean;
         failOnError: boolean;
         ignore: Array<string | RegExp | ((path: string) => undefined | null | boolean)>;
+        ignoreUnprefixedPublicAssets: boolean;
         routes: string[];
         /**
          * Amount of retries. Pass Infinity to retry indefinitely.

package/dist/types/index.d.mts

@@ -1,7 +1,7 @@
 import { App, Router, H3Event, RouterMethod } from 'h3';
 import { FetchRequest, FetchOptions, FetchResponse } from 'ofetch';
-import { a as NitroOptions, b as NitroConfig, N as NitroModule } from '../shared/nitro.BSXIveQI.mjs';
-export { A as AppConfig, C as CacheEntry, c as CacheOptions, d as CachedEventHandlerOptions, e as CompressOptions, g as DatabaseConnectionConfig, h as DatabaseConnectionConfigs, D as DatabaseConnectionName, l as DevServerOptions, I as EsbuildOptions, O as HTTPStatusCode, L as LoadConfigOptions, u as Nitro, y as NitroBuildInfo, q as NitroDevEventHandler, n as NitroDevServer, v as NitroDynamicConfig, r as NitroErrorHandler, p as NitroEventHandler, x as NitroFrameworkInfo, s as NitroHooks, t as NitroModuleInput, k as NitroOpenAPIConfig, E as NitroPreset, F as NitroPresetMeta, Q as NitroRouteConfig, o as NitroRouteMeta, T as NitroRouteRules, j as NitroRuntimeConfig, i as NitroRuntimeConfigApp, w as NitroTypes, m as NitroWorker, J as NodeExternalsOptions, B as PrerenderGenerateRoute, z as PrerenderRoute, P as PublicAssetDir, M as RawOptions, R as ResponseCacheEntry, G as RollupConfig, H as RollupVirtualOptions, S as ServerAssetDir, K as ServerAssetOptions, f as StorageMounts, V as VirtualModule } from '../shared/nitro.BSXIveQI.mjs';
+import { a as NitroOptions, b as NitroConfig, N as NitroModule } from '../shared/nitro.0NUDI83a.mjs';
+export { A as AppConfig, C as CacheEntry, c as CacheOptions, d as CachedEventHandlerOptions, e as CompressOptions, g as DatabaseConnectionConfig, h as DatabaseConnectionConfigs, D as DatabaseConnectionName, l as DevServerOptions, I as EsbuildOptions, O as HTTPStatusCode, L as LoadConfigOptions, u as Nitro, y as NitroBuildInfo, q as NitroDevEventHandler, n as NitroDevServer, v as NitroDynamicConfig, r as NitroErrorHandler, p as NitroEventHandler, x as NitroFrameworkInfo, s as NitroHooks, t as NitroModuleInput, k as NitroOpenAPIConfig, E as NitroPreset, F as NitroPresetMeta, Q as NitroRouteConfig, o as NitroRouteMeta, T as NitroRouteRules, j as NitroRuntimeConfig, i as NitroRuntimeConfigApp, w as NitroTypes, m as NitroWorker, J as NodeExternalsOptions, B as PrerenderGenerateRoute, z as PrerenderRoute, P as PublicAssetDir, M as RawOptions, R as ResponseCacheEntry, G as RollupConfig, H as RollupVirtualOptions, S as ServerAssetDir, K as ServerAssetOptions, f as StorageMounts, V as VirtualModule } from '../shared/nitro.0NUDI83a.mjs';
 import { Hookable } from 'hookable';
 import { NitroRuntimeHooks as NitroRuntimeHooks$1 } from 'nitropack';
 import { AbstractRequest, AbstractResponse } from 'node-mock-http';

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 import { App, Router, H3Event, RouterMethod } from 'h3';
 import { FetchRequest, FetchOptions, FetchResponse } from 'ofetch';
-import { a as NitroOptions, b as NitroConfig, N as NitroModule } from '../shared/nitro.BSXIveQI.js';
-export { A as AppConfig, C as CacheEntry, c as CacheOptions, d as CachedEventHandlerOptions, e as CompressOptions, g as DatabaseConnectionConfig, h as DatabaseConnectionConfigs, D as DatabaseConnectionName, l as DevServerOptions, I as EsbuildOptions, O as HTTPStatusCode, L as LoadConfigOptions, u as Nitro, y as NitroBuildInfo, q as NitroDevEventHandler, n as NitroDevServer, v as NitroDynamicConfig, r as NitroErrorHandler, p as NitroEventHandler, x as NitroFrameworkInfo, s as NitroHooks, t as NitroModuleInput, k as NitroOpenAPIConfig, E as NitroPreset, F as NitroPresetMeta, Q as NitroRouteConfig, o as NitroRouteMeta, T as NitroRouteRules, j as NitroRuntimeConfig, i as NitroRuntimeConfigApp, w as NitroTypes, m as NitroWorker, J as NodeExternalsOptions, B as PrerenderGenerateRoute, z as PrerenderRoute, P as PublicAssetDir, M as RawOptions, R as ResponseCacheEntry, G as RollupConfig, H as RollupVirtualOptions, S as ServerAssetDir, K as ServerAssetOptions, f as StorageMounts, V as VirtualModule } from '../shared/nitro.BSXIveQI.js';
+import { a as NitroOptions, b as NitroConfig, N as NitroModule } from '../shared/nitro.0NUDI83a.js';
+export { A as AppConfig, C as CacheEntry, c as CacheOptions, d as CachedEventHandlerOptions, e as CompressOptions, g as DatabaseConnectionConfig, h as DatabaseConnectionConfigs, D as DatabaseConnectionName, l as DevServerOptions, I as EsbuildOptions, O as HTTPStatusCode, L as LoadConfigOptions, u as Nitro, y as NitroBuildInfo, q as NitroDevEventHandler, n as NitroDevServer, v as NitroDynamicConfig, r as NitroErrorHandler, p as NitroEventHandler, x as NitroFrameworkInfo, s as NitroHooks, t as NitroModuleInput, k as NitroOpenAPIConfig, E as NitroPreset, F as NitroPresetMeta, Q as NitroRouteConfig, o as NitroRouteMeta, T as NitroRouteRules, j as NitroRuntimeConfig, i as NitroRuntimeConfigApp, w as NitroTypes, m as NitroWorker, J as NodeExternalsOptions, B as PrerenderGenerateRoute, z as PrerenderRoute, P as PublicAssetDir, M as RawOptions, R as ResponseCacheEntry, G as RollupConfig, H as RollupVirtualOptions, S as ServerAssetDir, K as ServerAssetOptions, f as StorageMounts, V as VirtualModule } from '../shared/nitro.0NUDI83a.js';
 import { Hookable } from 'hookable';
 import { NitroRuntimeHooks as NitroRuntimeHooks$1 } from 'nitropack';
 import { AbstractRequest, AbstractResponse } from 'node-mock-http';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.1-20250305-120252.94a73b50",
+  "version": "2.11.2-20250305-134511.9f4dffdb",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",