vite-node 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/cli.cjs

@@ -20,7 +20,7 @@ require('node:url');
 require('node:vm');
 require('node:events');
 
-var version = "2.0.0-beta.2";
+var version = "2.0.0-beta.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/cli.d.ts

@@ -1,4 +1,4 @@
-import { V as ViteNodeServerOptions } from './index-C38RQo3J.js';
+import { V as ViteNodeServerOptions } from './index-D1EszD4V.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 interface CliOptions {

package/dist/cli.mjs

@@ -18,7 +18,7 @@ import 'node:url';
 import 'node:vm';
 import 'node:events';
 
-var version = "2.0.0-beta.2";
+var version = "2.0.0-beta.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.cjs

@@ -344,7 +344,7 @@ ${getStack()}`), 2e3);
     });
     debugExecute(__filename);
     if (transformed[0] === "#")
-      transformed = transformed.replace(/^\#\!.*/, (s) => " ".repeat(s.length));
+      transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
     await this.runModule(context, transformed);
     return exports;
   }

package/dist/client.d.ts

@@ -1,2 +1,2 @@
-export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, a as ViteNodeRunner } from './index-C38RQo3J.js';
+export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, a as ViteNodeRunner } from './index-D1EszD4V.js';
 import './trace-mapping.d-DLVdEqOp.js';

package/dist/client.mjs

@@ -342,7 +342,7 @@ ${getStack()}`), 2e3);
     });
     debugExecute(__filename);
     if (transformed[0] === "#")
-      transformed = transformed.replace(/^\#\!.*/, (s) => " ".repeat(s.length));
+      transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
     await this.runModule(context, transformed);
     return exports;
   }

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'node:events';
 import { HMRPayload, Plugin } from 'vite';
-import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index-C38RQo3J.js';
+import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index-D1EszD4V.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 type EventType = string | symbol;

package/dist/{index-C38RQo3J.d.ts → index-D1EszD4V.d.ts}

@@ -274,6 +274,11 @@ interface ViteNodeResolveId {
     moduleSideEffects?: boolean | 'no-treeshake' | null;
     syntheticNamedExports?: boolean | string | null;
 }
