nitro-nightly 3.1.0-20251029-230306-50bca1ed → 3.1.0-20251030-005056-3637ebe2

package/dist/_build/build.mjs

@@ -1,5 +1,4 @@
 import { s as sanitizeFilePath } from '../_chunks/_deps/mlly.mjs';
-import { r as resolveModulePath } from '../_chunks/_deps/exsolve.mjs';
 import { runtimeDir } from 'nitro/runtime/meta';
 import { b as baseBuildConfig, a as baseBuildPlugins, r as replace, w as writeBuildInfo } from './info.mjs';
 import { builtinModules } from 'node:module';
@@ -16,13 +15,14 @@ import '../_chunks/_deps/acorn.mjs';
 import 'ufo';
 import '../_chunks/_deps/pkg-types.mjs';
 import '../_chunks/_deps/confbox.mjs';
+import '../_chunks/_deps/exsolve.mjs';
 import 'node:url';
-import 'node:fs/promises';
+import 'node:path';
 import 'node:assert';
 import 'node:process';
-import 'node:path';
 import 'node:v8';
 import 'node:util';
+import 'node:fs/promises';
 import '../_chunks/_deps/@rollup/plugin-replace.mjs';
 import '../_chunks/_deps/magic-string.mjs';
 import '../_chunks/_deps/@jridgewell/sourcemap-codec.mjs';
@@ -234,27 +234,6 @@ const getRolldownConfig = (nitro) => {
       }
     }
   };
-  config.plugins.push({
-    name: "nitro:rolldown-resolves",
-    async resolveId(id, parent, options) {
-      if (parent?.startsWith("\0virtual:#nitro-internal-virtual")) {
-        const internalRes = await this.resolve(id, import.meta.url, {
-          ...options,
-          custom: { ...options.custom, skipNoExternals: true }
-        });
-        if (internalRes) {
-          return internalRes;
-        }
-        return resolveModulePath(id, {
-          from: [nitro.options.rootDir, import.meta.url],
-          try: true
-        }) || resolveModulePath("./" + id, {
-          from: [nitro.options.rootDir, import.meta.url],
-          try: true
-        });
-      }
-    }
-  });
   config = defu(nitro.options.rollupConfig, config);
   return config;
 };

package/dist/_build/info.mjs

@@ -1,12 +1,9 @@
 import { r as replace$1 } from '../_chunks/_deps/@rollup/plugin-replace.mjs';
 import { defineEnv } from 'unenv';
 import { runtimeDir, runtimeDependencies } from 'nitro/runtime/meta';
-import { j as join, r as resolve, d as dirname, e as extname, a as relative, i as isAbsolute } from '../_chunks/_deps/pathe.mjs';
-import { pathToFileURL } from 'node:url';
-import { builtinModules } from 'node:module';
+import { j as join, r as resolve, d as dirname, e as extname, a as relative } from '../_chunks/_deps/pathe.mjs';
 import { hash } from 'ohash';
 import { defu } from 'defu';
-import { r as resolveModulePath } from '../_chunks/_deps/exsolve.mjs';
 import { u as unplugin } from '../_chunks/_deps/unimport.mjs';
 import { r as rollup } from '../_chunks/_deps/unwasm.mjs';
 import { connectors } from 'db0';
