vite 8.3.0-beta.1 → 8.3.0

package/dist/node/chunks/node.js

@@ -628,7 +628,7 @@ var BaseEnvironment = class extends PartialEnvironment {
 };
 //#endregion
 //#region package.json
-var version = "8.3.0-beta.1";
+var version = "8.3.0";
 //#endregion
 //#region src/node/constants.ts
 const ROLLUP_HOOKS = [
@@ -2057,8 +2057,9 @@ function isNodeBuiltin(id) {
 	if (id.startsWith(NODE_BUILTIN_NAMESPACE)) return true;
 	return nodeBuiltins.includes(id);
 }
+const inNodeModulesRE = /(?:^|[\\/])node_modules(?:[\\/]|$)/;
 function isInNodeModules(id) {
-	return id.includes("node_modules");
+	return inNodeModulesRE.test(id);
 }
 function moduleListContains(moduleList, id) {
 	return moduleList?.some((m) => m === id || id.startsWith(withTrailingSlash(m)));
@@ -2253,6 +2254,13 @@ function isFilePathFormatExplicit(filePath, packageCache) {
 }
 const splitRE = /\r?\n/g;
 const range = 2;
+/**
+* `splitRE` treats both LF and CRLF as a line terminator, so the terminator
+* following a line is 2 characters long when the source uses CRLF.
+*/
+function lineTerminatorLengthAt(source, index) {
+	return source[index] === "\r" ? 2 : 1;
+}
 function pad(source, n = 2) {
 	return source.split(splitRE).map((l) => ` `.repeat(n) + l).join(`\n`);
 }
@@ -2261,7 +2269,10 @@ function posToNumber(source, pos) {
 	const lines = source.split(splitRE);
 	const { line, column } = pos;
 	let start = 0;
-	for (let i = 0; i < line - 1 && i < lines.length; i++) start += lines[i].length + 1;
+	for (let i = 0; i < line - 1 && i < lines.length; i++) {
+		start += lines[i].length;
+		start += lineTerminatorLengthAt(source, start);
+	}
 	return start + column;
 }
 function numberToPos(source, offset) {
@@ -2319,12 +2330,12 @@ function generateCodeFrame(source, start = 0, end) {
 						const underline = "^".repeat(Math.min(length, MAX_DISPLAY_LEN));
 						res.push(`${" ".repeat(lineNumberWidth)}|  ` + underline);
 					}
-					count += lineLength + 1;
+					count += lineTerminatorLengthAt(source, count) + lineLength;
 				}
 			}
 			break;
 		}
-		count++;
+		count += lineTerminatorLengthAt(source, count);
 	}
 	return res.join("\n");
 }
@@ -19349,6 +19360,13 @@ const rewriteOriginHeader = (proxyReq, options, config) => {
 		}
 	}
 };
+function createProxyContextMatcher(context) {
+	if (context[0] === "^") {
+		const regex = new RegExp(context);
+		return (url) => regex.test(url);
+	}
+	return (url) => url.startsWith(context);
+}
 function proxyMiddleware(httpServer, options, config) {
 	const proxies = {};
 	Object.keys(options).forEach((context) => {
@@ -19384,72 +19402,77 @@ function proxyMiddleware(httpServer, options, config) {
 				});
 			});
 		});