+interface ViteNodeResolveModule {
+    external: string | null;
+    id: string;
+    fsPath: string;
+}
 interface ViteNodeServerOptions {
     /**
      * Inject inline sourcemap to modules
@@ -306,4 +311,4 @@ interface DebuggerOptions {
     loadDumppedModules?: boolean;
 }
 
-export { type Arrayable as A, type CustomEventMap as C, type DebuggerOptions as D, type FetchResult as F, type HMRPayload as H, ModuleCacheMap as M, type Nullable as N, type RawSourceMap as R, type StartOfSourceMap as S, type ViteNodeServerOptions as V, ViteNodeRunner as a, type HotContext as b, type DepsHandlingOptions as c, type ViteNodeResolveId as d, DEFAULT_REQUEST_STUBS as e, type Awaitable as f, type FetchFunction as g, type ResolveIdFunction as h, type CreateHotContextFunction as i, type ModuleCache as j, type ViteNodeRunnerOptions as k };
+export { type Arrayable as A, type CustomEventMap as C, type DebuggerOptions as D, type FetchResult as F, type HMRPayload as H, ModuleCacheMap as M, type Nullable as N, type RawSourceMap as R, type StartOfSourceMap as S, type ViteNodeServerOptions as V, ViteNodeRunner as a, type HotContext as b, type DepsHandlingOptions as c, type ViteNodeResolveId as d, DEFAULT_REQUEST_STUBS as e, type Awaitable as f, type FetchFunction as g, type ResolveIdFunction as h, type CreateHotContextFunction as i, type ModuleCache as j, type ViteNodeRunnerOptions as k, type ViteNodeResolveModule as l };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-C38RQo3J.js';
+export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, l as ViteNodeResolveModule, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-D1EszD4V.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-DLVdEqOp.js';

package/dist/server.cjs

@@ -14,7 +14,7 @@ require('node:module');
 require('node:path');
 
 const BUILTIN_EXTENSIONS = /* @__PURE__ */ new Set([".mjs", ".cjs", ".node", ".wasm"]);
-const ESM_SYNTAX_RE = /([\s;]|^)(import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
+const ESM_SYNTAX_RE = /(?:[\s;]|^)(?:import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;
 const defaultInline = [
@@ -63,7 +63,7 @@ async function isValidNodeImport(id) {
   const package_ = await utils.findNearestPackageData(pathe.dirname(id));
   if (package_.type === "module")
     return true;
-  if (/\.(\w+-)?esm?(-\w+)?\.js$|\/(esm?)\//.test(id))
+  if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id))
     return false;
   const code = await fs.promises.readFile(id, "utf8").catch(() => "");
   return !ESM_SYNTAX_RE.test(code);
@@ -77,7 +77,7 @@ async function shouldExternalize(id, options, cache = _defaultExternalizeCache)
 async function _shouldExternalize(id, options) {
   if (utils.isNodeBuiltin(id))
     return id;
-  if (id.startsWith("data:") || /^(https?:)?\/\//.test(id))
+  if (id.startsWith("data:") || /^(?:https?:)?\/\//.test(id))
     return id;
   id = patchWindowsImportPath(id);
   if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir))
@@ -153,7 +153,7 @@ class Debugger {
     await fs.promises.mkdir(this.dumpDir, { recursive: true });
   }
   encodeId(id) {
-    return `${id.replace(/[^\w@_-]/g, "_").replace(/_+/g, "_")}-${hashCode(id)}.js`;
+    return `${id.replace(/[^\w@\-]/g, "_").replace(/_+/g, "_")}-${hashCode(id)}.js`;
   }
   async recordExternalize(id, path) {
     if (!this.dumpDir)
@@ -179,7 +179,7 @@ ${result.code}`, "utf-8");
       return null;
     const code = await fs.promises.readFile(path, "utf-8");
     return {
-      code: code.replace(/^\/\/.*?\n/, ""),
+      code: code.replace(/^\/\/.*\n/, ""),
       map: void 0
     };
   }
@@ -284,6 +284,20 @@ class ViteNodeServer {
     const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
+  async resolveModule(rawId, resolved) {
+    const id = (resolved == null ? void 0 : resolved.id) || rawId;
+    const external = !pathe.isAbsolute(id) || this.isModuleDirectory(id) ? rawId : null;
+    return {
+      id,
+      fsPath: utils.cleanUrl(id),
+      external
+    };
+  }
+  isModuleDirectory(path) {
+    var _a;
+    const moduleDirectories = ((_a = this.options.deps) == null ? void 0 : _a.moduleDirectories) || ["/node_modules/"];
+    return moduleDirectories.some((dir) => path.includes(dir));
+  }
   getSourceMap(source) {
     var _a, _b;
     const fetchResult = (_a = this.fetchCache.get(source)) == null ? void 0 : _a.result;

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, d as ViteNodeResolveId, F as FetchResult } from './index-C38RQo3J.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, d as ViteNodeResolveId, F as FetchResult } from './index-D1EszD4V.js';
 import { E as EncodedSourceMap } from './trace-mapping.d-DLVdEqOp.js';
 
 declare class Debugger {
@@ -43,6 +43,12 @@ declare class ViteNodeServer {
     getTotalDuration(): number;
     private ensureExists;
     resolveId(id: string, importer?: string, transformMode?: 'web' | 'ssr'): Promise<ViteNodeResolveId | null>;
+    resolveModule(rawId: string, resolved: ViteNodeResolveId | null): Promise<{
+        id: string;
+        fsPath: string;
+        external: string | null;
+    }>;
+    private isModuleDirectory;
     getSourceMap(source: string): EncodedSourceMap | null;
     private assertMode;
     fetchModule(id: string, transformMode?: 'web' | 'ssr'): Promise<FetchResult>;

package/dist/server.mjs

@@ -1,9 +1,9 @@
 import { performance } from 'node:perf_hooks';
 import { existsSync, promises } from 'node:fs';
 import assert from 'node:assert';
-import { join, extname, dirname, resolve, relative, normalize } from 'pathe';
+import { join, extname, dirname, resolve, relative, normalize, isAbsolute } from 'pathe';
 import createDebug from 'debug';
-import { isNodeBuiltin, slash, findNearestPackageData, toArray, withTrailingSlash, normalizeModuleId, toFilePath } from './utils.mjs';
+import { isNodeBuiltin, slash, findNearestPackageData, toArray, withTrailingSlash, cleanUrl, normalizeModuleId, toFilePath } from './utils.mjs';
 import { KNOWN_ASSET_TYPES } from './constants.mjs';
 import c from 'picocolors';
 import { withInlineSourcemap } from './source-map.mjs';
@@ -12,7 +12,7 @@ import 'node:module';
 import 'node:path';
 
 const BUILTIN_EXTENSIONS = /* @__PURE__ */ new Set([".mjs", ".cjs", ".node", ".wasm"]);
-const ESM_SYNTAX_RE = /([\s;]|^)(import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
+const ESM_SYNTAX_RE = /(?:[\s;]|^)(?:import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/(es|esm)\/(.*\.js)$/;
 const defaultInline = [
@@ -61,7 +61,7 @@ async function isValidNodeImport(id) {
   const package_ = await findNearestPackageData(dirname(id));
   if (package_.type === "module")
     return true;
-  if (/\.(\w+-)?esm?(-\w+)?\.js$|\/(esm?)\//.test(id))
+  if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id))
     return false;
   const code = await promises.readFile(id, "utf8").catch(() => "");
   return !ESM_SYNTAX_RE.test(code);
@@ -75,7 +75,7 @@ async function shouldExternalize(id, options, cache = _defaultExternalizeCache)
 async function _shouldExternalize(id, options) {
   if (isNodeBuiltin(id))
     return id;
-  if (id.startsWith("data:") || /^(https?:)?\/\//.test(id))
+  if (id.startsWith("data:") || /^(?:https?:)?\/\//.test(id))
     return id;
   id = patchWindowsImportPath(id);
   if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir))
@@ -151,7 +151,7 @@ class Debugger {
     await promises.mkdir(this.dumpDir, { recursive: true });
   }
   encodeId(id) {
-    return `${id.replace(/[^\w@_-]/g, "_").replace(/_+/g, "_")}-${hashCode(id)}.js`;
+    return `${id.replace(/[^\w@\-]/g, "_").replace(/_+/g, "_")}-${hashCode(id)}.js`;
   }
   async recordExternalize(id, path) {
     if (!this.dumpDir)
@@ -177,7 +177,7 @@ ${result.code}`, "utf-8");
       return null;
     const code = await promises.readFile(path, "utf-8");
     return {
-      code: code.replace(/^\/\/.*?\n/, ""),
+      code: code.replace(/^\/\/.*\n/, ""),
       map: void 0
     };
   }
@@ -282,6 +282,20 @@ class ViteNodeServer {
     const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
+  async resolveModule(rawId, resolved) {
+    const id = (resolved == null ? void 0 : resolved.id) || rawId;
+    const external = !isAbsolute(id) || this.isModuleDirectory(id) ? rawId : null;
+    return {
+      id,
+      fsPath: cleanUrl(id),
+      external
+    };
+  }
+  isModuleDirectory(path) {
+    var _a;
+    const moduleDirectories = ((_a = this.options.deps) == null ? void 0 : _a.moduleDirectories) || ["/node_modules/"];
+    return moduleDirectories.some((dir) => path.includes(dir));
+  }
   getSourceMap(source) {
     var _a, _b;
     const fetchResult = (_a = this.fetchCache.get(source)) == null ? void 0 : _a.result;

package/dist/source-map.cjs

@@ -609,10 +609,10 @@ function supportRelativeURL(file, url) {
   if (!file)
     return url;
   const dir = path.dirname(file);
-  const match = /^\w+:\/\/[^\/]*/.exec(dir);
+  const match = /^\w+:\/\/[^/]*/.exec(dir);
   let protocol = match ? match[0] : "";
   const startPath = dir.slice(protocol.length);
-  if (protocol && /^\/\w\:/.test(startPath)) {
+  if (protocol && /^\/\w:/.test(startPath)) {
     protocol += "/";
     return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
   }
@@ -622,7 +622,7 @@ function retrieveSourceMapURL(source) {
   const fileData = retrieveFile(source);
   if (!fileData)
     return null;
-  const re = /(?:\/\/[@#][\s]*sourceMappingURL=([^\s'"]+)[\s]*$)|(?:\/\*[@#][\s]*sourceMappingURL=([^\s*'"]+)[\s]*(?:\*\/)[\s]*$)/mg;
+  const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
   let lastMatch, match;
   while (match = re.exec(fileData)) lastMatch = match;
   if (!lastMatch)
@@ -784,7 +784,7 @@ function wrapCallSite(frame, state) {
   if (source) {
     const line = frame.getLineNumber();
     let column = frame.getColumnNumber() - 1;
-    const noHeader = /^v(10\.1[6-9]|10\.[2-9][0-9]|10\.[0-9]{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
+    const noHeader = /^v(?:10\.1[6-9]|10\.[2-9]\d|10\.\d{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
     const headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
     if (line === 1 && column > headerLength && !frame.isEval())
       column -= headerLength;

package/dist/source-map.mjs

@@ -607,10 +607,10 @@ function supportRelativeURL(file, url) {
   if (!file)
     return url;
   const dir = path.dirname(file);
-  const match = /^\w+:\/\/[^\/]*/.exec(dir);
+  const match = /^\w+:\/\/[^/]*/.exec(dir);
   let protocol = match ? match[0] : "";
   const startPath = dir.slice(protocol.length);
-  if (protocol && /^\/\w\:/.test(startPath)) {
+  if (protocol && /^\/\w:/.test(startPath)) {
     protocol += "/";
     return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
   }
@@ -620,7 +620,7 @@ function retrieveSourceMapURL(source) {
   const fileData = retrieveFile(source);
   if (!fileData)
     return null;
-  const re = /(?:\/\/[@#][\s]*sourceMappingURL=([^\s'"]+)[\s]*$)|(?:\/\*[@#][\s]*sourceMappingURL=([^\s*'"]+)[\s]*(?:\*\/)[\s]*$)/mg;
+  const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
   let lastMatch, match;
   while (match = re.exec(fileData)) lastMatch = match;
   if (!lastMatch)
@@ -782,7 +782,7 @@ function wrapCallSite(frame, state) {
   if (source) {
     const line = frame.getLineNumber();
     let column = frame.getColumnNumber() - 1;
-    const noHeader = /^v(10\.1[6-9]|10\.[2-9][0-9]|10\.[0-9]{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
+    const noHeader = /^v(?:10\.1[6-9]|10\.[2-9]\d|10\.\d{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
     const headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
     if (line === 1 && column > headerLength && !frame.isEval())
       column -= headerLength;

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-C38RQo3J.js';
+export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, l as ViteNodeResolveModule, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-D1EszD4V.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-DLVdEqOp.js';

package/dist/utils.cjs

@@ -21,16 +21,15 @@ function normalizeRequestId(id, base) {
     id = id.replace(driveOppositeRegext, `${drive}$1`);
   return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^file:/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
-const queryRE = /\?.*$/s;
-const hashRE = /#.*$/s;
+const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
-  return url.replace(hashRE, "").replace(queryRE, "");
+  return url.replace(postfixRE, "");
 }
 const internalRequests = [
   "@vite/client",
   "@vite/env"
 ];
-const internalRequestRegexp = new RegExp(`^/?(${internalRequests.join("|")})$`);
+const internalRequestRegexp = new RegExp(`^/?(?:${internalRequests.join("|")})$`);
 function isInternalRequest(id) {
   return internalRequestRegexp.test(id);
 }
@@ -179,14 +178,12 @@ exports.cleanUrl = cleanUrl;
 exports.createImportMetaEnvProxy = createImportMetaEnvProxy;
 exports.findNearestPackageData = findNearestPackageData;
 exports.getCachedData = getCachedData;
-exports.hashRE = hashRE;
 exports.isInternalRequest = isInternalRequest;
 exports.isNodeBuiltin = isNodeBuiltin;
 exports.isPrimitive = isPrimitive;
 exports.isWindows = isWindows;
 exports.normalizeModuleId = normalizeModuleId;
 exports.normalizeRequestId = normalizeRequestId;
-exports.queryRE = queryRE;
 exports.setCacheData = setCacheData;
 exports.slash = slash;
 exports.toArray = toArray;

package/dist/utils.d.ts

@@ -1,12 +1,10 @@
-import { N as Nullable, A as Arrayable } from './index-C38RQo3J.js';
+import { N as Nullable, A as Arrayable } from './index-D1EszD4V.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;
 declare const VALID_ID_PREFIX = "/@id/";
 declare function normalizeRequestId(id: string, base?: string): string;
-declare const queryRE: RegExp;
-declare const hashRE: RegExp;
 declare function cleanUrl(url: string): string;
 declare function isInternalRequest(id: string): boolean;
 declare function normalizeModuleId(id: string): string;
@@ -30,4 +28,4 @@ declare function findNearestPackageData(basedir: string): Promise<{
     type?: 'module' | 'commonjs';
 }>;
 
-export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, findNearestPackageData, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath, withTrailingSlash };
+export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, findNearestPackageData, getCachedData, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, setCacheData, slash, toArray, toFilePath, withTrailingSlash };

package/dist/utils.mjs

@@ -19,16 +19,15 @@ function normalizeRequestId(id, base) {
     id = id.replace(driveOppositeRegext, `${drive}$1`);
   return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^file:/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
-const queryRE = /\?.*$/s;
-const hashRE = /#.*$/s;
+const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
-  return url.replace(hashRE, "").replace(queryRE, "");
+  return url.replace(postfixRE, "");
 }
 const internalRequests = [
   "@vite/client",
   "@vite/env"
 ];
-const internalRequestRegexp = new RegExp(`^/?(${internalRequests.join("|")})$`);
+const internalRequestRegexp = new RegExp(`^/?(?:${internalRequests.join("|")})$`);
 function isInternalRequest(id) {
   return internalRequestRegexp.test(id);
 }
@@ -172,4 +171,4 @@ async function findNearestPackageData(basedir) {
   return {};
 }
 
-export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, findNearestPackageData, getCachedData, hashRE, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, queryRE, setCacheData, slash, toArray, toFilePath, withTrailingSlash };
+export { VALID_ID_PREFIX, cleanUrl, createImportMetaEnvProxy, findNearestPackageData, getCachedData, isInternalRequest, isNodeBuiltin, isPrimitive, isWindows, normalizeModuleId, normalizeRequestId, setCacheData, slash, toArray, toFilePath, withTrailingSlash };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",