nitropack-nightly 2.11.0-20250224-142059.8ccbde5f → 2.11.0-20250225-133725.2ab3e582

package/dist/core/index.mjs

@@ -13,7 +13,7 @@ import defu$1, { defu } from 'defu';
 import { withLeadingSlash, withoutTrailingSlash, withTrailingSlash, withBase, parseURL, joinURL, withoutBase } from 'ufo';
 import { colors } from 'consola/utils';
 import escapeRE from 'escape-string-regexp';
-import { resolveModuleExportNames, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
+import { resolveModuleExportNames, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { resolveNitroPath, isDirectory, writeFile, prettyPath } from 'nitropack/kit';
 export { defineNitroPreset } from 'nitropack/kit';
 import { findWorkspaceDir } from 'pkg-types';
@@ -32,6 +32,7 @@ import { debounce } from 'perfect-debounce';
 import * as rollup from 'rollup';
 import { upperFirst } from 'scule';
 import { genTypeImport } from 'knitwork';
+import { resolveModulePath } from 'exsolve';
 import { resolveAlias } from 'pathe/utils';
 import { generateTypes, resolveSchema } from 'untyped';
 import { version } from 'nitropack/meta';
@@ -522,7 +523,8 @@ async function resolvePathOptions(options) {
   options.nodeModulesDirs.push(resolve(pkgDir, ".."));
   options.nodeModulesDirs = [
     ...new Set(
-      options.nodeModulesDirs.map((dir) => resolve(options.rootDir, dir))
+      // Adding trailing slash to optimize resolve performance (path is explicitly a dir)
+      options.nodeModulesDirs.map((dir) => resolve(options.rootDir, dir) + "/")
     )
   ];
   options.plugins = options.plugins.map((p) => resolveNitroPath(p, options));
@@ -1189,9 +1191,12 @@ async function writeTypes(nitro) {
       }
       let path = resolveAlias(i.from, nitro.options.alias);
       if (!isAbsolute(path)) {
-        const resolvedPath = await resolvePath(i.from, {
-          url: nitro.options.nodeModulesDirs
-        }).catch(() => null);
+        const resolvedPath = resolveModulePath(i.from, {
+          try: true,
+          from: nitro.options.nodeModulesDirs,
+          suffixes: ["/index"],
+          extensions: [".mjs", ".cjs", ".js", ".mts", ".cts", ".ts"]
+        });
         if (resolvedPath) {
           const { dir, name } = parseNodeModulePath(resolvedPath);
           if (!dir || !name) {

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250224-142059.8ccbde5f";
+const version = "2.11.0-20250225-133725.2ab3e582";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250224-142059.8ccbde5f";
+const version = "2.11.0-20250225-133725.2ab3e582";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250224-142059.8ccbde5f";
+const version = "2.11.0-20250225-133725.2ab3e582";
 
 export { version };

package/dist/presets/node/preset.mjs

@@ -1,6 +1,6 @@
 import { defineNitroPreset } from "nitropack/kit";
 import { normalize } from "pathe";
-import { resolvePathSync } from "mlly";
+import { resolveModulePath } from "exsolve";
 const node = defineNitroPreset(
   {
     entry: "./runtime/node-listener"
@@ -33,8 +33,9 @@ const nodeCluster = defineNitroPreset(
       "rollup:before"(_nitro, rollupConfig) {
         const manualChunks = rollupConfig.output?.manualChunks;
         if (manualChunks && typeof manualChunks === "function") {
-          const serverEntry = resolvePathSync("./runtime/node-server", {
-            url: import.meta.url
+          const serverEntry = resolveModulePath("./runtime/node-server", {
+            from: import.meta.url,
+            extensions: [".mjs", ".ts"]
           });
           rollupConfig.output.manualChunks = (id, meta) => {
             if (id.includes("node-server") && normalize(id) === serverEntry) {

package/dist/rollup/index.mjs

@@ -1,5 +1,5 @@
 import { builtinModules, createRequire } from 'node:module';
-import { pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import inject from '@rollup/plugin-inject';
@@ -7,6 +7,7 @@ import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import { defu } from 'defu';
 import { parseNodeModulePath as parseNodeModulePath$1, isValidNodeImport, normalizeid, lookupNodeModuleSubpath, resolvePath, sanitizeFilePath } from 'mlly';
+import { resolveModuleURL, resolveModulePath } from 'exsolve';
 import { runtimeDir, runtimeDependencies } from 'nitropack/runtime/meta';
 import { hash } from 'ohash';
 import { resolve, dirname, extname, relative, join, normalize, isAbsolute } from 'pathe';
@@ -359,21 +360,18 @@ function printWarnings(id, result, plugin) {
 
 function externals$1(opts) {
   const trackedExternals = /* @__PURE__ */ new Set();
-  const _resolveCache = /* @__PURE__ */ new Map();
-  const _resolve = async (id) => {
+  const tryResolve = (id) => {
     if (id.startsWith("\0")) {
       return id;
     }
-    let resolved = _resolveCache.get(id);
-    if (resolved) {
-      return resolved;
-    }
-    resolved = await resolvePath(id, {
+    const res = resolveModuleURL(id, {
+      try: true,
       conditions: opts.exportConditions,
-      url: opts.moduleDirectories
+      from: opts.moduleDirectories,
+      suffixes: ["/index"],
+      extensions: [".mjs", ".cjs", ".js", ".mts", ".cts", ".ts", ".json"]
     });
-    _resolveCache.set(id, resolved);
-    return resolved;
+    return res?.startsWith("file://") ? fileURLToPath(res) : res;
   };
   const inlineMatchers = (opts.inline || []).map((p) => normalizeMatcher(p)).sort((a, b) => (b.score || 0) - (a.score || 0));
   const externalMatchers = (opts.external || []).map((p) => normalizeMatcher(p)).sort((a, b) => (b.score || 0) - (a.score || 0));
@@ -407,7 +405,7 @@ function externals$1(opts) {
         return null;
       }
       if (!isAbsolute(resolved.id) || !existsSync(resolved.id) || await isDirectory(resolved.id)) {
-        resolved.id = await _resolve(resolved.id).catch(() => resolved.id);
+        resolved.id = tryResolve(resolved.id) || resolved.id;
       }
       if (!await isValidNodeImport(resolved.id).catch(() => false)) {
         return null;
@@ -425,17 +423,19 @@ function externals$1(opts) {
       }
       if (pkgName !== originalId) {
         if (!isAbsolute(originalId)) {
-          const fullPath = await _resolve(originalId);
-          trackedExternals.add(fullPath);
-          return {
-            id: originalId,
-            external: true
-          };
+          const fullPath = tryResolve(originalId);
+          if (fullPath) {
+            trackedExternals.add(fullPath);
+            return {
+              id: originalId,
+              external: true
+            };
+          }
         }
-        const packageEntry = await _resolve(pkgName).catch(() => null);
+        const packageEntry = tryResolve(pkgName);
         if (packageEntry !== id) {
           const guessedSubpath = await lookupNodeModuleSubpath(id).catch(() => null);
-          const resolvedGuess = guessedSubpath && await _resolve(join(pkgName, guessedSubpath)).catch(() => null);
+          const resolvedGuess = guessedSubpath && tryResolve(join(pkgName, guessedSubpath));
           if (resolvedGuess === id) {
             trackedExternals.add(resolvedGuess);
             return {
@@ -2007,8 +2007,11 @@ export const plugins = [
         }
         const resolved = await this.resolve(id, from, resolveOpts);
         if (!resolved) {
-          const _resolved = await resolvePath(id, {
-            url: nitro.options.nodeModulesDirs,
+          const _resolved = resolveModulePath(id, {
+            try: true,
+            from: nitro.options.nodeModulesDirs,
+            suffixes: ["/index"],
+            extensions: [".mjs", ".cjs", ".js", ".mts", ".cts", ".ts", ".json"],
             conditions: [
               "default",
               nitro.options.dev ? "development" : "production",
@@ -2016,7 +2019,7 @@ export const plugins = [
               "import",
               "require"
             ]
-          }).catch(() => null);
+          });
           if (_resolved) {
             return { id: _resolved, external: false };
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.0-20250224-142059.8ccbde5f",
+  "version": "2.11.0-20250225-133725.2ab3e582",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",
@@ -124,6 +124,7 @@
     "esbuild": "^0.25.0",
     "escape-string-regexp": "^5.0.0",
     "etag": "^1.8.1",
+    "exsolve": "^0.3.1",
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "gzip-size": "^7.0.0",