vite 4.0.0 → 4.0.2

package/dist/node/chunks/{dep-ed9cb113.js → dep-6305614c.js}

@@ -7295,7 +7295,7 @@ function isReference(node, parent) {
     return false;
 }
 
-var version$3 = "23.0.3";
+var version$3 = "23.0.4";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0"
 };
@@ -12175,10 +12175,8 @@ async function resolveServerUrls(server, options, config) {
             .flatMap((nInterface) => nInterface ?? [])
             .filter((detail) => detail &&
             detail.address &&
-            // Node < v18
             ((typeof detail.family === 'string' && detail.family === 'IPv4') ||
-                // Node >= v18
-                // @ts-expect-error
+                // @ts-expect-error Node 18.0 - 18.3 returns number
                 (typeof detail.family === 'number' && detail.family === 4)))
             .forEach((detail) => {
             const host = detail.address.replace('127.0.0.1', hostname.name);
@@ -12203,7 +12201,7 @@ function toUpperCaseDriveLetter(pathName) {
 const multilineCommentsRE$1 = /\/\*[^*]*\*+(?:[^/*][^*]*\*+)*\//g;
 const singlelineCommentsRE$1 = /\/\/.*/g;
 const requestQuerySplitRE = /\?(?!.*[/|}])/;
-// @ts-expect-error
+// @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.
@@ -12421,23 +12419,11 @@ const isNonDriveRelativeAbsolutePath = (p) => {
  * Determine if a file is being requested with the correct case, to ensure
  * consistent behaviour between dev and prod and across operating systems.
  */
-function shouldServe(url, assetsDir) {
-    try {
-        // viteTestUrl is set to something like http://localhost:4173/ and then many tests make calls
-        // like `await page.goto(viteTestUrl + '/example')` giving us URLs beginning with a double slash
-        const pathname = decodeURI(new URL$3(url.startsWith('//') ? url.substring(1) : url, 'http://example.com').pathname);
-        const file = path$o.join(assetsDir, pathname);
-        if (!fs$l.existsSync(file) ||
-            (isCaseInsensitiveFS && // can skip case check on Linux
-                !fs$l.statSync(file).isDirectory() &&
-                !hasCorrectCase(file, assetsDir))) {
-            return false;
-        }
+function shouldServeFile(filePath, root) {
+    // can skip case check on Linux
+    if (!isCaseInsensitiveFS)
         return true;
-    }
-    catch (err) {
-        return false;
-    }
+    return hasCorrectCase(filePath, root);
 }
 /**
  * Note that we can't use realpath here, because we don't want to follow
@@ -13378,7 +13364,7 @@ async function transformWithEsbuild(code, filename, options, inMap) {
             const loadedCompilerOptions = loadedTsconfig.compilerOptions ?? {};
             for (const field of meaningfulFields) {
                 if (field in loadedCompilerOptions) {
-                    // @ts-ignore TypeScript can't tell they are of the same type
+                    // @ts-expect-error TypeScript can't tell they are of the same type
                     compilerOptionsForFile[field] = loadedCompilerOptions[field];
                 }
             }
@@ -13390,6 +13376,23 @@ async function transformWithEsbuild(code, filename, options, inMap) {
                 ...tsconfigRaw?.compilerOptions,
             },
         };
+        const { compilerOptions } = tsconfigRaw;
+        if (compilerOptions) {
+            // esbuild derives `useDefineForClassFields` from `target` instead of `tsconfig.compilerOptions.target`
+            // https://github.com/evanw/esbuild/issues/2584
+            // but we want `useDefineForClassFields` to be derived from `tsconfig.compilerOptions.target`
+            if (compilerOptions.useDefineForClassFields === undefined) {
+                const lowercaseTarget = compilerOptions.target?.toLowerCase() ?? 'es3';
+                if (lowercaseTarget.startsWith('es')) {
+                    const esVersion = lowercaseTarget.slice(2);
+                    compilerOptions.useDefineForClassFields =
+                        esVersion === 'next' || +esVersion >= 2022;
+                }
+                else {
+                    compilerOptions.useDefineForClassFields = false;
+                }
+            }
+        }
     }
     const resolvedOptions = {
         sourcemap: true,
@@ -13529,7 +13532,7 @@ const buildEsbuildPlugin = (config) => {
             await initTSConfck(config);
         },
         async renderChunk(code, chunk, opts) {
-            // @ts-ignore injected by @vitejs/plugin-legacy
+            // @ts-expect-error injected by @vitejs/plugin-legacy
             if (opts.__vite_skip_esbuild__) {
                 return null;
             }
@@ -13843,7 +13846,7 @@ function terserPlugin(config) {
             // so that normal chunks can use the preferred minifier, and legacy chunks
             // can use terser.
             if (config.build.minify !== 'terser' &&
-                // @ts-ignore injected by @vitejs/plugin-legacy
+                // @ts-expect-error injected by @vitejs/plugin-legacy
                 !outputOptions.__vite_force_terser__) {
                 return null;
             }
@@ -21609,6 +21612,43 @@ var acorn = {
 	version: version$2
 };
 
+const HASH_RE = /#/g;
+const AMPERSAND_RE = /&/g;
+const EQUAL_RE = /=/g;
+const PLUS_RE = /\+/g;
+const ENC_BRACKET_OPEN_RE = /%5b/gi;
+const ENC_BRACKET_CLOSE_RE = /%5d/gi;
+const ENC_CARET_RE = /%5e/gi;
+const ENC_BACKTICK_RE = /%60/gi;
+const ENC_CURLY_OPEN_RE = /%7b/gi;
+const ENC_PIPE_RE = /%7c/gi;
+const ENC_CURLY_CLOSE_RE = /%7d/gi;
+const ENC_SPACE_RE = /%20/gi;
+function encode(text) {
+  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
+}
+function encodeQueryValue(text) {
+  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
+}
+function encodeQueryKey(text) {
+  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
+}
+function encodeQueryItem(key, value) {
+  if (typeof value === "number" || typeof value === "boolean") {
+    value = String(value);
+  }
+  if (!value) {
+    return encodeQueryKey(key);
+  }
+  if (Array.isArray(value)) {
+    return value.map((_value) => `${encodeQueryKey(key)}=${encodeQueryValue(_value)}`).join("&");
+  }
+  return `${encodeQueryKey(key)}=${encodeQueryValue(value)}`;
+}
+function stringifyQuery(query) {
+  return Object.keys(query).filter((k) => query[k] !== void 0).map((k) => encodeQueryItem(k, query[k])).join("&");
+}
+
 function matchAll(regex, string, addition) {
   const matches = [];
   for (const match of string.matchAll(regex)) {
@@ -22241,7 +22281,7 @@ function webWorkerPlugin(config) {
             return result();
         },
         generateBundle(opts) {
-            // @ts-ignore asset emits are skipped in legacy bundle
+            // @ts-expect-error asset emits are skipped in legacy bundle
             if (opts.__vite_skip_asset_emit__ || isWorker) {
                 return;
             }
@@ -36388,12 +36428,12 @@ function formatParseError(parserError, id, html) {
     const formattedError = {
         code: parserError.code,
         message: `parse5 error code ${parserError.code}`,
-    };
-    formattedError.frame = generateCodeFrame(html, parserError.startOffset);
-    formattedError.loc = {
-        file: id,
-        line: parserError.startLine,
-        column: parserError.startCol,
+        frame: generateCodeFrame(html, parserError.startOffset),
+        loc: {
+            file: id,
+            line: parserError.startLine,
+            column: parserError.startCol,
+        },
     };
     return formattedError;
 }
@@ -36413,12 +36453,10 @@ function handleParseError(parserError, html, filePath) {
             // Allow self closing on non-void elements #10439
             return;
     }
-    const parseError = {
-        loc: filePath,
-        frame: '',
-        ...formatParseError(parserError, filePath, html),
-    };
-    throw new Error(`Unable to parse HTML; ${parseError.message}\n at ${JSON.stringify(parseError.loc)}\n${parseError.frame}`);
+    const parseError = formatParseError(parserError, filePath, html);
+    throw new Error(`Unable to parse HTML; ${parseError.message}\n` +
+        ` at ${parseError.loc.file}:${parseError.loc.line}:${parseError.loc.column}\n` +
+        `${parseError.frame}`);
 }
 /**
  * Compiles index.html into an entry js module
@@ -37407,7 +37445,7 @@ function cssPostPlugin(config) {
             return null;
         },
         async generateBundle(opts, bundle) {
-            // @ts-ignore asset emits are skipped in legacy bundle
+            // @ts-expect-error asset emits are skipped in legacy bundle
             if (opts.__vite_skip_asset_emit__) {
                 return;
             }
@@ -37585,7 +37623,7 @@ async function compileCSS(id, code, config, urlReplacer) {
     }
     const postcssPlugins = postcssConfig && postcssConfig.plugins ? postcssConfig.plugins.slice() : [];
     if (needInlineImport) {
-        postcssPlugins.unshift((await import('./dep-1e0f5bc1.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-a1fa0d33.js').then(function (n) { return n.i; })).default({
             async resolve(id, basedir) {
                 const publicFile = checkPublicFile(id, config);
                 if (publicFile) {
@@ -37609,7 +37647,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-8f344fbd.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-e4585742.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -37784,7 +37822,6 @@ async function resolvePostcssConfig(config, dialect = 'css') {
     else {
         const searchPath = typeof inlineOptions === 'string' ? inlineOptions : config.root;
         try {
-            // @ts-ignore
             result = await src$1({}, searchPath);
         }
         catch (e) {
@@ -38034,11 +38071,9 @@ function fixScssBugImportValue(data) {
     typeof window !== 'undefined' &&
         typeof location !== 'undefined' &&
         data &&
-        // @ts-expect-error
-        data.file &&
-        // @ts-expect-error
-        data.contents == null) {
-        // @ts-expect-error
+        'file' in data &&
+        (!('contents' in data) || data.contents == null)) {
+        // @ts-expect-error we need to preserve file property for HMR
         data.contents = fs$l.readFileSync(data.file, 'utf-8');
     }
     return data;
@@ -38644,43 +38679,6 @@ base.MethodDefinition = base.PropertyDefinition = base.Property = function (node
   if (node.value) { c(node.value, st, "Expression"); }
 };
 
-const HASH_RE = /#/g;
-const AMPERSAND_RE = /&/g;
-const EQUAL_RE = /=/g;
-const PLUS_RE = /\+/g;
-const ENC_BRACKET_OPEN_RE = /%5B/gi;
-const ENC_BRACKET_CLOSE_RE = /%5D/gi;
-const ENC_CARET_RE = /%5E/gi;
-const ENC_BACKTICK_RE = /%60/gi;
-const ENC_CURLY_OPEN_RE = /%7B/gi;
-const ENC_PIPE_RE = /%7C/gi;
-const ENC_CURLY_CLOSE_RE = /%7D/gi;
-const ENC_SPACE_RE = /%20/gi;
-function encode(text) {
-  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
-}
-function encodeQueryValue(text) {
-  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
-}
-function encodeQueryKey(text) {
-  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
-}
-function encodeQueryItem(key, val) {
-  if (typeof val === "number" || typeof val === "boolean") {
-    val = String(val);
-  }
-  if (!val) {
-    return encodeQueryKey(key);
-  }
-  if (Array.isArray(val)) {
-    return val.map((_val) => `${encodeQueryKey(key)}=${encodeQueryValue(_val)}`).join("&");
-  }
-  return `${encodeQueryKey(key)}=${encodeQueryValue(val)}`;
-}
-function stringifyQuery(query) {
-  return Object.keys(query).map((k) => encodeQueryItem(k, query[k])).join("&");
-}
-
 const { isMatch: isMatch$1, scan } = micromatch_1;
 function getAffectedGlobModules(file, server) {
     const modules = [];
@@ -39634,19 +39632,19 @@ function stattag (stat) {
 var convertSourceMap = {};
 
 (function (exports) {
-	var fs = require$$0__default;
-	var path = require$$0$4;
 
 	Object.defineProperty(exports, 'commentRegex', {
 	  get: function getCommentRegex () {
-	    return /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/mg;
+	    // Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+	    return /^\s*?\/[\/\*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/mg;
 	  }
 	});
 
+
 	Object.defineProperty(exports, 'mapFileCommentRegex', {
 	  get: function getMapFileCommentRegex () {
 	    // Matches sourceMappingURL in either // or /* comment styles.
-	    return /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"`]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg;
+	    return /(?:\/\/[@#][ \t]+?sourceMappingURL=([^\s'"`]+?)[ \t]*?$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^*]+?)[ \t]*?(?:\*\/){1}[ \t]*?$)/mg;
 	  }
 	});
 
@@ -39680,29 +39678,43 @@ var convertSourceMap = {};
 	  return sm.split(',').pop();
 	}
 
-	function readFromFileMap(sm, dir) {
-	  // NOTE: this will only work on the server since it attempts to read the map file
-
+	function readFromFileMap(sm, read) {
 	  var r = exports.mapFileCommentRegex.exec(sm);
-
 	  // for some odd reason //# .. captures in 1 and /* .. */ in 2
 	  var filename = r[1] || r[2];
-	  var filepath = path.resolve(dir, filename);
 
 	  try {
-	    return fs.readFileSync(filepath, 'utf8');
+	    var sm = read(filename);
+	    if (sm != null && typeof sm.catch === 'function') {
+	      return sm.catch(throwError);
+	    } else {
+	      return sm;
+	    }
 	  } catch (e) {
-	    throw new Error('An error occurred while trying to read the map file at ' + filepath + '\n' + e);
+	    throwError(e);
+	  }
+
+	  function throwError(e) {
+	    throw new Error('An error occurred while trying to read the map file at ' + filename + '\n' + e.stack);
 	  }
 	}
 
 	function Converter (sm, opts) {
 	  opts = opts || {};
 
-	  if (opts.isFileComment) sm = readFromFileMap(sm, opts.commentFileDir);
-	  if (opts.hasComment) sm = stripComment(sm);
-	  if (opts.isEncoded) sm = decodeBase64(sm);
-	  if (opts.isJSON || opts.isEncoded) sm = JSON.parse(sm);
+	  if (opts.hasComment) {
+	    sm = stripComment(sm);
+	  }
+
+	  if (opts.encoding === 'base64') {
+	    sm = decodeBase64(sm);
+	  } else if (opts.encoding === 'uri') {
+	    sm = decodeURIComponent(sm);
+	  }
+
+	  if (opts.isJSON || opts.encoding) {
+	    sm = JSON.parse(sm);
+	  }
 
 	  this.sourcemap = sm;
 	}
@@ -39739,10 +39751,22 @@ var convertSourceMap = {};
 	  return btoa(unescape(encodeURIComponent(json)));
 	}
 
+	Converter.prototype.toURI = function () {
+	  var json = this.toJSON();
+	  return encodeURIComponent(json);
+	};
+
 	Converter.prototype.toComment = function (options) {
-	  var base64 = this.toBase64();
-	  var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
-	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	  var encoding, content, data;
+	  if (options != null && options.encoding === 'uri') {
+	    encoding = '';
+	    content = this.toURI();
+	  } else {
+	    encoding = ';base64';
+	    content = this.toBase64();
+	  }
+	  data = 'sourceMappingURL=data:application/json;charset=utf-8' + encoding + ',' + content;
+	  return options != null && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
 	};
 
 	// returns copy instead of original
@@ -39772,20 +39796,42 @@ var convertSourceMap = {};
 	  return new Converter(json, { isJSON: true });
 	};
 
+	exports.fromURI = function (uri) {
+	  return new Converter(uri, { encoding: 'uri' });
+	};
+
 	exports.fromBase64 = function (base64) {
-	  return new Converter(base64, { isEncoded: true });
+	  return new Converter(base64, { encoding: 'base64' });
 	};
 
 	exports.fromComment = function (comment) {
+	  var m, encoding;
 	  comment = comment
 	    .replace(/^\/\*/g, '//')
 	    .replace(/\*\/$/g, '');
-
-	  return new Converter(comment, { isEncoded: true, hasComment: true });
+	  m = exports.commentRegex.exec(comment);
+	  encoding = m && m[4] || 'uri';
+	  return new Converter(comment, { encoding: encoding, hasComment: true });
 	};
 
-	exports.fromMapFileComment = function (comment, dir) {
-	  return new Converter(comment, { commentFileDir: dir, isFileComment: true, isJSON: true });
+	function makeConverter(sm) {
+	  return new Converter(sm, { isJSON: true });
+	}
+
+	exports.fromMapFileComment = function (comment, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileComment`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+
+	  var sm = readFromFileMap(comment, read);
+	  if (sm != null && typeof sm.then === 'function') {
+	    return sm.then(makeConverter);
+	  } else {
+	    return makeConverter(sm);
+	  }
 	};
 
 	// Finds last sourcemap comment in file or returns null if none was found
@@ -39795,9 +39841,15 @@ var convertSourceMap = {};
 	};
 
 	// Finds last sourcemap comment in file or returns null if none was found
-	exports.fromMapFileSource = function (content, dir) {
+	exports.fromMapFileSource = function (content, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileSource`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
 	  var m = content.match(exports.mapFileCommentRegex);
-	  return m ? exports.fromMapFileComment(m.pop(), dir) : null;
+	  return m ? exports.fromMapFileComment(m.pop(), read) : null;
 	};
 
 	exports.removeComments = function (src) {
@@ -39897,7 +39949,7 @@ function viaCache(cache, uri, extns) {
 	}
 }
 
-function viaLocal(dir, isEtag, uri, extns) {
+function viaLocal(dir, isEtag, uri, extns, shouldServe) {
 	let i=0, arr=toAssume(uri, extns);
 	let abs, stats, name, headers;
 	for (; i < arr.length; i++) {
@@ -39905,6 +39957,7 @@ function viaLocal(dir, isEtag, uri, extns) {
 		if (abs.startsWith(dir) && require$$0$2.existsSync(abs)) {
 			stats = require$$0$2.statSync(abs);
 			if (stats.isDirectory()) continue;
+			if (shouldServe && !shouldServe(abs)) continue;
 			headers = toHeaders(name, stats, isEtag);
 			headers['Cache-Control'] = isEtag ? 'no-cache' : 'no-store';
 			return { abs, stats, headers };
@@ -40034,7 +40087,7 @@ function sirv (dir, opts={}) {
 			catch (err) { /* malform uri */ }
 		}
 
-		let data = lookup(pathname, extns) || isSPA && !isMatch(pathname, ignores) && lookup(fallback, extns);
+		let data = lookup(pathname, extns, opts.shouldServe) || isSPA && !isMatch(pathname, ignores) && lookup(fallback, extns, opts.shouldServe);
 		if (!data) return next ? next() : isNotFound(req, res);
 
 		if (isEtag && req.headers['if-none-match'] === data.headers['ETag']) {
@@ -40051,7 +40104,7 @@ function sirv (dir, opts={}) {
 	};
 }
 
-const sirvOptions = (headers) => {
+const sirvOptions = ({ headers, shouldServe, }) => {
     return {
         dev: true,
         etag: true,
@@ -40071,24 +40124,27 @@ const sirvOptions = (headers) => {
                 }
             }
         },
+        shouldServe,
     };
 };
 function servePublicMiddleware(dir, headers) {
-    const serve = sirv(dir, sirvOptions(headers));
+    const serve = sirv(dir, sirvOptions({
+        headers,
+        shouldServe: (filePath) => shouldServeFile(filePath, dir),
+    }));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServePublicMiddleware(req, res, next) {
         // skip import request and internal requests `/@fs/ /@vite-client` etc...
         if (isImportRequest(req.url) || isInternalRequest(req.url)) {
             return next();
         }
-        if (shouldServe(req.url, dir)) {
-            return serve(req, res, next);
-        }
-        next();
+        serve(req, res, next);
     };
 }
 function serveStaticMiddleware(dir, server) {
-    const serve = sirv(dir, sirvOptions(server.config.server.headers));
+    const serve = sirv(dir, sirvOptions({
+        headers: server.config.server.headers,
+    }));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServeStaticMiddleware(req, res, next) {
         // only serve the file if it's not an html request or ends with `/`
@@ -40136,7 +40192,7 @@ function serveStaticMiddleware(dir, server) {
     };
 }
 function serveRawFsMiddleware(server) {
-    const serveFromRoot = sirv('/', sirvOptions(server.config.server.headers));
+    const serveFromRoot = sirv('/', sirvOptions({ headers: server.config.server.headers }));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServeRawFsMiddleware(req, res, next) {
         const url = new URL(req.url, 'http://example.com');
@@ -40339,7 +40395,7 @@ async function loadAndTransform(id, url, server, options, timestamp) {
         if (code) {
             try {
                 map = (convertSourceMap.fromSource(code) ||
-                    convertSourceMap.fromMapFileSource(code, path$o.dirname(file)))?.toObject();
+                    (await convertSourceMap.fromMapFileSource(code, createConvertSourceMapReadMap(file))))?.toObject();
                 code = code.replace(convertSourceMap.mapFileCommentRegex, blankReplacer);
             }
             catch (e) {
@@ -40414,6 +40470,11 @@ async function loadAndTransform(id, url, server, options, timestamp) {
     }
     return result;
 }
+function createConvertSourceMapReadMap(originalFileName) {
+    return (filename) => {
+        return promises$2.readFile(path$o.resolve(path$o.dirname(originalFileName), filename), 'utf-8');
+    };
+}
 
 const isDebug$1 = !!process.env.DEBUG;
 const debug$9 = createDebugger('vite:import-analysis');
@@ -40695,26 +40756,6 @@ function importAnalysisPlugin(config) {
                 if (!isDynamicImport && assertIndex > -1) {
                     str().remove(end + 1, expEnd);
                 }
-                if (!isDynamicImport &&
-                    specifier &&
-                    !specifier.includes('?') && // ignore custom queries
-                    isCSSRequest(specifier) &&
-                    !isModuleCSSRequest(specifier)) {
-                    const sourceExp = source.slice(expStart, start);
-                    if (sourceExp.includes('from') && // check default and named imports
-                        !sourceExp.includes('__vite_glob_') // glob handles deprecation message itself
-                    ) {
-                        const newImport = sourceExp + specifier + `?inline` + source.slice(end, expEnd);
-                        this.warn(`\n` +
-                            picocolors.exports.cyan(importerModule.file) +
-                            `\n` +
-                            picocolors.exports.reset(generateCodeFrame(source, start)) +
-                            `\n` +
-                            picocolors.exports.yellow(`Default and named imports from CSS files are deprecated. ` +
-                                `Use the ?inline query instead. ` +
-                                `For example: ${newImport}`));
-                    }
-                }
                 // static import or valid string in dynamic import
                 // If resolvable, let's resolve it
                 if (specifier) {
@@ -40751,6 +40792,26 @@ function importAnalysisPlugin(config) {
                     }
                     // normalize
                     const [url, resolvedId] = await normalizeUrl(specifier, start);
+                    if (!isDynamicImport &&
+                        specifier &&
+                        !specifier.includes('?') && // ignore custom queries
+                        isCSSRequest(resolvedId) &&
+                        !isModuleCSSRequest(resolvedId)) {
+                        const sourceExp = source.slice(expStart, start);
+                        if (sourceExp.includes('from') && // check default and named imports
+                            !sourceExp.includes('__vite_glob_') // glob handles deprecation message itself
+                        ) {
+                            const newImport = sourceExp + specifier + `?inline` + source.slice(end, expEnd);
+                            this.warn(`\n` +
+                                picocolors.exports.cyan(importerModule.file) +
+                                `\n` +
+                                picocolors.exports.reset(generateCodeFrame(source, start)) +
+                                `\n` +
+                                picocolors.exports.yellow(`Default and named imports from CSS files are deprecated. ` +
+                                    `Use the ?inline query instead. ` +
+                                    `For example: ${newImport}`));
+                        }
+                    }
                     // record as safe modules
                     server?.moduleGraph.safeModulesPath.add(fsPathFromUrl(url));
                     if (url !== specifier) {
@@ -41072,7 +41133,7 @@ function clientInjectionsPlugin(config) {
                 }
                 return code
                     .replace(`__MODE__`, JSON.stringify(config.mode))
-                    .replace(`__BASE__`, JSON.stringify(devBase))
+                    .replace(/__BASE__/g, JSON.stringify(devBase))
                     .replace(`__DEFINES__`, serializeDefine(config.define || {}))
                     .replace(`__SERVER_HOST__`, JSON.stringify(serverHost))
                     .replace(`__HMR_PROTOCOL__`, JSON.stringify(protocol))
@@ -41112,7 +41173,6 @@ const wasmHelper = async (opts = {}, url) => {
             bytes = Buffer.from(urlContent, 'base64');
         }
         else if (typeof atob === 'function') {
-            // @ts-ignore
             const binaryString = atob(urlContent);
             bytes = new Uint8Array(binaryString.length);
             for (let i = 0; i < binaryString.length; i++) {
@@ -41122,7 +41182,6 @@ const wasmHelper = async (opts = {}, url) => {
         else {
             throw new Error('Failed to decode base64-encoded data URL, Buffer and atob are not supported');
         }
-        // @ts-ignore
         result = await WebAssembly.instantiate(bytes, opts);
     }
     else {
@@ -41131,19 +41190,14 @@ const wasmHelper = async (opts = {}, url) => {
         // correct MIME type for .wasm files, which unfortunately doesn't work for
         // a lot of static file servers, so we just work around it by getting the
         // raw buffer.
-        // @ts-ignore
         const response = await fetch(url);
         const contentType = response.headers.get('Content-Type') || '';
-        if (
-        // @ts-ignore
-        'instantiateStreaming' in WebAssembly &&
+        if ('instantiateStreaming' in WebAssembly &&
             contentType.startsWith('application/wasm')) {
-            // @ts-ignore
             result = await WebAssembly.instantiateStreaming(response, opts);
         }
         else {
             const buffer = await response.arrayBuffer();
-            // @ts-ignore
             result = await WebAssembly.instantiate(buffer, opts);
         }
     }
@@ -42173,7 +42227,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             const hook = plugin[hookName];
             if (!hook)
                 continue;
-            // @ts-expect-error
+            // @ts-expect-error hook is not a primitive
             const handler = 'handler' in hook ? hook.handler : hook;
             if (hook.sequential) {
                 await Promise.all(parallelPromises);
@@ -43348,7 +43402,7 @@ async function createDepsOptimizer(config, server) {
             metadata.discovered = {};
         }
         currentlyProcessing = false;
-        // @ts-ignore
+        // @ts-expect-error `enqueuedRerun` could exist because `debouncedProcessing` may run while awaited
         enqueuedRerun?.();
     }
     function fullReload() {
@@ -44321,26 +44375,22 @@ function toRelativePath(filename, importer) {
  * the async chunk itself.
  */
 function detectScriptRel() {
-    // @ts-ignore
     const relList = document.createElement('link').relList;
-    // @ts-ignore
     return relList && relList.supports && relList.supports('modulepreload')
         ? 'modulepreload'
         : 'preload';
 }
 function preload(baseModule, deps, importerUrl) {
-    // @ts-ignore
+    // @ts-expect-error __VITE_IS_MODERN__ will be replaced with boolean later
     if (!__VITE_IS_MODERN__ || !deps || deps.length === 0) {
         return baseModule();
     }
     const links = document.getElementsByTagName('link');
     return Promise.all(deps.map((dep) => {
-        // @ts-ignore
+        // @ts-expect-error assetsURL is declared before preload.toString()
         dep = assetsURL(dep, importerUrl);
-        // @ts-ignore
         if (dep in seen)
             return;
-        // @ts-ignore
         seen[dep] = true;
         const isCss = dep.endsWith('.css');
         const cssSelector = isCss ? '[rel="stylesheet"]' : '';
@@ -44361,16 +44411,13 @@ function preload(baseModule, deps, importerUrl) {
         else if (document.querySelector(`link[href="${dep}"]${cssSelector}`)) {
             return;
         }
-        // @ts-ignore
         const link = document.createElement('link');
-        // @ts-ignore
         link.rel = isCss ? 'stylesheet' : scriptRel;
         if (!isCss) {
             link.as = 'script';
             link.crossOrigin = '';
         }
         link.href = dep;
-        // @ts-ignore
         document.head.appendChild(link);
         if (isCss) {
             return new Promise((res, rej) => {
@@ -45246,6 +45293,10 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
             return [];
         return Object.entries(parse_1$1(fs$l.readFileSync(path)));
     }));
+    // test NODE_ENV override before expand as otherwise process.env.NODE_ENV would override this
+    if (parsed.NODE_ENV && process.env.VITE_USER_NODE_ENV === undefined) {
+        process.env.VITE_USER_NODE_ENV = parsed.NODE_ENV;
+    }
     try {
         // let environment variables use each other
         expand_1({ parsed });
@@ -45263,11 +45314,6 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {
             env[key] = value;
         }
-        else if (key === 'NODE_ENV' &&
-            process.env.VITE_USER_NODE_ENV === undefined) {
-            // NODE_ENV override in .env file
-            process.env.VITE_USER_NODE_ENV = value;
-        }
     }
     // check if there are actual env variables starting with VITE_*
     // these are typically provided inline and should be prioritized
@@ -45489,8 +45535,7 @@ async function doBuild(inlineConfig = {}) {
     };
     try {
         const buildOutputOptions = (output = {}) => {
-            // See https://github.com/vitejs/vite/issues/5812#issuecomment-984345618
-            // @ts-ignore
+            // @ts-expect-error See https://github.com/vitejs/vite/issues/5812#issuecomment-984345618
             if (output.output) {
                 config.logger.warn(`You've set "rollupOptions.output.output" in your config. ` +
                     `This is deprecated and will override all Vite.js default output options. ` +
@@ -45906,7 +45951,7 @@ function toOutputFilePathWithoutRuntime(filename, type, hostId, hostType, config
         });
         if (typeof result === 'object') {
             if (result.runtime) {
-                throw new Error(`{ runtime: "${result.runtime} }" is not supported for assets in ${hostType} files: ${filename}`);
+                throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
             }
             if (typeof result.relative === 'boolean') {
                 relative = result.relative;
@@ -53269,7 +53314,7 @@ async function nodeImport(id, importer, resolveOptions) {
         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
+        // @ts-expect-error jest only exists when running Jest
         typeof jest === 'undefined'
             ? { ...resolveOptions, tryEsmOnly: true }
             : resolveOptions, false);
@@ -54401,12 +54446,14 @@ function startBrowserProcess(browser, url) {
             const openedBrowser = preferredOSXBrowser && ps.includes(preferredOSXBrowser)
                 ? preferredOSXBrowser
                 : supportedChromiumBrowsers.find((b) => ps.includes(b));
-            // Try our best to reuse existing tab with AppleScript
-            execSync(`osascript openChrome.applescript "${encodeURI(url)}" "${openedBrowser}"`, {
-                cwd: join$2(VITE_PACKAGE_DIR, 'bin'),
-                stdio: 'ignore',
-            });
-            return true;
+            if (openedBrowser) {
+                // Try our best to reuse existing tab with AppleScript
+                execSync(`osascript openChrome.applescript "${encodeURI(url)}" "${openedBrowser}"`, {
+                    cwd: join$2(VITE_PACKAGE_DIR, 'bin'),
+                    stdio: 'ignore',
+                });
+                return true;
+            }
         }
         catch (err) {
             // Ignore errors
@@ -54484,6 +54531,14 @@ const BASE_SHORTCUTS = [
             await server.restart();
         },
     },
+    {
+        key: 'u',
+        description: 'show server url',
+        action(server) {
+            server.config.logger.info('');
+            server.printUrls();
+        },
+    },
     {
         key: 'o',
         description: 'open in browser',
@@ -61591,7 +61646,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         }
         s.update(node.sourceCodeLocation.startOffset, node.sourceCodeLocation.endOffset, `<script type="module" src="${modulePath}"></script>`);
     };
-    await traverseHtml(html, htmlPath, (node) => {
+    await traverseHtml(html, filename, (node) => {
         if (!nodeIsElement(node)) {
             return;
         }
@@ -61682,7 +61737,6 @@ function timeMiddleware(root) {
         const end = res.end;
         res.end = (...args) => {
             logTime(`${timeFrom(start)} ${prettifyUrl(req.url, root)}`);
-            // @ts-ignore
             return end.call(res, ...args);
         };
         next();
@@ -62167,7 +62221,7 @@ async function startServer(server, inlinePort, isRestart = false) {
         const path = typeof options.open === 'string' ? options.open : server.config.base;
         openBrowser(path.startsWith('http')
             ? path
-            : `${protocol}://${hostname.name}:${serverPort}${path}`, true, server.config.logger);
+            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, server.config.logger);
     }
 }
 function createServerCloseFn(server) {
@@ -62234,7 +62288,6 @@ function resolveServerOptions(root, raw, logger) {
     return server;
 }
 async function restartServer(server) {
-    // @ts-ignore
     global.__vite_start_time = performance.now();
     const { port: prevPort, host: prevHost } = server.config.server;
     const shortcutsOptions = server._shortcutsOptions;
@@ -62257,17 +62310,9 @@ async function restartServer(server) {
         });
         return;
     }
-    for (const key in newServer) {
-        if (key === '_restartPromise') {
-            // prevent new server `restart` function from calling
-            // @ts-ignore
-            newServer[key] = server[key];
-        }
-        else {
-            // @ts-ignore
-            server[key] = newServer[key];
-        }
-    }
+    // prevent new server `restart` function from calling
+    newServer._restartPromise = server._restartPromise;
+    Object.assign(server, newServer);
     const { logger, server: { port, host, middlewareMode }, } = server.config;
     if (!middlewareMode) {
         await server.listen(port, true);
@@ -62315,7 +62360,7 @@ var index = {
 	searchForWorkspaceRoot: searchForWorkspaceRoot
 };
 
-//@ts-nocheck
+/* eslint-disable */
 /* global Buffer */
 const noop = () => { };
 const mimes = /text|javascript|\/json|xml/i;
@@ -62346,7 +62391,6 @@ function compression() {
         let size = 0;
         function start() {
             started = true;
-            // @ts-ignore
             size = res.getHeader('Content-Length') | 0 || size;
             const compressible = mimes.test(String(res.getHeader('Content-Type') || 'text/plain'));
             const cleartext = !res.getHeader('Content-Encoding');
@@ -62473,13 +62517,11 @@ async function preview(inlineConfig = {}) {
                 }
             }
         },
+        shouldServe(filePath) {
+            return shouldServeFile(filePath, distDir);
+        },
     });
-    app.use(previewBase, async (req, res, next) => {
-        if (shouldServe(req.url, distDir)) {
-            return assetServer(req, res, next);
-        }
-        next();
-    });
+    app.use(previewBase, assetServer);
     // apply post server hooks from plugins
     postHooks.forEach((fn) => fn && fn());
     const options = config.preview;
@@ -62498,7 +62540,7 @@ async function preview(inlineConfig = {}) {
         const path = typeof options.open === 'string' ? options.open : previewBase;
         openBrowser(path.startsWith('http')
             ? path
-            : `${protocol}://${hostname.name}:${serverPort}${path}`, true, logger);
+            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, logger);
     }
     return {
         config,
@@ -62622,14 +62664,11 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     // resolve root
     const resolvedRoot = normalizePath$3(config.root ? path$o.resolve(config.root) : process.cwd());
     const clientAlias = [
-        { find: /^\/?@vite\/env/, replacement: () => ENV_ENTRY },
-        { find: /^\/?@vite\/client/, replacement: () => CLIENT_ENTRY },
+        { find: /^\/?@vite\/env/, replacement: ENV_ENTRY },
+        { find: /^\/?@vite\/client/, replacement: CLIENT_ENTRY },
     ];
     // resolve alias with internal client alias
-    const resolvedAlias = normalizeAlias(mergeAlias(
-    // @ts-ignore because @rollup/plugin-alias' type doesn't allow function
-    // replacement, but its implementation does work with function values.
-    clientAlias, config.resolve?.alias || []));
+    const resolvedAlias = normalizeAlias(mergeAlias(clientAlias, config.resolve?.alias || []));
     const resolveOptions = {
         mainFields: config.resolve?.mainFields ?? DEFAULT_MAIN_FIELDS,
         browserField: config.resolve?.browserField ?? true,