vite 4.3.0-beta.5 → 4.3.0-beta.7

package/dist/node/chunks/{dep-970ed287.js → dep-1a577c21.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { D as commonjsGlobal } from './dep-a26366f0.js';
+import { D as commonjsGlobal } from './dep-f1f8facc.js';
 import require$$0$1 from 'path';
 import require$$5 from 'crypto';
 import require$$0$2 from 'util';

package/dist/node/chunks/{dep-a26366f0.js → dep-f1f8facc.js}

@@ -28621,29 +28621,43 @@ function optimizedDepsPlugin(config) {
     };
 }
 function optimizedDepsBuildPlugin(config) {
+    let buildStartCalled = false;
     return {
         name: 'vite:optimized-deps-build',
         buildStart() {
-            if (!config.isWorker) {
-                // This will be run for the current active optimizer, during build
-                // it will be the SSR optimizer if config.build.ssr is defined
+            // Only reset the registered ids after a rebuild during build --watch
+            if (!config.isWorker && buildStartCalled) {
                 getDepsOptimizer(config)?.resetRegisteredIds();
             }
+            buildStartCalled = true;
         },
-        resolveId(id, importer, { ssr }) {
-            if (getDepsOptimizer(config, ssr)?.isOptimizedDepFile(id)) {
+        async resolveId(id, importer, options) {
+            const depsOptimizer = getDepsOptimizer(config);
+            if (!depsOptimizer)
+                return;
+            if (depsOptimizer.isOptimizedDepFile(id)) {
                 return id;
             }
+            else {
+                if (options?.custom?.['vite:pre-alias']) {
+                    // Skip registering the id if it is being resolved from the pre-alias plugin
+                    // When a optimized dep is aliased, we need to avoid waiting for it before optimizing
+                    return;
+                }
+                const resolved = await this.resolve(id, importer, {
+                    ...options,
+                    skipSelf: true,
+                });
+                if (resolved) {
+                    depsOptimizer.delayDepsOptimizerUntil(resolved.id, async () => {
+                        await this.load(resolved);
+                    });
+                    return resolved;
+                }
+            }
         },
-        transform(_code, id, options) {
-            const ssr = options?.ssr === true;
-            getDepsOptimizer(config, ssr)?.delayDepsOptimizerUntil(id, async () => {
-                await this.load({ id });
-            });
-        },
-        async load(id, options) {
-            const ssr = options?.ssr === true;
-            const depsOptimizer = getDepsOptimizer(config, ssr);
+        async load(id) {
+            const depsOptimizer = getDepsOptimizer(config);
             if (!depsOptimizer?.isOptimizedDepFile(id)) {
                 return;
             }
@@ -37821,8 +37835,14 @@ function cssPlugin(config) {
                     return fileToUrl(resolved, config, this);
                 }
                 if (config.command === 'build') {
-                    // #9800 If we cannot resolve the css url, leave a warning.
-                    config.logger.warnOnce(`\n${url} referenced in ${id} didn't resolve at build time, it will remain unchanged to be resolved at runtime`);
+                    const isExternal = config.build.rollupOptions.external
+                        ? resolveUserExternal(config.build.rollupOptions.external, url, // use URL as id since id could not be resolved
+                        id, false)
+                        : false;
+                    if (!isExternal) {
+                        // #9800 If we cannot resolve the css url, leave a warning.
+                        config.logger.warnOnce(`\n${url} referenced in ${id} didn't resolve at build time, it will remain unchanged to be resolved at runtime`);
+                    }
                 }
                 return url;
             };
@@ -38485,7 +38505,7 @@ function createCachedImport(imp) {
     };
 }
 const importPostcssImport = createCachedImport(() => import('./dep-e3f470e2.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-970ed287.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-1a577c21.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40602,7 +40622,7 @@ function importAnalysisPlugin(config) {
                             }
                             else if (needsInterop) {
                                 debug$a?.(`${url} needs interop`);
-                                interopNamedImports(str(), importSpecifier, url, index);
+                                interopNamedImports(str(), importSpecifier, url, index, importer, config);
                                 rewriteDone = true;
                             }
                         }
@@ -40611,7 +40631,7 @@ function importAnalysisPlugin(config) {
                         // correctly throw the error message.
                         else if (url.includes(browserExternalId) &&
                             source.slice(expStart, start).includes('{')) {
-                            interopNamedImports(str(), importSpecifier, url, index);
+                            interopNamedImports(str(), importSpecifier, url, index, importer, config);
                             rewriteDone = true;
                         }
                         if (!rewriteDone) {
@@ -40756,7 +40776,7 @@ function mergeAcceptedUrls(orderedUrls) {
     }
     return acceptedUrls;
 }
-function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex) {
+function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex, importer, config) {
     const source = str.original;
     const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, } = importSpecifier;
     if (dynamicIndex > -1) {
@@ -40766,7 +40786,7 @@ function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex) {
     else {
         const exp = source.slice(expStart, expEnd);
         const rawUrl = source.slice(start, end);
-        const rewritten = transformCjsImport(exp, rewrittenUrl, rawUrl, importIndex);
+        const rewritten = transformCjsImport(exp, rewrittenUrl, rawUrl, importIndex, importer, config);
         if (rewritten) {
             str.overwrite(expStart, expEnd, rewritten, { contentOnly: true });
         }
@@ -40789,12 +40809,18 @@ function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex) {
  *
  * Credits \@csr632 via #837
  */
-function transformCjsImport(importExp, url, rawUrl, importIndex) {
+function transformCjsImport(importExp, url, rawUrl, importIndex, importer, config) {
     const node = parse$d(importExp, {
         ecmaVersion: 'latest',
         sourceType: 'module',
     }).body[0];
-    if (node.type === 'ImportDeclaration' ||
+    // `export * from '...'` may cause unexpected problem, so give it a warning
+    if (config.command === 'serve' &&
+        node.type === 'ExportAllDeclaration' &&
+        !node.exported) {
+        config.logger.warn(picocolorsExports.yellow(`\nUnable to interop \`${importExp}\` in ${importer}, this may lose module exports. Please export "${rawUrl}" as ESM or use named exports instead, e.g. \`export { A, B } from "${rawUrl}"\``));
+    }
+    else if (node.type === 'ImportDeclaration' ||
         node.type === 'ExportNamedDeclaration') {
         if (!node.specifiers.length) {
             return `import "${url}"`;
@@ -41358,8 +41384,9 @@ function preAliasPlugin(config) {
                         return optimizedId; // aliased dep already optimized
                     }
                     const resolved = await this.resolve(id, importer, {
-                        skipSelf: true,
                         ...options,
+                        custom: { ...options.custom, 'vite:pre-alias': true },
+                        skipSelf: true,
                     });
                     if (resolved && !depsOptimizer.isOptimizedDepFile(resolved.id)) {
                         const optimizeDeps = depsOptimizer.options;
@@ -42119,6 +42146,14 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
         : { pre: [], post: [] };
     const { modulePreload } = config.build;
     return [
+        ...(isDepsOptimizerEnabled(config, false) ||
+            isDepsOptimizerEnabled(config, true)
+            ? [
+                isBuild
+                    ? optimizedDepsBuildPlugin(config)
+                    : optimizedDepsPlugin(config),
+            ]
+            : []),
         isWatch ? ensureWatchPlugin() : null,
         isBuild ? metadataPlugin() : null,
         watchPackageDataPlugin(config.packageCache),
@@ -42129,14 +42164,6 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
             (typeof modulePreload === 'object' && modulePreload.polyfill)
             ? modulePreloadPolyfillPlugin(config)
             : null,
-        ...(isDepsOptimizerEnabled(config, false) ||
-            isDepsOptimizerEnabled(config, true)
-            ? [
-                isBuild
-                    ? optimizedDepsBuildPlugin(config)
-                    : optimizedDepsPlugin(config),
-            ]
-            : []),
         resolvePlugin({
             ...config.resolve,
             root: config.root,
@@ -43363,7 +43390,7 @@ async function createDepsOptimizer(config, server) {
     const ssr = isBuild && !!config.build.ssr; // safe as Dev SSR don't use this optimizer
     const sessionTimestamp = Date.now().toString();
     const cachedMetadata = await loadCachedDepOptimizationMetadata(config, ssr);
-    let handle;
+    let debounceProcessingHandle;
     let closed = false;
     let metadata = cachedMetadata || initDepsOptimizerMetadata(config, ssr, sessionTimestamp);
     const depsOptimizer = {
@@ -43379,7 +43406,6 @@ async function createDepsOptimizer(config, server) {
         ensureFirstRun,
         close,
         options: getDepOptimizationConfig(config, ssr),
-        server,
     };
     depsOptimizerMap.set(config, depsOptimizer);
     let newDepsDiscovered = false;
@@ -43404,12 +43430,23 @@ async function createDepsOptimizer(config, server) {
     };
     let enqueuedRerun;
     let currentlyProcessing = false;
-    // If there wasn't a cache or it is outdated, we need to prepare a first run
     let firstRunCalled = !!cachedMetadata;
+    // During build, we wait for every module to be scanned before resolving
+    // optimized deps loading for rollup on each rebuild. It will be recreated
+    // after each buildStart.
+    // During dev, if this is a cold run, we wait for static imports discovered
+    // from the first request before resolving to minimize full page reloads.
+    // On warm start or after the first optimization is run, we use a simpler
+    // debounce strategy each time a new dep is discovered.
+    let crawlEndFinder;
+    if (isBuild || !cachedMetadata) {
+        crawlEndFinder = setupOnCrawlEnd(onCrawlEnd);
+    }
     let optimizationResult;
     let discover;
     async function close() {
         closed = true;
+        crawlEndFinder?.cancel();
         await Promise.allSettled([
             discover?.cancel(),
             depsOptimizer.scanProcessing,
@@ -43502,8 +43539,8 @@ async function createDepsOptimizer(config, server) {
         // Ensure that rerun is called sequentially
         enqueuedRerun = undefined;
         // Ensure that a rerun will not be issued for current discovered deps
-        if (handle)
-            clearTimeout(handle);
+        if (debounceProcessingHandle)
+            clearTimeout(debounceProcessingHandle);
         if (closed || Object.keys(metadata.discovered).length === 0) {
             currentlyProcessing = false;
             return;
@@ -43632,12 +43669,12 @@ async function createDepsOptimizer(config, server) {
         enqueuedRerun?.();
     }
     function fullReload() {
-        if (depsOptimizer.server) {
+        if (server) {
             // Cached transform results have stale imports (resolved to
             // old locations) so they need to be invalidated before the page is
             // reloaded.
-            depsOptimizer.server.moduleGraph.invalidateAll();
-            depsOptimizer.server.ws.send({
+            server.moduleGraph.invalidateAll();
+            server.ws.send({
                 type: 'full-reload',
                 path: '*',
             });
@@ -43675,7 +43712,10 @@ async function createDepsOptimizer(config, server) {
         // We'll wait until the user codebase is eagerly processed by Vite so
         // we can get a list of every missing dependency before giving to the
         // browser a dependency that may be outdated, thus avoiding full page reloads
-        if (firstRunCalled) {
+        if (!crawlEndFinder) {
+            if (isBuild) {
+                logger.error('Vite Internal Error: Missing dependency found after crawling ended');
+            }
             // Debounced rerun, let other missing dependencies be discovered before
             // the running next optimizeDeps
             debouncedProcessing();
@@ -43708,25 +43748,33 @@ async function createDepsOptimizer(config, server) {
         // Debounced rerun, let other missing dependencies be discovered before
         // the running next optimizeDeps
         enqueuedRerun = undefined;
-        if (handle)
-            clearTimeout(handle);
+        if (debounceProcessingHandle)
+            clearTimeout(debounceProcessingHandle);
         if (newDepsToLogHandle)
             clearTimeout(newDepsToLogHandle);
         newDepsToLogHandle = undefined;
-        handle = setTimeout(() => {
-            handle = undefined;
+        debounceProcessingHandle = setTimeout(() => {
+            debounceProcessingHandle = undefined;
             enqueuedRerun = rerun;
             if (!currentlyProcessing) {
                 enqueuedRerun();
             }
         }, timeout);
     }
+    // During dev, onCrawlEnd is called once when the server starts and all static
+    // imports after the first request have been crawled (dynamic imports may also
+    // be crawled if the browser requests them right away).
+    // During build, onCrawlEnd will be called once after each buildStart (so in
+    // watch mode it will be called after each rebuild has processed every module).
+    // All modules are transformed first in this case (both static and dynamic).
     async function onCrawlEnd() {
+        // On build time, a missing dep appearing after onCrawlEnd is an internal error
+        // On dev, switch after this point to a simple debounce strategy
+        crawlEndFinder = undefined;
         debug$8?.(picocolorsExports.green(`✨ static imports crawl ended`));
-        if (firstRunCalled) {
+        if (closed) {
             return;
         }
-        currentlyProcessing = false;
         const crawlDeps = Object.keys(metadata.discovered);
         // Await for the scan+optimize step running in the background
         // It normally should be over by the time crawling of user code ended
@@ -43734,6 +43782,7 @@ async function createDepsOptimizer(config, server) {
         if (!isBuild && optimizationResult) {
             const result = await optimizationResult.result;
             optimizationResult = undefined;
+            currentlyProcessing = false;
             const scanDeps = Object.keys(result.metadata.optimized);
             if (scanDeps.length === 0 && crawlDeps.length === 0) {
                 debug$8?.(picocolorsExports.green(`✨ no dependencies found by the scanner or crawling static imports`));
@@ -43766,6 +43815,7 @@ async function createDepsOptimizer(config, server) {
             }
         }
         else {
+            currentlyProcessing = false;
             if (crawlDeps.length === 0) {
                 debug$8?.(picocolorsExports.green(`✨ no dependencies found while crawling the static imports`));
                 firstRunCalled = true;
@@ -43776,29 +43826,51 @@ async function createDepsOptimizer(config, server) {
             }
         }
     }
-    const runOptimizerIfIdleAfterMs = 50;
-    let registeredIds = [];
-    let seenIds = new Set();
-    let workersSources = new Set();
-    const waitingOn = new Set();
-    let firstRunEnsured = false;
+    // Called during buildStart at build time, when build --watch is used.
     function resetRegisteredIds() {
-        registeredIds = [];
-        seenIds = new Set();
-        workersSources = new Set();
-        waitingOn.clear();
-        firstRunEnsured = false;
+        crawlEndFinder?.cancel();
+        crawlEndFinder = setupOnCrawlEnd(onCrawlEnd);
+    }
+    function registerWorkersSource(id) {
+        crawlEndFinder?.registerWorkersSource(id);
+    }
+    function delayDepsOptimizerUntil(id, done) {
+        if (crawlEndFinder && !depsOptimizer.isOptimizedDepFile(id)) {
+            crawlEndFinder.delayDepsOptimizerUntil(id, done);
+        }
+    }
+    function ensureFirstRun() {
+        crawlEndFinder?.ensureFirstRun();
+    }
+}
+const callCrawlEndIfIdleAfterMs = 50;
+function setupOnCrawlEnd(onCrawlEnd) {
+    const registeredIds = new Set();
+    const seenIds = new Set();
+    const workersSources = new Set();
+    let timeoutHandle;
+    let cancelled = false;
+    function cancel() {
+        cancelled = true;
+    }
+    let crawlEndCalled = false;
+    function callOnCrawlEnd() {
+        if (!cancelled && !crawlEndCalled) {
+            crawlEndCalled = true;
+            onCrawlEnd();
+        }
     }
     // If all the inputs are dependencies, we aren't going to get any
     // delayDepsOptimizerUntil(id) calls. We need to guard against this
     // by forcing a rerun if no deps have been registered
+    let firstRunEnsured = false;
     function ensureFirstRun() {
-        if (!firstRunEnsured && !firstRunCalled && registeredIds.length === 0) {
+        if (!firstRunEnsured && seenIds.size === 0) {
             setTimeout(() => {
-                if (!closed && registeredIds.length === 0) {
-                    onCrawlEnd();
+                if (seenIds.size === 0) {
+                    callOnCrawlEnd();
                 }
-            }, runOptimizerIfIdleAfterMs);
+            }, 200);
         }
         firstRunEnsured = true;
     }
@@ -43806,56 +43878,42 @@ async function createDepsOptimizer(config, server) {
         workersSources.add(id);
         // Avoid waiting for this id, as it may be blocked by the rollup
         // bundling process of the worker that also depends on the optimizer
-        registeredIds = registeredIds.filter((registered) => registered.id !== id);
-        if (waitingOn.has(id)) {
-            waitingOn.delete(id);
-            runOptimizerWhenIdle();
-        }
+        registeredIds.delete(id);
+        checkIfCrawlEndAfterTimeout();
     }
     function delayDepsOptimizerUntil(id, done) {
-        if (!depsOptimizer.isOptimizedDepFile(id) && !seenIds.has(id)) {
+        if (!seenIds.has(id)) {
             seenIds.add(id);
-            registeredIds.push({ id, done });
-            runOptimizerWhenIdle();
+            if (!workersSources.has(id)) {
+                registeredIds.add(id);
+                done()
+                    .catch(() => { })
+                    .finally(() => markIdAsDone(id));
+            }
         }
     }
-    async function runOptimizerWhenIdle() {
-        if (waitingOn.size > 0)
+    function markIdAsDone(id) {
+        registeredIds.delete(id);
+        checkIfCrawlEndAfterTimeout();
+    }
+    function checkIfCrawlEndAfterTimeout() {
+        if (cancelled || registeredIds.size > 0)
             return;
-        const processingRegisteredIds = registeredIds;
-        registeredIds = [];
-        const donePromises = processingRegisteredIds.map(async (registeredId) => {
-            waitingOn.add(registeredId.id);
-            try {
-                await registeredId.done();
-            }
-            finally {
-                waitingOn.delete(registeredId.id);
-            }
-        });
-        const afterLoad = () => {
-            if (closed)
-                return;
-            if (registeredIds.length > 0 &&
-                registeredIds.every((registeredId) => workersSources.has(registeredId.id))) {
-                return;
-            }
-            if (registeredIds.length > 0) {
-                runOptimizerWhenIdle();
-            }
-            else {
-                onCrawlEnd();
-            }
-        };
-        const results = await Promise.allSettled(donePromises);
-        if (registeredIds.length > 0 ||
-            results.some((result) => result.status === 'rejected')) {
-            afterLoad();
-        }
-        else {
-            setTimeout(afterLoad, runOptimizerIfIdleAfterMs);
-        }
+        if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+        timeoutHandle = setTimeout(callOnCrawlEndWhenIdle, callCrawlEndIfIdleAfterMs);
+    }
+    async function callOnCrawlEndWhenIdle() {
+        if (cancelled || registeredIds.size > 0)
+            return;
+        callOnCrawlEnd();
     }
+    return {
+        ensureFirstRun,
+        registerWorkersSource,
+        delayDepsOptimizerUntil,
+        cancel,
+    };
 }
 async function createDevSsrDepsOptimizer(config) {
     const metadata = await optimizeServerSsrDeps(config);
@@ -43962,22 +44020,18 @@ function addOptimizedDepInfo(metadata, type, depInfo) {
     metadata.depInfoList.push(depInfo);
     return depInfo;
 }
+let firstLoadCachedDepOptimizationMetadata = true;
 /**
  * Creates the initial dep optimization metadata, loading it from the deps cache
  * if it exists and pre-bundling isn't forced
  */
 async function loadCachedDepOptimizationMetadata(config, ssr, force = config.optimizeDeps.force, asCommand = false) {
     const log = asCommand ? config.logger.info : debug$7;
-    setTimeout(() => {
-        // 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$l.existsSync(path$o.join(config.cacheDir, '_metadata.json'))) {
-            emptyDir(config.cacheDir);
-        }
-        // Fire a clean up of stale cache dirs, in case old processes didn't
-        // terminate correctly
-        cleanupDepsCacheStaleDirs(config);
-    }, 100);
+    if (firstLoadCachedDepOptimizationMetadata) {
+        firstLoadCachedDepOptimizationMetadata = false;
+        // Fire up a clean up of stale processing deps dirs if older process exited early
+        setTimeout(() => cleanupDepsCacheStaleDirs(config), 0);
+    }
     const depsCacheDir = getDepsCacheDir(config, ssr);
     if (!force) {
         let cachedMetadata;
@@ -44081,6 +44135,9 @@ function runOptimizeDeps(resolvedConfig, depsInfo, ssr = resolvedConfig.command
         metadata,
         cancel: cleanUp,
         commit: async () => {
+            if (cleaned) {
+                throw new Error('Can not commit a Deps Optimization run as it was cancelled');
+            }
             // Ignore clean up requests after this point so the temp folder isn't deleted before
             // we finish commiting the new deps cache files to the deps folder
             committed = true;
@@ -44221,7 +44278,7 @@ async function prepareEsbuildOptimizerRun(resolvedConfig, depsInfo, ssr, process
     const idToExports = {};
     const optimizeDeps = getDepOptimizationConfig(config, ssr);
     const { plugins: pluginsFromConfig = [], ...esbuildOptions } = optimizeDeps?.esbuildOptions ?? {};
-    for (const id in depsInfo) {
+    await Promise.all(Object.keys(depsInfo).map(async (id) => {
         const src = depsInfo[id].src;
         const exportsData = await (depsInfo[id].exportsData ??
             extractExportsData(src, config, ssr));
@@ -44236,7 +44293,7 @@ async function prepareEsbuildOptimizerRun(resolvedConfig, depsInfo, ssr, process
         const flatId = flattenId(id);
         flatIdDeps[flatId] = src;
         idToExports[id] = exportsData;
-    }
+    }));
     if (optimizerContext.cancelled)
         return { context: undefined, idToExports };
     // esbuild automatically replaces process.env.NODE_ENV for platform 'browser'
@@ -44981,7 +45038,7 @@ function buildImportAnalysisPlugin(config) {
                             }
                             else if (needsInterop) {
                                 // config.logger.info(`${url} needs interop`)
-                                interopNamedImports(str(), imports[index], url, index);
+                                interopNamedImports(str(), imports[index], url, index, importer, config);
                                 rewriteDone = true;
                             }
                             if (!rewriteDone) {
@@ -46228,6 +46285,7 @@ var build$1 = {
 	resolveBuildOutputs: resolveBuildOutputs,
 	resolveBuildPlugins: resolveBuildPlugins,
 	resolveLibFilename: resolveLibFilename,
+	resolveUserExternal: resolveUserExternal,
 	toOutputFilePathInCss: toOutputFilePathInCss,
 	toOutputFilePathInHtml: toOutputFilePathInHtml,
 	toOutputFilePathInJS: toOutputFilePathInJS,
@@ -63154,10 +63212,6 @@ async function createServer(inlineConfig = {}) {
 }
 async function _createServer(inlineConfig = {}, options) {
     const config = await resolveConfig(inlineConfig, 'serve');
-    if (isDepsOptimizerEnabled(config, false)) {
-        // start optimizer in the background, we still need to await the setup
-        await initDepsOptimizer(config);
-    }
     const { root, server: serverConfig } = config;
     const httpsOptions = await resolveHttpsConfig(config.server.https);
     const { middlewareMode } = serverConfig;
@@ -63396,12 +63450,6 @@ async function _createServer(inlineConfig = {}, options) {
     }
     // error handler
     middlewares.use(errorMiddleware(server, middlewareMode));
-    // when the optimizer is ready, hook server so that it can reload the page
-    // or invalidate the module graph when needed
-    const depsOptimizer = getDepsOptimizer(config);
-    if (depsOptimizer) {
-        depsOptimizer.server = server;
-    }
     // httpServer.listen can be called multiple times
     // when port when using next port number
     // this code is to avoid calling buildStart multiple times
@@ -63414,6 +63462,10 @@ async function _createServer(inlineConfig = {}, options) {
             return initingServer;
         initingServer = (async function () {
             await container.buildStart({});
+            // start deps optimizer after all container plugins are ready
+            if (isDepsOptimizerEnabled(config, false)) {
+                await initDepsOptimizer(config, server);
+            }
             initingServer = undefined;
             serverInited = true;
         })();
@@ -63616,7 +63668,7 @@ function compression() {
     // disable Brotli on Node<12.7 where it is unsupported:
     if (!zlib$1.createBrotliCompress)
         brotli = false;
-    return (req, res, next = noop) => {
+    return function viteCompressionMiddleware(req, res, next = noop) {
         const accept = req.headers['accept-encoding'] + '';
         const encoding = ((brotli && accept.match(/\bbr\b/)) ||
             (accept.match(/\bgzip\b/)) ||
@@ -63773,7 +63825,7 @@ async function preview(inlineConfig = {}) {
     const previewBase = config.base === './' || config.base === '' ? '/' : config.base;
     // static assets
     const headers = config.preview.headers;
-    const assetServer = sirv(distDir, {
+    const viteAssetMiddleware = (...args) => sirv(distDir, {
         etag: true,
         dev: true,
         single: config.appType === 'spa',
@@ -63787,8 +63839,8 @@ async function preview(inlineConfig = {}) {
         shouldServe(filePath) {
             return shouldServeFile(filePath, distDir);
         },
-    });
-    app.use(previewBase, assetServer);
+    })(...args);
+    app.use(previewBase, viteAssetMiddleware);
     // apply post server hooks from plugins
     postHooks.forEach((fn) => fn && fn());
     const hostname = await resolveHostname(options.host);
@@ -64378,7 +64430,7 @@ async function loadConfigFromBundledFile(fileName, bundledCode, isESM) {
     if (isESM) {
         const fileBase = `${fileName}.timestamp-${Date.now()}-${Math.random()
             .toString(16)
-            .slice(2)})}`;
+            .slice(2)}`;
         const fileNameTmp = `${fileBase}.mjs`;
         const fileUrl = `${pathToFileURL(fileBase)}.mjs`;
         await fsp.writeFile(fileNameTmp, bundledCode);

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { B as picocolorsExports, C as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-a26366f0.js';
+import { B as picocolorsExports, C as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-f1f8facc.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -728,7 +728,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-a26366f0.js').then(function (n) { return n.G; });
+    const { createServer } = await import('./chunks/dep-f1f8facc.js').then(function (n) { return n.G; });
     try {
         const server = await createServer({
             root,
@@ -806,7 +806,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-a26366f0.js').then(function (n) { return n.F; });
+    const { build } = await import('./chunks/dep-f1f8facc.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -834,7 +834,7 @@ cli
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-a26366f0.js').then(function (n) { return n.E; });
+    const { optimizeDeps } = await import('./chunks/dep-f1f8facc.js').then(function (n) { return n.E; });
     try {
         const config = await resolveConfig({
             root,
@@ -860,7 +860,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-a26366f0.js').then(function (n) { return n.H; });
+    const { preview } = await import('./chunks/dep-f1f8facc.js').then(function (n) { return n.H; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -680,7 +680,6 @@ export declare interface DepsOptimizer {
     ensureFirstRun: () => void;
     close: () => Promise<void>;
     options: DepOptimizationOptions;
-    server?: ViteDevServer;
 }
 
 export { ErrorPayload }

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-a26366f0.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, l as loadConfigFromFile, z as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, A as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-a26366f0.js';
+import { i as isInNodeModules } from './chunks/dep-f1f8facc.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, l as loadConfigFromFile, z as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, A as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-f1f8facc.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.3.0-beta.5",
+  "version": "4.3.0-beta.7",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",