vite 5.0.0-beta.15 → 5.0.0-beta.17

package/dist/node/chunks/{dep-Kf16Z54K.js → dep-3p9Yqpeo.js}

@@ -20,11 +20,11 @@ import require$$1$1 from 'http';
 import require$$0$7 from 'stream';
 import require$$2 from 'os';
 import require$$2$1 from 'child_process';
+import { CLIENT_ENTRY, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, SPECIAL_QUERY_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, VITE_PACKAGE_DIR, ASYNC_DISPOSE, DEFAULT_DEV_PORT, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import os$4 from 'node:os';
 import { exec } from 'node:child_process';
 import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
-import { CLIENT_ENTRY, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, SPECIAL_QUERY_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$0$a from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -15712,15 +15712,17 @@ async function urlToBuiltUrl(url, importer, config, pluginContext) {
 // Inspired by https://github.com/iconify/iconify/blob/main/packages/utils/src/svg/url.ts
 function svgToDataURL(content) {
     const stringContent = content.toString();
-    // If the SVG contains some text, any transformation is unsafe, and given that double quotes would then
+    // If the SVG contains some text or HTML, any transformation is unsafe, and given that double quotes would then
     // need to be escaped, the gain to use a data URI would be ridiculous if not negative
-    if (stringContent.includes('<text')) {
+    if (stringContent.includes('<text') ||
+        stringContent.includes('<foreignObject')) {
         return `data:image/svg+xml;base64,${content.toString('base64')}`;
     }
     else {
         return ('data:image/svg+xml,' +
             stringContent
                 .trim()
+                .replaceAll(/>\s+</g, '><')
                 .replaceAll('"', "'")
                 .replaceAll('%', '%25')
                 .replaceAll('#', '%23')
@@ -36951,10 +36953,7 @@ function buildHtmlPlugin(config) {
     preHooks.push(htmlEnvHook(config));
     postHooks.push(postImportMapHook());
     const processedHtml = new Map();
-    const isExcludedUrl = (url) => url[0] === '#' ||
-        isExternalUrl(url) ||
-        isDataUrl(url) ||
-        checkPublicFile(url, config);
+    const isExcludedUrl = (url) => url[0] === '#' || isExternalUrl(url) || isDataUrl(url);
     // Same reason with `htmlInlineProxyPlugin`
     isAsyncScriptMap.set(config, new Map());
     return {
@@ -36998,13 +36997,33 @@ function buildHtmlPlugin(config) {
                 });
                 let js = '';
                 const s = new MagicString(html);
-                const assetUrls = [];
                 const scriptUrls = [];
                 const styleUrls = [];
                 let inlineModuleIndex = -1;
                 let everyScriptIsAsync = true;
                 let someScriptsAreAsync = false;
                 let someScriptsAreDefer = false;
+                const assetUrlsPromises = [];
+                // for each encountered asset url, rewrite original html so that it
+                // references the post-build location, ignoring empty attributes and
+                // attributes that directly reference named output.
+                const namedOutput = Object.keys(config?.build?.rollupOptions?.input || {});
+                const processAssetUrl = async (url) => {
+                    if (url !== '' && // Empty attribute
+                        !namedOutput.includes(url) && // Direct reference to named output
+                        !namedOutput.includes(removeLeadingSlash(url)) // Allow for absolute references as named output can't be an absolute path
+                    ) {
+                        try {
+                            return await urlToBuiltUrl(url, id, config, this);
+                        }
+                        catch (e) {
+                            if (e.code !== 'ENOENT') {
+                                throw e;
+                            }
+                        }
+                    }
+                    return url;
+                };
                 await traverseHtml(html, id, (node) => {
                     if (!nodeIsElement(node)) {
                         return;
@@ -37021,7 +37040,7 @@ function buildHtmlPlugin(config) {
                         }
                         if (isModule) {
                             inlineModuleIndex++;
-                            if (url && !isExcludedUrl(url)) {
+                            if (url && !isExcludedUrl(url) && !isPublicFile) {
                                 // <script type="module" src="..."/>
                                 // add it as an import
                                 js += `\nimport ${JSON.stringify(url)}`;
@@ -37059,34 +37078,51 @@ function buildHtmlPlugin(config) {
                         for (const p of node.attrs) {
                             const attrKey = getAttrKey(p);
                             if (p.value && assetAttrs.includes(attrKey)) {
-                                const attrSourceCodeLocation = node.sourceCodeLocation.attrs[attrKey];
-                                // assetsUrl may be encodeURI
-                                const url = decodeURI(p.value);
-                                if (!isExcludedUrl(url)) {
-                                    if (node.nodeName === 'link' &&
-                                        isCSSRequest(url) &&
-                                        // should not be converted if following attributes are present (#6748)
-                                        !node.attrs.some((p) => p.prefix === undefined &&
-                                            (p.name === 'media' || p.name === 'disabled'))) {
-                                        // CSS references, convert to import
-                                        const importExpression = `\nimport ${JSON.stringify(url)}`;
-                                        styleUrls.push({
-                                            url,
-                                            start: nodeStartWithLeadingWhitespace(node),
-                                            end: node.sourceCodeLocation.endOffset,
+                                if (attrKey === 'srcset') {
+                                    assetUrlsPromises.push((async () => {
+                                        const processedUrl = await processSrcSet(p.value, async ({ url }) => {
+                                            const decodedUrl = decodeURI(url);
+                                            if (!isExcludedUrl(decodedUrl)) {
+                                                const result = await processAssetUrl(url);
+                                                return result !== decodedUrl ? result : url;
+                                            }
+                                            return url;
                                         });
-                                        js += importExpression;
+                                        if (processedUrl !== p.value) {
+                                            overwriteAttrValue(s, getAttrSourceCodeLocation(node, attrKey), processedUrl);
+                                        }
+                                    })());
+                                }
+                                else {
+                                    const url = decodeURI(p.value);
+                                    if (checkPublicFile(url, config)) {
+                                        overwriteAttrValue(s, getAttrSourceCodeLocation(node, attrKey), toOutputPublicFilePath(url));
                                     }
-                                    else {
-                                        assetUrls.push({
-                                            attr: p,
-                                            sourceCodeLocation: attrSourceCodeLocation,
-                                        });
+                                    else if (!isExcludedUrl(url)) {
+                                        if (node.nodeName === 'link' &&
+                                            isCSSRequest(url) &&
+                                            // should not be converted if following attributes are present (#6748)
+                                            !node.attrs.some((p) => p.prefix === undefined &&
+                                                (p.name === 'media' || p.name === 'disabled'))) {
+                                            // CSS references, convert to import
+                                            const importExpression = `\nimport ${JSON.stringify(url)}`;
+                                            styleUrls.push({
+                                                url,
+                                                start: nodeStartWithLeadingWhitespace(node),
+                                                end: node.sourceCodeLocation.endOffset,
+                                            });
+                                            js += importExpression;
+                                        }
+                                        else {
+                                            assetUrlsPromises.push((async () => {
+                                                const processedUrl = await processAssetUrl(url);
+                                                if (processedUrl !== url) {
+                                                    overwriteAttrValue(s, getAttrSourceCodeLocation(node, attrKey), processedUrl);
+                                                }
+                                            })());
+                                        }
                                     }
                                 }
-                                else if (checkPublicFile(url, config)) {
-                                    overwriteAttrValue(s, attrSourceCodeLocation, toOutputPublicFilePath(url));
-                                }
                             }
                         }
                     }
@@ -37127,38 +37163,15 @@ function buildHtmlPlugin(config) {
                 if (someScriptsAreAsync && someScriptsAreDefer) {
                     config.logger.warn(`\nMixed async and defer script modules in ${id}, output script will fallback to defer. Every script, including inline ones, need to be marked as async for your output script to be async.`);
                 }
-                // for each encountered asset url, rewrite original html so that it
-                // references the post-build location, ignoring empty attributes and
-                // attributes that directly reference named output.
-                const namedOutput = Object.keys(config?.build?.rollupOptions?.input || {});
-                for (const { attr, sourceCodeLocation } of assetUrls) {
-                    // assetsUrl may be encodeURI
-                    const content = decodeURI(attr.value);
-                    if (content !== '' && // Empty attribute
-                        !namedOutput.includes(content) && // Direct reference to named output
-                        !namedOutput.includes(removeLeadingSlash(content)) // Allow for absolute references as named output can't be an absolute path
-                    ) {
-                        try {
-                            const url = attr.prefix === undefined && attr.name === 'srcset'
-                                ? await processSrcSet(content, ({ url }) => urlToBuiltUrl(url, id, config, this))
-                                : await urlToBuiltUrl(content, id, config, this);
-                            overwriteAttrValue(s, sourceCodeLocation, url);
-                        }
-                        catch (e) {
-                            if (e.code !== 'ENOENT') {
-                                throw e;
-                            }
-                        }
-                    }
-                }
+                await Promise.all(assetUrlsPromises);
                 // emit <script>import("./aaa")</script> asset
                 for (const { start, end, url } of scriptUrls) {
-                    if (!isExcludedUrl(url)) {
-                        s.update(start, end, await urlToBuiltUrl(url, id, config, this));
-                    }
-                    else if (checkPublicFile(url, config)) {
+                    if (checkPublicFile(url, config)) {
                         s.update(start, end, toOutputPublicFilePath(url));
                     }
+                    else if (!isExcludedUrl(url)) {
+                        s.update(start, end, await urlToBuiltUrl(url, id, config, this));
+                    }
                 }
                 // ignore <link rel="stylesheet"> if its url can't be resolved
                 const resolvedStyleUrls = await Promise.all(styleUrls.map(async (styleUrl) => ({
@@ -37669,20 +37682,22 @@ function incrementIndent(indent = '') {
 function getAttrKey(attr) {
     return attr.prefix === undefined ? attr.name : `${attr.prefix}:${attr.name}`;
 }
+function getAttrSourceCodeLocation(node, attrKey) {
+    return node.sourceCodeLocation.attrs[attrKey];
+}
 
 function resolveCSSOptions(options) {
-    if (options?.lightningcss) {
+    if (options?.transformer === 'lightningcss') {
         return {
             ...options,
             lightningcss: {
                 ...options.lightningcss,
-                targets: options.lightningcss.targets ??
+                targets: options.lightningcss?.targets ??
                     convertTargets(ESBUILD_MODULES_TARGET),
             },
         };
     }
-    // TS doesn't narrow the type with the previous if :/
-    return options;
+    return { ...options, lightningcss: undefined };
 }
 const cssModuleRE = new RegExp(`\\.module${CSS_LANGS_RE.source}`);
 const directRequestRE = /[?&]direct\b/;
@@ -38479,8 +38494,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-01ZZG1lv.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-dhvB1mwU.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-zjm7Opl5.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-pKKs8JVV.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -39187,7 +39202,9 @@ async function compileLightningCSS(id, src, config, urlReplacer) {
                 },
             },
             minify: config.isProduction && !!config.build.cssMinify,
-            sourceMap: config.css?.devSourcemap,
+            sourceMap: config.command === 'build'
+                ? !!config.build.sourcemap
+                : config.css?.devSourcemap,
             analyzeDependencies: true,
             cssModules: cssModuleRE.test(id)
                 ? config.css?.lightningcss?.cssModules ?? true
@@ -39757,7 +39774,6 @@ function optimizedDepsPlugin(config) {
                         // something unexpected has happened. In this case, Vite
                         // returns an empty response that will error.
                         throwProcessingError(id);
-                        return;
                     }
                     const newMetadata = depsOptimizer.metadata;
                     if (metadata !== newMetadata) {
@@ -47731,10 +47747,14 @@ async function loadAndTransform(id, url, server, options, timestamp, mod, resolv
     }
     if (code == null) {
         const isPublicFile = checkPublicFile(url, config);
+        let publicDirName = path$o.relative(config.root, config.publicDir);
+        if (publicDirName[0] !== '.')
+            publicDirName = '/' + publicDirName;
         const msg = isPublicFile
-            ? `This file is in /public and will be copied as-is during build without ` +
-                `going through the plugin transforms, and therefore should not be ` +
-                `imported from source code. It can only be referenced via HTML tags.`
+            ? `This file is in ${publicDirName} and will be copied as-is during ` +
+                `build without going through the plugin transforms, and therefore ` +
+                `should not be imported from source code. It can only be referenced ` +
+                `via HTML tags.`
             : `Does the file exist?`;
         const importerMod = server.moduleGraph.idToModuleMap
             .get(id)
@@ -54910,31 +54930,33 @@ function createWebSocketServer(server, config, httpsOptions) {
                 });
             });
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
     };
 }
 
 // this middleware is only active when (base !== '/')
-function baseMiddleware({ config, }) {
+function baseMiddleware(rawBase, middlewareMode) {
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteBaseMiddleware(req, res, next) {
         const url = req.url;
-        const parsed = new URL(url, 'http://vitejs.dev');
-        const path = parsed.pathname || '/';
-        const base = config.rawBase;
-        if (path.startsWith(base)) {
+        const pathname = cleanUrl(url);
+        const base = rawBase;
+        if (pathname.startsWith(base)) {
             // rewrite url to remove base. this ensures that other middleware does
             // not need to consider base being prepended or not
             req.url = stripBase(url, base);
             return next();
         }
         // skip redirect and error fallback on middleware mode, #4057
-        if (config.server.middlewareMode) {
+        if (middlewareMode) {
             return next();
         }
-        if (path === '/' || path === '/index.html') {
+        if (pathname === '/' || pathname === '/index.html') {
             // redirect root visit to based url with search and hash
             res.writeHead(302, {
-                Location: base + (parsed.search || '') + (parsed.hash || ''),
+                Location: base + url.slice(pathname.length),
             });
             res.end();
             return;
@@ -57110,19 +57132,7 @@ function doesProxyContextMatchUrl(context, url) {
 }
 
 const debug$6 = createDebugger('vite:html-fallback');
-function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
-    // When this middleware is mounted on a route, we need to re-assign `req.url` with a
-    // leading `.` to signal a relative rewrite. Returning with a leading `/` returns a
-    // buggy `req.url`. e.g.:
-    //
-    // mount /foo/bar:
-    //  req.url = /index.html
-    //  final   = /foo/barindex.html
-    //
-    // mount /foo/bar:
-    //  req.url = ./index.html
-    //  final   = /foo/bar/index.html
-    const prepend = mounted ? '.' : '';
+function htmlFallbackMiddleware(root, spaFallback) {
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteHtmlFallbackMiddleware(req, res, next) {
         if (
@@ -57146,7 +57156,7 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             const filePath = path$o.join(root, pathname);
             if (fs$l.existsSync(filePath)) {
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${url}`);
-                req.url = prepend + url;
+                req.url = url;
                 return next();
             }
         }
@@ -57156,7 +57166,7 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             if (fs$l.existsSync(filePath)) {
                 const newUrl = url + 'index.html';
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
-                req.url = prepend + newUrl;
+                req.url = newUrl;
                 return next();
             }
         }
@@ -57166,13 +57176,13 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             if (fs$l.existsSync(filePath)) {
                 const newUrl = url + '.html';
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
-                req.url = prepend + newUrl;
+                req.url = newUrl;
                 return next();
             }
         }
         if (spaFallback) {
             debug$6?.(`Rewriting ${req.method} ${req.url} to /index.html`);
-            req.url = prepend + '/index.html';
+            req.url = '/index.html';
         }
         next();
     };
@@ -57237,7 +57247,6 @@ function send(req, res, content, type, options) {
 const debugCache = createDebugger('vite:cache');
 const knownIgnoreList = new Set(['/', '/favicon.ico']);
 function transformMiddleware(server) {
-    const { config: { root, logger }, moduleGraph, } = server;
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return async function viteTransformMiddleware(req, res, next) {
         if (req.method !== 'GET' || knownIgnoreList.has(req.url)) {
@@ -57261,10 +57270,10 @@ function transformMiddleware(server) {
                     // means that the dependency has already been pre-bundled and loaded
                     const sourcemapPath = url.startsWith(FS_PREFIX)
                         ? fsPathFromId(url)
-                        : normalizePath$3(path$o.resolve(root, url.slice(1)));
+                        : normalizePath$3(path$o.resolve(server.config.root, url.slice(1)));
                     try {
                         const map = JSON.parse(await fsp.readFile(sourcemapPath, 'utf-8'));
-                        applySourcemapIgnoreList(map, sourcemapPath, server.config.server.sourcemapIgnoreList, logger);
+                        applySourcemapIgnoreList(map, sourcemapPath, server.config.server.sourcemapIgnoreList, server.config.logger);
                         return send(req, res, JSON.stringify(map), 'json', {
                             headers: server.config.server.headers,
                         });
@@ -57289,8 +57298,7 @@ function transformMiddleware(server) {
                 }
                 else {
                     const originalUrl = url.replace(/\.map($|\?)/, '$1');
-                    const map = (await moduleGraph.getModuleByUrl(originalUrl, false))
-                        ?.transformResult?.map;
+                    const map = (await server.moduleGraph.getModuleByUrl(originalUrl, false))?.transformResult?.map;
                     if (map) {
                         return send(req, res, JSON.stringify(map), 'json', {
                             headers: server.config.server.headers,
@@ -57328,7 +57336,7 @@ function transformMiddleware(server) {
                             `Files in the public directory are served at the root path.\n` +
                                 `Instead of ${colors$1.cyan(url)}, use ${colors$1.cyan(url.replace(publicPath, '/'))}.`;
                     }
-                    logger.warn(colors$1.yellow(warning));
+                    server.config.logger.warn(colors$1.yellow(warning));
                 }
             }
             if (isJSRequest(url) ||
@@ -57350,9 +57358,9 @@ function transformMiddleware(server) {
                 // check if we can return 304 early
                 const ifNoneMatch = req.headers['if-none-match'];
                 if (ifNoneMatch &&
-                    (await moduleGraph.getModuleByUrl(url, false))?.transformResult
+                    (await server.moduleGraph.getModuleByUrl(url, false))?.transformResult
                         ?.etag === ifNoneMatch) {
-                    debugCache?.(`[304] ${prettifyUrl(url, root)}`);
+                    debugCache?.(`[304] ${prettifyUrl(url, server.config.root)}`);
                     res.statusCode = 304;
                     return res.end();
                 }
@@ -57383,7 +57391,7 @@ function transformMiddleware(server) {
                     res.end();
                 }
                 // This timeout is unexpected
-                logger.error(e.message);
+                server.config.logger.error(e.message);
                 return;
             }
             if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP) {
@@ -57426,13 +57434,13 @@ function transformMiddleware(server) {
     };
 }
 
-function createDevHtmlTransformFn(server) {
-    const [preHooks, normalHooks, postHooks] = resolveHtmlTransforms(server.config.plugins, server.config.logger);
-    return (url, html, originalUrl) => {
+function createDevHtmlTransformFn(config) {
+    const [preHooks, normalHooks, postHooks] = resolveHtmlTransforms(config.plugins, config.logger);
+    return (server, url, html, originalUrl) => {
         return applyHtmlTransforms(html, [
-            preImportMapHook(server.config),
+            preImportMapHook(config),
             ...preHooks,
-            htmlEnvHook(server.config),
+            htmlEnvHook(config),
             devHtmlHook,
             ...normalHooks,
             ...postHooks,
@@ -57459,39 +57467,42 @@ function shouldPreTransform(url, config) {
 const wordCharRE = /\w/;
 const isSrcSet = (attr) => attr.name === 'srcset' && attr.prefix === undefined;
 const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, server) => {
-    if (server?.moduleGraph) {
-        const mod = server.moduleGraph.urlToModuleMap.get(url);
-        if (mod && mod.lastHMRTimestamp > 0) {
-            url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
-        }
-    }
-    if ((url[0] === '/' && url[1] !== '/') ||
-        // #3230 if some request url (localhost:3000/a/b) return to fallback html, the relative assets
-        // path will add `/a/` prefix, it will caused 404.
-        //
-        // skip if url contains `:` as it implies a url protocol or Windows path that we don't want to replace.
-        //
-        // rewrite `./index.js` -> `localhost:5173/a/index.js`.
-        // rewrite `../index.js` -> `localhost:5173/index.js`.
-        // rewrite `relative/index.js` -> `localhost:5173/a/relative/index.js`.
-        ((url[0] === '.' || (wordCharRE.test(url[0]) && !url.includes(':'))) &&
-            originalUrl &&
-            originalUrl !== '/' &&
-            htmlPath === '/index.html')) {
-        // prefix with base (dev only, base is never relative)
-        const replacer = (url) => {
+    // prefix with base (dev only, base is never relative)
+    const replacer = (url) => {
+        if (server?.moduleGraph) {
+            const mod = server.moduleGraph.urlToModuleMap.get(url);
+            if (mod && mod.lastHMRTimestamp > 0) {
+                url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
+            }
+        }
+        if ((url[0] === '/' && url[1] !== '/') ||
+            // #3230 if some request url (localhost:3000/a/b) return to fallback html, the relative assets
+            // path will add `/a/` prefix, it will caused 404.
+            //
+            // skip if url contains `:` as it implies a url protocol or Windows path that we don't want to replace.
+            //
+            // rewrite `./index.js` -> `localhost:5173/a/index.js`.
+            // rewrite `../index.js` -> `localhost:5173/index.js`.
+            // rewrite `relative/index.js` -> `localhost:5173/a/relative/index.js`.
+            ((url[0] === '.' || (wordCharRE.test(url[0]) && !url.includes(':'))) &&
+                originalUrl &&
+                originalUrl !== '/' &&
+                htmlPath === '/index.html')) {
             const devBase = config.base;
             const fullUrl = path$o.posix.join(devBase, url);
             if (server && shouldPreTransform(url, config)) {
                 preTransformRequest(server, fullUrl, devBase);
             }
             return fullUrl;
-        };
-        const processedUrl = useSrcSetReplacer
-            ? processSrcSetSync(url, ({ url }) => replacer(url))
-            : replacer(url);
-        return processedUrl;
-    }
+        }
+        else {
+            return url;
+        }
+    };
+    const processedUrl = useSrcSetReplacer
+        ? processSrcSetSync(url, ({ url }) => replacer(url))
+        : replacer(url);
+    return processedUrl;
 };
 const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl }) => {
     const { config, moduleGraph, watcher } = server;
@@ -57552,7 +57563,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
             const { src, sourceCodeLocation, isModule } = getScriptInfo(node);
             if (src) {
                 const processedUrl = processNodeUrl(src.value, isSrcSet(src), config, htmlPath, originalUrl, server);
-                if (processedUrl) {
+                if (processedUrl !== src.value) {
                     overwriteAttrValue(s, sourceCodeLocation, processedUrl);
                 }
             }
@@ -57563,7 +57574,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
                 const scriptNode = node.childNodes[node.childNodes.length - 1];
                 for (const { url, start, end, } of extractImportExpressionFromClassicScript(scriptNode)) {
                     const processedUrl = processNodeUrl(url, false, config, htmlPath, originalUrl);
-                    if (processedUrl) {
+                    if (processedUrl !== url) {
                         s.update(start, end, processedUrl);
                     }
                 }
@@ -57593,7 +57604,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
                 const attrKey = getAttrKey(p);
                 if (p.value && assetAttrs.includes(attrKey)) {
                     const processedUrl = processNodeUrl(p.value, isSrcSet(p), config, htmlPath, originalUrl);
-                    if (processedUrl) {
+                    if (processedUrl !== p.value) {
                         overwriteAttrValue(s, node.sourceCodeLocation.attrs[attrKey], processedUrl);
                     }
                 }
@@ -57814,7 +57825,11 @@ class ModuleGraph {
             });
         }
     }
-    invalidateModule(mod, seen = new Set(), timestamp = Date.now(), isHmr = false, hmrBoundaries = [], softInvalidate = false) {
+    invalidateModule(mod, seen = new Set(), timestamp = Date.now(), isHmr = false, 
+    /** @internal */
+    hmrBoundaries = [], 
+    /** @internal */
+    softInvalidate = false) {
         const prevInvalidationState = mod.invalidationState;
         const prevSsrInvalidationState = mod.ssrInvalidationState;
         // Handle soft invalidation before the `seen` check, as consecutive soft/hard invalidations can
@@ -57885,7 +57900,9 @@ class ModuleGraph {
      * @param staticImportedUrls Subset of `importedModules` where they're statically imported in code.
      *   This is only used for soft invalidations so `undefined` is fine but may cause more runtime processing.
      */
-    async updateModuleInfo(mod, importedModules, importedBindings, acceptedModules, acceptedExports, isSelfAccepting, ssr, staticImportedUrls) {
+    async updateModuleInfo(mod, importedModules, importedBindings, acceptedModules, acceptedExports, isSelfAccepting, ssr, 
+    /** @internal */
+    staticImportedUrls) {
         mod.isSelfAccepting = isSelfAccepting;
         const prevImports = ssr ? mod.ssrImportedModules : mod.clientImportedModules;
         let noLongerImported;
@@ -58331,7 +58348,8 @@ async function _createServer(inlineConfig = {}, options) {
     const container = await createPluginContainer(config, moduleGraph, watcher);
     const closeHttpServer = createServerCloseFn(httpServer);
     let exitProcess;
-    const server = {
+    const devHtmlTransformFn = createDevHtmlTransformFn(config);
+    let server = {
         config,
         middlewares,
         httpServer,
@@ -58360,7 +58378,9 @@ async function _createServer(inlineConfig = {}, options) {
                 });
             });
         },
-        transformIndexHtml: null,
+        transformIndexHtml(url, html, originalUrl) {
+            return devHtmlTransformFn(server, url, html, originalUrl);
+        },
         async ssrLoadModule(url, opts) {
             if (isDepsOptimizerEnabled(config, true)) {
                 await initDevSsrDepsOptimizer(config, server);
@@ -58449,6 +58469,9 @@ async function _createServer(inlineConfig = {}, options) {
             }
             server.resolvedUrls = null;
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
         printUrls() {
             if (server.resolvedUrls) {
                 printServerUrls(server.resolvedUrls, serverConfig.host, config.logger.info);
@@ -58473,6 +58496,11 @@ async function _createServer(inlineConfig = {}, options) {
             }
             return server._restartPromise;
         },
+        _setInternalServer(_server) {
+            // Rebind internal the server variable so functions reference the user
+            // server instance after a restart
+            server = _server;
+        },
         _restartPromise: null,
         _importGlobMap: new Map(),
         _forceOptimizeOnRestart: false,
@@ -58480,7 +58508,6 @@ async function _createServer(inlineConfig = {}, options) {
         _fsDenyGlob: picomatch$4(config.server.fs.deny, { matchBase: true }),
         _shortcutsOptions: undefined,
     };
-    server.transformIndexHtml = createDevHtmlTransformFn(server);
     if (!middlewareMode) {
         exitProcess = async () => {
             try {
@@ -58561,7 +58588,7 @@ async function _createServer(inlineConfig = {}, options) {
     }
     // base
     if (config.base !== '/') {
-        middlewares.use(baseMiddleware(server));
+        middlewares.use(baseMiddleware(config.rawBase, middlewareMode));
     }
     // open in editor support
     middlewares.use('/__open-in-editor', launchEditorMiddleware$1());
@@ -58755,6 +58782,8 @@ async function restartServer(server) {
     await server.close();
     // Assign new server props to existing server instance
     Object.assign(server, newServer);
+    // Rebind internal server variable so functions reference the user server
+    newServer._setInternalServer(server);
     const { logger, server: { port, middlewareMode }, } = server.config;
     if (!middlewareMode) {
         await server.listen(port, true);
@@ -61306,14 +61335,7 @@ function createPluginHookUtils(plugins) {
     }
     function getSortedPluginHooks(hookName) {
         const plugins = getSortedPlugins(hookName);
-        return plugins
-            .map((p) => {
-            const hook = p[hookName];
-            return typeof hook === 'object' && 'handler' in hook
-                ? hook.handler
-                : hook;
-        })
-            .filter(Boolean);
+        return plugins.map((p) => getHookHandler(p[hookName])).filter(Boolean);
     }
     return {
         getSortedPlugins,
@@ -61342,6 +61364,9 @@ function getSortedPluginsByHook(hookName, plugins) {
     }
     return [...pre, ...normal, ...post];
 }
+function getHookHandler(hook) {
+    return (typeof hook === 'object' ? hook.handler : hook);
+}
 
 /**
  * This file is refactored into TypeScript based on
@@ -61421,9 +61446,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             const hook = plugin[hookName];
             if (!hook)
                 continue;
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore hook is not a primitive
-            const handler = 'handler' in hook ? hook.handler : hook;
+            const handler = getHookHandler(hook);
             if (hook.sequential) {
                 await Promise.all(parallelPromises);
                 parallelPromises.length = 0;
@@ -61781,9 +61804,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                     continue;
                 ctx._activePlugin = plugin;
                 const pluginResolveStart = debugPluginResolve ? performance.now() : 0;
-                const handler = 'handler' in plugin.resolveId
-                    ? plugin.resolveId.handler
-                    : plugin.resolveId;
+                const handler = getHookHandler(plugin.resolveId);
                 const result = await handleHookPromise(handler.call(ctx, rawId, importer, {
                     attributes: options?.attributes ?? {},
                     custom: options?.custom,
@@ -61830,7 +61851,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 if (!plugin.load)
                     continue;
                 ctx._activePlugin = plugin;
-                const handler = 'handler' in plugin.load ? plugin.load.handler : plugin.load;
+                const handler = getHookHandler(plugin.load);
                 const result = await handleHookPromise(handler.call(ctx, id, { ssr }));
                 if (result != null) {
                     if (isObject$1(result)) {
@@ -61856,9 +61877,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 ctx._activeCode = code;
                 const start = debugPluginTransform ? performance.now() : 0;
                 let result;
-                const handler = 'handler' in plugin.transform
-                    ? plugin.transform.handler
-                    : plugin.transform;
+                const handler = getHookHandler(plugin.transform);
                 try {
                     result = await handleHookPromise(handler.call(ctx, code, id, { ssr }));
                 }
@@ -61903,6 +61922,9 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             await hookParallel('buildEnd', () => ctx, () => []);
             await hookParallel('closeBundle', () => ctx, () => []);
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
     };
     return container;
 }
@@ -62616,6 +62638,9 @@ async function createDepsOptimizer(config, server) {
         resetRegisteredIds,
         ensureFirstRun,
         close,
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
         options: getDepOptimizationConfig(config, ssr),
     };
     depsOptimizerMap.set(config, depsOptimizer);
@@ -63150,6 +63175,7 @@ async function createDevSsrDepsOptimizer(config) {
         resetRegisteredIds: () => { },
         ensureFirstRun: () => { },
         close: async () => { },
+        [ASYNC_DISPOSE]: async () => { },
         options: config.ssr.optimizeDeps,
     };
     devSsrDepsOptimizerMap.set(config, depsOptimizer);
@@ -65127,7 +65153,7 @@ function injectSsrFlagToHooks(plugin) {
 function wrapSsrResolveId(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (id, importer, options) {
         return fn.call(this, id, importer, injectSsrFlag(options));
     };
@@ -65144,7 +65170,7 @@ function wrapSsrResolveId(hook) {
 function wrapSsrLoad(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (id, ...args) {
         // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
         return fn.call(this, id, injectSsrFlag(args[0]));
@@ -65162,7 +65188,7 @@ function wrapSsrLoad(hook) {
 function wrapSsrTransform(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (code, importer, ...args) {
         // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
         return fn.call(this, code, importer, injectSsrFlag(args[0]));
@@ -65485,7 +65511,10 @@ async function preview(inlineConfig = {}) {
         app.use(proxyMiddleware(httpServer, proxy, config));
     }
     app.use(compression());
-    const previewBase = config.base === './' || config.base === '' ? '/' : config.base;
+    // base
+    if (config.base !== '/') {
+        app.use(baseMiddleware(config.rawBase, false));
+    }
     // static assets
     const headers = config.preview.headers;
     const viteAssetMiddleware = (...args) => sirv(distDir, {
@@ -65504,23 +65533,22 @@ async function preview(inlineConfig = {}) {
             return shouldServeFile(filePath, distDir);
         },
     })(...args);
-    app.use(previewBase, viteAssetMiddleware);
+    app.use(viteAssetMiddleware);
     // html fallback
     if (config.appType === 'spa' || config.appType === 'mpa') {
-        app.use(previewBase, htmlFallbackMiddleware(distDir, config.appType === 'spa', previewBase !== '/'));
+        app.use(htmlFallbackMiddleware(distDir, config.appType === 'spa'));
     }
     // apply post server hooks from plugins
     postHooks.forEach((fn) => fn && fn());
     if (config.appType === 'spa' || config.appType === 'mpa') {
         // transform index.html
-        app.use(previewBase, indexHtmlMiddleware(distDir, server));
+        app.use(indexHtmlMiddleware(distDir, server));
         // handle 404s
-        app.use(previewBase, notFoundMiddleware());
+        app.use(notFoundMiddleware());
     }
     const hostname = await resolveHostname(options.host);
     const port = options.port ?? DEFAULT_PREVIEW_PORT;
-    const protocol = options.https ? 'https' : 'http';
-    const serverPort = await httpServerStart(httpServer, {
+    await httpServerStart(httpServer, {
         port,
         strictPort: options.strictPort,
         host: hostname.host,
@@ -65528,10 +65556,11 @@ async function preview(inlineConfig = {}) {
     });
     server.resolvedUrls = await resolveServerUrls(httpServer, config.preview, config);
     if (options.open) {
-        const path = typeof options.open === 'string' ? options.open : previewBase;
-        openBrowser(path.startsWith('http')
-            ? path
-            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, logger);
+        const url = server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+        if (url) {
+            const path = typeof options.open === 'string' ? new URL(options.open, url).href : url;
+            openBrowser(path, true, logger);
+        }
     }
     return server;
 }
@@ -65565,7 +65594,7 @@ const promisifiedRealpath = promisify$4(fs$l.realpath);
 function defineConfig(config) {
     return config;
 }
-async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development') {
+async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development', isPreview = false) {
     let config = inlineConfig;
     let configFileDependencies = [];
     let mode = inlineConfig.mode || defaultMode;
@@ -65579,7 +65608,8 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     const configEnv = {
         mode,
         command,
-        ssrBuild: !!config.build?.ssr,
+        isSsrBuild: !!config.build?.ssr,
+        isPreview,
     };
     let { configFile } = config;
     if (configFile !== false) {
@@ -66157,7 +66187,7 @@ async function runConfigHook(config, plugins, configEnv) {
     let conf = config;
     for (const p of getSortedPluginsByHook('config', plugins)) {
         const hook = p.config;
-        const handler = hook && 'handler' in hook ? hook.handler : hook;
+        const handler = getHookHandler(hook);
         if (handler) {
             const res = await handler(conf, configEnv);
             if (res) {