vite 3.0.0-beta.7 → 3.0.0

package/dist/node/chunks/{dep-706f59ea.js → dep-561c5231.js}

@@ -22,7 +22,7 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promisify as promisify$4 } from 'node:util';
 import { promises } from 'node:dns';
 import resolve$5 from 'resolve';
-import { CLIENT_ENTRY, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, OPTIMIZABLE_ENTRY_RE, VALID_ID_PREFIX, FS_PREFIX, wildcardHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, loopbackHosts, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, JS_TYPES_RE, ESBUILD_MODULES_TARGET, CLIENT_DIR, NULL_BYTE_PLACEHOLDER, VERSION, VITE_PACKAGE_DIR, ENV_ENTRY, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, OPTIMIZABLE_ENTRY_RE, VALID_ID_PREFIX, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, JS_TYPES_RE, ESBUILD_MODULES_TARGET, CLIENT_DIR, NULL_BYTE_PLACEHOLDER, VERSION, VITE_PACKAGE_DIR, ENV_ENTRY, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5 from 'crypto';
 import require$$0$a from 'buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -12172,7 +12172,49 @@ async function resolveHostname(optionsHost) {
             name = localhostAddr;
         }
     }
-    return { host, name, implicit: optionsHost === undefined };
+    return { host, name };
+}
+async function resolveServerUrls(server, options, config) {
+    const address = server.address();
+    const isAddressInfo = (x) => x?.address;
+    if (!isAddressInfo(address)) {
+        return { local: [], network: [] };
+    }
+    const local = [];
+    const network = [];
+    const hostname = await resolveHostname(options.host);
+    const protocol = options.https ? 'https' : 'http';
+    const port = address.port;
+    const base = config.base === './' || config.base === '' ? '/' : config.base;
+    if (hostname.host && loopbackHosts.has(hostname.host)) {
+        let hostnameName = hostname.name;
+        if (hostnameName === '::1' ||
+            hostnameName === '0000:0000:0000:0000:0000:0000:0000:0001') {
+            hostnameName = `[${hostnameName}]`;
+        }
+        local.push(`${protocol}://${hostnameName}:${port}${base}`);
+    }
+    else {
+        Object.values(os$3.networkInterfaces())
+            .flatMap((nInterface) => nInterface ?? [])
+            .filter((detail) => detail &&
+            detail.address &&
+            // Node < v18
+            ((typeof detail.family === 'string' && detail.family === 'IPv4') ||
+                // Node >= v18
+                (typeof detail.family === 'number' && detail.family === 4)))
+            .forEach((detail) => {
+            const host = detail.address.replace('127.0.0.1', hostname.name);
+            const url = `${protocol}://${host}:${port}${base}`;
+            if (detail.address.includes('127.0.0.1')) {
+                local.push(url);
+            }
+            else {
+                network.push(url);
+            }
+        });
+    }
+    return { local, network };
 }
 function arraify(target) {
     return Array.isArray(target) ? target : [target];
@@ -12491,64 +12533,18 @@ function createLogger(level = 'info', options = {}) {
     };
     return logger;
 }
