vite-node 0.34.2 → 0.34.4

package/README.md

@@ -40,7 +40,7 @@ npx vite-node -h
 
 ### Options via CLI
 
-[All `ViteNodeServer` options](https://github.com/vitest-dev/vitest/blob/main/packages/vite-node/src/types.ts#L70-L89) are supported by the CLI. They may be defined through the dot syntax, as shown below:
+[All `ViteNodeServer` options](https://github.com/vitest-dev/vitest/blob/main/packages/vite-node/src/types.ts#L92-L111) are supported by the CLI. They may be defined through the dot syntax, as shown below:
 
 ```bash
 npx vite-node --options.deps.inline="module-name" --options.deps.external="/module-regexp/" index.ts
@@ -130,7 +130,7 @@ await server.close()
 
 Sometimes you might want to inspect the transformed code to investigate issues. You can set environment variable `VITE_NODE_DEBUG_DUMP=true` to let vite-node write the transformed result of each module under `.vite-node/dump`.
 
-If you want to debug by modifying the dumped code, you can change the value of `VITE_NODE_DEBUG_DUMP` to `load` and search for the dumpped files and use them for executing.
+If you want to debug by modifying the dumped code, you can change the value of `VITE_NODE_DEBUG_DUMP` to `load` and search for the dumped files and use them for executing.
 
 ```bash
 VITE_NODE_DEBUG_DUMP=load vite-node example.ts
@@ -151,7 +151,7 @@ const server = new ViteNodeServer(viteServer, {
 
 ### Debug Execution
 
-If the process get stuck, it might because there is a unresolvable circular dependencies, you can set `VITE_NODE_DEBUG_RUNNER=true` to vite-node warn about it.
+If the process gets stuck, it might be because there are unresolvable circular dependencies. You can set `VITE_NODE_DEBUG_RUNNER=true` for vite-node to warn about this.
 
 ```bash
 VITE_NODE_DEBUG_RUNNER=true vite-node example.ts

package/dist/cli.cjs

@@ -6,8 +6,8 @@ var vite = require('vite');
 var server = require('./server.cjs');
 var client = require('./client.cjs');
 var utils = require('./utils.cjs');
-var sourceMap = require('./source-map.cjs');
 var hmr = require('./chunk-hmr.cjs');
+var sourceMap = require('./source-map.cjs');
 require('perf_hooks');
 require('fs');
 require('pathe');
@@ -25,7 +25,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var cac__default = /*#__PURE__*/_interopDefaultLegacy(cac);
 var c__default = /*#__PURE__*/_interopDefaultLegacy(c);
 
-var version = "0.34.2";
+var version = "0.34.4";
 
 const cli = cac__default["default"]("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/cli.d.ts

@@ -1,5 +1,4 @@
-import { f as ViteNodeServerOptions } from './types-e8623e9c.js';
-import 'vite/types/hot';
+import { f as ViteNodeServerOptions } from './types-0f31b933.js';
 import './types.d-7442d07f.js';
 
 interface CliOptions {

package/dist/cli.mjs

@@ -18,7 +18,7 @@ import 'node:path';
 import 'node:vm';
 import 'node:events';
 
-var version = "0.34.2";
+var version = "0.34.4";
 
 const cli = cac("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/client.d.ts

@@ -1,3 +1,2 @@
 import './types.d-7442d07f.js';
-export { i as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-e8623e9c.js';
-import 'vite/types/hot';
+export { k as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, i as ViteNodeRunner } from './types-0f31b933.js';

package/dist/hmr.d.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'node:events';
-import { HMRPayload as HMRPayload$1, Plugin } from 'vite';
-import { h as ViteNodeRunner, H as HotContext } from './types-e8623e9c.js';
-import 'vite/types/hot';
+import { HMRPayload, Plugin } from 'vite';
+import { h as CustomEventMap, i as ViteNodeRunner, j as HMRPayload$1, H as HotContext } from './types-0f31b933.js';
 import './types.d-7442d07f.js';
 
 type EventType = string | symbol;
@@ -13,7 +12,7 @@ interface Emitter<Events extends Record<EventType, unknown>> {
     emit<Key extends keyof Events>(type: undefined extends Events[Key] ? Key : never): void;
 }
 type HMREmitter = Emitter<{
-    'message': HMRPayload$1;
+    'message': HMRPayload;
 }> & EventEmitter;
 declare module 'vite' {
     interface ViteDevServer {
@@ -23,82 +22,6 @@ declare module 'vite' {
 declare function createHmrEmitter(): HMREmitter;
 declare function viteNodeHmrPlugin(): Plugin;
 
-type HMRPayload =
-  | ConnectedPayload
-  | UpdatePayload
-  | FullReloadPayload
-  | CustomPayload
-  | ErrorPayload
-  | PrunePayload
-
-interface ConnectedPayload {
-  type: 'connected'
-}
-
-interface UpdatePayload {
-  type: 'update'
-  updates: Update[]
-}
-
-interface Update {
-  type: 'js-update' | 'css-update'
-  path: string
-  acceptedPath: string
-  timestamp: number
-  /**
-   * @experimental internal
-   */
-  explicitImportRequired?: boolean | undefined
-}
-
-interface PrunePayload {
-  type: 'prune'
-  paths: string[]
-}
-
-interface FullReloadPayload {
-  type: 'full-reload'
-  path?: string
-}
-
-interface CustomPayload {
-  type: 'custom'
-  event: string
-  data?: any
-}
-
-interface ErrorPayload {
-  type: 'error'
-  err: {
-    [name: string]: any
-    message: string
-    stack: string
-    id?: string
-    frame?: string
-    plugin?: string
-    pluginCode?: string
-    loc?: {
-      file?: string
-      line: number
-      column: number
-    }
-  }
-}
-
-interface CustomEventMap {
-  'vite:beforeUpdate': UpdatePayload
-  'vite:afterUpdate': UpdatePayload
-  'vite:beforePrune': PrunePayload
-  'vite:beforeFullReload': FullReloadPayload
-  'vite:error': ErrorPayload
-  'vite:invalidate': InvalidatePayload
-}
-
-interface InvalidatePayload {
-  path: string
-  message: string | undefined
-}
-
 type ModuleNamespace = Record<string, any> & {
     [Symbol.toStringTag]: 'Module';
 };
@@ -126,7 +49,7 @@ interface CacheData {
 declare function getCache(runner: ViteNodeRunner): CacheData;
 declare function sendMessageBuffer(runner: ViteNodeRunner, emitter: HMREmitter): void;
 declare function reload(runner: ViteNodeRunner, files: string[]): Promise<any[]>;
-declare function handleMessage(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], payload: HMRPayload): Promise<void>;
+declare function handleMessage(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], payload: HMRPayload$1): Promise<void>;
 declare function createHotContext(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], ownerPath: string): HotContext;
 
 export { Emitter, EventType, HMREmitter, Handler, HotCallback, HotModule, InferCustomEventPayload, ModuleNamespace, createHmrEmitter, createHotContext, getCache, handleMessage, reload, sendMessageBuffer, viteNodeHmrPlugin };

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-e8623e9c.js';
+export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-0f31b933.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
-import 'vite/types/hot';

package/dist/server.cjs

@@ -249,7 +249,7 @@ class ViteNodeServer {
     });
   }
   async resolveId(id, importer, transformMode) {
-    if (importer && !importer.startsWith(this.server.config.root))
+    if (importer && !importer.startsWith(utils.withTrailingSlash(this.server.config.root)))
       importer = pathe.resolve(this.server.config.root, importer);
     const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
@@ -313,7 +313,7 @@ class ViteNodeServer {
     let result;
     const cacheDir = (_a = this.options.deps) == null ? void 0 : _a.cacheDir;
     if (cacheDir && id.includes(cacheDir)) {
-      if (!id.startsWith(this.server.config.root))
+      if (!id.startsWith(utils.withTrailingSlash(this.server.config.root)))
         id = pathe.join(this.server.config.root, id);
       const timeout = setTimeout(() => {
         throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`);

package/dist/server.d.ts

@@ -1,7 +1,6 @@
 import { TransformResult, ViteDevServer } from 'vite';
 import { E as EncodedSourceMap } from './types.d-7442d07f.js';
-import { g as DebuggerOptions, D as DepsHandlingOptions, f as ViteNodeServerOptions, F as FetchResult, e as ViteNodeResolveId } from './types-e8623e9c.js';
-import 'vite/types/hot';
+import { g as DebuggerOptions, D as DepsHandlingOptions, f as ViteNodeServerOptions, F as FetchResult, e as ViteNodeResolveId } from './types-0f31b933.js';
 
 declare class Debugger {
     options: DebuggerOptions;

package/dist/server.mjs

@@ -3,7 +3,7 @@ import { existsSync, promises } from 'node:fs';
 import { join, resolve, relative, normalize } from 'pathe';
 import createDebug from 'debug';
 import { isValidNodeImport } from 'mlly';
-import { isNodeBuiltin, slash, toArray, normalizeModuleId, toFilePath } from './utils.mjs';
+import { isNodeBuiltin, slash, toArray, withTrailingSlash, normalizeModuleId, toFilePath } from './utils.mjs';
 import { KNOWN_ASSET_TYPES } from './constants.mjs';
 import c from 'picocolors';
 import { withInlineSourcemap } from './source-map.mjs';
@@ -240,7 +240,7 @@ class ViteNodeServer {
     });
   }
   async resolveId(id, importer, transformMode) {
-    if (importer && !importer.startsWith(this.server.config.root))
+    if (importer && !importer.startsWith(withTrailingSlash(this.server.config.root)))
       importer = resolve(this.server.config.root, importer);
     const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
@@ -304,7 +304,7 @@ class ViteNodeServer {
     let result;
     const cacheDir = (_a = this.options.deps) == null ? void 0 : _a.cacheDir;
     if (cacheDir && id.includes(cacheDir)) {
-      if (!id.startsWith(this.server.config.root))
+      if (!id.startsWith(withTrailingSlash(this.server.config.root)))
         id = join(this.server.config.root, id);
       const timeout = setTimeout(() => {
         throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`);

package/dist/source-map.cjs

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var pathe = require('pathe');
+var utils = require('./utils.cjs');
 var path = require('path');
 var fs = require('fs');
+require('node:url');
+require('module');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -871,15 +874,17 @@ function withInlineSourcemap(result, options) {
   let code = result.code;
   if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE))
     return result;
-  map.sources = (_a = map.sources) == null ? void 0 : _a.map((source) => {
-    if (!source)
+  if ("sources" in map) {
+    map.sources = (_a = map.sources) == null ? void 0 : _a.map((source) => {
+      if (!source)
+        return source;
+      if (pathe.isAbsolute(source)) {
+        const actualPath = !source.startsWith(utils.withTrailingSlash(options.root)) && source.startsWith("/") ? pathe.resolve(options.root, source.slice(1)) : source;
+        return pathe.relative(pathe.dirname(options.filepath), actualPath);
+      }
       return source;
-    if (pathe.isAbsolute(source)) {
-      const actualPath = !source.startsWith(options.root) && source.startsWith("/") ? pathe.resolve(options.root, source.slice(1)) : source;
-      return pathe.relative(pathe.dirname(options.filepath), actualPath);
-    }
-    return source;
-  });
+    });
+  }
   const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
   while (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");

package/dist/source-map.mjs

@@ -1,6 +1,9 @@
 import { isAbsolute, resolve as resolve$2, relative, dirname } from 'pathe';
+import { withTrailingSlash } from './utils.mjs';
 import path from 'node:path';
 import fs from 'node:fs';
+import 'node:url';
+import 'node:module';
 
 const comma = ','.charCodeAt(0);
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -862,15 +865,17 @@ function withInlineSourcemap(result, options) {
   let code = result.code;
   if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE))
     return result;
-  map.sources = (_a = map.sources) == null ? void 0 : _a.map((source) => {
-    if (!source)
+  if ("sources" in map) {
+    map.sources = (_a = map.sources) == null ? void 0 : _a.map((source) => {
+      if (!source)
+        return source;
+      if (isAbsolute(source)) {
+        const actualPath = !source.startsWith(withTrailingSlash(options.root)) && source.startsWith("/") ? resolve$2(options.root, source.slice(1)) : source;
+        return relative(dirname(options.filepath), actualPath);
+      }
       return source;
-    if (isAbsolute(source)) {
-      const actualPath = !source.startsWith(options.root) && source.startsWith("/") ? resolve$2(options.root, source.slice(1)) : source;
-      return relative(dirname(options.filepath), actualPath);
-    }
-    return source;
-  });
+    });
+  }
   const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
   while (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");

package/dist/{types-e8623e9c.d.ts → types-0f31b933.d.ts}

@@ -1,6 +1,127 @@
-import { ViteHotContext } from 'vite/types/hot';
 import { E as EncodedSourceMap } from './types.d-7442d07f.js';
 
+type HMRPayload =
+  | ConnectedPayload
+  | UpdatePayload
+  | FullReloadPayload
+  | CustomPayload
+  | ErrorPayload
+  | PrunePayload
+
+interface ConnectedPayload {
+  type: 'connected'
+}
+
+interface UpdatePayload {
+  type: 'update'
+  updates: Update[]
+}
+
+interface Update {
+  type: 'js-update' | 'css-update'
+  path: string
+  acceptedPath: string
+  timestamp: number
+  /**
+   * @experimental internal
+   */
+  explicitImportRequired?: boolean | undefined
+}
+
+interface PrunePayload {
+  type: 'prune'
+  paths: string[]
+}
+
+interface FullReloadPayload {
+  type: 'full-reload'
+  path?: string
+}
+
+interface CustomPayload {
+  type: 'custom'
+  event: string
+  data?: any
+}
+
+interface ErrorPayload {
+  type: 'error'
+  err: {
+    [name: string]: any
+    message: string
+    stack: string
+    id?: string
+    frame?: string
+    plugin?: string
+    pluginCode?: string
+    loc?: {
+      file?: string
+      line: number
+      column: number
+    }
+  }
+}
+
+interface CustomEventMap {
+  'vite:beforeUpdate': UpdatePayload
+  'vite:afterUpdate': UpdatePayload
+  'vite:beforePrune': PrunePayload
+  'vite:beforeFullReload': FullReloadPayload
+  'vite:error': ErrorPayload
+  'vite:invalidate': InvalidatePayload
+  'vite:ws:connect': WebSocketConnectionPayload
+  'vite:ws:disconnect': WebSocketConnectionPayload
+}
+
+interface WebSocketConnectionPayload {
+  /**
+   * @experimental
+   * We expose this instance experimentally to see potential usage.
+   * This might be removed in the future if we didn't find reasonable use cases.
+   * If you find this useful, please open an issue with details so we can discuss and make it stable API.
+   */
+  webSocket: WebSocket
+}
+
+interface InvalidatePayload {
+  path: string
+  message: string | undefined
+}
+
+type InferCustomEventPayload<T extends string> =
+  T extends keyof CustomEventMap ? CustomEventMap[T] : any
+
+type ModuleNamespace = Record<string, any> & {
+  [Symbol.toStringTag]: 'Module'
+}
+
+interface ViteHotContext {
+  readonly data: any
+
+  accept(): void
+  accept(cb: (mod: ModuleNamespace | undefined) => void): void
+  accept(dep: string, cb: (mod: ModuleNamespace | undefined) => void): void
+  accept(
+    deps: readonly string[],
+    cb: (mods: Array<ModuleNamespace | undefined>) => void,
+  ): void
+
+  acceptExports(
+    exportNames: string | readonly string[],
+    cb?: (mod: ModuleNamespace | undefined) => void,
+  ): void
+
+  dispose(cb: (data: any) => void): void
+  prune(cb: (data: any) => void): void
+  invalidate(message?: string): void
+
+  on<T extends string>(
+    event: T,
+    cb: (payload: InferCustomEventPayload<T>) => void,
+  ): void
+  send<T extends string>(event: T, data?: InferCustomEventPayload<T>): void
+}
+
 declare const DEFAULT_REQUEST_STUBS: Record<string, Record<string, unknown>>;
 declare class ModuleCacheMap extends Map<string, ModuleCache> {
     normalizePath(fsPath: string): string;
@@ -174,4 +295,4 @@ interface DebuggerOptions {
     loadDumppedModules?: boolean;
 }
 
-export { Arrayable as A, CreateHotContextFunction as C, DepsHandlingOptions as D, FetchResult as F, HotContext as H, ModuleCacheMap as M, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeRunnerOptions as V, Awaitable as a, FetchFunction as b, ResolveIdFunction as c, ModuleCache as d, ViteNodeResolveId as e, ViteNodeServerOptions as f, DebuggerOptions as g, ViteNodeRunner as h, DEFAULT_REQUEST_STUBS as i };
+export { Arrayable as A, CreateHotContextFunction as C, DepsHandlingOptions as D, FetchResult as F, HotContext as H, ModuleCacheMap as M, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeRunnerOptions as V, Awaitable as a, FetchFunction as b, ResolveIdFunction as c, ModuleCache as d, ViteNodeResolveId as e, ViteNodeServerOptions as f, DebuggerOptions as g, CustomEventMap as h, ViteNodeRunner as i, HMRPayload as j, DEFAULT_REQUEST_STUBS as k };

package/dist/types.d.ts

@@ -1,3 +1,2 @@
-import 'vite/types/hot';
+export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-0f31b933.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
-export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-e8623e9c.js';

package/dist/utils.cjs

@@ -17,7 +17,7 @@ function slash(str) {
 }
 const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
-  if (base && id.startsWith(base))
+  if (base && id.startsWith(withTrailingSlash(base)))
     id = `/${id.slice(base.length)}`;
   if (driveRegexp && !(driveRegexp == null ? void 0 : driveRegexp.test(id)) && (driveOppositeRegext == null ? void 0 : driveOppositeRegext.test(id)))
     id = id.replace(driveOppositeRegext, `${drive}$1`);
@@ -67,11 +67,11 @@ function toFilePath(id, root) {
   let { absolute, exists } = (() => {
     if (id.startsWith("/@fs/"))
       return { absolute: id.slice(4), exists: true };
-    if (!id.startsWith(root) && id.startsWith("/")) {
+    if (!id.startsWith(withTrailingSlash(root)) && id.startsWith("/")) {
       const resolved = pathe.resolve(root, id.slice(1));
       if (fs.existsSync(cleanUrl(resolved)))
         return { absolute: resolved, exists: true };
-    } else if (id.startsWith(root) && fs.existsSync(cleanUrl(id))) {
+    } else if (id.startsWith(withTrailingSlash(root)) && fs.existsSync(cleanUrl(id))) {
       return { absolute: id, exists: true };
     }
     return { absolute: id, exists: false };
@@ -122,6 +122,11 @@ function traverseBetweenDirs(longerDir, shorterDir, cb) {
     longerDir = pathe.dirname(longerDir);
   }
 }
+function withTrailingSlash(path) {
+  if (path[path.length - 1] !== "/")
+    return `${path}/`;
+  return path;
+}
 function createImportMetaEnvProxy() {
   const booleanKeys = [
     "DEV",
@@ -164,3 +169,4 @@ exports.setCacheData = setCacheData;
 exports.slash = slash;
 exports.toArray = toArray;
 exports.toFilePath = toFilePath;
+exports.withTrailingSlash = withTrailingSlash;

package/dist/utils.d.ts

@@ -1,5 +1,4 @@
-import { N as Nullable, A as Arrayable } from './types-e8623e9c.js';
-import 'vite/types/hot';
+import { N as Nullable, A as Arrayable } from './types-0f31b933.js';
 import './types.d-7442d07f.js';
 
 declare const isWindows: boolean;
@@ -25,6 +24,7 @@ declare function isNodeBuiltin(id: string): boolean;
 declare function toArray<T>(array?: Nullable<Arrayable<T>>): Array<T>;
 declare function getCachedData<T>(cache: Map<string, T>, basedir: string, originalBasedir: string): NonNullable<T> | undefined;
 declare function setCacheData<T>(cache: Map<string, T>, data: T, basedir: string, originalBasedir: string): void;
+declare function withTrailingSlash(path: string): string;
 declare function createImportMetaEnvProxy(): NodeJS.ProcessEnv;
 
-export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath };
+export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath, withTrailingSlash };

package/dist/utils.mjs

@@ -13,7 +13,7 @@ function slash(str) {
 }
 const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
-  if (base && id.startsWith(base))
+  if (base && id.startsWith(withTrailingSlash(base)))
     id = `/${id.slice(base.length)}`;
   if (driveRegexp && !(driveRegexp == null ? void 0 : driveRegexp.test(id)) && (driveOppositeRegext == null ? void 0 : driveOppositeRegext.test(id)))
     id = id.replace(driveOppositeRegext, `${drive}$1`);
@@ -63,11 +63,11 @@ function toFilePath(id, root) {
   let { absolute, exists } = (() => {
     if (id.startsWith("/@fs/"))
       return { absolute: id.slice(4), exists: true };
-    if (!id.startsWith(root) && id.startsWith("/")) {
+    if (!id.startsWith(withTrailingSlash(root)) && id.startsWith("/")) {
       const resolved = resolve(root, id.slice(1));
       if (existsSync(cleanUrl(resolved)))
         return { absolute: resolved, exists: true };
-    } else if (id.startsWith(root) && existsSync(cleanUrl(id))) {
+    } else if (id.startsWith(withTrailingSlash(root)) && existsSync(cleanUrl(id))) {
       return { absolute: id, exists: true };
     }
     return { absolute: id, exists: false };
@@ -118,6 +118,11 @@ function traverseBetweenDirs(longerDir, shorterDir, cb) {
     longerDir = dirname(longerDir);
   }
 }
+function withTrailingSlash(path) {
+  if (path[path.length - 1] !== "/")
+    return `${path}/`;
+  return path;
+}
 function createImportMetaEnvProxy() {
   const booleanKeys = [
     "DEV",
@@ -144,4 +149,4 @@ function createImportMetaEnvProxy() {
   });
 }
 
-export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath };
+export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath, withTrailingSlash };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",