vite 3.0.0-alpha.12 → 3.0.0-alpha.13

package/dist/node/chunks/{dep-9b1a7a5b.js → dep-0115731f.js}

@@ -1,5 +1,5 @@
 import require$$0 from 'postcss';
-import { x as commonjsGlobal } from './dep-7d4129cb.js';
+import { x as commonjsGlobal } from './dep-5d9a8c71.js';
 import path$2 from 'path';
 import require$$1 from 'crypto';
 import fs__default from 'fs';

package/dist/node/chunks/{dep-82a07453.js → dep-4cea16ce.js}

@@ -1,4 +1,4 @@
-import { x as commonjsGlobal } from './dep-7d4129cb.js';
+import { x as commonjsGlobal } from './dep-5d9a8c71.js';
 import require$$1 from 'crypto';
 import 'fs';
 import 'path';
@@ -16,7 +16,6 @@ import 'http';
 import 'stream';
 import 'os';
 import 'child_process';
-import 'dns';
 import '../constants.js';
 import 'buffer';
 import 'querystring';

package/dist/node/chunks/{dep-7d4129cb.js → dep-5d9a8c71.js}

@@ -15,7 +15,6 @@ import require$$1$3, { STATUS_CODES } from 'http';
 import require$$0$5 from 'stream';
 import require$$1 from 'os';
 import require$$2, { execSync } from 'child_process';
-import { promises as promises$1 } from 'dns';
 import require$$1$2, { createHash as createHash$2 } from 'crypto';
 import { CLIENT_ENTRY, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, VALID_ID_PREFIX, FS_PREFIX, wildcardHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, loopbackHosts, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, JS_TYPES_RE, CLIENT_DIR, NULL_BYTE_PLACEHOLDER, VERSION, VITE_PACKAGE_DIR, ENV_ENTRY, DEFAULT_ASSETS_RE } from '../constants.js';
 import require$$0$6 from 'buffer';
@@ -11951,6 +11950,19 @@ function transformResult(s, id, config) {
         map: needSourceMap ? s.generateMap({ hires: true, source: id }) : null
     };
 }
+async function asyncFlatten(arr) {
+    do {
+        arr = (await Promise.all(arr)).flat(Infinity);
+    } while (arr.some((v) => v?.then));
+    return arr;
+}
+// strip UTF-8 BOM
+function stripBomTag(content) {
+    if (content.charCodeAt(0) === 0xfeff) {
+        return content.slice(1);
+    }
+    return content;
+}
 
 /* eslint no-console: 0 */
 const LogLevels = {
@@ -12073,9 +12085,10 @@ function printServerUrls(hostname, protocol, port, base, info) {
             url: colors$1.cyan(`${protocol}://${hostnameName}:${colors$1.bold(port)}${base}`)
         });
         if (hostname.name === 'localhost') {
-            notes.push({
-                label: 'Hint',
-                message: colors$1.dim(`Use ${colors$1.white(colors$1.bold('--host'))} to expose to network.`)
+            urls.push({
+                label: 'Network',
+                url: `use ${colors$1.white(colors$1.bold('--host'))} to expose`,
+                disabled: true
             });
         }
     }
@@ -12095,18 +12108,13 @@ function printServerUrls(hostname, protocol, port, base, info) {
             urls.push({ label, url: colors$1.cyan(url) });
         });
     }
-    if (!hostname.host || wildcardHosts.has(hostname.host)) {
-        notes.push({
-            label: 'Note',
-            message: colors$1.dim('You are using a wildcard host. Ports might be overridden.')
-        });
-    }
     const length = Math.max(...[...urls, ...notes].map(({ label }) => label.length));
