nitropack-nightly 2.11.0-20250205-132346.c99b22fd → 2.11.0-20250206-184858.0f7c3eaf

package/dist/core/index.mjs

@@ -38,6 +38,7 @@ import { version } from 'nitropack/meta';
 import { gzipSize } from 'gzip-size';
 import prettyBytes from 'pretty-bytes';
 import zlib from 'node:zlib';
+import { walk, parse } from 'ultrahtml';
 import { Worker } from 'node:worker_threads';
 import { setResponseHeaders, getRequestURL, setResponseStatus, getResponseHeader, setResponseHeader, getRequestHeader, send, getRequestHeaders, eventHandler, createError, createApp, fromNodeMiddleware, toNodeListener } from 'h3';
 import { createProxyServer } from 'httpxy';
@@ -1784,7 +1785,6 @@ function isCompressibleMime(mimeType) {
 
 const allowedExtensions = /* @__PURE__ */ new Set(["", ".json"]);
 const linkParents$1 = /* @__PURE__ */ new Map();
-const LINK_REGEX = /(?<=\s)href=(?!&quot;)["']?([^"'>]+)/g;
 const HTML_ENTITIES = {
   "&lt;": "<",
   "&gt;": ">",
@@ -1798,13 +1798,19 @@ function escapeHtml(text) {
     (ch) => HTML_ENTITIES[ch] || ch
   );
 }
-function extractLinks(html, from, res, crawlLinks) {
+async function extractLinks(html, from, res, crawlLinks) {
   const links = [];
   const _links = [];
   if (crawlLinks) {
-    _links.push(
-      ...[...html.matchAll(LINK_REGEX)].map((m) => escapeHtml(m[1])).filter((m) => !decodeURIComponent(m).startsWith("#")).filter((link) => allowedExtensions.has(getExtension(link)))
-    );
+    await walk(parse(html), (node) => {
+      if (!node.attributes?.href) {
+        return;
+      }
+      const link = escapeHtml(node.attributes.href);
+      if (!decodeURIComponent(link).startsWith("#") && allowedExtensions.has(getExtension(link))) {
+        _links.push(link);
+      }
+    });
   }
   const header = res.headers.get("x-nitro-prerender") || "";
   _links.push(...header.split(",").map((i) => decodeURIComponent(i.trim())));
@@ -2037,7 +2043,7 @@ async function prerender(nitro) {
       _route.skip = true;
     }
     if (!_route.error && (isImplicitHTML || route.endsWith(".html"))) {
-      const extractedLinks = extractLinks(
+      const extractedLinks = await extractLinks(
         dataBuff.toString("utf8"),
         route,
         res,

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250205-132346.c99b22fd";
+const version = "2.11.0-20250206-184858.0f7c3eaf";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250205-132346.c99b22fd";
+const version = "2.11.0-20250206-184858.0f7c3eaf";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250205-132346.c99b22fd";
+const version = "2.11.0-20250206-184858.0f7c3eaf";
 
 export { version };

package/dist/runtime/internal/app.mjs

@@ -11,9 +11,9 @@ import {
 import { createHooks } from "hookable";
 import { Headers, createFetch } from "ofetch";
 import {
-  createCall,
-  createFetch as createLocalFetch
-} from "unenv/runtime/fetch/index";
+  fetchNodeRequestHandler,
+  callNodeRequestHandler
+} from "node-mock-http";
 import errorHandler from "#nitro-internal-virtual/error-handler";
 import { plugins } from "#nitro-internal-virtual/plugins";
 import { handlers } from "#nitro-internal-virtual/server-handlers";
@@ -64,11 +64,18 @@ function createNitroApp() {
   const router = createRouter({
     preemptive: true
   });
-  const localCall = createCall(toNodeListener(h3App));
-  const _localFetch = createLocalFetch(localCall, (u, i) => globalThis.fetch(u, i));
-  const localFetch = (input, init) => _localFetch(input, init).then(
-    (response) => normalizeFetchResponse(response)
-  );
+  const nodeHandler = toNodeListener(h3App);
+  const localCall = (aRequest) => callNodeRequestHandler(nodeHandler, aRequest);
+  const localFetch = (input, init) => {
+    if (!input.toString().startsWith("/")) {
+      return globalThis.fetch(input, init);
+    }
+    return fetchNodeRequestHandler(
+      nodeHandler,
+      input,
+      init
+    ).then((response) => normalizeFetchResponse(response));
+  };
   const $fetch = createFetch({
     fetch: localFetch,
     Headers,

package/dist/types/index.d.mts

@@ -4,7 +4,7 @@ import { a as NitroConfig, N as NitroModule, b as NitroOptions } from '../shared
 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.BwjZlymJ.mjs';
 import { Hookable } from 'hookable';
 import { NitroRuntimeHooks as NitroRuntimeHooks$1 } from 'nitropack';
-import { createCall, createFetch } from 'unenv/runtime/fetch/index';
+import { AbstractRequest, AbstractResponse } from 'node-mock-http';
 import { CaptureError as CaptureError$1, CapturedErrorContext as CapturedErrorContext$1, CacheOptions } from 'nitropack/types';
 import 'consola';
 import 'nitropack/presets';
@@ -52,8 +52,8 @@ interface NitroApp {
     h3App: App;
     router: Router;
     hooks: Hookable<NitroRuntimeHooks>;
-    localCall: ReturnType<typeof createCall>;
-    localFetch: ReturnType<typeof createFetch>;
+    localCall: (aRequest: AbstractRequest) => Promise<AbstractResponse>;
+    localFetch: (req: string | URL | Request, init?: RequestInit & AbstractRequest) => Promise<Response>;
     captureError: CaptureError;
 }
 interface NitroAppPlugin {

package/dist/types/index.d.ts

@@ -4,7 +4,7 @@ import { a as NitroConfig, N as NitroModule, b as NitroOptions } from '../shared
 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.BwjZlymJ.js';
 import { Hookable } from 'hookable';
 import { NitroRuntimeHooks as NitroRuntimeHooks$1 } from 'nitropack';
-import { createCall, createFetch } from 'unenv/runtime/fetch/index';
+import { AbstractRequest, AbstractResponse } from 'node-mock-http';
 import { CaptureError as CaptureError$1, CapturedErrorContext as CapturedErrorContext$1, CacheOptions } from 'nitropack/types';
 import 'consola';
 import 'nitropack/presets';
@@ -52,8 +52,8 @@ interface NitroApp {
     h3App: App;
     router: Router;
     hooks: Hookable<NitroRuntimeHooks>;
-    localCall: ReturnType<typeof createCall>;
-    localFetch: ReturnType<typeof createFetch>;
+    localCall: (aRequest: AbstractRequest) => Promise<AbstractResponse>;
+    localFetch: (req: string | URL | Request, init?: RequestInit & AbstractRequest) => Promise<Response>;
     captureError: CaptureError;
 }
 interface NitroAppPlugin {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.0-20250205-132346.c99b22fd",
+  "version": "2.11.0-20250206-184858.0f7c3eaf",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",
@@ -142,6 +142,7 @@
     "mime": "^4.0.6",
     "mlly": "^1.7.4",
     "node-fetch-native": "^1.6.6",
+    "node-mock-http": "^1.0.0",
     "ofetch": "^1.4.1",
     "ohash": "^1.1.4",
     "openapi-typescript": "^7.6.0",
@@ -159,6 +160,7 @@
     "source-map": "^0.7.4",
     "std-env": "^3.8.0",
     "ufo": "^1.5.4",
+    "ultrahtml": "^1.5.3",
     "uncrypto": "^0.1.3",
     "unctx": "^2.4.1",
     "unenv": "^1.10.0",