@@ -286,7 +283,7 @@ function routing(nitro) {
           `
 import * as __routeRules__ from "nitro/runtime/internal/route-rules";
 ${nitro.options.serverEntry ? `import __serverEntry__ from ${JSON.stringify(nitro.options.serverEntry)};` : ""}
-import {${h3Imports.join(", ")}} from "nitro/deps/h3";
+import {${h3Imports.join(", ")}} from "h3";
 
 export const findRouteRules = ${nitro.routing.routeRules.compileToString({ serialize: serializeRouteRule, matchAll: true })}
 
@@ -808,7 +805,7 @@ function rendererTemplate(nitro) {
             return (
               /* js */
               `
-              import { HTTPResponse } from "nitro/deps/h3";
+              import { HTTPResponse } from "h3";
               export const rendererTemplate = () => new HTTPResponse(${JSON.stringify(html)}, { headers: { "content-type": "text/html; charset=utf-8" } });
             `
             );
@@ -849,6 +846,29 @@ function featureFlags(nitro) {
   );
 }
 
+const subpathMap = {
+  "nitro/h3": "h3",
+  "nitro/deps/h3": "h3",
+  "nitro/deps/ofetch": "ofetch"
+};
+function nitroResolveIds() {
+  return {
+    name: "nitro:resolve-ids",
+    resolveId: {
+      order: "pre",
+      handler(id, importer, rOpts) {
+        if (importer && importer.startsWith("\0virtual:#nitro-internal-virtual")) {
+          return this.resolve(id, runtimeDir, { skipSelf: true });
+        }
+        const mappedId = subpathMap[id];
+        if (mappedId) {
+          return this.resolve(mappedId, runtimeDir, { skipSelf: true });
+        }
+      }
+    }
+  };
+}
+
 function baseBuildPlugins(nitro, base) {
   const plugins = [];
   if (nitro.options.imports) {
@@ -879,6 +899,7 @@ function baseBuildPlugins(nitro, base) {
     )
   );
   plugins.push(featureFlags(nitro));
+  plugins.push(nitroResolveIds());
   plugins.push(serverAssets(nitro));
   plugins.push(publicAssets(nitro));
   plugins.push(storage(nitro));
@@ -904,46 +925,7 @@ function baseBuildPlugins(nitro, base) {
   if (nitro.options.renderer?.template) {
     plugins.push(rendererTemplate(nitro));
   }
-  if (nitro.options.noExternals) {
-    plugins.push({
-      name: "no-externals",
-      async resolveId(id, importer, resolveOpts) {
-        if (resolveOpts.custom?.skipNoExternals) {
-          return;
-        }
-        id = base.aliases[id] || id;
-        if (base.env.external.includes(id) || nitro.options.node && (id.startsWith("node:") || builtinModules.includes(id))) {
-          return { id, external: true };
-        }
-        const resolved = await this.resolve(id, importer, resolveOpts);
-        if (!resolved) {
-          const _resolved = resolveModulePath(id, {
-            try: true,
-            from: importer && isAbsolute(importer) ? [pathToFileURL(importer), ...nitro.options.nodeModulesDirs] : nitro.options.nodeModulesDirs,
-            suffixes: ["", "/index"],
-            extensions: [".mjs", ".cjs", ".js", ".mts", ".cts", ".ts", ".json"],
-            conditions: [
-              "default",
-              nitro.options.dev ? "development" : "production",
-              "node",
-              "import",
-              "require"
-            ]
-          });
-          if (_resolved) {
-            return { id: _resolved, external: false };
-          }
-        }
-        if (!resolved || resolved.external && !id.endsWith(".wasm")) {
-          throw new Error(
-            `Cannot resolve ${JSON.stringify(id)} from ${JSON.stringify(
-              importer
-            )} and externals are not allowed!`
-          );
-        }
-      }
-    });
-  } else {
+  if (!nitro.options.noExternals) {
     plugins.push(
       rollupNodeFileTrace(
         defu(nitro.options.externals, {
@@ -961,7 +943,6 @@ function baseBuildPlugins(nitro, base) {
             "@@/",
             "virtual:",
             "nitro/runtime",
-            "nitro/runtime",
             dirname(nitro.options.entry),
             ...nitro.options.experimental.wasm ? [(id) => id?.endsWith(".wasm")] : [],
             runtimeDir,

package/dist/_build/vite.mjs

@@ -841,58 +841,13 @@ function nitroService(ctx) {
     sharedDuringBuild: true,
     applyToEnvironment: (env) => env.name === "nitro",
     resolveId: {
-      async handler(id, importer, options) {
+      async handler(id) {
         if (id === "#nitro-vite-setup") {
           return { id, moduleSideEffects: true };
         }
         if (id === "#nitro-vite-services") {
           return id;
         }
-        if (runtimeDependencies.some(
-          (dep) => id === dep || id.startsWith(`${dep}/`)
-        )) {
-          const resolved = await this.resolve(id, importer, {
-            ...options,
-            skipSelf: true
-          });
-          return resolved || resolveModulePath(id, {
-            from: ctx.nitro.options.nodeModulesDirs,
-            conditions: ctx.nitro.options.exportConditions,
-            try: true
-          });
-        }
-        if (importer?.startsWith("\0virtual:#nitro-internal-virtual")) {
-          const internalRes = await this.resolve(id, import.meta.url, {
-            ...options,
-            custom: { ...options.custom, skipNoExternals: true }
-          });
-          if (internalRes) {
-            return internalRes;
-          }
-          const resolvedFromRoot = await this.resolve(
-            id,
-            ctx.nitro.options.rootDir,
-            { ...options, custom: { ...options.custom, skipNoExternals: true } }
-          );
-          if (resolvedFromRoot) {
-            return resolvedFromRoot;
-          }
-          const ids = [id];
-          if (!/^[./@#]/.test(id)) {
-            ids.push(`./${id}`);
-          }
-          for (const _id of ids) {
-            const resolved = resolveModulePath(_id, {
-              from: process.cwd(),
-              extensions: DEFAULT_EXTENSIONS,
-              suffixes: ["", "/index"],
-              try: true
-            });
-            if (resolved) {
-              return resolved;
-            }
-          }
-        }
       }
     },
     load: {

package/lib/runtime/meta.mjs

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "node:url";
 
-export const pkgDir = fileURLToPath(new URL("../", import.meta.url));
+export const pkgDir = fileURLToPath(new URL("../../", import.meta.url));
 
 export const runtimeDir = fileURLToPath(
   new URL("../../dist/runtime/", import.meta.url)
@@ -28,6 +28,7 @@ export const runtimeDependencies = [
   "unctx", // traced
   "unenv", // dep
   "unstorage", // dep
+  "nitro/h3",
   "nitro/deps/h3",
   "nitro/deps/ofetch",
   "nitro/runtime",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-nightly",
-  "version": "3.1.0-20251029-230306-50bca1ed",
+  "version": "3.1.0-20251030-005056-3637ebe2",
   "description": "Build and Deploy Universal JavaScript Servers",
   "homepage": "https://nitro.build",
   "repository": "nitrojs/nitro",