-    const print = (iconWithColor, label, messageWithColor) => {
-        info(`  ${iconWithColor}  ${colors$1.bold(label)}: ${' '.repeat(length - label.length)}${messageWithColor}`);
+    const print = (iconWithColor, label, messageWithColor, disabled) => {
+        const message = `  ${iconWithColor}  ${label ? colors$1.bold(label) + ':' : ' '} ${' '.repeat(length - label.length)}${messageWithColor}`;
+        info(disabled ? colors$1.dim(message) : message);
     };
-    urls.forEach(({ label, url: text }) => {
-        print(colors$1.green('➜'), label, text);
+    urls.forEach(({ label, url: text, disabled }) => {
+        print(colors$1.green('➜'), label, text, disabled);
     });
     notes.forEach(({ label, message: text }) => {
         print(colors$1.white('❖'), label, text);
@@ -13290,11 +13298,20 @@ function manifestPlugin(config) {
                 }
                 return manifestChunk;
             }
+            function createAsset(chunk) {
+                return {
+                    file: chunk.fileName,
+                    src: chunk.name
+                };
+            }
             for (const file in bundle) {
                 const chunk = bundle[file];
                 if (chunk.type === 'chunk') {
                     manifest[getChunkName(chunk)] = createChunk(chunk);
                 }
+                else if (chunk.type === 'asset' && typeof chunk.name === 'string') {
+                    manifest[chunk.name] = createAsset(chunk);
+                }
             }
             outputCount++;
             const output = config.build.rollupOptions?.output;
@@ -14725,7 +14742,7 @@ const debug$c = createDebugger('vite:resolve-details', {
     onlyWhenFocused: true
 });
 function resolvePlugin(baseOptions) {
-    const { root, isBuild, isProduction, asSrc, ssrConfig, preferRelative = false } = baseOptions;
+    const { root, isProduction, asSrc, ssrConfig, preferRelative = false } = baseOptions;
     const { target: ssrTarget, noExternal: ssrNoExternal } = ssrConfig ?? {};
     return {
         name: 'vite:resolve',
@@ -14798,7 +14815,7 @@ function resolvePlugin(baseOptions) {
                     // Optimized files could not yet exist in disk, resolve to the full path
                     // Inject the current browserHash version if the path doesn't have one
                     if (!normalizedFsPath.match(DEP_VERSION_RE)) {
-                        const browserHash = optimizedDepInfoFromFile(depsOptimizer.metadata, normalizedFsPath)?.browserHash;
+                        const browserHash = optimizedDepInfoFromFile(depsOptimizer.metadata({ ssr }), normalizedFsPath)?.browserHash;
                         if (browserHash) {
                             return injectQuery(normalizedFsPath, `v=${browserHash}`);
                         }
@@ -14856,9 +14873,8 @@ function resolvePlugin(baseOptions) {
                 if (!external &&
                     asSrc &&
                     depsOptimizer &&
-                    (isBuild || !ssr) &&
                     !options.scan &&
-                    (res = await tryOptimizedResolve(depsOptimizer, id, importer))) {
+                    (res = await tryOptimizedResolve(depsOptimizer, ssr, id, importer))) {
                     return res;
                 }
                 if (targetWeb &&
@@ -15003,6 +15019,7 @@ function tryResolveFile(file, postfix, options, tryIndex, targetWeb, tryPrefix,
 const idToPkgMap = new Map();
 function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, externalize) {
     const { root, dedupe, isBuild, preserveSymlinks, packageCache } = options;
+    ssr ?? (ssr = false);
     // split id by last '>' for nested selected packages, for example:
     // 'foo > bar > baz' => 'foo > bar' & 'baz'
     // 'foo'             => ''          & 'foo'
@@ -15129,7 +15146,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         // otherwise we may introduce duplicated modules for externalized files
         // from pre-bundled deps.
         if (!isBuild) {
-            const versionHash = depsOptimizer.metadata.browserHash;
+            const versionHash = depsOptimizer.metadata({ ssr }).browserHash;
             if (versionHash && isJsType) {
                 resolved = injectQuery(resolved, `v=${versionHash}`);
             }
@@ -15138,7 +15155,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
     else {
         // this is a missing import, queue optimize-deps re-run and
         // get a resolved its optimized info
-        const optimizedInfo = depsOptimizer.registerMissingImport(id, resolved);
+        const optimizedInfo = depsOptimizer.registerMissingImport(id, resolved, ssr);
         resolved = depsOptimizer.getOptimizedDepId(optimizedInfo);
     }
     if (isBuild) {
@@ -15153,9 +15170,13 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         return { id: resolved };
     }
 }
-async function tryOptimizedResolve(depsOptimizer, id, importer) {
+async function tryOptimizedResolve(depsOptimizer, ssr, id, importer) {
     await depsOptimizer.scanProcessing;
-    const depInfo = optimizedDepInfoFromId(depsOptimizer.metadata, id);
+    const metadata = depsOptimizer.metadata({ ssr });
+    if (!metadata) {
+        return;
+    }
+    const depInfo = optimizedDepInfoFromId(metadata, id);
     if (depInfo) {
         return depsOptimizer.getOptimizedDepId(depInfo);
     }
@@ -15163,7 +15184,7 @@ async function tryOptimizedResolve(depsOptimizer, id, importer) {
         return;
     // further check if id is imported by nested dependency
     let resolvedSrc;
-    for (const optimizedData of depsOptimizer.metadata.depInfoList) {
+    for (const optimizedData of metadata.depInfoList) {
         if (!optimizedData.src)
             continue; // Ignore chunks
         const pkgPath = optimizedData.id;
@@ -15575,24 +15596,30 @@ function esbuildDepPlugin(qualified, exportsData, config) {
                 };
             });
             build.onLoad({ filter: /.*/, namespace: 'browser-external' }, ({ path }) => {
-                return {
-                    // Return in CJS to intercept named imports. Use `Object.create` to
-                    // create the Proxy in the prototype to workaround esbuild issue. Why?
-                    //
-                    // In short, esbuild cjs->esm flow:
-                    // 1. Create empty object using `Object.create(Object.getPrototypeOf(module.exports))`.
-                    // 2. Assign props of `module.exports` to the object.
-                    // 3. Return object for ESM use.
-                    //
-                    // If we do `module.exports = new Proxy({}, {})`, step 1 returns empty object,
-                    // step 2 does nothing as there's no props for `module.exports`. The final object
-                    // is just an empty object.
-                    //
-                    // Creating the Proxy in the prototype satisfies step 1 immediately, which means
-                    // the returned object is a Proxy that we can intercept.
-                    //
-                    // Note: Skip keys that are accessed by esbuild and browser devtools.
-                    contents: `\
+                if (config.isProduction) {
+                    return {
+                        contents: 'module.exports = {}'
+                    };
+                }
+                else {
+                    return {
+                        // Return in CJS to intercept named imports. Use `Object.create` to
+                        // create the Proxy in the prototype to workaround esbuild issue. Why?
+                        //
+                        // In short, esbuild cjs->esm flow:
+                        // 1. Create empty object using `Object.create(Object.getPrototypeOf(module.exports))`.
+                        // 2. Assign props of `module.exports` to the object.
+                        // 3. Return object for ESM use.
+                        //
+                        // If we do `module.exports = new Proxy({}, {})`, step 1 returns empty object,
+                        // step 2 does nothing as there's no props for `module.exports`. The final object
+                        // is just an empty object.
+                        //
+                        // Creating the Proxy in the prototype satisfies step 1 immediately, which means
+                        // the returned object is a Proxy that we can intercept.
+                        //
+                        // Note: Skip keys that are accessed by esbuild and browser devtools.
+                        contents: `\
 module.exports = Object.create(new Proxy({}, {
   get(_, key) {
     if (
@@ -15605,7 +15632,8 @@ module.exports = Object.create(new Proxy({}, {
     }
   }
 }))`
-                };
+                    };
+                }
             });
             // yarn 2 pnp compat
             if (isRunningWithYarnPnp) {
@@ -27991,6 +28019,20 @@ function fileToDevUrl(id, config) {
 function getAssetFilename(hash, config) {
     return assetHashToFilenameMap.get(config)?.get(hash);
 }
+function resolveAssetFileNames(config) {
+    const output = config.build?.rollupOptions?.output;
+    const defaultAssetFileNames = path$p.posix.join(config.build.assetsDir, '[name].[hash][extname]');
+    // Steps to determine which assetFileNames will be actually used.
+    // First, if output is an object or string, use assetFileNames in it.
+    // And a default assetFileNames as fallback.
+    let assetFileNames = (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
+        defaultAssetFileNames;
+    if (output && Array.isArray(output)) {
+        // Second, if output is an array, adopt assetFileNames in the first object.
+        assetFileNames = output[0].assetFileNames ?? assetFileNames;
+    }
+    return assetFileNames;
+}
 /**
  * converts the source filepath of the asset to the output filename based on the assetFileNames option. \
  * this function imitates the behavior of rollup.js. \
@@ -28102,18 +28144,7 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
         const contentHash = getHash(content);
         const { search, hash } = parse$m(id);
         const postfix = (search || '') + (hash || '');
-        const output = config.build?.rollupOptions?.output;
-        const defaultAssetFileNames = path$p.posix.join(config.build.assetsDir, '[name].[hash][extname]');
-        // Steps to determine which assetFileNames will be actually used.
-        // First, if output is an object or string, use assetFileNames in it.
-        // And a default assetFileNames as fallback.
-        let assetFileNames = (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
-            defaultAssetFileNames;
-        if (output && Array.isArray(output)) {
-            // Second, if output is an array, adopt assetFileNames in the first object.
-            assetFileNames = output[0].assetFileNames ?? assetFileNames;
-        }
-        const fileName = assetFileNamesToFileName(assetFileNames, file, contentHash, content);
+        const fileName = assetFileNamesToFileName(resolveAssetFileNames(config), file, contentHash, content);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);
         }
@@ -28426,6 +28457,7 @@ function jsonPlugin(options = {}, isBuild) {
                 return null;
             if (SPECIAL_QUERY_RE.test(id))
                 return null;
+            json = stripBomTag(json);
             try {
                 if (options.stringify) {
                     if (isBuild) {
@@ -29468,12 +29500,21 @@ function getDepsOptimizer(config) {
 async function initDepsOptimizer(config, server) {
     const { logger } = config;
     const isBuild = config.command === 'build';
-    const scan = config.command !== 'build' && config.optimizeDeps.devScan;
+    const scan = config.command !== 'build' && config.legacy?.devDepsScanner;
     const sessionTimestamp = Date.now().toString();
     const cachedMetadata = loadCachedDepOptimizationMetadata(config);
     let handle;
+    let ssrServerDepsMetadata;
+    let _metadata = cachedMetadata || initDepsOptimizerMetadata(config, sessionTimestamp);
     const depsOptimizer = {
-        metadata: cachedMetadata || initDepsOptimizerMetadata(config, sessionTimestamp),
+        metadata: (options) => {
+            if (isBuild || !options.ssr) {
+                return _metadata;
+            }
+            else {
+                return ssrServerDepsMetadata;
+            }
+        },
         registerMissingImport,
         run: () => debouncedProcessing(0),
         isOptimizedDepFile: (id) => isOptimizedDepFile(id, config),
@@ -29485,6 +29526,9 @@ async function initDepsOptimizer(config, server) {
         options: config.optimizeDeps
     };
     depsOptimizerMap.set(config, depsOptimizer);
+    if (!isBuild && config.ssr) {
+        ssrServerDepsMetadata = await optimizeServerSsrDeps(config);
+    }
     let newDepsDiscovered = false;
     let newDepsToLog = [];
     let newDepsToLogHandle;
@@ -29515,7 +29559,7 @@ async function initDepsOptimizer(config, server) {
         if (!scan) {
             // Initialize discovered deps with manually added optimizeDeps.include info
             const discovered = await initialProjectDependencies(config, sessionTimestamp);
-            const { metadata } = depsOptimizer;
+            const metadata = _metadata;
             for (const depInfo of Object.values(discovered)) {
                 addOptimizedDepInfo(metadata, 'discovered', {
                     ...depInfo,
@@ -29531,7 +29575,7 @@ async function initDepsOptimizer(config, server) {
             setTimeout(async () => {
                 try {
                     debuggerViteDeps(colors$1.green(`scanning for dependencies...`));
-                    const { metadata } = depsOptimizer;
+                    const metadata = _metadata;
                     const discovered = await discoverProjectDependencies(config, sessionTimestamp);
                     // Respect the scan phase discover order to improve reproducibility
                     for (const depInfo of Object.values(discovered)) {
@@ -29563,7 +29607,7 @@ async function initDepsOptimizer(config, server) {
         // Ensure that a rerun will not be issued for current discovered deps
         if (handle)
             clearTimeout(handle);
-        if (Object.keys(depsOptimizer.metadata.discovered).length === 0) {
+        if (Object.keys(_metadata.discovered).length === 0) {
             currentlyProcessing = false;
             return;
         }
@@ -29571,11 +29615,11 @@ async function initDepsOptimizer(config, server) {
         // a succesful completion of the optimizeDeps rerun will end up
         // creating new bundled version of all current and discovered deps
         // in the cache dir and a new metadata info object assigned
-        // to optimizeDeps.metadata. A fullReload is only issued if
-        // the previous bundled dependencies have changed.
-        // if the rerun fails, optimizeDeps.metadata remains untouched,
-        // current discovered deps are cleaned, and a fullReload is issued
-        let { metadata } = depsOptimizer;
+        // to _metadata. A fullReload is only issued if the previous bundled
+        // dependencies have changed.
+        // if the rerun fails, _metadata remains untouched, current discovered
+        // deps are cleaned, and a fullReload is issued
+        let metadata = _metadata;
         // All deps, previous known and newly discovered are rebundled,
         // respect insertion order to keep the metadata file stable
         const newDeps = {};
@@ -29655,7 +29699,7 @@ async function initDepsOptimizer(config, server) {
                 if (isRerun) {
                     newDepsToLog.push(...Object.keys(newData.optimized).filter((dep) => !metadata.optimized[dep]));
                 }
-                metadata = depsOptimizer.metadata = newData;
+                metadata = _metadata = newData;
                 resolveEnqueuedProcessingPromises();
             };
             if (!needsReload) {
@@ -29727,7 +29771,7 @@ async function initDepsOptimizer(config, server) {
         // debounce time to wait for new missing deps finished, issue a new
         // optimization of deps (both old and newly found) once the previous
         // optimizeDeps processing is finished
-        const deps = Object.keys(depsOptimizer.metadata.discovered);
+        const deps = Object.keys(_metadata.discovered);
         const depsString = depsLogString(deps);
         debuggerViteDeps(colors$1.green(`new dependencies found: ${depsString}`));
         runOptimizer();
@@ -29739,7 +29783,10 @@ async function initDepsOptimizer(config, server) {
         if (depsOptimizer.scanProcessing) {
             config.logger.error('Vite internal error: registering missing import before initial scanning is over');
         }
-        const { metadata } = depsOptimizer;
+        if (!isBuild && ssr) {
+            config.logger.error(`Error: ${id} is a missing dependency in SSR dev server, it needs to be added to optimizeDeps.include`);
+        }
+        const metadata = _metadata;
         const optimized = metadata.optimized[id];
         if (optimized) {
             return optimized;
@@ -29757,7 +29804,7 @@ async function initDepsOptimizer(config, server) {
         newDepsDiscovered = true;
         missing = addOptimizedDepInfo(metadata, 'discovered', {
             id,
-            file: getOptimizedDepPath(id, config),
+            file: getOptimizedDepPath(id, config, ssr),
             src: resolved,
             // Assing a browserHash to this missing dependency that is unique to
             // the current state of known + missing deps. If its optimizeDeps run
@@ -29885,7 +29932,7 @@ const jsMapExtensionRE = /\.js\.map$/i;
 /**
  * Used by Vite CLI when running `vite optimize`
  */
-async function optimizeDeps(config, force = config.force, asCommand = false) {
+async function optimizeDeps(config, force = config.optimizeDeps.force, asCommand = false) {
     const log = asCommand ? config.logger.info : debug$a;
     const cachedMetadata = loadCachedDepOptimizationMetadata(config, force, asCommand);
     if (cachedMetadata) {
@@ -29898,6 +29945,31 @@ async function optimizeDeps(config, force = config.force, asCommand = false) {
     await result.commit();
     return result.metadata;
 }
+async function optimizeServerSsrDeps(config) {
+    const cachedMetadata = loadCachedDepOptimizationMetadata(config, config.optimizeDeps.force, false, true // ssr
+    );
+    if (cachedMetadata) {
+        return cachedMetadata;
+    }
+    let alsoInclude;
+    let noExternalFilter;
+    const noExternal = config.ssr?.noExternal;
+    if (noExternal) {
+        alsoInclude = arraify(noExternal).filter((ne) => typeof ne === 'string');
+        noExternalFilter =
+            noExternal === true
+                ? (dep) => false
+                : createFilter$1(noExternal, config.optimizeDeps?.exclude, {
+                    resolve: false
+                });
+    }
+    const deps = {};
+    await addManuallyIncludedOptimizeDeps(deps, config, alsoInclude, noExternalFilter);
+    const depsInfo = toDiscoveredDependencies(config, deps, true);
+    const result = await runOptimizeDeps(config, depsInfo, true);
+    await result.commit();
+    return result.metadata;
+}
 function initDepsOptimizerMetadata(config, timestamp) {
     const hash = getDepHash(config);
     return {
@@ -29918,14 +29990,14 @@ function addOptimizedDepInfo(metadata, type, depInfo) {
  * Creates the initial dep optimization metadata, loading it from the deps cache
  * if it exists and pre-bundling isn't forced
  */
-function loadCachedDepOptimizationMetadata(config, force = config.force, asCommand = false) {
+function loadCachedDepOptimizationMetadata(config, force = config.optimizeDeps.force, asCommand = false, ssr = !!config.build.ssr) {
     const log = asCommand ? config.logger.info : debug$a;
     // Before Vite 2.9, dependencies were cached in the root of the cacheDir
     // For compat, we remove the cache if we find the old structure
     if (fs__default.existsSync(path$p.join(config.cacheDir, '_metadata.json'))) {
         emptyDir(config.cacheDir);
     }
-    const depsCacheDir = getDepsCacheDir(config);
+    const depsCacheDir = getDepsCacheDir(config, ssr);
     if (!force) {
         let cachedMetadata;
         try {
@@ -29969,13 +30041,16 @@ async function discoverProjectDependencies(config, timestamp) {
 async function initialProjectDependencies(config, timestamp, knownDeps) {
     const deps = knownDeps ?? {};
     await addManuallyIncludedOptimizeDeps(deps, config);
+    return toDiscoveredDependencies(config, deps, !!config.build.ssr, timestamp);
+}
+function toDiscoveredDependencies(config, deps, ssr, timestamp) {
     const browserHash = getOptimizedBrowserHash(getDepHash(config), deps, timestamp);
     const discovered = {};
     for (const id in deps) {
         const src = deps[id];
         discovered[id] = {
             id,
-            file: getOptimizedDepPath(id, config),
+            file: getOptimizedDepPath(id, config, ssr),
             src,
             browserHash: browserHash,
             exportsData: extractExportsData(src, config)
@@ -30000,14 +30075,14 @@ function depsLogString(qualifiedIds) {
  * Internally, Vite uses this function to prepare a optimizeDeps run. When Vite starts, we can get
  * the metadata and start the server without waiting for the optimizeDeps processing to be completed
  */
-async function runOptimizeDeps(resolvedConfig, depsInfo) {
+async function runOptimizeDeps(resolvedConfig, depsInfo, ssr = !!resolvedConfig.build.ssr) {
     const isBuild = resolvedConfig.command === 'build';
     const config = {
         ...resolvedConfig,
         command: 'build'
     };
-    const depsCacheDir = getDepsCacheDir(resolvedConfig);
-    const processingCacheDir = getProcessingDepsCacheDir(resolvedConfig);
+    const depsCacheDir = getDepsCacheDir(resolvedConfig, ssr);
+    const processingCacheDir = getProcessingDepsCacheDir(resolvedConfig, ssr);
     // Create a temporal directory so we don't need to delete optimized deps
     // until they have been processed. This also avoids leaving the deps cache
     // directory in a corrupted state if there is an error
@@ -30114,7 +30189,7 @@ async function runOptimizeDeps(resolvedConfig, depsInfo) {
             const id = path$p
                 .relative(processingCacheDirOutputPath, o)
                 .replace(jsExtensionRE, '');
-            const file = getOptimizedDepPath(id, resolvedConfig);
+            const file = getOptimizedDepPath(id, resolvedConfig, ssr);
             if (!findOptimizedDepInfoInRecord(metadata.optimized, (depInfo) => depInfo.file === file)) {
                 addOptimizedDepInfo(metadata, 'chunks', {
                     id,
@@ -30135,15 +30210,15 @@ async function findKnownImports(config) {
     await addManuallyIncludedOptimizeDeps(deps, config);
     return Object.keys(deps);
 }
-async function addManuallyIncludedOptimizeDeps(deps, config) {
-    const include = config.optimizeDeps?.include;
+async function addManuallyIncludedOptimizeDeps(deps, config, extra, filter) {
+    const include = [...(config.optimizeDeps?.include ?? []), ...(extra ?? [])];
     if (include) {
         const resolve = config.createResolver({ asSrc: false, scan: true });
         for (const id of include) {
             // normalize 'foo   >bar` as 'foo > bar' to prevent same id being added
             // and for pretty printing
             const normalizedId = normalizeId(id);
-            if (!deps[normalizedId]) {
+            if (!deps[normalizedId] && filter?.(normalizedId) !== false) {
                 const entry = await resolve(id);
                 if (entry) {
                     deps[normalizedId] = entry;
@@ -30166,36 +30241,37 @@ function newDepOptimizationProcessing() {
 function depsFromOptimizedDepInfo(depsInfo) {
     return Object.fromEntries(Object.entries(depsInfo).map((d) => [d[0], d[1].src]));
 }
-function getOptimizedDepPath(id, config) {
-    return normalizePath$3(path$p.resolve(getDepsCacheDir(config), flattenId(id) + '.js'));
+function getOptimizedDepPath(id, config, ssr = !!config.build.ssr) {
+    return normalizePath$3(path$p.resolve(getDepsCacheDir(config, ssr), flattenId(id) + '.js'));
 }
-function getDepsCacheSuffix(config) {
+function getDepsCacheSuffix(config, ssr) {
     let suffix = '';
     if (config.command === 'build') {
         // Differentiate build caches depending on outDir to allow parallel builds
         const { outDir } = config.build;
         const buildId = outDir.length > 8 || outDir.includes('/') ? getHash(outDir) : outDir;
         suffix += `_build-${buildId}`;
-        if (config.build.ssr) {
-            suffix += '_ssr';
-        }
+    }
+    if (ssr) {
+        suffix += '_ssr';
     }
     return suffix;
 }
-function getDepsCacheDir(config) {
-    const dirName = 'deps' + getDepsCacheSuffix(config);
-    return normalizePath$3(path$p.resolve(config.cacheDir, dirName));
+function getDepsCacheDir(config, ssr) {
+    return getDepsCacheDirPrefix(config) + getDepsCacheSuffix(config, ssr);
+}
+function getProcessingDepsCacheDir(config, ssr) {
+    return (getDepsCacheDirPrefix(config) + getDepsCacheSuffix(config, ssr) + '_temp');
 }
-function getProcessingDepsCacheDir(config) {
-    const dirName = 'deps' + getDepsCacheSuffix(config) + '_temp';
-    return normalizePath$3(path$p.resolve(config.cacheDir, dirName));
+function getDepsCacheDirPrefix(config) {
+    return normalizePath$3(path$p.resolve(config.cacheDir, 'deps'));
 }
 function isOptimizedDepFile(id, config) {
-    return id.startsWith(getDepsCacheDir(config));
+    return id.startsWith(getDepsCacheDirPrefix(config));
 }
 function createIsOptimizedDepUrl(config) {
     const { root } = config;
-    const depsCacheDir = getDepsCacheDir(config);
+    const depsCacheDir = getDepsCacheDirPrefix(config);
     // determine the url prefix of files inside cache directory
     const depsCacheDirRelative = normalizePath$3(path$p.relative(root, depsCacheDir));
     const depsCacheDirPrefix = depsCacheDirRelative.startsWith('../')
@@ -30424,11 +30500,13 @@ var index$1 = {
 	__proto__: null,
 	debuggerViteDeps: debuggerViteDeps,
 	optimizeDeps: optimizeDeps,
+	optimizeServerSsrDeps: optimizeServerSsrDeps,
 	initDepsOptimizerMetadata: initDepsOptimizerMetadata,
 	addOptimizedDepInfo: addOptimizedDepInfo,
 	loadCachedDepOptimizationMetadata: loadCachedDepOptimizationMetadata,
 	discoverProjectDependencies: discoverProjectDependencies,
 	initialProjectDependencies: initialProjectDependencies,
+	toDiscoveredDependencies: toDiscoveredDependencies,
 	depsLogString: depsLogString,
 	runOptimizeDeps: runOptimizeDeps,
 	findKnownImports: findKnownImports,
@@ -30436,6 +30514,7 @@ var index$1 = {
 	depsFromOptimizedDepInfo: depsFromOptimizedDepInfo,
 	getOptimizedDepPath: getOptimizedDepPath,
 	getDepsCacheDir: getDepsCacheDir,
+	getDepsCacheDirPrefix: getDepsCacheDirPrefix,
 	isOptimizedDepFile: isOptimizedDepFile,
 	createIsOptimizedDepUrl: createIsOptimizedDepUrl,
 	extractExportsData: extractExportsData,
@@ -38383,7 +38462,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await import('./dep-bb927dda.js').then(function (n) { return n.c; });
+    const { parse, transform } = await import('./dep-dab76395.js').then(function (n) { return n.c; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -39260,20 +39339,24 @@ function cssPostPlugin(config) {
                 }
                 return chunkCSS;
             }
+            function ensureFileExt(name, ext) {
+                return path$p.format({ ...path$p.parse(name), base: undefined, ext });
+            }
             if (config.build.cssCodeSplit) {
                 if (isPureCssChunk) {
                     // this is a shared CSS-only chunk that is empty.
                     pureCssChunks.add(chunk.fileName);
                 }
-                if (opts.format === 'es' ||
-                    opts.format === 'cjs' ||
-                    opts.format === 'system') {
-                    const cssAssetName = chunk.name + '.css';
+                if (opts.format === 'es' || opts.format === 'cjs') {
+                    const cssAssetName = ensureFileExt(chunk.facadeModuleId
+                        ? normalizePath$3(path$p.relative(config.root, chunk.facadeModuleId))
+                        : chunk.name, '.css');
                     chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssAssetName);
                     chunkCSS = await finalizeCss(chunkCSS, true, config);
                     // emit corresponding css file
                     const fileHandle = this.emitFile({
                         name: cssAssetName,
+                        fileName: assetFileNamesToFileName(resolveAssetFileNames(config), cssAssetName, getHash(chunkCSS), chunkCSS),
                         type: 'asset',
                         source: chunkCSS
                     });
@@ -39320,7 +39403,7 @@ function cssPostPlugin(config) {
                     .map((file) => path$p.basename(file))
                     .join('|')
                     .replace(/\./g, '\\.');
-                const emptyChunkRE = new RegExp(opts.format === 'es' || opts.format === 'system'
+                const emptyChunkRE = new RegExp(opts.format === 'es'
                     ? `\\bimport\\s*["'][^"']*(?:${emptyChunkFiles})["'];\n?`
                     : `\\brequire\\(\\s*["'][^"']*(?:${emptyChunkFiles})["']\\);\n?`, 'g');
                 for (const file in bundle) {
@@ -39483,7 +39566,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-9b1a7a5b.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-0115731f.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -40594,8 +40677,8 @@ function createIsSsrExternal(config) {
         return external;
     };
 }
-// When ssr.format is 'cjs', this function is used reverting to the Vite 2.9
-// SSR externalization heuristics
+// When config.experimental.buildSsrCjsExternalHeuristics is enabled, this function
+// is used reverting to the Vite 2.9 SSR externalization heuristics
 function cjsSsrCollectExternals(root, preserveSymlinks, ssrExternals, seen, logger) {
     const rootPkgContent = lookupFile(root, ['package.json']);
     if (!rootPkgContent) {
@@ -40726,10 +40809,11 @@ function optimizedDepsPlugin(config) {
         // this.load({ id }) isn't implemented in PluginContainer
         // The logic to register an id to wait until it is processed
         // is in importAnalysis, see call to delayDepsOptimizerUntil
-        async load(id) {
+        async load(id, options) {
+            const ssr = options?.ssr ?? false;
             const depsOptimizer = getDepsOptimizer(config);
             if (depsOptimizer?.isOptimizedDepFile(id)) {
-                const metadata = depsOptimizer?.metadata;
+                const metadata = depsOptimizer?.metadata({ ssr });
                 if (metadata) {
                     const file = cleanUrl(id);
                     const versionMatch = id.match(DEP_VERSION_RE);
@@ -40753,7 +40837,7 @@ function optimizedDepsPlugin(config) {
                             throwProcessingError(id);
                             return;
                         }
-                        const newMetadata = depsOptimizer.metadata;
+                        const newMetadata = depsOptimizer.metadata({ ssr });
                         if (metadata !== newMetadata) {
                             const currentInfo = optimizedDepInfoFromFile(newMetadata, file);
                             if (info.browserHash !== currentInfo?.browserHash) {
@@ -40795,9 +40879,10 @@ function optimizedDepsBuildPlugin(config) {
                 await this.load({ id });
             });
         },
-        async load(id) {
+        async load(id, options) {
+            const ssr = options?.ssr ?? false;
             const depsOptimizer = getDepsOptimizer(config);
-            const metadata = depsOptimizer?.metadata;
+            const metadata = depsOptimizer?.metadata({ ssr });
             if (!metadata || !depsOptimizer?.isOptimizedDepFile(id)) {
                 return;
             }
@@ -40921,10 +41006,7 @@ function importAnalysisPlugin(config) {
             const start = performance.now();
             await init;
             let imports = [];
-            // strip UTF-8 BOM
-            if (source.charCodeAt(0) === 0xfeff) {
-                source = source.slice(1);
-            }
+            source = stripBomTag(source);
             try {
                 imports = parse$g(source)[0];
             }
@@ -40980,7 +41062,8 @@ function importAnalysisPlugin(config) {
                         // the dependency needs to be resolved starting from the original source location of the optimized file
                         // because starting from node_modules/.vite will not find the dependency if it was not hoisted
                         // (that is, if it is under node_modules directory in the package source of the optimized file)
-                        for (const optimizedModule of depsOptimizer.metadata.depInfoList) {
+                        for (const optimizedModule of depsOptimizer.metadata({ ssr })
+                            .depInfoList) {
                             if (!optimizedModule.src)
                                 continue; // Ignore chunks
                             if (optimizedModule.file === importerModule.file) {
@@ -41005,7 +41088,7 @@ function importAnalysisPlugin(config) {
                     // in root: infer short absolute path from root
                     url = resolved.id.slice(root.length);
                 }
-                else if (resolved.id.startsWith(getDepsCacheDir(config)) ||
+                else if (resolved.id.startsWith(getDepsCacheDirPrefix(config)) ||
                     fs__default.existsSync(cleanUrl(resolved.id))) {
                     // an optimized deps may not yet exists in the filesystem, or
                     // a regular file exists but is out of root: rewrite to absolute /@fs/ paths
@@ -41094,7 +41177,7 @@ function importAnalysisPlugin(config) {
                     }
                     // skip ssr external
                     if (ssr) {
-                        if (config.ssr?.format === 'cjs') {
+                        if (config.legacy?.buildSsrCjsExternalHeuristics) {
                             if (cjsShouldExternalizeForSSR(specifier, server._ssrExternals)) {
                                 continue;
                             }
@@ -41132,7 +41215,7 @@ function importAnalysisPlugin(config) {
                             // The browserHash in resolvedId could be stale in which case there will be a full
                             // page reload. We could return a 404 in that case but it is safe to return the request
                             const file = cleanUrl(resolvedId); // Remove ?v={hash}
-                            const needsInterop = await optimizedDepNeedsInterop(depsOptimizer.metadata, file, config);
+                            const needsInterop = await optimizedDepNeedsInterop(depsOptimizer.metadata({ ssr }), file, config);
                             if (needsInterop === undefined) {
                                 // Non-entry dynamic imports from dependencies will reach here as there isn't
                                 // optimize info for them, but they don't need es interop. If the request isn't
@@ -41270,7 +41353,7 @@ function importAnalysisPlugin(config) {
                         // Unexpected error, log the issue but avoid an unhandled exception
                         config.logger.error(e.message);
                     });
-                    if (depsOptimizer && !config.optimizeDeps.devScan) {
+                    if (depsOptimizer && !config.legacy?.devDepsScanner) {
                         depsOptimizer.delayDepsOptimizerUntil(id, () => request);
                     }
                 });
@@ -41506,7 +41589,8 @@ function buildImportAnalysisPlugin(config) {
                         // the dependency needs to be resolved starting from the original source location of the optimized file
                         // because starting from node_modules/.vite will not find the dependency if it was not hoisted
                         // (that is, if it is under node_modules directory in the package source of the optimized file)
-                        for (const optimizedModule of depsOptimizer.metadata.depInfoList) {
+                        for (const optimizedModule of depsOptimizer.metadata({ ssr })
+                            .depInfoList) {
                             if (!optimizedModule.src)
                                 continue; // Ignore chunks
                             if (optimizedModule.file === importer) {
@@ -41564,7 +41648,7 @@ function buildImportAnalysisPlugin(config) {
                         if (depsOptimizer.isOptimizedDepFile(resolvedId) &&
                             !resolvedId.match(optimizedDepChunkRE)) {
                             const file = cleanUrl(resolvedId); // Remove ?v={hash}
-                            const needsInterop = await optimizedDepNeedsInterop(depsOptimizer.metadata, file, config);
+                            const needsInterop = await optimizedDepNeedsInterop(depsOptimizer.metadata({ ssr }), file, config);
                             let rewriteDone = false;
                             if (needsInterop === undefined) {
                                 // Non-entry dynamic imports from dependencies will reach here as there isn't
@@ -42000,7 +42084,7 @@ function resolveBuildPlugins(config) {
         pre: [
             ...(options.watch ? [ensureWatchPlugin()] : []),
             watchPackageDataPlugin(config),
-            ...(!isDepsOptimizerEnabled(config)
+            ...(config.legacy?.buildRollupPluginCommonjs
                 ? [commonjs(options.commonjsOptions)]
                 : []),
             dataURIPlugin(),
@@ -42069,7 +42153,7 @@ async function doBuild(inlineConfig = {}) {
     // In CJS, we can pass the externals to rollup as is. In ESM, we need to
     // do it in the resolve plugin so we can add the resolved extension for
     // deep node_modules imports
-    if (ssr && config.ssr?.format === 'cjs') {
+    if (ssr && config.legacy?.buildSsrCjsExternalHeuristics) {
         external = await cjsSsrResolveExternal(config, userExternal);
     }
     if (isDepsOptimizerEnabled(config)) {
@@ -42321,7 +42405,7 @@ function onRollupWarning(warning, warn, config) {
 async function cjsSsrResolveExternal(config, user) {
     // see if we have cached deps data available
     let knownImports;
-    const dataPath = path$p.join(getDepsCacheDir(config), '_metadata.json');
+    const dataPath = path$p.join(getDepsCacheDir(config, false), '_metadata.json');
     try {
         const data = JSON.parse(fs__default.readFileSync(dataPath, 'utf-8'));
         knownImports = Object.keys(data.optimized);
@@ -48725,7 +48809,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await import('./dep-82a07453.js')).createCertificate();
+        const content = (await import('./dep-4cea16ce.js')).createCertificate();
         promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => promises.writeFile(cachePath, content))
@@ -48735,12 +48819,6 @@ async function getCertificate(cacheDir) {
 }
 async function httpServerStart(httpServer, serverOptions) {
     let { port, strictPort, host, logger } = serverOptions;
-    // This could be removed when Vite only supports Node 17+ because verbatim=true is default
-    // https://github.com/nodejs/node/pull/39987
-    if (host === 'localhost') {
-        const addr = await promises$1.lookup('localhost', { verbatim: true });
-        host = addr.address;
-    }
     return new Promise((resolve, reject) => {
         const onError = (e) => {
             if (e.code === 'EADDRINUSE') {
@@ -57582,10 +57660,7 @@ 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);
-    let { middlewareMode } = serverConfig;
-    if (middlewareMode === true) {
-        middlewareMode = 'ssr';
-    }
+    const { middlewareMode } = serverConfig;
     const middlewares = connect();
     const httpServer = middlewareMode
         ? null
@@ -57771,20 +57846,17 @@ async function createServer(inlineConfig = {}) {
     // serve static files
     middlewares.use(serveRawFsMiddleware(server));
     middlewares.use(serveStaticMiddleware(root, server));
-    const isMiddlewareMode = middlewareMode && middlewareMode !== 'html';
     // spa fallback
-    if (config.spa && !isMiddlewareMode) {
+    if (config.appType === 'spa') {
         middlewares.use(spaFallbackMiddleware(root));
     }
     // run post config hooks
     // This is applied before the html middleware so that user middleware can
     // serve custom content instead of index.html.
     postHooks.forEach((fn) => fn && fn());
-    if (config.spa && !isMiddlewareMode) {
+    if (config.appType === 'spa' || config.appType === 'mpa') {
         // transform index.html
         middlewares.use(indexHtmlMiddleware(server));
-    }
-    if (!isMiddlewareMode) {
         // handle 404s
         // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
         middlewares.use(function vite404Middleware(_, res) {
@@ -57793,7 +57865,7 @@ async function createServer(inlineConfig = {}) {
         });
     }
     // error handler
-    middlewares.use(errorMiddleware(server, !!middlewareMode));
+    middlewares.use(errorMiddleware(server, middlewareMode));
     const initOptimizer = async () => {
         if (isDepsOptimizerEnabled(config)) {
             await initDepsOptimizer(config, server);
@@ -57902,7 +57974,8 @@ function resolvedAllowDir(root, dir) {
 function resolveServerOptions(root, raw, logger) {
     const server = {
         preTransformRequests: true,
-        ...raw
+        ...raw,
+        middlewareMode: !!raw?.middlewareMode
     };
     let allowDirs = server.fs?.allow;
     const deny = server.fs?.deny || ['.env', '.env.*', '*.{crt,pem}'];
@@ -57977,13 +58050,15 @@ async function restartServer(server) {
 }
 async function updateCjsSsrExternals(server) {
     if (!server._ssrExternals) {
+        // We use the non-ssr optimized deps to find known imports
         let knownImports = [];
         const depsOptimizer = getDepsOptimizer(server.config);
         if (depsOptimizer) {
             await depsOptimizer.scanProcessing;
+            const metadata = depsOptimizer.metadata({ ssr: false });
             knownImports = [
-                ...Object.keys(depsOptimizer.metadata.optimized),
-                ...Object.keys(depsOptimizer.metadata.discovered)
+                ...Object.keys(metadata.optimized),
+                ...Object.keys(metadata.discovered)
             ];
         }
         server._ssrExternals = cjsSsrResolveExternals(server.config, knownImports);
@@ -58146,7 +58221,7 @@ async function preview(inlineConfig = {}) {
     app.use(config.base, sirv(distDir, {
         etag: true,
         dev: true,
-        single: config.spa
+        single: config.appType === 'spa'
     }));
     // apply post server hooks from plugins
     postHooks.forEach((fn) => fn && fn());
@@ -58251,11 +58326,21 @@ const wasmHelperId = '/__vite-wasm-helper';
 const wasmHelper = async (opts = {}, url) => {
     let result;
     if (url.startsWith('data:')) {
-        // @ts-ignore
-        const binaryString = atob(url.replace(/^data:.*?base64,/, ''));
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
+        const urlContent = url.replace(/^data:.*?base64,/, '');
+        let bytes;
+        if (typeof Buffer === 'function' && typeof Buffer.from === 'function') {
+            bytes = Buffer.from(urlContent, 'base64');
+        }
+        else if (typeof atob === 'function') {
+            // @ts-ignore
+            const binaryString = atob(urlContent);
+            bytes = new Uint8Array(binaryString.length);
+            for (let i = 0; i < binaryString.length; i++) {
+                bytes[i] = binaryString.charCodeAt(i);
+            }
+        }
+        else {
+            throw new Error('Failed to decode base64-encoded data URL, Buffer and atob are not supported');
         }
         // @ts-ignore
         result = await WebAssembly.instantiate(bytes, opts);
@@ -58603,12 +58688,10 @@ function preAliasPlugin(config) {
     return {
         name: 'vite:pre-alias',
         async resolveId(id, importer, options) {
+            const ssr = options?.ssr ?? false;
             const depsOptimizer = getDepsOptimizer(config);
-            if (depsOptimizer &&
-                !options?.ssr &&
-                bareImportRE.test(id) &&
-                !options?.scan) {
-                return await tryOptimizedResolve(depsOptimizer, id, importer);
+            if (depsOptimizer && bareImportRE.test(id) && !options?.scan) {
+                return await tryOptimizedResolve(depsOptimizer, ssr, id, importer);
             }
         }
     };
@@ -60842,7 +60925,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     mode = inlineConfig.mode || config.mode || mode;
     configEnv.mode = mode;
     // resolve plugins
-    const rawUserPlugins = (config.plugins || []).flat(Infinity).filter((p) => {
+    const rawUserPlugins = (await asyncFlatten(config.plugins || [])).filter((p) => {
         if (!p) {
             return false;
         }
@@ -60960,7 +61043,14 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         ? path$p.resolve(resolvedRoot, typeof publicDir === 'string' ? publicDir : 'public')
         : '';
     const server = resolveServerOptions(resolvedRoot, config.server, logger);
-    const ssr = resolveSSROptions(config.ssr);
+    let ssr = resolveSSROptions(config.ssr);
+    if (config.legacy?.buildSsrCjsExternalHeuristics) {
+        if (ssr)
+            ssr.format = 'cjs';
+        else
+            ssr = { target: 'node', format: 'cjs' };
+    }
+    const middlewareMode = config?.server?.middlewareMode;
     const optimizeDeps = config.optimizeDeps || {};
     const resolved = {
         ...config,
@@ -61003,8 +61093,23 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             }
         },
         worker: resolvedWorkerOptions,
-        spa: config.spa ?? true
+        appType: config.appType ?? middlewareMode === 'ssr' ? 'custom' : 'spa'
     };
+    if (middlewareMode === 'ssr') {
+        logger.warn(colors$1.yellow(`server.middlewareMode 'ssr' is now deprecated, use server.middlewareMode true and appType 'custom'`));
+    }
+    if (middlewareMode === 'html') {
+        logger.warn(colors$1.yellow(`server.middlewareMode 'html' is now deprecated, use server.middlewareMode true`));
+    }
+    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
+        }
+    }
     // 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.

package/dist/node/chunks/{dep-bb927dda.js → dep-dab76395.js}

@@ -1,4 +1,4 @@
-import { y as getAugmentedNamespace, z as getDefaultExportFromCjs } from './dep-7d4129cb.js';
+import { y as getAugmentedNamespace, z as getDefaultExportFromCjs } from './dep-5d9a8c71.js';
 
 import { fileURLToPath as __cjs_fileURLToPath } from 'url';
 import { dirname as __cjs_dirname } from 'path';

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import { EventEmitter } from 'events';
-import { w as colors, k as createLogger, e as resolveConfig } from './chunks/dep-7d4129cb.js';
+import { w as colors, k as createLogger, e as resolveConfig } from './chunks/dep-5d9a8c71.js';
 import { VERSION } from './constants.js';
 import 'fs';
 import 'path';
@@ -16,7 +16,6 @@ import 'http';
 import 'stream';
 import 'os';
 import 'child_process';
-import 'dns';
 import 'crypto';
 import 'buffer';
 import 'querystring';
@@ -683,7 +682,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-5d9a8c71.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -692,6 +691,7 @@ cli
             configFile: options.config,
             logLevel: options.logLevel,
             clearScreen: options.clearScreen,
+            optimizeDeps: { force: options.force },
             server: cleanOptions(options)
         });
         if (!server.httpServer) {
@@ -729,7 +729,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-5d9a8c71.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -739,7 +739,7 @@ cli
             configFile: options.config,
             logLevel: options.logLevel,
             clearScreen: options.clearScreen,
-            force: options.force,
+            optimizeDeps: { force: options.force },
             build: buildOptions
         });
     }
@@ -753,7 +753,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-5d9a8c71.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -776,7 +776,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-5d9a8c71.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'path';
 import { fileURLToPath } from 'url';
 
-var version = "3.0.0-alpha.12";
+var version = "3.0.0-alpha.13";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.d.ts

@@ -75,6 +75,15 @@ export declare type AnymatchFn = (testString: string) => boolean
 
 export declare type AnymatchPattern = string | RegExp | AnymatchFn
 
+/**
+ * spa: include SPA fallback middleware and configure sirv with `single: true` in preview
+ *
+ * mpa: only include non-SPA HTML middlewares
+ *
+ * custom: don't include HTML middlewares
+ */
+export declare type AppType = 'spa' | 'mpa' | 'custom';
+
 export declare interface AwaitWriteFinishOptions {
     /**
      * Amount of time in milliseconds for a file size to remain constant before emitting its event.
@@ -537,13 +546,6 @@ export declare interface DepOptimizationOptions {
      * vite project root. This will overwrite default entries inference.
      */
     entries?: string | string[];
-    /**
-     * Enable esbuild based scan phase, to get back to the optimized deps discovery
-     * strategy used in Vite v2
-     * @default false
-     * @experimental
-     */
-    devScan?: boolean;
     /**
      * Force optimize listed dependencies (must be resolvable import paths,
      * cannot be globs).
@@ -590,6 +592,11 @@ export declare interface DepOptimizationOptions {
      * @experimental
      */
     disabled?: boolean | 'build' | 'dev';
+    /**
+     * Force dep pre-optimization regardless of whether deps have changed.
+     * @experimental
+     */
+    force?: boolean;
 }
 
 export declare interface DepOptimizationProcessing {
@@ -609,9 +616,11 @@ export declare interface DepOptimizationResult {
 }
 
 export declare interface DepsOptimizer {
-    metadata: DepOptimizationMetadata;
+    metadata: (options: {
+        ssr: boolean;
+    }) => DepOptimizationMetadata;
     scanProcessing?: Promise<void>;
-    registerMissingImport: (id: string, resolved: string) => OptimizedDepInfo;
+    registerMissingImport: (id: string, resolved: string, ssr?: boolean) => OptimizedDepInfo;
     run: () => void;
     isOptimizedDepFile: (id: string) => boolean;
     isOptimizedDepUrl: (url: string) => boolean;
@@ -1202,6 +1211,33 @@ export declare interface KnownAsTypeMap {
     worker: Worker
 }
 
+export declare interface LegacyOptions {
+    /**
+     * Revert vite dev to the v2.9 strategy. Enable esbuild based deps scanner.
+     *
+     * @experimental
+     * @deprecated
+     * @default false
+     */
+    devDepsScanner?: boolean;
+    /**
+     * Revert vite build to the v2.9 strategy. Disable esbuild deps optimization and adds `@rollup/plugin-commonjs`
+     *
+     * @experimental
+     * @deprecated
+     * @default false
+     */
+    buildRollupPluginCommonjs?: boolean;
+    /**
+     * Revert vite build --ssr to the v2.9 strategy. Use CJS SSR build and v2.9 externalization heuristics
+     *
+     * @experimental
+     * @deprecated
+     * @default false
+     */
+    buildSsrCjsExternalHeuristics?: boolean;
+}
+
 export declare type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife';
 
 export declare interface LibraryOptions {
@@ -1521,7 +1557,7 @@ export declare interface PluginContainer {
     close(): Promise<void>;
 }
 
-export declare type PluginOption = Plugin_2 | false | null | undefined | PluginOption[];
+export declare type PluginOption = Plugin_2 | false | null | undefined | PluginOption[] | Promise<Plugin_2 | false | null | undefined | PluginOption[]>;
 
 /**
  * Starts the Vite server in preview mode, to simulate a production deployment
@@ -1603,7 +1639,7 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'asse
     optimizeDeps: DepOptimizationOptions;
     /* Excluded from this release type: packageCache */
     worker: ResolveWorkerOptions;
-    spa: boolean;
+    appType: AppType;
 }>;
 
 export declare interface ResolvedPreviewOptions extends PreviewOptions {
@@ -1611,6 +1647,7 @@ export declare interface ResolvedPreviewOptions extends PreviewOptions {
 
 export declare interface ResolvedServerOptions extends ServerOptions {
     fs: Required<FileSystemServeOptions>;
+    middlewareMode: boolean;
 }
 
 export declare interface ResolvedSSROptions extends SSROptions {
@@ -2222,11 +2259,6 @@ export declare interface UserConfig {
      * Preview specific options, e.g. host, port, https...
      */
     preview?: PreviewOptions;
-    /**
-     * Force dep pre-optimization regardless of whether deps have changed.
-     * @experimental
-     */
-    force?: boolean;
     /**
      * Dep optimization options
      */
@@ -2238,11 +2270,18 @@ export declare interface UserConfig {
     /**
      * Experimental features
      *
-     * Features under this field are addressed to be changed that might NOT follow semver.
+     * Features under this field could change in the future and might NOT follow semver.
      * Please be careful and always pin Vite's version when using them.
      * @experimental
      */
     experimental?: ExperimentalOptions;
+    /**
+     * Legacy options
+     *
+     * Features under this field only follow semver for patches, they could be removed in a
+     * future minor version. Please always pin Vite's version to a minor when using them.
+     */
+    legacy?: LegacyOptions;
     /**
      * Log level.
      * Default: 'info'
@@ -2286,11 +2325,12 @@ export declare interface UserConfig {
         rollupOptions?: Omit<RollupOptions, 'plugins' | 'input' | 'onwarn' | 'preserveEntrySignatures'>;
     };
     /**
-     * Whether your application is a Single Page Application (SPA). Set to `false`
-     * for other kinds of apps like MPAs.
-     * @default true
+     * Whether your application is a Single Page Application (SPA),
+     * a Multi-Page Application (MPA), or Custom Application (SSR
+     * and frameworks with custom HTML handling)
+     * @default 'spa'
      */
-    spa?: boolean;
+    appType?: AppType;
 }
 
 export declare type UserConfigExport = UserConfig | Promise<UserConfig> | UserConfigFn;

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, i as isDepsOptimizerEnabled, l as loadConfigFromFile, u as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, e as resolveConfig, v as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-7d4129cb.js';
+export { b as build, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, i as isDepsOptimizerEnabled, l as loadConfigFromFile, u as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, e as resolveConfig, v as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-5d9a8c71.js';
 export { VERSION as version } from './constants.js';
 import 'fs';
 import 'path';
@@ -16,7 +16,6 @@ import 'http';
 import 'stream';
 import 'os';
 import 'child_process';
-import 'dns';
 import 'crypto';
 import 'buffer';
 import 'querystring';

package/dist/node-cjs/publicUtils.cjs

@@ -22,7 +22,7 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 
-var version = "3.0.0-alpha.12";
+var version = "3.0.0-alpha.13";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))), '../../..');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.12",
+  "version": "3.0.0-alpha.13",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",