vite-node 3.0.9 → 3.1.0-beta.2

package/dist/utils.mjs

@@ -6,195 +6,180 @@ import { resolve, join, dirname } from 'pathe';
 const isWindows = process.platform === "win32";
 const drive = isWindows ? process.cwd()[0] : null;
 const driveOpposite = drive ? drive === drive.toUpperCase() ? drive.toLowerCase() : drive.toUpperCase() : null;
-const driveRegexp = drive ? new RegExp(`(?:^|/@fs/)${drive}(:[\\/])`) : null;
-const driveOppositeRegext = driveOpposite ? new RegExp(`(?:^|/@fs/)${driveOpposite}(:[\\/])`) : null;
+const driveRegexp = drive ? new RegExp(`(?:^|/@fs/)${drive}(\:[\\/])`) : null;
+const driveOppositeRegext = driveOpposite ? new RegExp(`(?:^|/@fs/)${driveOpposite}(\:[\\/])`) : null;
 function slash(str) {
-  return str.replace(/\\/g, "/");
+	return str.replace(/\\/g, "/");
 }
 const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, 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`);
-  }
-  if (id.startsWith("file://")) {
-    const { file, postfix } = splitFileAndPostfix(id);
-    return fileURLToPath(file) + postfix;
-  }
-  return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
+	if (base && id.startsWith(withTrailingSlash(base))) id = `/${id.slice(base.length)}`;
+	if (driveRegexp && !(driveRegexp === null || driveRegexp === void 0 ? void 0 : driveRegexp.test(id)) && (driveOppositeRegext === null || driveOppositeRegext === void 0 ? void 0 : driveOppositeRegext.test(id))) id = id.replace(driveOppositeRegext, `${drive}$1`);
+	if (id.startsWith("file://")) {
+		const { file, postfix } = splitFileAndPostfix(id);
+		return fileURLToPath(file) + postfix;
+	}
+	return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
 const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
-  return url.replace(postfixRE, "");
+	return url.replace(postfixRE, "");
 }
 function splitFileAndPostfix(path) {
-  const file = cleanUrl(path);
-  return { file, postfix: path.slice(file.length) };
+	const file = cleanUrl(path);
+	return {
+		file,
+		postfix: path.slice(file.length)
+	};
 }
 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);
+	return internalRequestRegexp.test(id);
 }
-const prefixedBuiltins = /* @__PURE__ */ new Set([
-  "node:sea",
-  "node:sqlite",
-  "node:test",
-  "node:test/reporters"
+const prefixedBuiltins = new Set([
+	"node:sea",
+	"node:sqlite",
+	"node:test",
+	"node:test/reporters"
 ]);
-const builtins = /* @__PURE__ */ new Set([
-  ...builtinModules,
-  "assert/strict",
-  "diagnostics_channel",
-  "dns/promises",
-  "fs/promises",
-  "path/posix",
-  "path/win32",
-  "readline/promises",
-  "stream/consumers",
-  "stream/promises",
-  "stream/web",
-  "timers/promises",
-  "util/types",
-  "wasi"
+const builtins = new Set([
+	...builtinModules,
+	"assert/strict",
+	"diagnostics_channel",
+	"dns/promises",
+	"fs/promises",
+	"path/posix",
+	"path/win32",
+	"readline/promises",
+	"stream/consumers",
+	"stream/promises",
+	"stream/web",
+	"timers/promises",
+	"util/types",
+	"wasi"
 ]);
 function normalizeModuleId(id) {
-  if (prefixedBuiltins.has(id)) {
-    return id;
-  }
-  if (id.startsWith("file://")) {
-    return fileURLToPath(id);
-  }
-  return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
+	if (prefixedBuiltins.has(id)) return id;
+	if (id.startsWith("file://")) return fileURLToPath(id);
+	return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
 }
 function isPrimitive(v) {
-  return v !== Object(v);
+	return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let { absolute, exists } = (() => {
-    if (id.startsWith("/@fs/")) {
-      return { absolute: id.slice(4), exists: true };
-    }
-    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(withTrailingSlash(root)) && existsSync(cleanUrl(id))) {
-      return { absolute: id, exists: true };
-    }
-    return { absolute: id, exists: false };
-  })();
-  if (absolute.startsWith("//")) {
-    absolute = absolute.slice(1);
-  }
-  return {
-    path: isWindows && absolute.startsWith("/") ? slash(fileURLToPath(pathToFileURL(absolute.slice(1)).href)) : absolute,
-    exists
-  };
+	let { absolute, exists } = (() => {
+		if (id.startsWith("/@fs/")) return {
+			absolute: id.slice(4),
+			exists: true
+		};
+		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(withTrailingSlash(root)) && existsSync(cleanUrl(id))) return {
+			absolute: id,
+			exists: true
+		};
+		return {
+			absolute: id,
+			exists: false
+		};
+	})();
+	if (absolute.startsWith("//")) absolute = absolute.slice(1);
+	return {
+		path: isWindows && absolute.startsWith("/") ? slash(fileURLToPath(pathToFileURL(absolute.slice(1)).href)) : absolute,
+		exists
+	};
 }
 const NODE_BUILTIN_NAMESPACE = "node:";
 function isNodeBuiltin(id) {
-  if (prefixedBuiltins.has(id)) {
-    return true;
-  }
-  return builtins.has(
-    id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(NODE_BUILTIN_NAMESPACE.length) : id
-  );
-}
+	if (prefixedBuiltins.has(id)) return true;
+	return builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE) ? id.slice(NODE_BUILTIN_NAMESPACE.length) : id);
+}
+/**
+* Convert `Arrayable<T>` to `Array<T>`
+*
+* @category Array
+*/
 function toArray(array) {
-  if (array === null || array === void 0) {
-    array = [];
-  }
-  if (Array.isArray(array)) {
-    return array;
-  }
-  return [array];
+	if (array === null || array === void 0) array = [];
+	if (Array.isArray(array)) return array;
+	return [array];
 }
 function getCachedData(cache, basedir, originalBasedir) {
-  const pkgData = cache.get(getFnpdCacheKey(basedir));
-  if (pkgData) {
-    traverseBetweenDirs(originalBasedir, basedir, (dir) => {
-      cache.set(getFnpdCacheKey(dir), pkgData);
-    });
-    return pkgData;
-  }
+	const pkgData = cache.get(getFnpdCacheKey(basedir));
+	if (pkgData) {
+		traverseBetweenDirs(originalBasedir, basedir, (dir) => {
+			cache.set(getFnpdCacheKey(dir), pkgData);
+		});
+		return pkgData;
+	}
 }
 function setCacheData(cache, data, basedir, originalBasedir) {
-  cache.set(getFnpdCacheKey(basedir), data);
-  traverseBetweenDirs(originalBasedir, basedir, (dir) => {
-    cache.set(getFnpdCacheKey(dir), data);
-  });
+	cache.set(getFnpdCacheKey(basedir), data);
+	traverseBetweenDirs(originalBasedir, basedir, (dir) => {
+		cache.set(getFnpdCacheKey(dir), data);
+	});
 }
 function getFnpdCacheKey(basedir) {
-  return `fnpd_${basedir}`;
+	return `fnpd_${basedir}`;
 }
+/**
+* Traverse between `longerDir` (inclusive) and `shorterDir` (exclusive) and call `cb` for each dir.
+* @param longerDir Longer dir path, e.g. `/User/foo/bar/baz`
+* @param shorterDir Shorter dir path, e.g. `/User/foo`
+*/
 function traverseBetweenDirs(longerDir, shorterDir, cb) {
-  while (longerDir !== shorterDir) {
-    cb(longerDir);
-    longerDir = dirname(longerDir);
-  }
+	while (longerDir !== shorterDir) {
+		cb(longerDir);
+		longerDir = dirname(longerDir);
+	}
 }
 function withTrailingSlash(path) {
-  if (path[path.length - 1] !== "/") {
-    return `${path}/`;
-  }
-  return path;
+	if (path[path.length - 1] !== "/") return `${path}/`;
+	return path;
 }
 function createImportMetaEnvProxy() {
-  const booleanKeys = ["DEV", "PROD", "SSR"];
-  return new Proxy(process.env, {
-    get(_, key) {
-      if (typeof key !== "string") {
-        return void 0;
-      }
-      if (booleanKeys.includes(key)) {
-        return !!process.env[key];
-      }
-      return process.env[key];
-    },
-    set(_, key, value) {
-      if (typeof key !== "string") {
-        return true;
-      }
-      if (booleanKeys.includes(key)) {
-        process.env[key] = value ? "1" : "";
-      } else {
-        process.env[key] = value;
-      }
-      return true;
-    }
-  });
-}
-const packageCache = /* @__PURE__ */ new Map();
+	const booleanKeys = [
+		"DEV",
+		"PROD",
+		"SSR"
+	];
+	return new Proxy(process.env, {
+		get(_, key) {
+			if (typeof key !== "string") return void 0;
+			if (booleanKeys.includes(key)) return !!process.env[key];
+			return process.env[key];
+		},
+		set(_, key, value) {
+			if (typeof key !== "string") return true;
+			if (booleanKeys.includes(key)) process.env[key] = value ? "1" : "";
+			else process.env[key] = value;
+			return true;
+		}
+	});
+}
+const packageCache = new Map();
 async function findNearestPackageData(basedir) {
-  var _a;
-  const originalBasedir = basedir;
-  while (basedir) {
-    const cached = getCachedData(packageCache, basedir, originalBasedir);
-    if (cached) {
-      return cached;
-    }
-    const pkgPath = join(basedir, "package.json");
-    if ((_a = await promises.stat(pkgPath).catch(() => {
-    })) == null ? void 0 : _a.isFile()) {
-      const pkgData = JSON.parse(await promises.readFile(pkgPath, "utf8"));
-      if (packageCache) {
-        setCacheData(packageCache, pkgData, basedir, originalBasedir);
-      }
-      return pkgData;
-    }
-    const nextBasedir = dirname(basedir);
-    if (nextBasedir === basedir) {
-      break;
-    }
-    basedir = nextBasedir;
-  }
-  return {};
+	const originalBasedir = basedir;
+	while (basedir) {
+		var _await$fsp$stat$catch;
+		const cached = getCachedData(packageCache, basedir, originalBasedir);
+		if (cached) return cached;
+		const pkgPath = join(basedir, "package.json");
+		if ((_await$fsp$stat$catch = await promises.stat(pkgPath).catch(() => {})) === null || _await$fsp$stat$catch === void 0 ? void 0 : _await$fsp$stat$catch.isFile()) {
+			const pkgData = JSON.parse(await promises.readFile(pkgPath, "utf8"));
+			if (packageCache) setCacheData(packageCache, pkgData, basedir, originalBasedir);
+			return pkgData;
+		}
+		const nextBasedir = dirname(basedir);
+		if (nextBasedir === basedir) break;
+		basedir = nextBasedir;
+	}
+	return {};
 }
 
 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": "3.0.9",
+  "version": "3.1.0-beta.2",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",