vite 5.0.0-beta.3 → 5.0.0-beta.5

package/dist/node/chunks/{dep-dc9999ab.js → dep-4109817a.js}

@@ -23,7 +23,7 @@ import os$4 from 'node:os';
 import { exec } from 'node:child_process';
 import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, SPECIAL_QUERY_RE, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, SPECIAL_QUERY_RE, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$3$1 from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -7460,9 +7460,9 @@ function isReference(node, parent) {
     return false;
 }
 
-var version$3 = "25.0.4";
+var version$3 = "25.0.5";
 var peerDependencies = {
-	rollup: "^2.68.0||^3.0.0"
+	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
 
 function tryParse(parse, code, id) {
@@ -7485,6 +7485,7 @@ function hasCjsKeywords(code, ignoreGlobal) {
 
 /* eslint-disable no-underscore-dangle */
 
+
 function analyzeTopLevelStatements(parse, code, id) {
   const ast = tryParse(parse, code, id);
 
@@ -7531,6 +7532,7 @@ function analyzeTopLevelStatements(parse, code, id) {
 
 /* eslint-disable import/prefer-default-export */
 
+
 function deconflict(scopes, globals, identifier) {
   let i = 1;
   let deconflicted = makeLegalIdentifier(identifier);
@@ -7919,6 +7921,7 @@ function getEsImportProxy(id, defaultIsModuleExports) {
 
 /* eslint-disable no-param-reassign, no-undefined */
 
+
 function getCandidatesForExtension(resolved, extension) {
   return [resolved + extension, `${resolved}${sep}index${extension}`];
 }
@@ -8229,6 +8232,7 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             currentlyResolvingForParent.add(source);
             const resolved =
               (await rollupContext.resolve(source, parentId, {
+                skipSelf: false,
                 custom: { 'node-resolve': { isRequire: true } }
               })) || resolveExtensions(source, parentId, extensions);
             currentlyResolvingForParent.delete(source);
@@ -8897,6 +8901,7 @@ function getGenerateRequireName() {
 
 /* eslint-disable no-param-reassign, no-shadow, no-underscore-dangle, no-continue */
 
+
 const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/;
 
 const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/;
@@ -9167,6 +9172,9 @@ async function transformCommonjs(
               }
               if (!ignoreDynamicRequires) {
                 if (isShorthandProperty(parent)) {
+                  // as key and value are the same object, isReference regards
+                  // both as references, so we need to skip now
+                  skippedNodes.add(parent.value);
                   magicString.prependRight(node.start, 'require: ');
                 }
                 replacedDynamicRequires.push(node);
@@ -9709,7 +9717,7 @@ function commonjs(options = {}) {
       try {
         return transformAndCheckExports.call(this, code, id);
       } catch (err) {
-        return this.error(err, err.loc);
+        return this.error(err, err.pos);
       }
     }
   };
@@ -12291,9 +12299,9 @@ function windowsSafeRealPathSync(path) {
     return fs$l.realpathSync(path);
 }
 function optimizeSafeRealPathSync() {
-    // Skip if using Node <16.18 due to MAX_PATH issue: https://github.com/vitejs/vite/issues/12931
+    // Skip if using Node <18.10 due to MAX_PATH issue: https://github.com/vitejs/vite/issues/12931
     const nodeVersion = process.versions.node.split('.').map(Number);
-    if (nodeVersion[0] < 16 || (nodeVersion[0] === 16 && nodeVersion[1] < 18)) {
+    if (nodeVersion[0] < 18 || (nodeVersion[0] === 18 && nodeVersion[1] < 10)) {
         safeRealpathSync = fs$l.realpathSync;
         return;
     }
@@ -12565,20 +12573,12 @@ function arraify(target) {
 const multilineCommentsRE$1 = /\/\*[^*]*\*+(?:[^/*][^*]*\*+)*\//g;
 const singlelineCommentsRE$1 = /\/\/.*/g;
 const requestQuerySplitRE = /\?(?!.*[/|}])/;
-// @ts-expect-error jest only exists when running Jest
-const usingDynamicImport = typeof jest === 'undefined';
 /**
  * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
  *
- * As a temporary workaround for Jest's lack of stable ESM support, we fallback to require
- * if we're in a Jest environment.
- * See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077
- *
  * @param file File path to import.
  */
-const dynamicImport = usingDynamicImport
-    ? new Function('file', 'return import(file)')
-    : _require$2;
+const dynamicImport = new Function('file', 'return import(file)');
 function parseRequest(id) {
     const [_, search] = id.split(requestQuerySplitRE, 2);
     if (!search) {
@@ -13215,11 +13215,13 @@ const NATIVE_SEP_RE = new RegExp('\\' + path$o.sep, 'g');
 /** @type {Map<string,RegExp>}*/
 const PATTERN_REGEX_CACHE = new Map();
 const GLOB_ALL_PATTERN = `**/*`;
-const DEFAULT_EXTENSIONS = ['.ts', '.tsx', '.mts', '.cts'];
-const DEFAULT_EXTENSIONS_RE_GROUP = `\\.(?:${DEFAULT_EXTENSIONS.map((ext) => ext.substring(1)).join(
+const TS_EXTENSIONS = ['.ts', '.tsx', '.mts', '.cts'];
+const JS_EXTENSIONS = ['.js', '.jsx', '.mjs', '.cjs'];
+const TSJS_EXTENSIONS = TS_EXTENSIONS.concat(JS_EXTENSIONS);
+const TS_EXTENSIONS_RE_GROUP = `\\.(?:${TS_EXTENSIONS.map((ext) => ext.substring(1)).join('|')})`;
+const TSJS_EXTENSIONS_RE_GROUP = `\\.(?:${TSJS_EXTENSIONS.map((ext) => ext.substring(1)).join(
 	'|'
 )})`;
-
 const IS_POSIX = path$o.posix.sep === path$o.sep;
 
 /**
@@ -13245,10 +13247,8 @@ async function resolveTSConfigJson(filename, cache) {
 		return; // ignore files that are not json
 	}
 	const tsconfig = path$o.resolve(filename);
-	if (cache) {
-		if (cache.hasParseResult(tsconfig) || cache.hasParseResult(filename)) {
-			return tsconfig;
-		}
+	if (cache && (cache.hasParseResult(tsconfig) || cache.hasParseResult(filename))) {
+		return tsconfig;
 	}
 	return promises$1.stat(tsconfig).then((stat) => {
 		if (stat.isFile() || stat.isFIFO()) {
@@ -13317,12 +13317,15 @@ const resolve2posix = IS_POSIX
 /**
  *
  * @param {import('./public.d.ts').TSConfckParseResult} result
+ * @param {import('./public.d.ts').TSConfckParseOptions} [options]
  * @returns {string[]}
  */
-function resolveReferencedTSConfigFiles(result) {
+function resolveReferencedTSConfigFiles(result, options) {
 	const dir = path$o.dirname(result.tsconfigFile);
 	return result.tsconfig.references.map((ref) => {
-		const refPath = ref.path.endsWith('.json') ? ref.path : path$o.join(ref.path, 'tsconfig.json');
+		const refPath = ref.path.endsWith('.json')
+			? ref.path
+			: path$o.join(ref.path, options?.configName ?? 'tsconfig.json');
 		return resolve2posix(dir, refPath);
 	});
 }
@@ -13333,9 +13336,11 @@ function resolveReferencedTSConfigFiles(result) {
  * @returns {import('./public.d.ts').TSConfckParseResult}
  */
 function resolveSolutionTSConfig(filename, result) {
+	const allowJs = result.tsconfig.compilerOptions?.allowJs;
+	const extensions = allowJs ? TSJS_EXTENSIONS : TS_EXTENSIONS;
 	if (
 		result.referenced &&
-		DEFAULT_EXTENSIONS.some((ext) => filename.endsWith(ext)) &&
+		extensions.some((ext) => filename.endsWith(ext)) &&
 		!isIncluded(filename, result)
 	) {
 		const solutionTSConfig = result.referenced.find((referenced) =>
@@ -13361,13 +13366,15 @@ function isIncluded(filename, result) {
 	if (files.includes(filename)) {
 		return true;
 	}
+	const allowJs = result.tsconfig.compilerOptions?.allowJs;
 	const isIncluded = isGlobMatch(
 		absoluteFilename,
 		dir,
-		result.tsconfig.include || (result.tsconfig.files ? [] : [GLOB_ALL_PATTERN])
+		result.tsconfig.include || (result.tsconfig.files ? [] : [GLOB_ALL_PATTERN]),
+		allowJs
 	);
 	if (isIncluded) {
-		const isExcluded = isGlobMatch(absoluteFilename, dir, result.tsconfig.exclude || []);
+		const isExcluded = isGlobMatch(absoluteFilename, dir, result.tsconfig.exclude || [], allowJs);
 		return !isExcluded;
 	}
 	return false;
@@ -13379,9 +13386,11 @@ function isIncluded(filename, result) {
  * @param filename {string} posix style abolute path to filename to test
  * @param dir {string} posix style absolute path to directory of tsconfig containing patterns
  * @param patterns {string[]} glob patterns to match against
+ * @param allowJs {boolean} allowJs setting in tsconfig to include js extensions in checks
  * @returns {boolean} true when at least one pattern matches filename
  */
-function isGlobMatch(filename, dir, patterns) {
+function isGlobMatch(filename, dir, patterns, allowJs) {
+	const extensions = allowJs ? TSJS_EXTENSIONS : TS_EXTENSIONS;
 	return patterns.some((pattern) => {
 		// filename must end with part of pattern that comes after last wildcard
 		let lastWildcardIndex = pattern.length;
@@ -13403,7 +13412,7 @@ function isGlobMatch(filename, dir, patterns) {
 		}
 
 		// if pattern ends with *, filename must end with a default extension
-		if (pattern.endsWith('*') && !DEFAULT_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
+		if (pattern.endsWith('*') && !extensions.some((ext) => filename.endsWith(ext))) {
 			return false;
 		}
 
@@ -13439,7 +13448,7 @@ function isGlobMatch(filename, dir, patterns) {
 		if (PATTERN_REGEX_CACHE.has(resolvedPattern)) {
 			return PATTERN_REGEX_CACHE.get(resolvedPattern).test(filename);
 		}
-		const regex = pattern2regex(resolvedPattern);
+		const regex = pattern2regex(resolvedPattern, allowJs);
 		PATTERN_REGEX_CACHE.set(resolvedPattern, regex);
 		return regex.test(filename);
 	});
@@ -13447,9 +13456,10 @@ function isGlobMatch(filename, dir, patterns) {
 
 /**
  * @param {string} resolvedPattern
+ * @param {boolean} allowJs
  * @returns {RegExp}
  */
-function pattern2regex(resolvedPattern) {
+function pattern2regex(resolvedPattern, allowJs) {
 	let regexStr = '^';
 	for (let i = 0; i < resolvedPattern.length; i++) {
 		const char = resolvedPattern[i];
@@ -13474,7 +13484,7 @@ function pattern2regex(resolvedPattern) {
 
 	// add known file endings if pattern ends on *
 	if (resolvedPattern.endsWith('*')) {
-		regexStr += DEFAULT_EXTENSIONS_RE_GROUP;
+		regexStr += allowJs ? TSJS_EXTENSIONS_RE_GROUP : TS_EXTENSIONS_RE_GROUP;
 	}
 	regexStr += '$';
 
@@ -13494,12 +13504,15 @@ async function find(filename, options) {
 		return null;
 	}
 	const cache = options?.cache;
-	if (cache?.hasTSConfigPath(dir)) {
-		return cache.getTSConfigPath(dir);
+	const configName = options?.configName ?? 'tsconfig.json';
+	if (cache?.hasConfigPath(dir, configName)) {
+		return cache.getConfigPath(dir, configName);
 	}
 	const { /** @type {Promise<string|null>} */ promise, resolve, reject } = makePromise();
-	const root = options?.root ? path$o.resolve(options.root) : null;
-	findUp(dir, { promise, resolve, reject }, options?.cache, root);
+	if (options?.root && !path$o.isAbsolute(options.root)) {
+		options.root = path$o.resolve(options.root);
+	}
+	findUp(dir, { promise, resolve, reject }, options);
 	return promise;
 }
 
@@ -13507,16 +13520,15 @@ async function find(filename, options) {
  *
  * @param {string} dir
  * @param {{promise:Promise<string|null>,resolve:(result:string|null)=>void,reject:(err:any)=>void}} madePromise
- * @param {import('./cache.js').TSConfckCache}  [cache]
- * @param {string} [root]
+ * @param {import('./public.d.ts').TSConfckFindOptions} [options] - options
  */
-function findUp(dir, { resolve, reject, promise }, cache, root) {
-	const tsconfig = path$o.join(dir, 'tsconfig.json');
+function findUp(dir, { resolve, reject, promise }, options) {
+	const { cache, root, configName } = options ?? {};
 	if (cache) {
-		if (cache.hasTSConfigPath(dir)) {
+		if (cache.hasConfigPath(dir, configName)) {
 			let cached;
 			try {
-				cached = cache.getTSConfigPath(dir);
+				cached = cache.getConfigPath(dir, configName);
 			} catch (e) {
 				reject(e);
 				return;
@@ -13527,9 +13539,10 @@ function findUp(dir, { resolve, reject, promise }, cache, root) {
 				resolve(cached);
 			}
 		} else {
-			cache.setTSConfigPath(dir, promise);
+			cache.setConfigPath(dir, promise, configName);
 		}
 	}
+	const tsconfig = path$o.join(dir, options?.configName ?? 'tsconfig.json');
 	fs$l.stat(tsconfig, (err, stats) => {
 		if (stats && (stats.isFile() || stats.isFIFO())) {
 			resolve(tsconfig);
@@ -13540,7 +13553,7 @@ function findUp(dir, { resolve, reject, promise }, cache, root) {
 			if (root === dir || (parent = path$o.dirname(dir)) === dir) {
 				resolve(null);
 			} else {
-				findUp(parent, { promise, resolve, reject }, cache, root);
+				findUp(parent, { promise, resolve, reject }, options);
 			}
 		}
 	});
@@ -13752,7 +13765,7 @@ async function parse$f(filename, options) {
 			result = await cache.getParseResult(tsconfigFile);
 		} else {
 			result = await parseFile$1(tsconfigFile, cache, filename === tsconfigFile);
-			await Promise.all([parseExtends(result, cache), parseReferences(result, cache)]);
+			await Promise.all([parseExtends(result, cache), parseReferences(result, options)]);
 		}
 		resolve(resolveSolutionTSConfig(filename, result));
 		return promise;
@@ -13777,9 +13790,11 @@ async function parseFile$1(tsconfigFile, cache, skipCache) {
 		.readFile(tsconfigFile, 'utf-8')
 		.then(toJson)
 		.then((json) => {
+			const parsed = JSON.parse(json);
+			applyDefaults(parsed, tsconfigFile);
 			return {
 				tsconfigFile,
-				tsconfig: normalizeTSConfig(JSON.parse(json), path$o.dirname(tsconfigFile))
+				tsconfig: normalizeTSConfig(parsed, path$o.dirname(tsconfigFile))
 			};
 		})
 		.catch((e) => {
@@ -13813,16 +13828,18 @@ function normalizeTSConfig(tsconfig, dir) {
 /**
  *
  * @param {import('./public.d.ts').TSConfckParseResult} result
- * @param {import('./cache.js').TSConfckCache} [cache]
+ * @param {import('./public.d.ts').TSConfckParseOptions} [options]
  * @returns {Promise<void>}
  */
-async function parseReferences(result, cache) {
+async function parseReferences(result, options) {
 	if (!result.tsconfig.references) {
 		return;
 	}
-	const referencedFiles = resolveReferencedTSConfigFiles(result);
-	const referenced = await Promise.all(referencedFiles.map((file) => parseFile$1(file, cache)));
-	await Promise.all(referenced.map((ref) => parseExtends(ref, cache)));
+	const referencedFiles = resolveReferencedTSConfigFiles(result, options);
+	const referenced = await Promise.all(
+		referencedFiles.map((file) => parseFile$1(file, options?.cache))
+	);
+	await Promise.all(referenced.map((ref) => parseExtends(ref, options?.cache)));
 	referenced.forEach((ref) => {
 		ref.solution = result;
 	});
@@ -14074,34 +14091,66 @@ class TSConfckParseError extends Error {
 	}
 }
 
+/**
+ *
+ * @param {any} tsconfig
+ * @param {string} tsconfigFile
+ */
+function applyDefaults(tsconfig, tsconfigFile) {
+	if (isJSConfig(tsconfigFile)) {
+		tsconfig.compilerOptions = {
+			...DEFAULT_JSCONFIG_COMPILER_OPTIONS,
+			...tsconfig.compilerOptions
+		};
+	}
+}
+
+const DEFAULT_JSCONFIG_COMPILER_OPTIONS = {
+	allowJs: true,
+	maxNodeModuleJsDepth: 2,
+	allowSyntheticDefaultImports: true,
+	skipLibCheck: true,
+	noEmit: true
+};
+
+/**
+ * @param {string} configFileName
+ */
+function isJSConfig(configFileName) {
+	return path$o.basename(configFileName) === 'jsconfig.json';
+}
+
 /** @template T */
 class TSConfckCache {
 	/**
 	 * clear cache, use this if you have a long running process and tsconfig files have been added,changed or deleted
 	 */
 	clear() {
-		this.#tsconfigPaths.clear();
+		this.#configPaths.clear();
 		this.#parsed.clear();
 	}
 
 	/**
-	 * has cached closest tsconfig for files in dir
+	 * has cached closest config for files in dir
 	 * @param {string} dir
+	 * @param {string} [configName=tsconfig.json]
 	 * @returns {boolean}
 	 */
-	hasTSConfigPath(dir) {
-		return this.#tsconfigPaths.has(dir);
+	hasConfigPath(dir, configName = 'tsconfig.json') {
+		return this.#configPaths.has(`${dir}/${configName}`);
 	}
 
 	/**
 	 * get cached closest tsconfig for files in dir
 	 * @param {string} dir
+	 * @param {string} [configName=tsconfig.json]
 	 * @returns {Promise<string|null>|string|null}
 	 * @throws {unknown} if cached value is an error
 	 */
-	getTSConfigPath(dir) {
-		const value = this.#tsconfigPaths.get(dir);
-		if (value === null || value.length || value.then) {
+	getConfigPath(dir, configName = 'tsconfig.json') {
+		const key = `${dir}/${configName}`;
+		const value = this.#configPaths.get(key);
+		if (value == null || value.length || value.then) {
 			return value;
 		} else {
 			throw value;
@@ -14157,19 +14206,21 @@ class TSConfckCache {
 	 * @internal
 	 * @private
 	 * @param {string} dir
-	 * @param {Promise<string|null>} tsconfigPath
+	 * @param {Promise<string|null>} configPath
+	 * @param {string} [configName=tsconfig.json]
 	 */
-	setTSConfigPath(dir, tsconfigPath) {
-		this.#tsconfigPaths.set(dir, tsconfigPath);
-		tsconfigPath
+	setConfigPath(dir, configPath, configName = 'tsconfig.json') {
+		const key = `${dir}/${configName}`;
+		this.#configPaths.set(key, configPath);
+		configPath
 			.then((path) => {
-				if (this.#tsconfigPaths.get(dir) === tsconfigPath) {
-					this.#tsconfigPaths.set(dir, path);
+				if (this.#configPaths.get(key) === configPath) {
+					this.#configPaths.set(key, path);
 				}
 			})
 			.catch((e) => {
-				if (this.#tsconfigPaths.get(dir) === tsconfigPath) {
-					this.#tsconfigPaths.set(dir, e);
+				if (this.#configPaths.get(key) === configPath) {
+					this.#configPaths.set(key, e);
 				}
 			});
 	}
@@ -14180,7 +14231,7 @@ class TSConfckCache {
 	 * @private
 	 * @type{Map<string,(Promise<string|null>|string|null)>}
 	 */
-	#tsconfigPaths = new Map();
+	#configPaths = new Map();
 
 	/**
 	 * map files to their parsed tsconfig result
@@ -14192,8 +14243,9 @@ class TSConfckCache {
 }
 
 const debug$g = createDebugger('vite:esbuild');
-// IIFE content looks like `var MyLib = function() {`. Spaces are removed when minified
-const IIFE_BEGIN_RE = /(const|var)\s+\S+\s*=\s*function\(\)\s*\{.*"use strict";/s;
+// IIFE content looks like `var MyLib = function() {`.
+// Spaces are removed and parameters are mangled when minified
+const IIFE_BEGIN_RE = /(const|var)\s+\S+\s*=\s*function\([^()]*\)\s*\{\s*"use strict";/;
 const validExtensionRE = /\.\w+$/;
 const jsxExtensionsRE = /\.(?:j|t)sx\b/;
 let server;
@@ -14721,11 +14773,14 @@ const loadTerserPath = (root) => {
     return terserPath;
 };
 function terserPlugin(config) {
+    const { maxWorkers, ...terserOptions } = config.build.terserOptions;
     const makeWorker = () => new Worker_1(async (terserPath, code, options) => {
         // test fails when using `import`. maybe related: https://github.com/nodejs/node/issues/43205
         // eslint-disable-next-line no-restricted-globals -- this function runs inside cjs
         const terser = require(terserPath);
         return terser.minify(code, options);
+    }, {
+        max: maxWorkers,
     });
     let worker;
     return {
@@ -14749,7 +14804,7 @@ function terserPlugin(config) {
             const terserPath = loadTerserPath(config.root);
             const res = await worker.run(terserPath, code, {
                 safari10: true,
-                ...config.build.terserOptions,
+                ...terserOptions,
                 sourceMap: !!outputOptions.sourcemap,
                 module: outputOptions.format.startsWith('es'),
                 toplevel: outputOptions.format === 'cjs',
@@ -15576,16 +15631,35 @@ class Mappings {
 
 	addEdit(sourceIndex, content, loc, nameIndex) {
 		if (content.length) {
+			let contentLineEnd = content.indexOf('\n', 0);
+			let previousContentLineEnd = -1;
+			while (contentLineEnd >= 0) {
+				const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
+				if (nameIndex >= 0) {
+					segment.push(nameIndex);
+				}
+				this.rawSegments.push(segment);
+
+				this.generatedCodeLine += 1;
+				this.raw[this.generatedCodeLine] = this.rawSegments = [];
+				this.generatedCodeColumn = 0;
+
+				previousContentLineEnd = contentLineEnd;
+				contentLineEnd = content.indexOf('\n', contentLineEnd + 1);
+			}
+
 			const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
 			if (nameIndex >= 0) {
 				segment.push(nameIndex);
 			}
 			this.rawSegments.push(segment);
+
+			this.advance(content.slice(previousContentLineEnd + 1));
 		} else if (this.pending) {
 			this.rawSegments.push(this.pending);
+			this.advance(content);
 		}
 
-		this.advance(content);
 		this.pending = null;
 	}
 
@@ -27854,7 +27928,7 @@ function stringifyQuery(query) {
 }
 
 new Set(builtinModules);
-function matchAll(regex, string, addition) {
+function matchAll$1(regex, string, addition) {
   const matches = [];
   for (const match of string.matchAll(regex)) {
     matches.push({
@@ -28393,7 +28467,7 @@ pathToFileURL(process.cwd());
 const ESM_STATIC_IMPORT_RE = /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\p{L}\p{M}\w\t\n\r $*,/{}@.]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gmu;
 const TYPE_RE = /^\s*?type\s/;
 function findStaticImports(code) {
-  return matchAll(ESM_STATIC_IMPORT_RE, code, { type: "static" });
+  return matchAll$1(ESM_STATIC_IMPORT_RE, code, { type: "static" });
 }
 function parseStaticImport(matched) {
   const cleanedImports = clearImports(matched.imports);
@@ -28458,10 +28532,15 @@ function resolvePlugin(resolveOptions) {
             const targetWeb = !ssr || ssrTarget === 'webworker';
             // this is passed by @rollup/plugin-commonjs
             const isRequire = resolveOpts?.custom?.['node-resolve']?.isRequire ?? false;
+            // end user can configure different conditions for ssr and client.
+            // falls back to client conditions if no ssr conditions supplied
+            const ssrConditions = resolveOptions.ssrConfig?.resolve?.conditions ||
+                resolveOptions.conditions;
             const options = {
                 isRequire,
                 ...resolveOptions,
                 scan: resolveOpts?.scan ?? resolveOptions.scan,
+                conditions: ssr ? ssrConditions : resolveOptions.conditions,
             };
             const resolvedImports = resolveSubpathImports(id, importer, options, targetWeb);
             if (resolvedImports) {
@@ -28821,8 +28900,10 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = f
             bareImportRE.test(id)) {
             const mainPkg = findNearestMainPackageData(basedir, packageCache)?.data;
             if (mainPkg) {
-                if (mainPkg.peerDependencies?.[id] &&
-                    mainPkg.peerDependenciesMeta?.[id]?.optional) {
+                const pkgName = getNpmPackageName(id);
+                if (pkgName != null &&
+                    mainPkg.peerDependencies?.[pkgName] &&
+                    mainPkg.peerDependenciesMeta?.[pkgName]?.optional) {
                     return {
                         id: `${optionalPeerDepId}:${id}:${mainPkg.name}`,
                     };
@@ -28847,7 +28928,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = f
             ...options,
             isRequire: false,
             mainFields: DEFAULT_MAIN_FIELDS,
-            extensions: DEFAULT_EXTENSIONS$1,
+            extensions: DEFAULT_EXTENSIONS,
         });
     }
     if (!resolved) {
@@ -37111,7 +37192,7 @@ function _stripLiteralAcorn(code, options) {
 
 const multilineCommentsRE = /\/\*([^*\/])*?\*\//gms;
 const singlelineCommentsRE = /(?:^|\n|\r)\s*\/\/.*(?:\r|\n|$)/gm;
-const templateLiteralRE = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
+const templateLiteralRE$1 = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
 const quotesRE = [
   /(["'`])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
   /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
@@ -37125,7 +37206,7 @@ function stripLiteralRegex(code, options) {
   let expanded = code;
   for (let i = 0; i < 16; i++) {
     const before = expanded;
-    expanded = expanded.replace(templateLiteralRE, "` $1`");
+    expanded = expanded.replace(templateLiteralRE$1, "` $1`");
     if (expanded === before)
       break;
   }
@@ -37635,6 +37716,14 @@ function expand (config) {
 
 var expand_1 = expand;
 
+function getEnvFilesForMode(mode) {
+    return [
+        /** default file */ `.env`,
+        /** local file */ `.env.local`,
+        /** mode file */ `.env.${mode}`,
+        /** mode local file */ `.env.${mode}.local`,
+    ];
+}
 function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (mode === 'local') {
         throw new Error(`"local" cannot be used as a mode name because it conflicts with ` +
@@ -37642,12 +37731,7 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     }
     prefixes = arraify(prefixes);
     const env = {};
-    const envFiles = [
-        /** default file */ `.env`,
-        /** local file */ `.env.local`,
-        /** mode file */ `.env.${mode}`,
-        /** mode local file */ `.env.${mode}.local`,
-    ];
+    const envFiles = getEnvFilesForMode(mode);
     const parsed = Object.fromEntries(envFiles.flatMap((file) => {
         const filePath = path$o.join(envDir, file);
         if (!tryStatSync(filePath)?.isFile())
@@ -37949,6 +38033,31 @@ function buildHtmlPlugin(config) {
                 const publicBase = getBaseInHTML(relativeUrlPath, config);
                 const publicToRelative = (filename, importer) => publicBase + filename;
                 const toOutputPublicFilePath = (url) => toOutputFilePathInHtml(url.slice(1), 'public', relativeUrlPath, 'html', config, publicToRelative);
+                // Determines true start position for the node, either the < character
+                // position, or the newline at the end of the previous line's node.
+                const nodeStartWithLeadingWhitespace = (node) => {
+                    if (node.sourceCodeLocation.startOffset === 0)
+                        return node.sourceCodeLocation.startOffset;
+                    // Gets the offset for the start of the line including the
+                    // newline trailing the previous node
+                    const lineStartOffset = node.sourceCodeLocation.startOffset -
+                        node.sourceCodeLocation.startCol;
+                    const line = s.slice(lineStartOffset, node.sourceCodeLocation.startOffset);
+                    // <previous-line-node></previous-line-node>
+                    // <target-node></target-node>
+                    //
+                    // Here we want to target the newline at the end of the previous line
+                    // as the start position for our target.
+                    //
+                    // <previous-node></previous-node>
+                    // <doubled-up-node></doubled-up-node><target-node></target-node>
+                    //
+                    // However, if there is content between our target node start and the
+                    // previous newline, we cannot strip it out without risking content deletion.
+                    return line.trim()
+                        ? node.sourceCodeLocation.startOffset
+                        : lineStartOffset;
+                };
                 // pre-transform
                 html = await applyHtmlTransforms(html, preHooks, {
                     path: publicPath,
@@ -38044,7 +38153,7 @@ function buildHtmlPlugin(config) {
                                         const importExpression = `\nimport ${JSON.stringify(url)}`;
                                         styleUrls.push({
                                             url,
-                                            start: node.sourceCodeLocation.startOffset,
+                                            start: nodeStartWithLeadingWhitespace(node),
                                             end: node.sourceCodeLocation.endOffset,
                                         });
                                         js += importExpression;
@@ -38099,7 +38208,7 @@ function buildHtmlPlugin(config) {
                     if (shouldRemove) {
                         // remove the script tag from the html. we are going to inject new
                         // ones in the end.
-                        s.remove(node.sourceCodeLocation.startOffset, node.sourceCodeLocation.endOffset);
+                        s.remove(nodeStartWithLeadingWhitespace(node), node.sourceCodeLocation.endOffset);
                     }
                 });
                 isAsyncScriptMap.get(config).set(id, everyScriptIsAsync);
@@ -39399,8 +39508,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-68c42983.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-9586b1f1.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-958c4c65.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-86245b77.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40737,11 +40846,13 @@ function createIsConfiguredAsSsrExternal(config) {
     const noExternalFilter = noExternal !== 'undefined' &&
         typeof noExternal !== 'boolean' &&
         createFilter(undefined, noExternal, { resolve: false });
+    const targetConditions = config.ssr.resolve?.externalConditions || [];
     const resolveOptions = {
         ...config.resolve,
         root,
         isProduction: false,
         isBuild: true,
+        conditions: targetConditions,
     };
     const isExternalizable = (id, importer, configuredAsExternal) => {
         if (!bareImportRE.test(id) || id.includes('\0')) {
@@ -41716,7 +41827,7 @@ async function handleHMRUpdate(file, server, configOnly) {
     const isConfig = file === config.configFile;
     const isConfigDependency = config.configFileDependencies.some((name) => file === name);
     const isEnv = config.inlineConfig.envFile !== false &&
-        (fileName === '.env' || fileName.startsWith('.env.'));
+        getEnvFilesForMode(config.mode).includes(fileName);
     if (isConfig || isConfigDependency || isEnv) {
         // auto restart server
         debugHmr?.(`[config change] ${colors$1.dim(shortFile)}`);
@@ -42098,6 +42209,7 @@ const hasImportInQueryParamsRE = /[?&]import=?\b/;
 const hasViteIgnoreRE = /\/\*\s*@vite-ignore\s*\*\//;
 const cleanUpRawUrlRE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
 const urlIsStringRE = /^(?:'.*'|".*"|`.*`)$/;
+const templateLiteralRE = /^\s*`(.*)`\s*$/;
 function isExplicitImportRequired(url) {
     return !isJSRequest(cleanUrl(url)) && !isCSSRequest(url);
 }
@@ -42255,7 +42367,6 @@ function importAnalysisPlugin(config) {
             let needQueryInjectHelper = false;
             let s;
             const str = () => s || (s = new MagicString(source));
-            const importedUrls = new Set();
             let isPartiallySelfAccepting = false;
             const importedBindings = enablePartialAccept
                 ? new Map()
@@ -42291,6 +42402,9 @@ function importAnalysisPlugin(config) {
                     importerModule.isSelfAccepting = false;
                     return this.error(`Failed to resolve import "${url}" from "${path$o.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
                 }
+                if (isExternalUrl(resolved.id)) {
+                    return [resolved.id, resolved.id];
+                }
                 const isRelative = url[0] === '.';
                 const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
                 // normalize all imports into resolved URLs
@@ -42308,9 +42422,6 @@ function importAnalysisPlugin(config) {
                 else {
                     url = resolved.id;
                 }
-                if (isExternalUrl(url)) {
-                    return [url, url];
-                }
                 // if the resolved id is not a valid browser import specifier,
                 // prefix it to make it valid. We will strip this before feeding it
                 // back into the transform pipeline
@@ -42356,13 +42467,14 @@ function importAnalysisPlugin(config) {
                 }
                 return [url, resolved.id];
             };
+            const orderedImportedUrls = new Array(imports.length);
             const orderedAcceptedUrls = new Array(imports.length);
             const orderedAcceptedExports = new Array(imports.length);
             await Promise.all(imports.map(async (importSpecifier, index) => {
-                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, 
+                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, a: assertIndex, } = importSpecifier;
                 // #2083 User may use escape path,
                 // so use imports[index].n to get the unescaped string
-                n: specifier, a: assertIndex, } = importSpecifier;
+                let specifier = importSpecifier.n;
                 const rawUrl = source.slice(start, end);
                 // check import.meta usage
                 if (rawUrl === 'import.meta') {
@@ -42392,6 +42504,15 @@ function importAnalysisPlugin(config) {
                     }
                     return;
                 }
+                else if (templateLiteralRE.test(rawUrl)) {
+                    // If the import has backticks but isn't transformed as a glob import
+                    // (as there's nothing to glob), check if it's simply a plain string.
+                    // If so, we can replace the specifier as a plain string to prevent
+                    // an incorrect "cannot be analyzed" warning.
+                    if (!(rawUrl.includes('${') && rawUrl.includes('}'))) {
+                        specifier = rawUrl.replace(templateLiteralRE, '$1');
+                    }
+                }
                 const isDynamicImport = dynamicIndex > -1;
                 // strip import assertions as we can process them ourselves
                 if (!isDynamicImport && assertIndex > -1) {
@@ -42479,7 +42600,7 @@ function importAnalysisPlugin(config) {
                     const hmrUrl = unwrapId(stripBase(url, base));
                     const isLocalImport = !isExternalUrl(hmrUrl) && !isDataUrl(hmrUrl);
                     if (isLocalImport) {
-                        importedUrls.add(hmrUrl);
+                        orderedImportedUrls[index] = hmrUrl;
                     }
                     if (enablePartialAccept && importedBindings) {
                         extractImportedBindings(resolvedId, source, importSpecifier, importedBindings);
@@ -42498,7 +42619,10 @@ function importAnalysisPlugin(config) {
                                 return;
                             }
                             // Unexpected error, log the issue but avoid an unhandled exception
-                            config.logger.error(e.message, { error: e });
+                            config.logger.error(`Pre-transform error: ${e.message}`, {
+                                error: e,
+                                timestamp: true,
+                            });
                         });
                     }
                 }
@@ -42530,6 +42654,7 @@ function importAnalysisPlugin(config) {
                     }
                 }
             }));
+            const importedUrls = new Set(orderedImportedUrls.filter(Boolean));
             const acceptedUrls = mergeAcceptedUrls(orderedAcceptedUrls);
             const acceptedExports = mergeAcceptedUrls(orderedAcceptedExports);
             if (hasEnv) {
@@ -44999,7 +45124,8 @@ async function computeEntries(config) {
     }
     // Non-supported entry file types and virtual files should not be scanned for
     // dependencies.
-    entries = entries.filter((entry) => isScannable(entry) && fs$l.existsSync(entry));
+    entries = entries.filter((entry) => isScannable(entry, config.optimizeDeps.extensions) &&
+        fs$l.existsSync(entry));
     return entries;
 }
 async function prepareEsbuildScanner(config, entries, deps, missing, scanContext) {
@@ -45129,12 +45255,11 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     namespace: 'html',
                 };
             });
-            // extract scripts inside HTML-like files and treat it as a js module
-            build.onLoad({ filter: htmlTypesRE, namespace: 'html' }, async ({ path }) => {
-                let raw = await fsp.readFile(path, 'utf-8');
+            const htmlTypeOnLoadCallback = async ({ path: p }) => {
+                let raw = await fsp.readFile(p, 'utf-8');
                 // Avoid matching the content of the comment
                 raw = raw.replace(commentRE, '<!---->');
-                const isHtml = path.endsWith('.html');
+                const isHtml = p.endsWith('.html');
                 scriptRE.lastIndex = 0;
                 let js = '';
                 let scriptId = 0;
@@ -45160,7 +45285,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     if (lang === 'ts' || lang === 'tsx' || lang === 'jsx') {
                         loader = lang;
                     }
-                    else if (path.endsWith('.astro')) {
+                    else if (p.endsWith('.astro')) {
                         loader = 'ts';
                     }
                     const srcMatch = openTag.match(srcRE);
@@ -45178,11 +45303,12 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         // since they may be used in the template
                         const contents = content +
                             (loader.startsWith('ts') ? extractImportPaths(content) : '');
-                        const key = `${path}?id=${scriptId++}`;
+                        const key = `${p}?id=${scriptId++}`;
                         if (contents.includes('import.meta.glob')) {
                             scripts[key] = {
                                 loader: 'js',
-                                contents: await doTransformGlobImport(contents, path, loader),
+                                contents: await doTransformGlobImport(contents, p, loader),
+                                resolveDir: normalizePath$3(path$o.dirname(p)),
                                 pluginData: {
                                     htmlType: { loader },
                                 },
@@ -45192,6 +45318,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                             scripts[key] = {
                                 loader,
                                 contents,
+                                resolveDir: normalizePath$3(path$o.dirname(p)),
                                 pluginData: {
                                     htmlType: { loader },
                                 },
@@ -45204,7 +45331,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         // Especially for Svelte files, exports in <script context="module"> means module exports,
                         // exports in <script> means component props. To avoid having two same export name from the
                         // star exports, we need to ignore exports in <script>
-                        if (path.endsWith('.svelte') && context !== 'module') {
+                        if (p.endsWith('.svelte') && context !== 'module') {
                             js += `import ${virtualModulePath}\n`;
                         }
                         else {
@@ -45216,14 +45343,20 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                 // anywhere in a string. Svelte and Astro files can't have
                 // `export default` as code so we know if it's encountered it's a
                 // false positive (e.g. contained in a string)
-                if (!path.endsWith('.vue') || !js.includes('export default')) {
+                if (!p.endsWith('.vue') || !js.includes('export default')) {
                     js += '\nexport default {}';
                 }
                 return {
                     loader: 'js',
                     contents: js,
                 };
-            });
+            };
+            // extract scripts inside HTML-like files and treat it as a js module
+            build.onLoad({ filter: htmlTypesRE, namespace: 'html' }, htmlTypeOnLoadCallback);
+            // the onResolve above will use namespace=html but esbuild doesn't
+            // call onResolve for glob imports and those will use namespace=file
+            // https://github.com/evanw/esbuild/issues/3317
+            build.onLoad({ filter: htmlTypesRE, namespace: 'file' }, htmlTypeOnLoadCallback);
             // bare imports: record and externalize ----------------------------------
             build.onResolve({
                 // avoid matching windows volume
@@ -45251,7 +45384,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         }
                         return externalUnlessEntry({ path: id });
                     }
-                    else if (isScannable(resolved)) {
+                    else if (isScannable(resolved, config.optimizeDeps.extensions)) {
                         const namespace = htmlTypesRE.test(resolved) ? 'html' : undefined;
                         // linked package, keep crawling
                         return {
@@ -45296,7 +45429,8 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     },
                 });
                 if (resolved) {
-                    if (shouldExternalizeDep(resolved, id) || !isScannable(resolved)) {
+                    if (shouldExternalizeDep(resolved, id) ||
+                        !isScannable(resolved, config.optimizeDeps.extensions)) {
                         return externalUnlessEntry({ path: id });
                     }
                     const namespace = htmlTypesRE.test(resolved) ? 'html' : undefined;
@@ -45368,8 +45502,11 @@ function shouldExternalizeDep(resolvedId, rawId) {
     }
     return false;
 }
-function isScannable(id) {
-    return JS_TYPES_RE.test(id) || htmlTypesRE.test(id);
+function isScannable(id, extensions) {
+    return (JS_TYPES_RE.test(id) ||
+        htmlTypesRE.test(id) ||
+        extensions?.includes(path$o.extname(id)) ||
+        false);
 }
 // esbuild v0.18 only transforms decorators when `experimentalDecorators` is set to `true`.
 // To preserve compat with the esbuild breaking change, we set `experimentalDecorators` to
@@ -54670,206 +54807,249 @@ chokidar.watch = watch;
 
 var shellQuote$1 = {};
 
-shellQuote$1.quote = function (xs) {
-    return xs.map(function (s) {
-        if (s && typeof s === 'object') {
-            return s.op.replace(/(.)/g, '\\$1');
-        }
-        else if (/["\s]/.test(s) && !/'/.test(s)) {
-            return "'" + s.replace(/(['\\])/g, '\\$1') + "'";
-        }
-        else if (/["'\s]/.test(s)) {
-            return '"' + s.replace(/(["\\$`!])/g, '\\$1') + '"';
-        }
-        else {
-            return String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@\[\\\]^`{|}])/g, '$1\\$2');
-        }
-    }).join(' ');
+var quote = function quote(xs) {
+	return xs.map(function (s) {
+		if (s && typeof s === 'object') {
+			return s.op.replace(/(.)/g, '\\$1');
+		}
+		if ((/["\s]/).test(s) && !(/'/).test(s)) {
+			return "'" + s.replace(/(['\\])/g, '\\$1') + "'";
+		}
+		if ((/["'\s]/).test(s)) {
+			return '"' + s.replace(/(["\\$`!])/g, '\\$1') + '"';
+		}
+		return String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@[\\\]^`{|}])/g, '$1\\$2');
+	}).join(' ');
 };
 
 // '<(' is process substitution operator and
 // can be parsed the same as control operator
 var CONTROL = '(?:' + [
-    '\\|\\|', '\\&\\&', ';;', '\\|\\&', '\\<\\(', '>>', '>\\&', '[&;()|<>]'
+	'\\|\\|',
+	'\\&\\&',
+	';;',
+	'\\|\\&',
+	'\\<\\(',
+	'\\<\\<\\<',
+	'>>',
+	'>\\&',
+	'<\\&',
+	'[&;()|<>]'
 ].join('|') + ')';
+var controlRE = new RegExp('^' + CONTROL + '$');
 var META = '|&;()<> \\t';
-var BAREWORD = '(\\\\[\'"' + META + ']|[^\\s\'"' + META + '])+';
 var SINGLE_QUOTE = '"((\\\\"|[^"])*?)"';
 var DOUBLE_QUOTE = '\'((\\\\\'|[^\'])*?)\'';
+var hash = /^#$/;
+
+var SQ = "'";
+var DQ = '"';
+var DS = '$';
 
 var TOKEN = '';
+var mult = 0x100000000; // Math.pow(16, 8);
 for (var i = 0; i < 4; i++) {
-    TOKEN += (Math.pow(16,8)*Math.random()).toString(16);
+	TOKEN += (mult * Math.random()).toString(16);
 }
+var startsWithToken = new RegExp('^' + TOKEN);
 
-shellQuote$1.parse = function (s, env, opts) {
-    var mapped = parse$5(s, env, opts);
-    if (typeof env !== 'function') return mapped;
-    return mapped.reduce(function (acc, s) {
-        if (typeof s === 'object') return acc.concat(s);
-        var xs = s.split(RegExp('(' + TOKEN + '.*?' + TOKEN + ')', 'g'));
-        if (xs.length === 1) return acc.concat(xs[0]);
-        return acc.concat(xs.filter(Boolean).map(function (x) {
-            if (RegExp('^' + TOKEN).test(x)) {
-                return JSON.parse(x.split(TOKEN)[1]);
-            }
-            else return x;
-        }));
-    }, []);
-};
+function matchAll(s, r) {
+	var origIndex = r.lastIndex;
 
-function parse$5 (s, env, opts) {
-    var chunker = new RegExp([
-        '(' + CONTROL + ')', // control chars
-        '(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')*'
-    ].join('|'), 'g');
-    var match = s.match(chunker).filter(Boolean);
-    var commented = false;
+	var matches = [];
+	var matchObj;
 
-    if (!match) return [];
-    if (!env) env = {};
-    if (!opts) opts = {};
-    return match.map(function (s, j) {
-        if (commented) {
-            return;
-        }
-        if (RegExp('^' + CONTROL + '$').test(s)) {
-            return { op: s };
-        }
+	while ((matchObj = r.exec(s))) {
+		matches.push(matchObj);
+		if (r.lastIndex === matchObj.index) {
+			r.lastIndex += 1;
+		}
+	}
 
-        // Hand-written scanner/parser for Bash quoting rules:
-        //
-        //  1. inside single quotes, all characters are printed literally.
-        //  2. inside double quotes, all characters are printed literally
-        //     except variables prefixed by '$' and backslashes followed by
-        //     either a double quote or another backslash.
-        //  3. outside of any quotes, backslashes are treated as escape
-        //     characters and not printed (unless they are themselves escaped)
-        //  4. quote context can switch mid-token if there is no whitespace
-        //     between the two quote contexts (e.g. all'one'"token" parses as
-        //     "allonetoken")
-        var SQ = "'";
-        var DQ = '"';
-        var DS = '$';
-        var BS = opts.escape || '\\';
-        var quote = false;
-        var esc = false;
-        var out = '';
-        var isGlob = false;
-
-        for (var i = 0, len = s.length; i < len; i++) {
-            var c = s.charAt(i);
-            isGlob = isGlob || (!quote && (c === '*' || c === '?'));
-            if (esc) {
-                out += c;
-                esc = false;
-            }
-            else if (quote) {
-                if (c === quote) {
-                    quote = false;
-                }
-                else if (quote == SQ) {
-                    out += c;
-                }
-                else { // Double quote
-                    if (c === BS) {
-                        i += 1;
-                        c = s.charAt(i);
-                        if (c === DQ || c === BS || c === DS) {
-                            out += c;
-                        } else {
-                            out += BS + c;
-                        }
-                    }
-                    else if (c === DS) {
-                        out += parseEnvVar();
-                    }
-                    else {
-                        out += c;
-                    }
-                }
-            }
-            else if (c === DQ || c === SQ) {
-                quote = c;
-            }
-            else if (RegExp('^' + CONTROL + '$').test(c)) {
-                return { op: s };
-            }
-            else if (RegExp('^#$').test(c)) {
-                commented = true;
-                if (out.length){
-                    return [out, { comment: s.slice(i+1) + match.slice(j+1).join(' ') }];
-                }
-                return [{ comment: s.slice(i+1) + match.slice(j+1).join(' ') }];
-            }
-            else if (c === BS) {
-                esc = true;
-            }
-            else if (c === DS) {
-                out += parseEnvVar();
-            }
-            else out += c;
-        }
+	r.lastIndex = origIndex;
 
-        if (isGlob) return {op: 'glob', pattern: out};
+	return matches;
+}
 
-        return out;
+function getVar(env, pre, key) {
+	var r = typeof env === 'function' ? env(key) : env[key];
+	if (typeof r === 'undefined' && key != '') {
+		r = '';
+	} else if (typeof r === 'undefined') {
+		r = '$';
+	}
 
-        function parseEnvVar() {
-            i += 1;
-            var varend, varname;
-            //debugger
-            if (s.charAt(i) === '{') {
-                i += 1;
-                if (s.charAt(i) === '}') {
-                    throw new Error("Bad substitution: " + s.substr(i - 2, 3));
-                }
-                varend = s.indexOf('}', i);
-                if (varend < 0) {
-                    throw new Error("Bad substitution: " + s.substr(i));
-                }
-                varname = s.substr(i, varend - i);
-                i = varend;
-            }
-            else if (/[*@#?$!_\-]/.test(s.charAt(i))) {
-                varname = s.charAt(i);
-                i += 1;
-            }
-            else {
-                varend = s.substr(i).match(/[^\w\d_]/);
-                if (!varend) {
-                    varname = s.substr(i);
-                    i = s.length;
-                } else {
-                    varname = s.substr(i, varend.index);
-                    i += varend.index - 1;
-                }
-            }
-            return getVar(null, '', varname);
-        }
-    })
-    // finalize parsed aruments
-    .reduce(function(prev, arg){
-        if (arg === undefined){
-            return prev;
-        }
-        return prev.concat(arg);
-    },[]);
+	if (typeof r === 'object') {
+		return pre + TOKEN + JSON.stringify(r) + TOKEN;
+	}
+	return pre + r;
+}
 
-    function getVar (_, pre, key) {
-        var r = typeof env === 'function' ? env(key) : env[key];
-        if (r === undefined && key != '')
-            r = '';
-        else if (r === undefined)
-            r = '$';
+function parseInternal(string, env, opts) {
+	if (!opts) {
+		opts = {};
+	}
+	var BS = opts.escape || '\\';
+	var BAREWORD = '(\\' + BS + '[\'"' + META + ']|[^\\s\'"' + META + '])+';
 
-        if (typeof r === 'object') {
-            return pre + TOKEN + JSON.stringify(r) + TOKEN;
-        }
-        else return pre + r;
-    }
+	var chunker = new RegExp([
+		'(' + CONTROL + ')', // control chars
+		'(' + BAREWORD + '|' + SINGLE_QUOTE + '|' + DOUBLE_QUOTE + ')+'
+	].join('|'), 'g');
+
+	var matches = matchAll(string, chunker);
+
+	if (matches.length === 0) {
+		return [];
+	}
+	if (!env) {
+		env = {};
+	}
+
+	var commented = false;
+
+	return matches.map(function (match) {
+		var s = match[0];
+		if (!s || commented) {
+			return void undefined;
+		}
+		if (controlRE.test(s)) {
+			return { op: s };
+		}
+
+		// Hand-written scanner/parser for Bash quoting rules:
+		//
+		// 1. inside single quotes, all characters are printed literally.
+		// 2. inside double quotes, all characters are printed literally
+		//    except variables prefixed by '$' and backslashes followed by
+		//    either a double quote or another backslash.
+		// 3. outside of any quotes, backslashes are treated as escape
+		//    characters and not printed (unless they are themselves escaped)
+		// 4. quote context can switch mid-token if there is no whitespace
+		//     between the two quote contexts (e.g. all'one'"token" parses as
+		//     "allonetoken")
+		var quote = false;
+		var esc = false;
+		var out = '';
+		var isGlob = false;
+		var i;
+
+		function parseEnvVar() {
+			i += 1;
+			var varend;
+			var varname;
+			var char = s.charAt(i);
+
+			if (char === '{') {
+				i += 1;
+				if (s.charAt(i) === '}') {
+					throw new Error('Bad substitution: ' + s.slice(i - 2, i + 1));
+				}
+				varend = s.indexOf('}', i);
+				if (varend < 0) {
+					throw new Error('Bad substitution: ' + s.slice(i));
+				}
+				varname = s.slice(i, varend);
+				i = varend;
+			} else if ((/[*@#?$!_-]/).test(char)) {
+				varname = char;
+				i += 1;
+			} else {
+				var slicedFromI = s.slice(i);
+				varend = slicedFromI.match(/[^\w\d_]/);
+				if (!varend) {
+					varname = slicedFromI;
+					i = s.length;
+				} else {
+					varname = slicedFromI.slice(0, varend.index);
+					i += varend.index - 1;
+				}
+			}
+			return getVar(env, '', varname);
+		}
+
+		for (i = 0; i < s.length; i++) {
+			var c = s.charAt(i);
+			isGlob = isGlob || (!quote && (c === '*' || c === '?'));
+			if (esc) {
+				out += c;
+				esc = false;
+			} else if (quote) {
+				if (c === quote) {
+					quote = false;
+				} else if (quote == SQ) {
+					out += c;
+				} else { // Double quote
+					if (c === BS) {
+						i += 1;
+						c = s.charAt(i);
+						if (c === DQ || c === BS || c === DS) {
+							out += c;
+						} else {
+							out += BS + c;
+						}
+					} else if (c === DS) {
+						out += parseEnvVar();
+					} else {
+						out += c;
+					}
+				}
+			} else if (c === DQ || c === SQ) {
+				quote = c;
+			} else if (controlRE.test(c)) {
+				return { op: s };
+			} else if (hash.test(c)) {
+				commented = true;
+				var commentObj = { comment: string.slice(match.index + i + 1) };
+				if (out.length) {
+					return [out, commentObj];
+				}
+				return [commentObj];
+			} else if (c === BS) {
+				esc = true;
+			} else if (c === DS) {
+				out += parseEnvVar();
+			} else {
+				out += c;
+			}
+		}
+
+		if (isGlob) {
+			return { op: 'glob', pattern: out };
+		}
+
+		return out;
+	}).reduce(function (prev, arg) { // finalize parsed arguments
+		// TODO: replace this whole reduce with a concat
+		return typeof arg === 'undefined' ? prev : prev.concat(arg);
+	}, []);
 }
 
+var parse$5 = function parse(s, env, opts) {
+	var mapped = parseInternal(s, env, opts);
+	if (typeof env !== 'function') {
+		return mapped;
+	}
+	return mapped.reduce(function (acc, s) {
+		if (typeof s === 'object') {
+			return acc.concat(s);
+		}
+		var xs = s.split(RegExp('(' + TOKEN + '.*?' + TOKEN + ')', 'g'));
+		if (xs.length === 1) {
+			return acc.concat(xs[0]);
+		}
+		return acc.concat(xs.filter(Boolean).map(function (x) {
+			if (startsWithToken.test(x)) {
+				return JSON.parse(x.split(TOKEN)[1]);
+			}
+			return x;
+		}));
+	}, []);
+};
+
+shellQuote$1.quote = quote;
+shellQuote$1.parse = parse$5;
+
 var osx = {
   '/Applications/Atom.app/Contents/MacOS/Atom': 'atom',
   '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta':
@@ -54913,10 +55093,10 @@ var osx = {
 var linux = {
   atom: 'atom',
   Brackets: 'brackets',
-  code: 'code',
   'code-insiders': 'code-insiders',
-  codium: 'codium',
+  code: 'code',
   vscodium: 'vscodium',
+  codium: 'codium',
   emacs: 'emacs',
   gvim: 'gvim',
   'idea.sh': 'idea',
@@ -56510,18 +56690,20 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     };
     urlStack = urlStack.concat(url);
     const isCircular = (url) => urlStack.includes(url);
-    const { isProduction, resolve: { dedupe, preserveSymlinks }, root, } = server.config;
+    const { isProduction, resolve: { dedupe, preserveSymlinks }, root, ssr, } = server.config;
+    const overrideConditions = ssr.resolve?.externalConditions || [];
     const resolveOptions = {
         mainFields: ['main'],
         browserField: true,
         conditions: [],
-        overrideConditions: ['production', 'development'],
+        overrideConditions: [...overrideConditions, 'production', 'development'],
         extensions: ['.js', '.cjs', '.json'],
         dedupe,
         preserveSymlinks,
         isBuild: false,
         isProduction,
         root,
+        ssrConfig: ssr,
     };
     // Since dynamic imports can happen in parallel, we need to
     // account for multiple pending deps and duplicate imports.
@@ -56619,22 +56801,13 @@ async function nodeImport(id, importer, resolveOptions) {
         url = id;
     }
     else {
-        const resolved = tryNodeResolve(id, importer, 
-        // Non-external modules can import ESM-only modules, but only outside
-        // of test runs, because we use Node `require` in Jest to avoid segfault.
-        // @ts-expect-error jest only exists when running Jest
-        typeof jest === 'undefined'
-            ? { ...resolveOptions, tryEsmOnly: true }
-            : resolveOptions, false);
+        const resolved = tryNodeResolve(id, importer, { ...resolveOptions, tryEsmOnly: true }, false, undefined, true);
         if (!resolved) {
             const err = new Error(`Cannot find module '${id}' imported from '${importer}'`);
             err.code = 'ERR_MODULE_NOT_FOUND';
             throw err;
         }
-        url = resolved.id;
-        if (usingDynamicImport) {
-            url = pathToFileURL(url).toString();
-        }
+        url = pathToFileURL(resolved.id).toString();
     }
     const mod = await dynamicImport(url);
     return proxyESM(mod);
@@ -64885,11 +65058,16 @@ function htmlFallbackMiddleware(root, spaFallback) {
                     return spaFallback ? `/index.html` : request.url;
                 },
             },
-            // don't rewrite paths ending with .html
             {
                 from: /\.html$/,
-                to({ request }) {
-                    return request.url;
+                to({ parsedUrl, request }) {
+                    // .html files are not handled by serveStaticMiddleware
+                    // so we need to check if the file exists
+                    const pathname = decodeURIComponent(parsedUrl.pathname);
+                    if (fs$l.existsSync(path$o.join(root, pathname))) {
+                        return request.url;
+                    }
+                    return spaFallback ? `/index.html` : request.url;
                 },
             },
         ],
@@ -64991,7 +65169,7 @@ function transformMiddleware(server) {
                     }
                     else {
                         warning =
-                            `files in the public directory are served at the root path.\n` +
+                            `Files in the public directory are served at the root path.\n` +
                                 `Instead of ${colors$1.cyan(url)}, use ${colors$1.cyan(url.replace(publicPath, '/'))}.`;
                     }
                     logger.warn(colors$1.yellow(warning));
@@ -65316,7 +65494,10 @@ function preTransformRequest(server, url, base) {
             return;
         }
         // Unexpected error, log the issue but avoid an unhandled exception
-        server.config.logger.error(e.message);
+        server.config.logger.error(`Pre-transform error: ${e.message}`, {
+            error: e,
+            timestamp: true,
+        });
     });
 }
 
@@ -66273,6 +66454,7 @@ async function preview(inlineConfig = {}) {
         etag: true,
         dev: true,
         single: config.appType === 'spa',
+        ignores: false,
         setHeaders(res) {
             if (headers) {
                 for (const name in headers) {
@@ -66403,6 +66585,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         allowClearScreen: config.clearScreen,
         customLogger: config.customLogger,
     });
+    let foundDiscouragedVariableName;
+    if ((foundDiscouragedVariableName = Object.keys(config.define ?? {}).find((k) => ['process', 'global'].includes(k)))) {
+        logger.warn(colors$1.yellow(`Replacing ${colors$1.bold(foundDiscouragedVariableName)} using the define option is discouraged. See https://vitejs.dev/config/shared-options.html#define for more details.`));
+    }
     // resolve root
     const resolvedRoot = normalizePath$3(config.root ? path$o.resolve(config.root) : process.cwd());
     if (resolvedRoot.includes('#')) {
@@ -66424,7 +66610,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         mainFields: config.resolve?.mainFields ?? DEFAULT_MAIN_FIELDS,
         browserField: config.resolve?.browserField ?? true,
         conditions: config.resolve?.conditions ?? [],
-        extensions: config.resolve?.extensions ?? DEFAULT_EXTENSIONS$1,
+        extensions: config.resolve?.extensions ?? DEFAULT_EXTENSIONS,
         dedupe: config.resolve?.dedupe ?? [],
         preserveSymlinks: config.resolve?.preserveSymlinks ?? false,
         alias: resolvedAlias,
@@ -66632,12 +66818,6 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     else if (middlewareMode === 'html') {
         logger.warn(colors$1.yellow(`Setting server.middlewareMode to 'html' is deprecated, set server.middlewareMode to \`true\` instead`));
     }
-    if (config.server?.force &&
-        !isBuild &&
-        config.optimizeDeps?.force === undefined) {
-        resolved.optimizeDeps.force = true;
-        logger.warn(colors$1.yellow(`server.force is deprecated, use optimizeDeps.force instead`));
-    }
     debug?.(`using resolved config: %O`, {
         ...resolved,
         plugins: resolved.plugins.map((p) => p.name),
@@ -66819,7 +66999,7 @@ async function bundleConfigFile(fileName, isESM) {
                             conditions: [],
                             overrideConditions: ['node'],
                             dedupe: [],
-                            extensions: DEFAULT_EXTENSIONS$1,
+                            extensions: DEFAULT_EXTENSIONS,
                             preserveSymlinks: false,
                             packageCache,
                             isRequire,