vite 4.4.9 → 5.0.0-beta.1

package/dist/node/chunks/{dep-df561101.js → dep-e31699fa.js}

@@ -11861,7 +11861,7 @@ function isInNodeModules(id) {
     return id.includes('node_modules');
 }
 function moduleListContains(moduleList, id) {
-    return moduleList?.some((m) => m === id || id.startsWith(m + '/'));
+    return moduleList?.some((m) => m === id || id.startsWith(withTrailingSlash(m)));
 }
 function isOptimizable(id, optimizeDeps) {
     const { extensions } = optimizeDeps;
@@ -11901,15 +11901,17 @@ function testCaseInsensitiveFS() {
     }
     return fs$l.existsSync(CLIENT_ENTRY.replace('client.mjs', 'cLiEnT.mjs'));
 }
-function isUrl(path) {
-    try {
-        new URL$3(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+const urlCanParse = URL$3.canParse ??
+    // URL.canParse is supported from Node.js 18.17.0+, 20.0.0+
+    ((path, base) => {
+        try {
+            new URL$3(path, base);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    });
 const isCaseInsensitiveFS = testCaseInsensitiveFS();
 const isWindows$4 = os$4.platform() === 'win32';
 const VOLUME_RE = /^[A-Z]:/i;
@@ -11923,6 +11925,12 @@ function fsPathFromId(id) {
 function fsPathFromUrl(url) {
     return fsPathFromId(cleanUrl(url));
 }
+function withTrailingSlash(path) {
+    if (path[path.length - 1] !== '/') {
+        return `${path}/`;
+    }
+    return path;
+}
 /**
  * Check if dir is a parent of file
  *
@@ -11933,9 +11941,7 @@ function fsPathFromUrl(url) {
  * @returns true if dir is a parent of file
  */
 function isParentDirectory(dir, file) {
-    if (dir[dir.length - 1] !== '/') {
-        dir = `${dir}/`;
-    }
+    dir = withTrailingSlash(dir);
     return (file.startsWith(dir) ||
         (isCaseInsensitiveFS && file.toLowerCase().startsWith(dir.toLowerCase())));
 }
@@ -12172,7 +12178,7 @@ function emptyDir(dir, skip) {
             if (path$o.dirname(file) !== '.') {
                 const matched = file.match(splitFirstDirRE);
                 if (matched) {
-                    nested ?? (nested = new Map());
+                    nested ??= new Map();
                     const [, nestedDir, skipPath] = matched;
                     let nestedSkip = nested.get(nestedDir);
                     if (!nestedSkip) {
@@ -12287,7 +12293,7 @@ function optimizeSafeRealPathSync() {
 function ensureWatchedFile(watcher, file, root) {
     if (file &&
         // only need to watch if out of root
-        !file.startsWith(root + '/') &&
+        !file.startsWith(withTrailingSlash(root)) &&
         // some rollup plugins use null bytes for private resolved Ids
         !file.includes('\0') &&
         fs$l.existsSync(file)) {
@@ -12299,7 +12305,7 @@ const escapedSpaceCharacters = /( |\\t|\\n|\\f|\\r)+/g;
 const imageSetUrlRE = /^(?:[\w\-]+\(.*?\)|'.*?'|".*?"|\S*)/;
 function reduceSrcset(ret) {
     return ret.reduce((prev, { url, descriptor }, index) => {
-        descriptor ?? (descriptor = '');
+        descriptor ??= '';
         return (prev +=
             url + ` ${descriptor}${index === ret.length - 1 ? '' : ', '}`);
     }, '');
@@ -12727,7 +12733,7 @@ function stripBase(path, base) {
     if (path === base) {
         return '/';
     }
-    const devBase = base[base.length - 1] === '/' ? base : base + '/';
+    const devBase = withTrailingSlash(base);
     return path.startsWith(devBase) ? path.slice(devBase.length - 1) : path;
 }
 function arrayEqual(a, b) {
@@ -13084,9 +13090,10 @@ function buildReporterPlugin(config) {
                         if (isLarge)
                             hasLargeChunks = true;
                         const sizeColor = isLarge ? colors$1.yellow : colors$1.dim;
-                        let log = colors$1.dim(relativeOutDir + '/');
+                        let log = colors$1.dim(withTrailingSlash(relativeOutDir));
                         log +=
-                            !config.build.lib && entry.name.startsWith(assetsDir)
+                            !config.build.lib &&
+                                entry.name.startsWith(withTrailingSlash(assetsDir))
                                 ? colors$1.dim(assetsDir) +
                                     group.color(entry.name
                                         .slice(assetsDir.length)
@@ -13112,7 +13119,7 @@ function buildReporterPlugin(config) {
                 config.build.minify &&
                 !config.build.lib &&
                 !config.build.ssr) {
-                config.logger.warn(colors$1.yellow(`\n(!) Some chunks are larger than ${chunkLimit} kBs after minification. Consider:\n` +
+                config.logger.warn(colors$1.yellow(`\n(!) Some chunks are larger than ${chunkLimit} kB after minification. Consider:\n` +
                     `- Using dynamic import() to code-split the application\n` +
                     `- Use build.rollupOptions.output.manualChunks to improve chunking: https://rollupjs.org/configuration-options/#output-manualchunks\n` +
                     `- Adjust chunk size limit for this warning via build.chunkSizeWarningLimit.`));
@@ -13794,8 +13801,8 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
 }
 
 const debug$f = createDebugger('vite:esbuild');
-const INJECT_HELPERS_IIFE_RE = /^(.*?)((?:const|var)\s+\S+\s*=\s*function\s*\([^)]*\)\s*\{\s*"use strict";)/s;
-const INJECT_HELPERS_UMD_RE = /^(.*?)(\(function\([^)]*\)\s*\{.+?amd.+?function\([^)]*\)\s*\{\s*"use strict";)/s;
+// 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;
 const validExtensionRE = /\.\w+$/;
 const jsxExtensionsRE = /\.(?:j|t)sx\b/;
 let server;
@@ -14028,16 +14035,26 @@ const buildEsbuildPlugin = (config) => {
             if (config.build.lib) {
                 // #7188, esbuild adds helpers out of the UMD and IIFE wrappers, and the
                 // names are minified potentially causing collision with other globals.
-                // We use a regex to inject the helpers inside the wrappers.
+                // We inject the helpers inside the wrappers.
+                // e.g. turn:
+                //    <esbuild helpers> (function(){ /*actual content/* })()
+                // into:
+                //    (function(){ <esbuild helpers> /*actual content/* })()
+                // Not using regex because it's too hard to rule out performance issues like #8738 #8099 #10900 #14065
+                // Instead, using plain string index manipulation (indexOf, slice) which is simple and performant
                 // We don't need to create a MagicString here because both the helpers and
                 // the headers don't modify the sourcemap
-                const injectHelpers = opts.format === 'umd'
-                    ? INJECT_HELPERS_UMD_RE
-                    : opts.format === 'iife'
-                        ? INJECT_HELPERS_IIFE_RE
-                        : undefined;
-                if (injectHelpers) {
-                    res.code = res.code.replace(injectHelpers, (_, helpers, header) => header + helpers);
+                const esbuildCode = res.code;
+                const contentIndex = opts.format === 'iife'
+                    ? esbuildCode.match(IIFE_BEGIN_RE)?.index || 0
+                    : opts.format === 'umd'
+                        ? esbuildCode.indexOf(`(function(`) // same for minified or not
+                        : 0;
+                if (contentIndex > 0) {
+                    const esbuildHelpers = esbuildCode.slice(0, contentIndex);
+                    res.code = esbuildCode
+                        .slice(contentIndex)
+                        .replace(`"use strict";`, `"use strict";` + esbuildHelpers);
                 }
             }
             return res;
@@ -14353,7 +14370,7 @@ function terserPlugin(config) {
                 return null;
             }
             // Lazy load worker.
-            worker || (worker = makeWorker());
+            worker ||= makeWorker();
             const terserPath = loadTerserPath(config.root);
             const res = await worker.run(terserPath, code, {
                 safari10: true,
@@ -16072,7 +16089,7 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
     // In both cases, the wrapping should already be fine
     assetUrlRE.lastIndex = 0;
     while ((match = assetUrlRE.exec(code))) {
-        s || (s = new MagicString(code));
+        s ||= new MagicString(code);
         const [full, referenceId, postfix = ''] = match;
         const file = ctx.getFileName(referenceId);
         chunk.viteMetadata.importedAssets.add(cleanUrl(file));
@@ -16087,7 +16104,7 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
     const publicAssetUrlMap = publicAssetUrlCache.get(config);
     publicAssetUrlRE.lastIndex = 0;
     while ((match = publicAssetUrlRE.exec(code))) {
-        s || (s = new MagicString(code));
+        s ||= new MagicString(code);
         const [full, hash] = match;
         const publicUrl = publicAssetUrlMap.get(hash).slice(1);
         const replacement = toOutputFilePathInJS(publicUrl, 'public', chunk.fileName, 'js', config, toRelativeRuntime);
@@ -16098,6 +16115,9 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
     }
     return s;
 }
+// During build, if we don't use a virtual file for public assets, rollup will
+// watch for these ids resulting in watching the root of the file system in Windows,
+const viteBuildPublicIdPrefix = '\0vite:asset:public';
 /**
  * Also supports loading plain strings with import text from './foo.txt?raw'
  */
@@ -16117,10 +16137,15 @@ function assetPlugin(config) {
             // will fail to resolve in the main resolver. handle them here.
             const publicFile = checkPublicFile(id, config);
             if (publicFile) {
-                return id;
+                return config.command === 'build'
+                    ? `${viteBuildPublicIdPrefix}${id}`
+                    : id;
             }
         },
         async load(id) {
+            if (id.startsWith(viteBuildPublicIdPrefix)) {
+                id = id.slice(viteBuildPublicIdPrefix.length);
+            }
             if (id[0] === '\0') {
                 // Rollup convention, this id should be handled by the
                 // plugin that marked it with \0
@@ -16176,7 +16201,7 @@ function checkPublicFile(url, { publicDir }) {
         return;
     }
     const publicFile = path$o.join(publicDir, cleanUrl(url));
-    if (!publicFile.startsWith(publicDir)) {
+    if (!normalizePath$3(publicFile).startsWith(withTrailingSlash(normalizePath$3(publicDir)))) {
         // can happen if URL starts with '../'
         return;
     }
@@ -16198,10 +16223,10 @@ async function fileToUrl(id, config, ctx) {
 function fileToDevUrl(id, config) {
     let rtn;
     if (checkPublicFile(id, config)) {
-        // in public dir, keep the url as-is
+        // in public dir during dev, keep the url as-is
         rtn = id;
     }
-    else if (id.startsWith(config.root)) {
+    else if (id.startsWith(withTrailingSlash(config.root))) {
         // in project root, infer short public path
         rtn = '/' + path$o.posix.relative(config.root, id);
     }
@@ -28086,7 +28111,9 @@ function resolvePlugin(resolveOptions) {
             }
             // URL
             // /foo -> /fs-root/foo
-            if (asSrc && id[0] === '/' && (rootInRoot || !id.startsWith(root))) {
+            if (asSrc &&
+                id[0] === '/' &&
+                (rootInRoot || !id.startsWith(withTrailingSlash(root)))) {
                 const fsPath = path$o.resolve(root, id.slice(1));
                 if ((res = tryFsResolve(fsPath, options))) {
                     debug$d?.(`[url] ${colors$1.cyan(id)} -> ${colors$1.dim(res)}`);
@@ -28580,7 +28607,7 @@ async function tryOptimizedResolve(depsOptimizer, id, importer, preserveSymlinks
             idPkgDir = normalizePath$3(idPkgDir);
         }
         // match by src to correctly identify if id belongs to nested dependency
-        if (optimizedData.src.startsWith(idPkgDir)) {
+        if (optimizedData.src.startsWith(withTrailingSlash(idPkgDir))) {
             return depsOptimizer.getOptimizedDepId(optimizedData);
         }
     }
@@ -28652,7 +28679,7 @@ function resolvePackageEntry(id, { dir, data, setResolvedCache, getResolvedCache
                 }
             }
         }
-        entryPoint || (entryPoint = data.main);
+        entryPoint ||= data.main;
         // try default entry when entry is not define
         // https://nodejs.org/api/modules.html#all-together
         const entryPoints = entryPoint
@@ -37561,9 +37588,9 @@ function buildHtmlPlugin(config) {
                                 js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.js"`;
                                 shouldRemove = true;
                             }
-                            everyScriptIsAsync && (everyScriptIsAsync = isAsync);
-                            someScriptsAreAsync || (someScriptsAreAsync = isAsync);
-                            someScriptsAreDefer || (someScriptsAreDefer = !isAsync);
+                            everyScriptIsAsync &&= isAsync;
+                            someScriptsAreAsync ||= isAsync;
+                            someScriptsAreDefer ||= !isAsync;
                         }
                         else if (url && !isPublicFile) {
                             if (!isExcludedUrl(url)) {
@@ -37864,7 +37891,7 @@ function buildHtmlPlugin(config) {
                 let s;
                 inlineCSSRE$1.lastIndex = 0;
                 while ((match = inlineCSSRE$1.exec(result))) {
-                    s || (s = new MagicString(result));
+                    s ||= new MagicString(result);
                     const { 0: full, 1: scopedName } = match;
                     const cssTransformedCode = htmlProxyResult.get(scopedName);
                     s.update(match.index, match.index + full.length, cssTransformedCode);
@@ -37884,7 +37911,7 @@ function buildHtmlPlugin(config) {
                 });
                 result = result.replace(publicAssetUrlRE, (_, fileHash) => {
                     const publicAssetPath = toOutputPublicAssetFilePath(getPublicAssetFilename(fileHash, config));
-                    return isUrl(publicAssetPath)
+                    return urlCanParse(publicAssetPath)
                         ? publicAssetPath
                         : normalizePath$3(publicAssetPath);
                 });
@@ -38345,7 +38372,7 @@ function cssPostPlugin(config) {
     };
     return {
         name: 'vite:css-post',
-        buildStart() {
+        renderStart() {
             // Ensure new caches for every build (i.e. rebuilding in watch mode)
             pureCssChunks = new Set();
             outputToExtractedCSSMap = new Map();
@@ -38426,7 +38453,7 @@ function cssPostPlugin(config) {
                 else {
                     let content = css;
                     if (config.build.cssMinify) {
-                        content = await minifyCSS(content, config);
+                        content = await minifyCSS(content, config, true);
                     }
                     code = `export default ${JSON.stringify(content)}`;
                 }
@@ -38506,9 +38533,10 @@ function cssPostPlugin(config) {
                     pureCssChunks.add(chunk);
                 }
                 if (opts.format === 'es' || opts.format === 'cjs') {
-                    const cssAssetName = chunk.facadeModuleId
-                        ? normalizePath$3(path$o.relative(config.root, chunk.facadeModuleId))
-                        : chunk.name;
+                    const isEntry = chunk.isEntry && isPureCssChunk;
+                    const cssAssetName = normalizePath$3(!isEntry && chunk.facadeModuleId
+                        ? path$o.relative(config.root, chunk.facadeModuleId)
+                        : chunk.name);
                     const lang = path$o.extname(cssAssetName).slice(1);
                     const cssFileName = ensureFileExt(cssAssetName, '.css');
                     chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssAssetName);
@@ -38532,7 +38560,6 @@ function cssPostPlugin(config) {
                         source: chunkCSS,
                     });
                     const originalName = isPreProcessor(lang) ? cssAssetName : cssFileName;
-                    const isEntry = chunk.isEntry && isPureCssChunk;
                     generatedAssets
                         .get(config)
                         .set(referenceId, { originalName, isEntry });
@@ -38605,19 +38632,12 @@ function cssPostPlugin(config) {
             // remove empty css chunks and their imports
             if (pureCssChunks.size) {
                 // map each pure css chunk (rendered chunk) to it's corresponding bundle
-                // chunk. we check that by comparing the `moduleIds` as they have different
-                // filenames (rendered chunk has the !~{XXX}~ placeholder)
-                const pureCssChunkNames = [];
-                for (const pureCssChunk of pureCssChunks) {
-                    for (const key in bundle) {
-                        const bundleChunk = bundle[key];
-                        if (bundleChunk.type === 'chunk' &&
-                            arrayEqual(bundleChunk.moduleIds, pureCssChunk.moduleIds)) {
-                            pureCssChunkNames.push(key);
-                            break;
-                        }
-                    }
-                }
+                // chunk. we check that by `preliminaryFileName` as they have different
+                // `filename`s (rendered chunk has the !~{XXX}~ placeholder)
+                const prelimaryNameToChunkMap = Object.fromEntries(Object.values(bundle)
+                    .filter((chunk) => chunk.type === 'chunk')
+                    .map((chunk) => [chunk.preliminaryFileName, chunk.fileName]));
+                const pureCssChunkNames = [...pureCssChunks].map((pureCssChunk) => prelimaryNameToChunkMap[pureCssChunk.fileName]);
                 const emptyChunkFiles = pureCssChunkNames
                     .map((file) => path$o.basename(file))
                     .join('|')
@@ -38649,6 +38669,7 @@ function cssPostPlugin(config) {
                 pureCssChunkNames.forEach((fileName) => {
                     removedPureCssFiles.set(fileName, bundle[fileName]);
                     delete bundle[fileName];
+                    delete bundle[`${fileName}.map`];
                 });
             }
             let extractedCss = outputToExtractedCSSMap.get(opts);
@@ -38959,8 +38980,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-e0331088.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-73522cdf.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-c457d7ce.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-6db0c752.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -39003,7 +39024,7 @@ async function finalizeCss(css, minify, config) {
         css = await hoistAtRules(css);
     }
     if (minify && config.build.cssMinify) {
-        css = await minifyCSS(css, config);
+        css = await minifyCSS(css, config, false);
     }
     return css;
 }
@@ -39164,7 +39185,10 @@ async function doImportCSSReplace(rawUrl, matched, replacer) {
     }
     return `@import ${wrap}${await replacer(rawUrl)}${wrap}`;
 }
-async function minifyCSS(css, config) {
+async function minifyCSS(css, config, inlined) {
+    // We want inlined CSS to not end with a linebreak, while ensuring that
+    // regular CSS assets do end with a linebreak.
+    // See https://github.com/vitejs/vite/pull/13893#issuecomment-1678628198
     if (config.build.cssMinify === 'lightningcss') {
         const { code, warnings } = (await importLightningCSS()).transform({
             ...config.css?.lightningcss,
@@ -39179,7 +39203,8 @@ async function minifyCSS(css, config) {
                 .map((w) => w.message)
                 .join('\n')}`));
         }
-        return code.toString();
+        // LightningCSS output does not return a linebreak at the end
+        return code.toString() + (inlined ? '' : '\n');
     }
     try {
         const { code, warnings } = await transform$1(css, {
@@ -39191,7 +39216,8 @@ async function minifyCSS(css, config) {
             const msgs = await formatMessages(warnings, { kind: 'warning' });
             config.logger.warn(colors$1.yellow(`warnings when minifying css:\n${msgs.join('\n')}`));
         }
-        return code;
+        // esbuild output does return a linebreak at the end
+        return inlined ? code.trimEnd() : code;
     }
     catch (e) {
         if (e.errors) {
@@ -39482,6 +39508,9 @@ let ViteLessManager;
 function createViteLessPlugin(less, rootFile, alias, resolvers) {
     if (!ViteLessManager) {
         ViteLessManager = class ViteManager extends less.FileManager {
+            resolvers;
+            rootFile;
+            alias;
             constructor(rootFile, resolvers, alias) {
                 super();
                 this.rootFile = rootFile;
@@ -39623,6 +39652,7 @@ async function compileLightningCSS(id, src, config, urlReplacer) {
             analyzeDependencies: true,
         })
         : await (await importLightningCSS()).bundleAsync({
+            ...config.css?.lightningcss,
             filename,
             resolver: {
                 read(filePath) {
@@ -39648,14 +39678,12 @@ async function compileLightningCSS(id, src, config, urlReplacer) {
                     return id;
                 },
             },
-            targets: config.css?.lightningcss?.targets,
             minify: config.isProduction && !!config.build.cssMinify,
             sourceMap: config.css?.devSourcemap,
             analyzeDependencies: true,
             cssModules: cssModuleRE.test(id)
                 ? config.css?.lightningcss?.cssModules ?? true
                 : undefined,
-            drafts: config.css?.lightningcss?.drafts,
         });
     let css = res.code.toString();
     for (const dep of res.dependencies) {
@@ -40274,7 +40302,8 @@ function cjsShouldExternalizeForSSR(id, externals) {
         }
         // deep imports, check ext before externalizing - only externalize
         // extension-less imports and explicit .js imports
-        if (id.startsWith(e + '/') && (!path$o.extname(id) || id.endsWith('.js'))) {
+        if (id.startsWith(withTrailingSlash(e)) &&
+            (!path$o.extname(id) || id.endsWith('.js'))) {
             return true;
         }
     });
@@ -40784,8 +40813,11 @@ function getAffectedGlobModules(file, server) {
     for (const [id, allGlobs] of server._importGlobMap) {
         // (glob1 || glob2) && !glob3 && !glob4...
         if (allGlobs.some(({ affirmed, negated }) => (!affirmed.length || affirmed.some((glob) => isMatch$1(file, glob))) &&
-            (!negated.length || negated.every((glob) => isMatch$1(file, glob)))))
-            modules.push(...(server.moduleGraph.getModulesByFile(id) || []));
+            (!negated.length || negated.every((glob) => isMatch$1(file, glob))))) {
+            const mod = server.moduleGraph.getModuleById(id);
+            if (mod)
+                modules.push(mod);
+        }
     }
     modules.forEach((i) => {
         if (i?.file)
@@ -40822,7 +40854,7 @@ function importGlobPlugin(config) {
         },
     };
 }
-const importGlobRE = /\bimport\.meta\.(glob|globEager|globEagerDefault)(?:<\w+>)?\s*\(/g;
+const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g;
 const knownOptions = {
     as: ['string'],
     eager: ['boolean'],
@@ -40887,7 +40919,6 @@ async function parseImportGlob(code, importer, root, resolveId) {
     }
     const matches = Array.from(cleanCode.matchAll(importGlobRE));
     const tasks = matches.map(async (match, index) => {
-        const type = match[1];
         const start = match.index;
         const err = (msg) => {
             const e = new Error(`Invalid glob import syntax: ${msg}`);
@@ -40973,13 +41004,11 @@ async function parseImportGlob(code, importer, root, resolveId) {
         const globsResolved = await Promise.all(globs.map((glob) => toAbsoluteGlob(glob, root, importer, resolveId)));
         const isRelative = globs.every((i) => '.!'.includes(i[0]));
         return {
-            match,
             index,
             globs,
             globsResolved,
             isRelative,
             options,
-            type,
             start,
             end,
         };
@@ -41006,15 +41035,6 @@ async function transformGlobImport(code, id, root, resolveId, isProduction, rest
     const dir = isVirtual ? undefined : dirname(id);
     const matches = await parseImportGlob(code, isVirtual ? undefined : id, root, resolveId);
     const matchedFiles = new Set();
-    // TODO: backwards compatibility
-    matches.forEach((i) => {
-        if (i.type === 'globEager')
-            i.options.eager = true;
-        if (i.type === 'globEagerDefault') {
-            i.options.eager = true;
-            i.options.import = 'default';
-        }
-    });
     if (!matches.length)
         return null;
     const s = new MagicString(code);
@@ -41073,7 +41093,7 @@ async function transformGlobImport(code, id, root, resolveId, isProduction, rest
             }
             importPath = `${importPath}${importQuery}`;
             const isCSS = !query && isCSSRequest(file) && !isModuleCSSRequest(file);
-            includesCSS || (includesCSS = isCSS);
+            includesCSS ||= isCSS;
             const importKey = options.import && options.import !== '*'
                 ? options.import
                 : undefined;
@@ -41216,7 +41236,9 @@ const debugHmr = createDebugger('vite:hmr');
 const whitespaceRE = /\s/;
 const normalizedClientDir = normalizePath$3(CLIENT_DIR);
 function getShortName(file, root) {
-    return file.startsWith(root + '/') ? path$o.posix.relative(root, file) : file;
+    return file.startsWith(withTrailingSlash(root))
+        ? path$o.posix.relative(root, file)
+        : file;
 }
 async function handleHMRUpdate(file, server, configOnly) {
     const { ws, config, moduleGraph } = server;
@@ -41243,7 +41265,7 @@ async function handleHMRUpdate(file, server, configOnly) {
     }
     debugHmr?.(`[file change] ${colors$1.dim(shortFile)}`);
     // (dev only) the client itself cannot be hot updated.
-    if (file.startsWith(normalizedClientDir)) {
+    if (file.startsWith(withTrailingSlash(normalizedClientDir))) {
         ws.send({
             type: 'full-reload',
             path: '*',
@@ -41804,7 +41826,7 @@ function importAnalysisPlugin(config) {
                 const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js'`
-                if (resolved.id.startsWith(root + '/')) {
+                if (resolved.id.startsWith(withTrailingSlash(root))) {
                     // in root: infer short absolute path from root
                     url = resolved.id.slice(root.length);
                 }
@@ -42036,7 +42058,7 @@ function importAnalysisPlugin(config) {
                         });
                     }
                 }
-                else if (!importer.startsWith(clientDir)) {
+                else if (!importer.startsWith(withTrailingSlash(clientDir))) {
                     if (!isInNodeModules(importer)) {
                         // check @vite-ignore which suppresses dynamic import warning
                         const hasViteIgnore = hasViteIgnoreRE.test(
@@ -42145,23 +42167,32 @@ function mergeAcceptedUrls(orderedUrls) {
 function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex, importer, config) {
     const source = str.original;
     const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, } = importSpecifier;
+    const exp = source.slice(expStart, expEnd);
     if (dynamicIndex > -1) {
         // rewrite `import('package')` to expose the default directly
-        str.overwrite(expStart, expEnd, `import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))`, { contentOnly: true });
+        str.overwrite(expStart, expEnd, `import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))` +
+            getLineBreaks(exp), { contentOnly: true });
     }
     else {
-        const exp = source.slice(expStart, expEnd);
         const rawUrl = source.slice(start, end);
         const rewritten = transformCjsImport(exp, rewrittenUrl, rawUrl, importIndex, importer, config);
         if (rewritten) {
-            str.overwrite(expStart, expEnd, rewritten, { contentOnly: true });
+            str.overwrite(expStart, expEnd, rewritten + getLineBreaks(exp), {
+                contentOnly: true,
+            });
         }
         else {
             // #1439 export * from '...'
-            str.overwrite(start, end, rewrittenUrl, { contentOnly: true });
+            str.overwrite(start, end, rewrittenUrl + getLineBreaks(source.slice(start, end)), {
+                contentOnly: true,
+            });
         }
     }
 }
+// get line breaks to preserve line count for not breaking source maps
+function getLineBreaks(str) {
+    return str.includes('\n') ? '\n'.repeat(str.split('\n').length - 1) : '';
+}
 /**
  * Detect import statements to a known optimized CJS dependency and provide
  * ES named imports interop. We do this by rewriting named imports to a variable
@@ -42278,11 +42309,12 @@ function clientInjectionsPlugin(config) {
             const timeout = hmrConfig?.timeout || 30000;
             const overlay = hmrConfig?.overlay !== false;
             const isHmrServerSpecified = !!hmrConfig?.server;
+            const hmrConfigName = path$o.basename(config.configFile || 'vite.config.js');
             // hmr.clientPort -> hmr.port
             // -> (24678 if middleware mode and HMR server is not specified) -> new URL(import.meta.url).port
             let port = hmrConfig?.clientPort || hmrConfig?.port || null;
             if (config.server.middlewareMode && !isHmrServerSpecified) {
-                port || (port = 24678);
+                port ||= 24678;
             }
             let directTarget = hmrConfig?.host || resolvedServerHostname;
             directTarget += `:${hmrConfig?.port || resolvedServerPort}`;
@@ -42303,6 +42335,7 @@ function clientInjectionsPlugin(config) {
             const hmrBaseReplacement = escapeReplacement(hmrBase);
             const hmrTimeoutReplacement = escapeReplacement(timeout);
             const hmrEnableOverlayReplacement = escapeReplacement(overlay);
+            const hmrConfigNameReplacement = escapeReplacement(hmrConfigName);
             injectConfigValues = (code) => {
                 return code
                     .replace(`__MODE__`, modeReplacement)
@@ -42315,7 +42348,8 @@ function clientInjectionsPlugin(config) {
                     .replace(`__HMR_DIRECT_TARGET__`, hmrDirectTargetReplacement)
                     .replace(`__HMR_BASE__`, hmrBaseReplacement)
                     .replace(`__HMR_TIMEOUT__`, hmrTimeoutReplacement)
-                    .replace(`__HMR_ENABLE_OVERLAY__`, hmrEnableOverlayReplacement);
+                    .replace(`__HMR_ENABLE_OVERLAY__`, hmrEnableOverlayReplacement)
+                    .replace(`__HMR_CONFIG_NAME__`, hmrConfigNameReplacement);
             };
         },
         transform(code, id, options) {
@@ -42610,9 +42644,15 @@ function webWorkerPlugin(config) {
                         injectEnv = module?.transformResult?.code || '';
                     }
                 }
-                return {
-                    code: injectEnv + raw,
-                };
+                if (injectEnv) {
+                    const s = new MagicString(raw);
+                    s.prepend(injectEnv);
+                    return {
+                        code: s.toString(),
+                        map: s.generateMap({ hires: 'boundary' }),
+                    };
+                }
+                return;
             }
             if (query == null ||
                 (query && (query.worker ?? query.sharedworker) == null)) {
@@ -42627,7 +42667,7 @@ function webWorkerPlugin(config) {
                     ? 'module'
                     : 'classic'
                 : 'module';
-            const workerOptions = workerType === 'classic' ? '' : ',{type: "module"}';
+            const workerTypeOption = workerType === 'classic' ? undefined : 'module';
             if (isBuild) {
                 getDepsOptimizer(config, ssr)?.registerWorkersSource(id);
                 if (query.inline != null) {
@@ -42638,21 +42678,33 @@ function webWorkerPlugin(config) {
                     workerConstructor === 'Worker'
                         ? `${encodedJs}
           const blob = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs)], { type: "text/javascript;charset=utf-8" });
-          export default function WorkerWrapper() {
+          export default function WorkerWrapper(options) {
             let objURL;
             try {
               objURL = blob && (window.URL || window.webkitURL).createObjectURL(blob);
               if (!objURL) throw ''
-              return new ${workerConstructor}(objURL)
+              return new ${workerConstructor}(objURL, { name: options?.name })
             } catch(e) {
-              return new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
+              return new ${workerConstructor}(
+                "data:application/javascript;base64," + encodedJs,
+                {
+                  ${workerTypeOption ? `type: "${workerTypeOption}",` : ''}
+                  name: options?.name
+                }
+              );
             } finally {
               objURL && (window.URL || window.webkitURL).revokeObjectURL(objURL);
             }
           }`
                         : `${encodedJs}
-          export default function WorkerWrapper() {
-            return new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
+          export default function WorkerWrapper(options) {
+            return new ${workerConstructor}(
+              "data:application/javascript;base64," + encodedJs,
+              {
+                ${workerTypeOption ? `type: "${workerTypeOption}",` : ''}
+                name: options?.name
+              }
+            );
           }
           `;
                     return {
@@ -42677,8 +42729,14 @@ function webWorkerPlugin(config) {
                 };
             }
             return {
-                code: `export default function WorkerWrapper() {
-          return new ${workerConstructor}(${JSON.stringify(url)}${workerOptions})
+                code: `export default function WorkerWrapper(options) {
+          return new ${workerConstructor}(
+            ${JSON.stringify(url)},
+            {
+              ${workerTypeOption ? `type: "${workerTypeOption}",` : ''}
+              name: options?.name
+            }
+          );
         }`,
                 map: { mappings: '' }, // Empty sourcemap to suppress Rollup warning
             };
@@ -42805,7 +42863,7 @@ function matches(pattern, importee) {
     if (importee === pattern) {
         return true;
     }
-    return importee.startsWith(pattern + '/');
+    return importee.startsWith(withTrailingSlash(pattern));
 }
 function getAliasPatterns(entries) {
     if (!entries) {
@@ -43045,7 +43103,7 @@ function workerImportMetaUrlPlugin(config) {
                     if (rawUrl[0] === '`' && rawUrl.includes('${')) {
                         this.error(`\`new URL(url, import.meta.url)\` is not supported in dynamic template string.`, urlIndex);
                     }
-                    s || (s = new MagicString(code));
+                    s ||= new MagicString(code);
                     const workerType = getWorkerType(code, cleanString, index + allExp.length);
                     const url = rawUrl.slice(1, -1);
                     let file;
@@ -43054,15 +43112,16 @@ function workerImportMetaUrlPlugin(config) {
                         file = tryFsResolve(file, fsResolveOptions) ?? file;
                     }
                     else {
-                        workerResolver ?? (workerResolver = config.createResolver({
+                        workerResolver ??= config.createResolver({
                             extensions: [],
                             tryIndex: false,
                             preferRelative: true,
-                        }));
+                        });
                         file = await workerResolver(url, id);
-                        file ?? (file = url[0] === '/'
-                            ? slash$1(path$o.join(config.publicDir, url))
-                            : slash$1(path$o.resolve(path$o.dirname(id), url)));
+                        file ??=
+                            url[0] === '/'
+                                ? slash$1(path$o.join(config.publicDir, url))
+                                : slash$1(path$o.resolve(path$o.dirname(id), url));
                     }
                     let builtUrl;
                     if (isBuild) {
@@ -43166,16 +43225,17 @@ function assetImportMetaUrlPlugin(config) {
                         file = tryFsResolve(file, fsResolveOptions) ?? file;
                     }
                     else {
-                        assetResolver ?? (assetResolver = config.createResolver({
+                        assetResolver ??= config.createResolver({
                             extensions: [],
                             mainFields: [],
                             tryIndex: false,
                             preferRelative: true,
-                        }));
+                        });
                         file = await assetResolver(url, id);
-                        file ?? (file = url[0] === '/'
-                            ? slash$1(path$o.join(config.publicDir, url))
-                            : slash$1(path$o.resolve(path$o.dirname(id), url)));
+                        file ??=
+                            url[0] === '/'
+                                ? slash$1(path$o.join(config.publicDir, url))
+                                : slash$1(path$o.resolve(path$o.dirname(id), url));
                     }
                     // Get final asset URL. If the file does not exist,
                     // we fall back to the initial URL and let it resolve in runtime
@@ -43517,7 +43577,7 @@ function dynamicImportVarsPlugin(config) {
                 if (hasViteIgnoreRE.test(source.slice(expStart, expEnd))) {
                     continue;
                 }
-                s || (s = new MagicString(source));
+                s ||= new MagicString(source);
                 let result;
                 try {
                     // When import string is using backticks, es-module-lexer `end` captures
@@ -43895,15 +43955,15 @@ async function createPluginContainer(config, moduleGraph, watcher) {
     // active plugin in that pipeline can be tracked in a concurrency-safe manner.
     // using a class to make creating new contexts more efficient
     class Context {
+        meta = minimalContext.meta;
+        ssr = false;
+        _scan = false;
+        _activePlugin;
+        _activeId = null;
+        _activeCode = null;
+        _resolveSkips;
+        _addedImports = null;
         constructor(initialPlugin) {
-            this.meta = minimalContext.meta;
-            this.ssr = false;
-            this._scan = false;
-            this._activeId = null;
-            this._activeCode = null;
-            this._addedImports = null;
-            this.debug = noop$3;
-            this.info = noop$3;
             this._activePlugin = initialPlugin || null;
         }
         parse(code, opts = {}) {
@@ -43988,6 +44048,8 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             // the the error middleware.
             throw formatError(e, position, this);
         }
+        debug = noop$3;
+        info = noop$3;
     }
     function formatError(e, position, ctx) {
         const err = (typeof e === 'string' ? new Error(e) : e);
@@ -44048,7 +44110,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 typeof err.loc?.line === 'number' &&
                 typeof err.loc?.column === 'number') {
                 const rawSourceMap = ctx._getCombinedSourcemap();
-                if (rawSourceMap) {
+                if (rawSourceMap && 'version' in rawSourceMap) {
                     const traced = new TraceMap(rawSourceMap);
                     const { source, line, column } = originalPositionFor$1(traced, {
                         line: Number(err.loc.line),
@@ -44085,11 +44147,13 @@ async function createPluginContainer(config, moduleGraph, watcher) {
         return err;
     }
     class TransformContext extends Context {
+        filename;
+        originalCode;
+        originalSourcemap = null;
+        sourcemapChain = [];
+        combinedMap = null;
         constructor(filename, code, inMap) {
             super();
-            this.originalSourcemap = null;
-            this.sourcemapChain = [];
-            this.combinedMap = null;
             this.filename = filename;
             this.originalCode = code;
             if (inMap) {
@@ -44100,7 +44164,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 this.sourcemapChain.push(inMap);
             }
         }
-        _getCombinedSourcemap(createIfNull = false) {
+        _getCombinedSourcemap() {
             if (debugSourcemapCombine &&
                 debugSourcemapCombineFilter &&
                 this.filename.includes(debugSourcemapCombineFilter)) {
@@ -44110,13 +44174,24 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 debugSourcemapCombine('----------');
             }
             let combinedMap = this.combinedMap;
+            // { mappings: '' }
+            if (combinedMap &&
+                !('version' in combinedMap) &&
+                combinedMap.mappings === '') {
+                this.sourcemapChain.length = 0;
+                return combinedMap;
+            }
             for (let m of this.sourcemapChain) {
                 if (typeof m === 'string')
                     m = JSON.parse(m);
                 if (!('version' in m)) {
+                    // { mappings: '' }
+                    if (m.mappings === '') {
+                        combinedMap = { mappings: '' };
+                        break;
+                    }
                     // empty, nullified source map
-                    combinedMap = this.combinedMap = null;
-                    this.sourcemapChain.length = 0;
+                    combinedMap = null;
                     break;
                 }
                 if (!combinedMap) {
@@ -44129,15 +44204,6 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                     ]);
                 }
             }
-            if (!combinedMap) {
-                return createIfNull
-                    ? new MagicString(this.originalCode).generateMap({
-                        includeContent: true,
-                        hires: 'boundary',
-                        source: cleanUrl(this.filename),
-                    })
-                    : null;
-            }
             if (combinedMap !== this.combinedMap) {
                 this.combinedMap = combinedMap;
                 this.sourcemapChain.length = 0;
@@ -44145,7 +44211,15 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             return this.combinedMap;
         }
         getCombinedSourcemap() {
-            return this._getCombinedSourcemap(true);
+            const map = this._getCombinedSourcemap();
+            if (!map || (!('version' in map) && map.mappings === '')) {
+                return new MagicString(this.originalCode).generateMap({
+                    includeContent: true,
+                    hires: 'boundary',
+                    source: cleanUrl(this.filename),
+                });
+            }
+            return map;
         }
     }
     let closed = false;
@@ -44879,7 +44953,7 @@ function expandGlobIds(id, config) {
         }
         const possibleExportPaths = [];
         for (const key in exports) {
-            if (key.startsWith('.')) {
+            if (key[0] === '.') {
                 if (key.includes('*')) {
                     // "./glob/*": {
                     //   "browser": "./dist/glob/*-browser/*.js", <-- get this one
@@ -45412,7 +45486,6 @@ async function createDepsOptimizer(config, server) {
         if (closed) {
             return;
         }
-        const crawlDeps = Object.keys(metadata.discovered);
         // Await for the scan+optimize step running in the background
         // It normally should be over by the time crawling of user code ended
         await depsOptimizer.scanProcessing;
@@ -45420,6 +45493,7 @@ async function createDepsOptimizer(config, server) {
             const result = await optimizationResult.result;
             optimizationResult = undefined;
             currentlyProcessing = false;
+            const crawlDeps = Object.keys(metadata.discovered);
             const scanDeps = Object.keys(result.metadata.optimized);
             if (scanDeps.length === 0 && crawlDeps.length === 0) {
                 debug$8?.(colors$1.green(`✨ no dependencies found by the scanner or crawling static imports`));
@@ -45452,6 +45526,7 @@ async function createDepsOptimizer(config, server) {
             }
         }
         else {
+            const crawlDeps = Object.keys(metadata.discovered);
             currentlyProcessing = false;
             if (crawlDeps.length === 0) {
                 debug$8?.(colors$1.green(`✨ no dependencies found while crawling the static imports`));
@@ -46058,7 +46133,11 @@ function newDepOptimizationProcessing() {
 }
 // Convert to { id: src }
 function depsFromOptimizedDepInfo(depsInfo) {
-    return Object.fromEntries(Object.entries(depsInfo).map((d) => [d[0], d[1].src]));
+    const obj = {};
+    for (const key in depsInfo) {
+        obj[key] = depsInfo[key].src;
+    }
+    return obj;
 }
 function getOptimizedDepPath(id, config, ssr) {
     return normalizePath$3(path$o.resolve(getDepsCacheDir(config, ssr), flattenId(id) + '.js'));
@@ -46336,7 +46415,7 @@ function findOptimizedDepInfoInRecord(dependenciesInfo, callbackFn) {
 async function optimizedDepNeedsInterop(metadata, file, config, ssr) {
     const depInfo = optimizedDepInfoFromFile(metadata, file);
     if (depInfo?.src && depInfo.needsInterop === undefined) {
-        depInfo.exportsData ?? (depInfo.exportsData = extractExportsData(depInfo.src, config, ssr));
+        depInfo.exportsData ??= extractExportsData(depInfo.src, config, ssr);
         depInfo.needsInterop = needsInterop(config, ssr, depInfo.id, await depInfo.exportsData);
     }
     return depInfo?.needsInterop;
@@ -46615,7 +46694,7 @@ function buildImportAnalysisPlugin(config) {
                 }
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js'`
-                if (resolved.id.startsWith(root + '/')) {
+                if (resolved.id.startsWith(withTrailingSlash(root))) {
                     // in root: infer short absolute path from root
                     url = resolved.id.slice(root.length);
                 }
@@ -46946,7 +47025,7 @@ function ssrManifestPlugin(config) {
                     if (chunk.code.includes(preloadMethod)) {
                         // generate css deps map
                         const code = chunk.code;
-                        let imports;
+                        let imports = [];
                         try {
                             imports = parse$e(code)[0].filter((i) => i.n && i.d > -1);
                         }
@@ -47214,11 +47293,18 @@ function send$2(req, res, content, type, options) {
         }
     }
     // inject source map reference
-    if (map && map.mappings) {
+    if (map && 'version' in map && map.mappings) {
         if (type === 'js' || type === 'css') {
             content = getCodeWithSourcemap(type, content.toString(), map);
         }
     }
+    else {
+        if (type === 'js' && (!map || map.mappings !== '')) {
+            const urlWithoutTimestamp = removeTimestampQuery(req.url);
+            const ms = new MagicString(content.toString());
+            content = getCodeWithSourcemap(type, content.toString(), ms.generateMap({ source: urlWithoutTimestamp, hires: 'boundary' }));
+        }
+    }
     res.statusCode = 200;
     res.end(content);
     return;
@@ -47614,7 +47700,7 @@ function serveStaticMiddleware(dir, server) {
         }
         if (redirectedPathname) {
             // dir is pre-normalized to posix style
-            if (redirectedPathname.startsWith(dir)) {
+            if (redirectedPathname.startsWith(withTrailingSlash(dir))) {
                 redirectedPathname = redirectedPathname.slice(dir.length);
             }
         }
@@ -47622,7 +47708,7 @@ function serveStaticMiddleware(dir, server) {
         let fileUrl = path$o.resolve(dir, removeLeadingSlash(resolvedPathname));
         if (resolvedPathname[resolvedPathname.length - 1] === '/' &&
             fileUrl[fileUrl.length - 1] !== '/') {
-            fileUrl = fileUrl + '/';
+            fileUrl = withTrailingSlash(fileUrl);
         }
         if (!ensureServingAccess(fileUrl, server, res, next)) {
             return;
@@ -47804,7 +47890,7 @@ function resolveBuildOptions(raw, logger, root) {
     if (resolved.minify === 'false') {
         resolved.minify = false;
     }
-    if (resolved.minify === true) {
+    else if (resolved.minify === true) {
         resolved.minify = 'esbuild';
     }
     if (resolved.cssMinify == null) {
@@ -47887,7 +47973,6 @@ async function build(inlineConfig = {}) {
         await initDepsOptimizer(config);
     }
     const rollupOptions = {
-        context: 'globalThis',
         preserveEntrySignatures: ssr
             ? 'allow-extension'
             : libOptions
@@ -48027,7 +48112,7 @@ function prepareOutDir(outDirs, emptyOutDir, config) {
     if (emptyOutDir == null) {
         for (const outDir of nonDuplicateDirs) {
             if (fs$l.existsSync(outDir) &&
-                !normalizePath$3(outDir).startsWith(config.root + '/')) {
+                !normalizePath$3(outDir).startsWith(withTrailingSlash(config.root))) {
                 // warn if outDir is outside of root
                 config.logger.warn(colors$1.yellow(`\n${colors$1.bold(`(!)`)} outDir ${colors$1.white(colors$1.dim(outDir))} is not inside project root and will not be emptied.\n` +
                     `Use --emptyOutDir to override.\n`));
@@ -48084,7 +48169,7 @@ function resolveLibFilename(libOptions, format, entryName, root, extension, pack
             : entryName);
     if (!name)
         throw new Error('Name in package.json is required if option "build.lib.fileName" is not provided.');
-    extension ?? (extension = resolveOutputJsExtension(format, packageJson?.type));
+    extension ??= resolveOutputJsExtension(format, packageJson?.type);
     if (format === 'cjs' || format === 'es') {
         return `${name}.${extension}`;
     }
@@ -48391,7 +48476,9 @@ const toOutputFilePathInHtml = toOutputFilePathWithoutRuntime;
 function areSeparateFolders(a, b) {
     const na = normalizePath$3(a);
     const nb = normalizePath$3(b);
-    return na !== nb && !na.startsWith(nb + '/') && !nb.startsWith(na + '/');
+    return (na !== nb &&
+        !na.startsWith(withTrailingSlash(nb)) &&
+        !nb.startsWith(withTrailingSlash(na)));
 }
 
 var build$1 = {
@@ -54943,7 +55030,7 @@ async function loadAndTransform(id, url, server, options, timestamp, mod, resolv
     if (server._restartPromise && !ssr)
         throwClosedServerError();
     // ensure module in graph after successful load
-    mod ?? (mod = await moduleGraph._ensureEntryFromUrl(url, ssr, undefined, resolved));
+    mod ??= await moduleGraph._ensureEntryFromUrl(url, ssr, undefined, resolved);
     ensureWatchedFile(watcher, mod.file, root);
     // transform
     const transformStart = debugTransform ? performance.now() : 0;
@@ -54962,22 +55049,31 @@ async function loadAndTransform(id, url, server, options, timestamp, mod, resolv
         code = transformResult.code;
         map = transformResult.map;
     }
-    if (map && mod.file) {
-        map = (typeof map === 'string' ? JSON.parse(map) : map);
-        if (map.mappings) {
-            await injectSourcesContent(map, mod.file, logger);
+    let normalizedMap;
+    if (typeof map === 'string') {
+        normalizedMap = JSON.parse(map);
+    }
+    else if (map) {
+        normalizedMap = map;
+    }
+    else {
+        normalizedMap = null;
+    }
+    if (normalizedMap && 'version' in normalizedMap && mod.file) {
+        if (normalizedMap.mappings) {
+            await injectSourcesContent(normalizedMap, mod.file, logger);
         }
         const sourcemapPath = `${mod.file}.map`;
-        applySourcemapIgnoreList(map, sourcemapPath, config.server.sourcemapIgnoreList, logger);
+        applySourcemapIgnoreList(normalizedMap, sourcemapPath, config.server.sourcemapIgnoreList, logger);
         if (path$o.isAbsolute(mod.file)) {
-            for (let sourcesIndex = 0; sourcesIndex < map.sources.length; ++sourcesIndex) {
-                const sourcePath = map.sources[sourcesIndex];
+            for (let sourcesIndex = 0; sourcesIndex < normalizedMap.sources.length; ++sourcesIndex) {
+                const sourcePath = normalizedMap.sources[sourcesIndex];
                 if (sourcePath) {
                     // Rewrite sources to relative paths to give debuggers the chance
                     // to resolve and display them in a meaningful way (rather than
                     // with absolute paths).
                     if (path$o.isAbsolute(sourcePath)) {
-                        map.sources[sourcesIndex] = path$o.relative(path$o.dirname(mod.file), sourcePath);
+                        normalizedMap.sources[sourcesIndex] = path$o.relative(path$o.dirname(mod.file), sourcePath);
                     }
                 }
             }
@@ -54986,12 +55082,12 @@ async function loadAndTransform(id, url, server, options, timestamp, mod, resolv
     if (server._restartPromise && !ssr)
         throwClosedServerError();
     const result = ssr && !server.config.experimental.skipSsrTransform
-        ? await server.ssrTransform(code, map, url, originalCode)
-        : {
+        ? await server.ssrTransform(code, normalizedMap, url, originalCode)
+        : ({
             code,
-            map,
+            map: normalizedMap,
             etag: getEtag(code, { weak: true }),
-        };
+        });
     // Only cache the result if the module wasn't invalidated while it was
     // being processed, so it is re-processed next time if it is stale
     if (timestamp > mod.lastInvalidationTimestamp) {
@@ -55500,7 +55596,10 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
         },
     });
     let map = s.generateMap({ hires: 'boundary' });
-    if (inMap && inMap.mappings && inMap.sources.length > 0) {
+    if (inMap &&
+        inMap.mappings &&
+        'sources' in inMap &&
+        inMap.sources.length > 0) {
         map = combineSourcemaps(url, [
             {
                 ...map,
@@ -55958,7 +56057,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
         }
     }
     let sourceMapSuffix = '';
-    if (result.map) {
+    if (result.map && 'version' in result.map) {
         const moduleSourceMap = Object.assign({}, result.map, {
             // currently we need to offset the line
             // https://github.com/nodejs/node/issues/43047#issuecomment-1180632750
@@ -57204,7 +57303,7 @@ function execAsync(command, options) {
     });
 }
 
-function bindShortcuts(server, opts) {
+function bindCLIShortcuts(server, opts) {
     if (!server.httpServer || !process.stdin.isTTY || process.env.CI) {
         return;
     }
@@ -57309,8 +57408,13 @@ const BASE_PREVIEW_SHORTCUTS = [
         key: 'o',
         description: 'open in browser',
         action(server) {
-            const url = server.resolvedUrls.local[0] ?? server.resolvedUrls.network[0];
-            openBrowser(url, true, server.config.logger);
+            const url = server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+            if (url) {
+                openBrowser(url, true, server.config.logger);
+            }
+            else {
+                server.config.logger.warn('No URL available to open in browser');
+            }
         },
     },
     {
@@ -61692,6 +61796,7 @@ function createWebSocketServer(server, config, httpsOptions) {
     // TODO: the main server port may not have been chosen yet as it may use the next available
     const portsAreCompatible = !hmrPort || hmrPort === config.server.port;
     const wsServer = hmrServer || (portsAreCompatible && server);
+    let hmrServerWsListener;
     const customListeners = new Map();
     const clientsMap = new WeakMap();
     const port = hmrPort || 24678;
@@ -61703,14 +61808,15 @@ function createWebSocketServer(server, config, httpsOptions) {
             hmrBase = path$o.posix.join(hmrBase, hmrPath);
         }
         wss = new WebSocketServerRaw({ noServer: true });
-        wsServer.on('upgrade', (req, socket, head) => {
+        hmrServerWsListener = (req, socket, head) => {
             if (req.headers['sec-websocket-protocol'] === HMR_HEADER &&
                 req.url === hmrBase) {
                 wss.handleUpgrade(req, socket, head, (ws) => {
                     wss.emit('connection', ws, req);
                 });
             }
-        });
+        };
+        wsServer.on('upgrade', hmrServerWsListener);
     }
     else {
         // http server request handler keeps the same with
@@ -61852,6 +61958,11 @@ function createWebSocketServer(server, config, httpsOptions) {
             });
         },
         close() {
+            // should remove listener if hmr.server is set
+            // otherwise the old listener swallows all WebSocket connections
+            if (hmrServerWsListener && wsServer) {
+                wsServer.off('upgrade', hmrServerWsListener);
+            }
             return new Promise((resolve, reject) => {
                 wss.clients.forEach((client) => {
                     client.terminate();
@@ -61909,7 +62020,7 @@ function baseMiddleware({ config, }) {
         }
         else if (req.headers.accept?.includes('text/html')) {
             // non-based page visit
-            const redirectPath = url + '/' !== base ? joinUrlSegments(base, url) : base;
+            const redirectPath = withTrailingSlash(url) !== base ? joinUrlSegments(base, url) : base;
             res.writeHead(404, {
                 'Content-Type': 'text/html',
             });
@@ -64198,9 +64309,10 @@ var history = /*@__PURE__*/getDefaultExportFromCjs(libExports);
 
 function htmlFallbackMiddleware(root, spaFallback) {
     const historyHtmlFallbackMiddleware = history({
+        disableDotRule: true,
         logger: createDebugger('vite:html-fallback'),
-        // support /dir/ without explicit index.html
         rewrites: [
+            // support /dir/ without explicit index.html
             {
                 from: /\/$/,
                 to({ parsedUrl, request }) {
@@ -64211,6 +64323,13 @@ function htmlFallbackMiddleware(root, spaFallback) {
                     return spaFallback ? `/index.html` : request.url;
                 },
             },
+            // don't rewrite paths ending with .html
+            {
+                from: /\.html$/,
+                to({ request }) {
+                    return request.url;
+                },
+            },
         ],
     });
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
@@ -64289,10 +64408,10 @@ function transformMiddleware(server) {
             // check if public dir is inside root dir
             const publicDir = normalizePath$3(server.config.publicDir);
             const rootDir = normalizePath$3(server.config.root);
-            if (publicDir.startsWith(rootDir)) {
+            if (publicDir.startsWith(withTrailingSlash(rootDir))) {
                 const publicPath = `${publicDir.slice(rootDir.length)}/`;
                 // warn explicit public paths
-                if (url.startsWith(publicPath)) {
+                if (url.startsWith(withTrailingSlash(publicPath))) {
                     let warning;
                     if (isImportRequest(url)) {
                         const rawUrl = removeImportQuery(url);
@@ -64570,7 +64689,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         const result = await server.pluginContainer.transform(code, mod.id);
         let content = '';
         if (result) {
-            if (result.map) {
+            if (result.map && 'version' in result.map) {
                 if (result.map.mappings) {
                     await injectSourcesContent(result.map, proxyModulePath, config.logger);
                 }
@@ -64654,27 +64773,35 @@ function timeMiddleware(root) {
 }
 
 class ModuleNode {
+    /**
+     * Public served url path, starts with /
+     */
+    url;
+    /**
+     * Resolved file system path + query
+     */
+    id = null;
+    file = null;
+    type;
+    info;
+    meta;
+    importers = new Set();
+    clientImportedModules = new Set();
+    ssrImportedModules = new Set();
+    acceptedHmrDeps = new Set();
+    acceptedHmrExports = null;
+    importedBindings = null;
+    isSelfAccepting;
+    transformResult = null;
+    ssrTransformResult = null;
+    ssrModule = null;
+    ssrError = null;
+    lastHMRTimestamp = 0;
+    lastInvalidationTimestamp = 0;
     /**
      * @param setIsSelfAccepting - set `false` to set `isSelfAccepting` later. e.g. #7870
      */
     constructor(url, setIsSelfAccepting = true) {
-        /**
-         * Resolved file system path + query
-         */
-        this.id = null;
-        this.file = null;
-        this.importers = new Set();
-        this.clientImportedModules = new Set();
-        this.ssrImportedModules = new Set();
-        this.acceptedHmrDeps = new Set();
-        this.acceptedHmrExports = null;
-        this.importedBindings = null;
-        this.transformResult = null;
-        this.ssrTransformResult = null;
-        this.ssrModule = null;
-        this.ssrError = null;
-        this.lastHMRTimestamp = 0;
-        this.lastInvalidationTimestamp = 0;
         this.url = url;
         this.type = isDirectCSSRequest(url) ? 'css' : 'js';
         if (setIsSelfAccepting) {
@@ -64690,21 +64817,22 @@ class ModuleNode {
     }
 }
 class ModuleGraph {
+    resolveId;
+    urlToModuleMap = new Map();
+    idToModuleMap = new Map();
+    // a single file may corresponds to multiple modules with different queries
+    fileToModulesMap = new Map();
+    safeModulesPath = new Set();
+    /**
+     * @internal
+     */
+    _unresolvedUrlToModuleMap = new Map();
+    /**
+     * @internal
+     */
+    _ssrUnresolvedUrlToModuleMap = new Map();
     constructor(resolveId) {
         this.resolveId = resolveId;
-        this.urlToModuleMap = new Map();
-        this.idToModuleMap = new Map();
-        // a single file may corresponds to multiple modules with different queries
-        this.fileToModulesMap = new Map();
-        this.safeModulesPath = new Set();
-        /**
-         * @internal
-         */
-        this._unresolvedUrlToModuleMap = new Map();
-        /**
-         * @internal
-         */
-        this._ssrUnresolvedUrlToModuleMap = new Map();
     }
     async getModuleByUrl(rawUrl, ssr) {
         // Quick path, if we already have a module for this rawUrl (even without extension)
@@ -65074,6 +65202,9 @@ async function _createServer(inlineConfig = {}, options) {
                 throw new Error('cannot print server URLs before server.listen is called.');
             }
         },
+        bindCLIShortcuts(options) {
+            bindCLIShortcuts(server, options);
+        },
         async restart(forceOptimize) {
             if (!server._restartPromise) {
                 server._forceOptimizeOnRestart = !!forceOptimize;
@@ -65387,7 +65518,7 @@ async function restartServer(server) {
     }
     if (shortcutsOptions) {
         shortcutsOptions.print = false;
-        bindShortcuts(newServer, shortcutsOptions);
+        bindCLIShortcuts(newServer, shortcutsOptions);
     }
 }
 async function updateCjsSsrExternals(server) {
@@ -65573,6 +65704,9 @@ async function preview(inlineConfig = {}) {
                 throw new Error('cannot print server URLs before server is listening.');
             }
         },
+        bindCLIShortcuts(options) {
+            bindCLIShortcuts(server, options);
+        },
     };
     // apply server hooks from plugins
     const postHooks = [];
@@ -65637,7 +65771,7 @@ var preview$1 = {
 };
 
 function resolveSSROptions(ssr, preserveSymlinks, buildSsrCjsExternalHeuristics) {
-    ssr ?? (ssr = {});
+    ssr ??= {};
     const optimizeDeps = ssr.optimizeDeps ?? {};
     const format = buildSsrCjsExternalHeuristics ? 'cjs' : 'esm';
     const target = 'node';
@@ -65721,7 +65855,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
             optimizeDeps: { disabled: false },
             ssr: { optimizeDeps: { disabled: false } },
         });
-        config.build ?? (config.build = {});
+        config.build ??= {};
         config.build.commonjsOptions = { include: [] };
     }
     // Define logger
@@ -65871,7 +66005,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         configFileDependencies: configFileDependencies.map((name) => normalizePath$3(path$o.resolve(name))),
         inlineConfig,
         root: resolvedRoot,
-        base: resolvedBase.endsWith('/') ? resolvedBase : resolvedBase + '/',
+        base: withTrailingSlash(resolvedBase),
         rawBase: resolvedBase,
         resolve: resolveOptions,
         publicDir: resolvedPublicDir,
@@ -65994,7 +66128,7 @@ assetFileNames isn't equal for every build.rollupOptions.output. A single patter
     if (config.legacy?.buildSsrCjsExternalHeuristics ||
         config.ssr?.format === 'cjs') {
         resolved.logger.warn(colors$1.yellow(`
-(!) Experimental legacy.buildSsrCjsExternalHeuristics and ssr.format: 'cjs' are going to be removed in Vite 5. 
+(!) Experimental legacy.buildSsrCjsExternalHeuristics and ssr.format: 'cjs' are going to be removed in Vite 5.
     Find more information and give feedback at https://github.com/vitejs/vite/discussions/13816.
 `));
     }
@@ -66111,7 +66245,7 @@ async function bundleConfigFile(fileName, isESM) {
         entryPoints: [fileName],
         outfile: 'out.js',
         write: false,
-        target: ['node14.18', 'node16'],
+        target: ['node18'],
         platform: 'node',
         bundle: true,
         format: isESM ? 'esm' : 'cjs',
@@ -66288,4 +66422,4 @@ function isDepsOptimizerEnabled(config, ssr) {
         (command === 'serve' && disabled === 'dev'));
 }
 
-export { loadEnv as A, resolveEnvPrefix as B, colors$1 as C, bindShortcuts as D, getDefaultExportFromCjs as E, commonjsGlobal as F, index$1 as G, build$1 as H, index as I, preview$1 as J, preprocessCSS as a, build as b, createServer as c, resolvePackageData as d, buildErrorMessage as e, formatPostcssSourceMap as f, defineConfig as g, resolveConfig as h, isInNodeModules as i, resolveBaseUrl as j, getDepOptimizationConfig as k, loadConfigFromFile as l, isDepsOptimizerEnabled as m, normalizePath$3 as n, optimizeDeps as o, preview as p, mergeConfig as q, resolvePackageEntry as r, sortUserPlugins as s, transformWithEsbuild as t, mergeAlias as u, createFilter as v, send$2 as w, createLogger as x, searchForWorkspaceRoot as y, isFileServingAllowed as z };
+export { loadEnv as A, resolveEnvPrefix as B, colors$1 as C, getDefaultExportFromCjs as D, commonjsGlobal as E, index$1 as F, build$1 as G, index as H, preview$1 as I, preprocessCSS as a, build as b, createServer as c, resolvePackageData as d, buildErrorMessage as e, formatPostcssSourceMap as f, defineConfig as g, resolveConfig as h, isInNodeModules as i, resolveBaseUrl as j, getDepOptimizationConfig as k, loadConfigFromFile as l, isDepsOptimizerEnabled as m, normalizePath$3 as n, optimizeDeps as o, preview as p, mergeConfig as q, resolvePackageEntry as r, sortUserPlugins as s, transformWithEsbuild as t, mergeAlias as u, createFilter as v, send$2 as w, createLogger as x, searchForWorkspaceRoot as y, isFileServingAllowed as z };