-async function printCommonServerUrls(server, options, config) {
-    const address = server.address();
-    const isAddressInfo = (x) => x?.address;
-    if (isAddressInfo(address)) {
-        const hostname = await resolveHostname(options.host);
-        const protocol = options.https ? 'https' : 'http';
-        const base = config.base === './' || config.base === '' ? '/' : config.base;
-        printServerUrls(hostname, protocol, address.port, base, config.logger.info);
+function printServerUrls(urls, optionsHost, info) {
+    const colorUrl = (url) => picocolors.exports.cyan(url.replace(/:(\d+)\//, (_, port) => `:${picocolors.exports.bold(port)}/`));
+    for (const url of urls.local) {
+        info(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Local')}:   ${colorUrl(url)}`);
     }
-}
-function printServerUrls(hostname, protocol, port, base, info) {
-    const urls = [];
-    const notes = [];
-    if (hostname.host && loopbackHosts.has(hostname.host)) {
-        let hostnameName = hostname.name;
-        if (hostnameName === '::1' ||
-            hostnameName === '0000:0000:0000:0000:0000:0000:0000:0001') {
-            hostnameName = `[${hostnameName}]`;
-        }
-        urls.push({
-            label: 'Local',
-            url: picocolors.exports.cyan(`${protocol}://${hostnameName}:${picocolors.exports.bold(port)}${base}`)
-        });
-        if (hostname.implicit) {
-            urls.push({
-                label: 'Network',
-                url: `use ${picocolors.exports.white(picocolors.exports.bold('--host'))} to expose`,
-                disabled: true
-            });
-        }
+    for (const url of urls.network) {
+        info(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Network')}: ${colorUrl(url)}`);
     }
-    else {
-        Object.values(os$3.networkInterfaces())
-            .flatMap((nInterface) => nInterface ?? [])
-            .filter((detail) => detail &&
-            detail.address &&
-            // Node < v18
-            ((typeof detail.family === 'string' && detail.family === 'IPv4') ||
-                // Node >= v18
-                (typeof detail.family === 'number' && detail.family === 4)))
-            .forEach((detail) => {
-            const host = detail.address.replace('127.0.0.1', hostname.name);
-            const url = `${protocol}://${host}:${picocolors.exports.bold(port)}${base}`;
-            const label = detail.address.includes('127.0.0.1') ? 'Local' : 'Network';
-            urls.push({ label, url: picocolors.exports.cyan(url) });
-        });
+    if (urls.network.length === 0 && optionsHost === undefined) {
+        const note = `use ${picocolors.exports.white(picocolors.exports.bold('--host'))} to expose`;
+        info(picocolors.exports.dim(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Network')}: ${note}`));
     }
-    const length = Math.max(...[...urls, ...notes].map(({ label }) => label.length));
-    const print = (iconWithColor, label, messageWithColor, disabled) => {
-        const message = `  ${iconWithColor}  ${label ? picocolors.exports.bold(label) + ':' : ' '} ${' '.repeat(length - label.length)}${messageWithColor}`;
-        info(disabled ? picocolors.exports.dim(message) : message);
-    };
-    urls.forEach(({ label, url: text, disabled }) => {
-        print(picocolors.exports.green('➜'), label, text, disabled);
-    });
-    notes.forEach(({ label, message: text }) => {
-        print(picocolors.exports.white('❖'), label, text);
-    });
 }
 
 const writeColors = {
@@ -33823,7 +33819,8 @@ function resolvePlugin(resolveOptions) {
                 scan: resolveOpts?.scan ?? resolveOptions.scan
             };
             if (importer) {
-                if (isTsRequest(importer)) {
+                if (isTsRequest(importer) ||
+                    resolveOpts.custom?.depScan?.loader?.startsWith('ts')) {
                     options.isFromTsImporter = true;
                 }
                 else {
@@ -34950,6 +34947,8 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 skip.add(this._activePlugin);
             }
             let out = await container.resolveId(id, importer, {
+                custom: options?.custom,
+                isEntry: !!options?.isEntry,
                 skip,
                 ssr: this.ssr,
                 scan: this._scan
@@ -35168,7 +35167,6 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
             const skip = options?.skip;
             const ssr = options?.ssr;
             const scan = !!options?.scan;
-            const isEntry = !!options?.isEntry;
             const ctx = new Context();
             ctx.ssr = !!ssr;
             ctx._scan = scan;
@@ -35183,7 +35181,12 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                     continue;
                 ctx._activePlugin = plugin;
                 const pluginResolveStart = isDebug ? performance.now() : 0;
-                const result = await plugin.resolveId.call(ctx, rawId, importer, { ssr, scan, isEntry });
+                const result = await plugin.resolveId.call(ctx, rawId, importer, {
+                    custom: options?.custom,
+                    isEntry: !!options?.isEntry,
+                    ssr,
+                    scan
+                });
                 if (!result)
                     continue;
                 if (typeof result === 'string') {
@@ -35788,12 +35791,13 @@ const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const contextRE = /\bcontext\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 function esbuildScanPlugin(config, container, depImports, missing, entries) {
     const seen = new Map();
-    const resolve = async (id, importer) => {
+    const resolve = async (id, importer, options) => {
         const key = id + (importer && path$n.dirname(importer));
         if (seen.has(key)) {
             return seen.get(key);
         }
         const resolved = await container.resolveId(id, importer && normalizePath$3(importer), {
+            ...options,
             scan: true
         });
         const res = resolved?.id;
@@ -35910,13 +35914,19 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                             }
                             scripts[key] = {
                                 loader: 'js',
-                                contents: (await transformGlobImport(transpiledContents, path, config.root, resolve))?.s.toString() || transpiledContents
+                                contents: (await transformGlobImport(transpiledContents, path, config.root, resolve))?.s.toString() || transpiledContents,
+                                pluginData: {
+                                    htmlType: { loader }
+                                }
                             };
                         }
                         else {
                             scripts[key] = {
                                 loader,
-                                contents
+                                contents,
+                                pluginData: {
+                                    htmlType: { loader }
+                                }
                             };
                         }
                         const virtualModulePath = JSON.stringify(virtualModulePrefix + key);
@@ -36006,9 +36016,13 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
             // catch all -------------------------------------------------------------
             build.onResolve({
                 filter: /.*/
-            }, async ({ path: id, importer }) => {
+            }, async ({ path: id, importer, pluginData }) => {
                 // use vite resolver to support urls and omitted extensions
-                const resolved = await resolve(id, importer);
+                const resolved = await resolve(id, importer, {
+                    custom: {
+                        depScan: { loader: pluginData?.htmlType?.loader }
+                    }
+                });
                 if (resolved) {
                     if (shouldExternalizeDep(resolved, id) || !isScannable(resolved)) {
                         return externalUnlessEntry({ path: id });
@@ -36189,41 +36203,41 @@ async function createDepsOptimizer(config, server) {
         }
         if (!isBuild) {
             // Important, the scanner is dev only
-            runScanner();
-        }
-    }
-    async function runScanner() {
-        const scanPhaseProcessing = newDepOptimizationProcessing();
-        depsOptimizer.scanProcessing = scanPhaseProcessing.promise;
-        try {
-            debuggerViteDeps(picocolors.exports.green(`scanning for dependencies...`));
-            const deps = await discoverProjectDependencies(config);
-            debuggerViteDeps(picocolors.exports.green(Object.keys(deps).length > 0
-                ? `dependencies found by scanner: ${depsLogString(Object.keys(deps))}`
-                : `no dependencies found by scanner`));
-            // Add these dependencies to the discovered list, as these are currently
-            // used by the preAliasPlugin to support aliased and optimized deps.
-            // This is also used by the CJS externalization heuristics in legacy mode
-            for (const id of Object.keys(deps)) {
-                if (!metadata.discovered[id]) {
-                    addMissingDep(id, deps[id]);
-                }
-            }
-            if (!isBuild) {
-                const knownDeps = prepareKnownDeps();
-                // For dev, we run the scanner and the first optimization
-                // run on the background, but we wait until crawling has ended
-                // to decide if we send this result to the browser or we need to
-                // do another optimize step
-                postScanOptimizationResult = runOptimizeDeps(config, knownDeps);
-            }
-        }
-        catch (e) {
-            logger.error(e.message);
-        }
-        finally {
-            scanPhaseProcessing.resolve();
-            depsOptimizer.scanProcessing = undefined;
+            const scanPhaseProcessing = newDepOptimizationProcessing();
+            depsOptimizer.scanProcessing = scanPhaseProcessing.promise;
+            // Ensure server listen is called before the scanner
+            setTimeout(async () => {
+                try {
+                    debuggerViteDeps(picocolors.exports.green(`scanning for dependencies...`));
+                    const deps = await discoverProjectDependencies(config);
+                    debuggerViteDeps(picocolors.exports.green(Object.keys(deps).length > 0
+                        ? `dependencies found by scanner: ${depsLogString(Object.keys(deps))}`
+                        : `no dependencies found by scanner`));
+                    // Add these dependencies to the discovered list, as these are currently
+                    // used by the preAliasPlugin to support aliased and optimized deps.
+                    // This is also used by the CJS externalization heuristics in legacy mode
+                    for (const id of Object.keys(deps)) {
+                        if (!metadata.discovered[id]) {
+                            addMissingDep(id, deps[id]);
+                        }
+                    }
+                    if (!isBuild) {
+                        const knownDeps = prepareKnownDeps();
+                        // For dev, we run the scanner and the first optimization
+                        // run on the background, but we wait until crawling has ended
+                        // to decide if we send this result to the browser or we need to
+                        // do another optimize step
+                        postScanOptimizationResult = runOptimizeDeps(config, knownDeps);
+                    }
+                }
+                catch (e) {
+                    logger.error(e.message);
+                }
+                finally {
+                    scanPhaseProcessing.resolve();
+                    depsOptimizer.scanProcessing = undefined;
+                }
+            }, 0);
         }
     }
     async function startNextDiscoveredBatch() {
@@ -36640,7 +36654,8 @@ const isDebugEnabled = _debug('vite:deps').enabled;
 const jsExtensionRE = /\.js$/i;
 const jsMapExtensionRE = /\.js\.map$/i;
 /**
- * Used by Vite CLI when running `vite optimize`
+ * Scan and optimize dependencies within a project.
+ * Used by Vite CLI when running `vite optimize`.
  */
 async function optimizeDeps(config, force = config.optimizeDeps.force, asCommand = false) {
     const log = asCommand ? config.logger.info : debug$a;
@@ -36870,8 +36885,7 @@ async function runOptimizeDeps(resolvedConfig, depsInfo, ssr = !!resolvedConfig.
             // They're not supported yet because `optimizeDeps.exclude` currently only accepts strings
             if (!Array.isArray(rollupOptionsExternal) ||
                 rollupOptionsExternal.some((ext) => typeof ext !== 'string')) {
-                throw new Error(`[vite] 'build.rollupOptions.external' can only be an array of strings or a string.\n` +
-                    `You can turn on 'legacy.buildRollupPluginCommonjs' to support more advanced options.`);
+                throw new Error(`[vite] 'build.rollupOptions.external' can only be an array of strings or a string when using esbuild optimization at build time.`);
             }
             external.push(...rollupOptionsExternal);
         }
@@ -37941,18 +37955,22 @@ function createIsConfiguredAsSsrExternal(config) {
     const noExternalFilter = noExternal !== 'undefined' &&
         typeof noExternal !== 'boolean' &&
         createFilter(undefined, noExternal, { resolve: false });
+    // Returns true if it is configured as external, false if it is filtered
+    // by noExternal and undefined if it isn't affected by the explicit config
     return (id) => {
         const { ssr } = config;
-        if (!ssr || ssr.external?.includes(id)) {
-            return true;
-        }
-        if (typeof noExternal === 'boolean') {
-            return !noExternal;
-        }
-        if (noExternalFilter) {
-            return noExternalFilter(id);
+        if (ssr) {
+            if (ssr.external?.includes(id)) {
+                return true;
+            }
+            if (typeof noExternal === 'boolean') {
+                return !noExternal;
+            }
+            if (noExternalFilter && !noExternalFilter(id)) {
+                return false;
+            }
         }
-        return true;
+        return undefined;
     };
 }
 function createIsSsrExternal(config) {
@@ -37976,9 +37994,11 @@ function createIsSsrExternal(config) {
         if (processedIds.has(id)) {
             return processedIds.get(id);
         }
-        const external = !id.startsWith('.') &&
-            !path$n.isAbsolute(id) &&
-            (isBuiltin(id) || (isConfiguredAsExternal(id) && isValidPackageEntry(id)));
+        let external = false;
+        if (!id.startsWith('.') && !path$n.isAbsolute(id)) {
+            external =
+                isBuiltin(id) || (isConfiguredAsExternal(id) ?? isValidPackageEntry(id));
+        }
         processedIds.set(id, external);
         return external;
     };
@@ -38760,11 +38780,11 @@ const ssrImportKey = `__vite_ssr_import__`;
 const ssrDynamicImportKey = `__vite_ssr_dynamic_import__`;
 const ssrExportAllKey = `__vite_ssr_exportAll__`;
 const ssrImportMetaKey = `__vite_ssr_import_meta__`;
-async function ssrTransform(code, inMap, url, options) {
+async function ssrTransform(code, inMap, url, originalCode, options) {
     if (options?.json?.stringify && isJSONRequest(url)) {
         return ssrTransformJSON(code, inMap);
     }
-    return ssrTransformScript(code, inMap, url);
+    return ssrTransformScript(code, inMap, url, originalCode);
 }
 async function ssrTransformJSON(code, inMap) {
     return {
@@ -38774,7 +38794,7 @@ async function ssrTransformJSON(code, inMap) {
         dynamicDeps: []
     };
 }
-async function ssrTransformScript(code, inMap, url) {
+async function ssrTransformScript(code, inMap, url, originalCode) {
     const s = new MagicString(code);
     let ast;
     try {
@@ -38953,11 +38973,13 @@ async function ssrTransformScript(code, inMap, url) {
                 sourcesContent: inMap.sourcesContent
             },
             inMap
-        ]);
+        ], false);
     }
     else {
         map.sources = [url];
-        map.sourcesContent = [code];
+        // needs to use originalCode instead of code
+        // because code might be already transformed even if map is null
+        map.sourcesContent = [originalCode];
     }
     return {
         code: s.toString(),
@@ -39474,7 +39496,7 @@ function serveStaticMiddleware(dir, server) {
             return;
         }
         if (redirected) {
-            req.url = redirected;
+            req.url = encodeURIComponent(redirected);
         }
         serve(req, res, next);
     };
@@ -39496,7 +39518,7 @@ function serveRawFsMiddleware(server) {
             url = url.slice(FS_PREFIX.length);
             if (isWindows$4)
                 url = url.replace(/^[A-Z]:/i, '');
-            req.url = url;
+            req.url = encodeURIComponent(url);
             serveFromRoot(req, res, next);
         }
         else {
@@ -39719,6 +39741,7 @@ async function loadAndTransform(id, url, server, options, timestamp) {
         inMap: map,
         ssr
     });
+    const originalCode = code;
     if (transformResult == null ||
         (isObject$2(transformResult) && transformResult.code == null)) {
         // no transform applied, keep code as-is
@@ -39737,7 +39760,7 @@ async function loadAndTransform(id, url, server, options, timestamp) {
         }
     }
     const result = ssr
-        ? await ssrTransform(code, map, url, {
+        ? await ssrTransform(code, map, url, originalCode, {
             json: { stringify: !!server.config.json?.stringify }
         })
         : {
@@ -40083,7 +40106,7 @@ function importAnalysisPlugin(config) {
                     if (ssr) {
                         return [url, url];
                     }
-                    this.error(`Failed to resolve import "${url}" from "${path$n.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
+                    return this.error(`Failed to resolve import "${url}" from "${path$n.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
                 }
                 const isRelative = url.startsWith('.');
                 const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
@@ -40455,6 +40478,7 @@ function transformCjsImport(importExp, url, rawUrl, importIndex) {
             else if (spec.type === 'ExportSpecifier' &&
                 spec.exported.type === 'Identifier') {
                 // for ExportSpecifier, local name is same as imported name
+                // prefix the variable name to avoid clashing with other local variables
                 const importedName = spec.local.name;
                 // we want to specify exported name as variable and re-export it
                 const exportedName = spec.exported.name;
@@ -40463,8 +40487,9 @@ function transformCjsImport(importExp, url, rawUrl, importIndex) {
                     importNames.push({ importedName, localName: defaultExports });
                 }
                 else {
-                    importNames.push({ importedName, localName: exportedName });
-                    exportNames.push(exportedName);
+                    const localName = makeLegalIdentifier(`__vite__cjsExport_${exportedName}`);
+                    importNames.push({ importedName, localName });
+                    exportNames.push(`${localName} as ${exportedName}`);
                 }
             }
         }
@@ -40627,7 +40652,7 @@ function buildImportAnalysisPlugin(config) {
                     if (ssr) {
                         return [url, url];
                     }
-                    this.error(`Failed to resolve import "${url}" from "${path$n.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
+                    return this.error(`Failed to resolve import "${url}" from "${path$n.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
                 }
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js'`
@@ -41002,7 +41027,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await import('./dep-5d9e5830.js').then(function (n) { return n.c; });
+    const { parse, transform } = await import('./dep-f2ffe191.js').then(function (n) { return n.c; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -42132,7 +42157,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-d3bbad19.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-eb5668bc.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -43193,13 +43218,14 @@ function resolveBuildOptions(raw, isBuild, logger) {
 }
 function resolveBuildPlugins(config) {
     const options = config.build;
+    const { commonjsOptions } = options;
+    const usePluginCommonjs = !Array.isArray(commonjsOptions?.include) ||
+        commonjsOptions?.include.length !== 0;
     return {
         pre: [
             ...(options.watch ? [ensureWatchPlugin()] : []),
             watchPackageDataPlugin(config),
-            ...(config.legacy?.buildRollupPluginCommonjs
-                ? [commonjs(options.commonjsOptions)]
-                : []),
+            ...(usePluginCommonjs ? [commonjs(options.commonjsOptions)] : []),
             dataURIPlugin(),
             assetImportMetaUrlPlugin(config),
             ...(options.rollupOptions.plugins
@@ -49989,9 +50015,6 @@ async function resolveHttpsConfig(https, cacheDir) {
         key: readFileIfExists(key),
         pfx: readFileIfExists(pfx)
     });
-    if (!httpsOption.key || !httpsOption.cert) {
-        httpsOption.cert = httpsOption.key = await getCertificate(cacheDir);
-    }
     return httpsOption;
 }
 function readFileIfExists(value) {
@@ -50005,27 +50028,6 @@ function readFileIfExists(value) {
     }
     return value;
 }
-async function getCertificate(cacheDir) {
-    const cachePath = path$n.join(cacheDir, '_cert.pem');
-    try {
-        const [stat, content] = await Promise.all([
-            promises$2.stat(cachePath),
-            promises$2.readFile(cachePath, 'utf8')
-        ]);
-        if (Date.now() - stat.ctime.valueOf() > 30 * 24 * 60 * 60 * 1000) {
-            throw new Error('cache is outdated.');
-        }
-        return content;
-    }
-    catch {
-        const content = (await import('./dep-e8d443bf.js')).createCertificate();
-        promises$2
-            .mkdir(cacheDir, { recursive: true })
-            .then(() => promises$2.writeFile(cachePath, content))
-            .catch(() => { });
-        return content;
-    }
-}
 async function httpServerStart(httpServer, serverOptions) {
     let { port, strictPort, host, logger } = serverOptions;
     return new Promise((resolve, reject) => {
@@ -58896,7 +58898,7 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
 async function createServer(inlineConfig = {}) {
     const config = await resolveConfig(inlineConfig, 'serve', 'development');
     const { root, server: serverConfig } = config;
-    const httpsOptions = await resolveHttpsConfig(config.server.https, config.cacheDir);
+    const httpsOptions = await resolveHttpsConfig(config.server.https);
     const { middlewareMode } = serverConfig;
     const middlewares = connect();
     const httpServer = middlewareMode
@@ -58928,8 +58930,9 @@ async function createServer(inlineConfig = {}) {
         pluginContainer: container,
         ws,
         moduleGraph,
+        resolvedUrls: null,
         ssrTransform(code, inMap, url) {
-            return ssrTransform(code, inMap, url, {
+            return ssrTransform(code, inMap, url, code, {
                 json: { stringify: server.config.json?.stringify }
             });
         },
@@ -58953,8 +58956,12 @@ async function createServer(inlineConfig = {}) {
         ssrRewriteStacktrace(stack) {
             return ssrRewriteStacktrace(stack, moduleGraph);
         },
-        listen(port, isRestart) {
-            return startServer(server, port, isRestart);
+        async listen(port, isRestart) {
+            await startServer(server, port, isRestart);
+            if (httpServer) {
+                server.resolvedUrls = await resolveServerUrls(httpServer, config.server, config);
+            }
+            return server;
         },
         async close() {
             if (!middlewareMode) {
@@ -58969,14 +58976,18 @@ async function createServer(inlineConfig = {}) {
                 container.close(),
                 closeHttpServer()
             ]);
+            server.resolvedUrls = null;
         },
-        async printUrls() {
-            if (httpServer) {
-                await printCommonServerUrls(httpServer, config.server, config);
+        printUrls() {
+            if (server.resolvedUrls) {
+                printServerUrls(server.resolvedUrls, serverConfig.host, config.logger.info);
             }
-            else {
+            else if (middlewareMode) {
                 throw new Error('cannot print server URLs in middleware mode.');
             }
+            else {
+                throw new Error('cannot print server URLs before server.listen is called.');
+            }
         },
         async restart(forceOptimize) {
             if (!server._restartPromise) {
@@ -59185,7 +59196,6 @@ async function startServer(server, inlinePort, isRestart = false) {
             ? path
             : `${protocol}://${hostname.name}:${serverPort}${path}`, true, server.config.logger);
     }
-    return server;
 }
 function createServerCloseFn(server) {
     if (!server) {
@@ -59452,7 +59462,7 @@ function resolvePreviewOptions(preview, server) {
 async function preview(inlineConfig = {}) {
     const config = await resolveConfig(inlineConfig, 'serve', 'production');
     const app = connect();
-    const httpServer = await resolveHttpServer(config.preview, app, await resolveHttpsConfig(config.preview?.https, config.cacheDir));
+    const httpServer = await resolveHttpServer(config.preview, app, await resolveHttpsConfig(config.preview?.https));
     // apply server hooks from plugins
     const postHooks = [];
     for (const plugin of config.plugins) {
@@ -59492,6 +59502,7 @@ async function preview(inlineConfig = {}) {
         host: hostname.host,
         logger
     });
+    const resolvedUrls = await resolveServerUrls(httpServer, config.preview, config);
     if (options.open) {
         const path = typeof options.open === 'string' ? options.open : previewBase;
         openBrowser(path.startsWith('http')
@@ -59501,8 +59512,9 @@ async function preview(inlineConfig = {}) {
     return {
         config,
         httpServer,
-        async printUrls() {
-            await printCommonServerUrls(httpServer, config.preview, config);
+        resolvedUrls,
+        printUrls() {
+            printServerUrls(resolvedUrls, options.host, logger.info);
         }
     };
 }
@@ -59525,6 +59537,10 @@ function clientInjectionsPlugin(config) {
         name: 'vite:client-inject',
         async transform(code, id, options) {
             if (id === normalizedClientEntry || id === normalizedEnvEntry) {
+                const resolvedServerHostname = (await resolveHostname(config.server.host)).name;
+                const resolvedServerPort = config.server.port;
+                const devBase = config.base;
+                const serverHost = `${resolvedServerHostname}:${resolvedServerPort}${devBase}`;
                 let hmrConfig = config.server.hmr;
                 hmrConfig = isObject$2(hmrConfig) ? hmrConfig : undefined;
                 const host = hmrConfig?.host || null;
@@ -59537,9 +59553,8 @@ function clientInjectionsPlugin(config) {
                 if (config.server.middlewareMode) {
                     port || (port = 24678);
                 }
-                const devBase = config.base;
-                let directTarget = hmrConfig?.host || (await resolveHostname(config.server.host)).name;
-                directTarget += `:${hmrConfig?.port || config.server.port}`;
+                let directTarget = hmrConfig?.host || resolvedServerHostname;
+                directTarget += `:${hmrConfig?.port || resolvedServerPort}`;
                 directTarget += devBase;
                 let hmrBase = devBase;
                 if (hmrConfig?.path) {
@@ -59549,6 +59564,7 @@ function clientInjectionsPlugin(config) {
                     .replace(`__MODE__`, JSON.stringify(config.mode))
                     .replace(`__BASE__`, JSON.stringify(devBase))
                     .replace(`__DEFINES__`, serializeDefine(config.define || {}))
+                    .replace(`__SERVER_HOST__`, JSON.stringify(serverHost))
                     .replace(`__HMR_PROTOCOL__`, JSON.stringify(protocol))
                     .replace(`__HMR_HOSTNAME__`, JSON.stringify(host))
                     .replace(`__HMR_PORT__`, JSON.stringify(port))
@@ -62221,6 +62237,7 @@ function resolveSSROptions(ssr, buildSsrCjsExternalHeuristics, preserveSymlinks)
         target,
         ...ssr,
         optimizeDeps: {
+            disabled: true,
             ...optimizeDeps,
             esbuildOptions: {
                 preserveSymlinks,
@@ -62250,6 +62267,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     if (mode === 'production') {
         process.env.NODE_ENV = 'production';
     }
+    // production env would not work in serve, fallback to development
+    if (command === 'serve' && process.env.NODE_ENV === 'production') {
+        process.env.NODE_ENV = 'development';
+    }
     const configEnv = {
         mode,
         command,
@@ -62304,6 +62325,14 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             }
         }
     }
+    if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
+        config = mergeConfig(config, {
+            optimizeDeps: { disabled: false },
+            ssr: { optimizeDeps: { disabled: false } }
+        });
+        config.build ?? (config.build = {});
+        config.build.commonjsOptions = { include: [] };
+    }
     // resolve root
     const resolvedRoot = normalizePath$3(config.root ? path$n.resolve(config.root) : process.cwd());
     const clientAlias = [
@@ -62403,12 +62432,6 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     const ssr = resolveSSROptions(config.ssr, config.legacy?.buildSsrCjsExternalHeuristics, config.resolve?.preserveSymlinks);
     const middlewareMode = config?.server?.middlewareMode;
     const optimizeDeps = config.optimizeDeps || {};
-    if (process.env.VITE_TEST_LEGACY_CJS_PLUGIN) {
-        config.legacy = {
-            ...config.legacy,
-            buildRollupPluginCommonjs: true
-        };
-    }
     const BASE_URL = resolvedBase;
     const resolved = {
         ...config,
@@ -62444,6 +62467,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         packageCache: new Map(),
         createResolver,
         optimizeDeps: {
+            disabled: 'build',
             ...optimizeDeps,
             esbuildOptions: {
                 preserveSymlinks: config.resolve?.preserveSymlinks,
@@ -62451,7 +62475,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             }
         },
         worker: resolvedWorkerOptions,
-        appType: config.appType ?? middlewareMode === 'ssr' ? 'custom' : 'spa',
+        appType: config.appType ?? (middlewareMode === 'ssr' ? 'custom' : 'spa'),
         experimental: {
             importGlobRestoreExtension: false,
             hmrPartialAccept: false,
@@ -62470,22 +62494,6 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         resolved.optimizeDeps.force = true;
         logger.warn(picocolors.exports.yellow(`server.force is deprecated, use optimizeDeps.force instead`));
     }
-    if (resolved.legacy?.buildRollupPluginCommonjs) {
-        const optimizerDisabled = resolved.optimizeDeps.disabled;
-        if (!optimizerDisabled) {
-            resolved.optimizeDeps.disabled = 'build';
-        }
-        else if (optimizerDisabled === 'dev') {
-            resolved.optimizeDeps.disabled = true; // Also disabled during build
-        }
-        const ssrOptimizerDisabled = resolved.ssr.optimizeDeps.disabled;
-        if (!ssrOptimizerDisabled) {
-            resolved.ssr.optimizeDeps.disabled = 'build';
-        }
-        else if (ssrOptimizerDisabled === 'dev') {
-            resolved.ssr.optimizeDeps.disabled = true; // Also disabled during build
-        }
-    }
     // Some plugins that aren't intended to work in the bundling of workers (doing post-processing at build time for example).
     // And Plugins may also have cached that could be corrupted by being used in these extra rollup calls.
     // So we need to separate the worker plugin from the plugin that vite needs to run.