-		proxies[context] = [proxy, { ...opts }];
+		proxies[context] = {
+			proxy,
+			options: { ...opts },
+			match: createProxyContextMatcher(context)
+		};
 	});
 	if (httpServer) httpServer.on("upgrade", async (req, socket, head) => {
 		const url = req.url;
-		for (const context in proxies) if (doesProxyContextMatchUrl(context, url)) {
-			const [proxy, opts] = proxies[context];
-			if (opts.ws || opts.target?.toString().startsWith("ws:") || opts.target?.toString().startsWith("wss:")) {
-				if (opts.bypass) try {
-					const bypassResult = await opts.bypass(req, void 0, opts);
-					if (typeof bypassResult === "string") {
-						debug$8?.(`bypass: ${req.url} -> ${bypassResult}`);
-						req.url = bypassResult;
-						return;
-					}
-					if (bypassResult === false) {
-						debug$8?.(`bypass: ${req.url} -> 404`);
-						socket.end("HTTP/1.1 404 Not Found\r\n\r\n", "");
+		for (const context in proxies) {
+			const { proxy, options: opts, match } = proxies[context];
+			if (match(url)) {
+				if (opts.ws || opts.target?.toString().startsWith("ws:") || opts.target?.toString().startsWith("wss:")) {
+					if (opts.bypass) try {
+						const bypassResult = await opts.bypass(req, void 0, opts);
+						if (typeof bypassResult === "string") {
+							debug$8?.(`bypass: ${req.url} -> ${bypassResult}`);
+							req.url = bypassResult;
+							return;
+						}
+						if (bypassResult === false) {
+							debug$8?.(`bypass: ${req.url} -> 404`);
+							socket.end("HTTP/1.1 404 Not Found\r\n\r\n", "");
+							return;
+						}
+					} catch (err) {
+						config.logger.error(`${import_picocolors.default.red(`ws proxy bypass error:`)}\n${err.stack}`, {
+							timestamp: true,
+							error: err
+						});
 						return;
 					}
-				} catch (err) {
-					config.logger.error(`${import_picocolors.default.red(`ws proxy bypass error:`)}\n${err.stack}`, {
-						timestamp: true,
-						error: err
-					});
+					if (opts.rewrite) req.url = opts.rewrite(url);
+					debug$8?.(`${req.url} -> ws ${opts.target}`);
+					proxy.ws(req, socket, head);
 					return;
 				}
-				if (opts.rewrite) req.url = opts.rewrite(url);
-				debug$8?.(`${req.url} -> ws ${opts.target}`);
-				proxy.ws(req, socket, head);
-				return;
 			}
 		}
 	});
 	return async function viteProxyMiddleware(req, res, next) {
 		const url = req.url;
-		for (const context in proxies) if (doesProxyContextMatchUrl(context, url)) {
-			const [proxy, opts] = proxies[context];
-			const options = {};
-			if (opts.bypass) try {
-				const bypassResult = await opts.bypass(req, res, opts);
-				if (typeof bypassResult === "string") {
-					debug$8?.(`bypass: ${req.url} -> ${bypassResult}`);
-					req.url = bypassResult;
-					if (res.writableEnded) return;
-					return next();
-				}
-				if (bypassResult === false) {
-					debug$8?.(`bypass: ${req.url} -> 404`);
-					res.statusCode = 404;
-					return res.end();
+		for (const context in proxies) {
+			const { proxy, options: opts, match } = proxies[context];
+			if (match(url)) {
+				const options = {};
+				if (opts.bypass) try {
+					const bypassResult = await opts.bypass(req, res, opts);
+					if (typeof bypassResult === "string") {
+						debug$8?.(`bypass: ${req.url} -> ${bypassResult}`);
+						req.url = bypassResult;
+						if (res.writableEnded) return;
+						return next();
+					}
+					if (bypassResult === false) {
+						debug$8?.(`bypass: ${req.url} -> 404`);
+						res.statusCode = 404;
+						return res.end();
+					}
+				} catch (e) {
+					debug$8?.(`bypass: ${req.url} -> ${e}`);
+					return next(e);
 				}
-			} catch (e) {
-				debug$8?.(`bypass: ${req.url} -> ${e}`);
-				return next(e);
+				debug$8?.(`${req.url} -> ${opts.target || opts.forward}`);
+				if (opts.rewrite) req.url = opts.rewrite(req.url);
+				proxy.web(req, res, options);
+				return;
 			}
-			debug$8?.(`${req.url} -> ${opts.target || opts.forward}`);
-			if (opts.rewrite) req.url = opts.rewrite(req.url);
-			proxy.web(req, res, options);
-			return;
 		}
 		next();
 	};
 }
-function doesProxyContextMatchUrl(context, url) {
-	return context[0] === "^" && new RegExp(context).test(url) || url.startsWith(context);
-}
 //#endregion
 //#region src/node/server/middlewares/rejectInvalidRequest.ts
 /**
@@ -26412,7 +26435,7 @@ function preload(baseModule, deps, importerUrl) {
 				link.addEventListener("load", res);
 				link.addEventListener("error", () => rej(/* @__PURE__ */ new Error(`Unable to preload CSS for ${dep}`)));
 			});
-		}));
+		}).filter((p) => p !== void 0));
 	}
 	function handlePreloadError(err) {
 		const e = new Event("vite:preloadError", { cancelable: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "8.3.0-beta.1",
+  "version": "8.3.0",
   "description": "Native-ESM powered web dev build tool",
   "keywords": [
     "build-tool",