vite 4.3.0-beta.6 → 4.3.0-beta.7

package/dist/node/chunks/{dep-9ae8857c.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-631467cd.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-631467cd.js → dep-f1f8facc.js}

@@ -28652,6 +28652,7 @@ function optimizedDepsBuildPlugin(config) {
                     depsOptimizer.delayDepsOptimizerUntil(resolved.id, async () => {
                         await this.load(resolved);
                     });
+                    return resolved;
                 }
             }
         },
@@ -37834,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;
             };
@@ -38498,7 +38505,7 @@ function createCachedImport(imp) {
     };
 }
 const importPostcssImport = createCachedImport(() => import('./dep-e3f470e2.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-9ae8857c.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
@@ -43836,18 +43843,17 @@ async function createDepsOptimizer(config, server) {
         crawlEndFinder?.ensureFirstRun();
     }
 }
-const runOptimizerIfIdleAfterMs = 50;
+const callCrawlEndIfIdleAfterMs = 50;
 function setupOnCrawlEnd(onCrawlEnd) {
-    let registeredIds = [];
+    const registeredIds = new Set();
     const seenIds = new Set();
     const workersSources = new Set();
-    const waitingOn = new Map();
-    let firstRunEnsured = false;
-    let crawlEndCalled = false;
+    let timeoutHandle;
     let cancelled = false;
     function cancel() {
         cancelled = true;
     }
+    let crawlEndCalled = false;
     function callOnCrawlEnd() {
         if (!cancelled && !crawlEndCalled) {
             crawlEndCalled = true;
@@ -43857,13 +43863,14 @@ function setupOnCrawlEnd(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 && seenIds.size === 0) {
             setTimeout(() => {
                 if (seenIds.size === 0) {
                     callOnCrawlEnd();
                 }
-            }, runOptimizerIfIdleAfterMs);
+            }, 200);
         }
         firstRunEnsured = true;
     }
@@ -43871,60 +43878,35 @@ function setupOnCrawlEnd(onCrawlEnd) {
         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);
-        const resolve = waitingOn.get(id);
-        // Forced resolve to avoid waiting for the bundling of the worker to finish
-        resolve?.();
+        registeredIds.delete(id);
+        checkIfCrawlEndAfterTimeout();
     }
     function delayDepsOptimizerUntil(id, done) {
         if (!seenIds.has(id)) {
             seenIds.add(id);
-            registeredIds.push({ id, done });
-            callOnCrawlEndWhenIdle();
+            if (!workersSources.has(id)) {
+                registeredIds.add(id);
+                done()
+                    .catch(() => { })
+                    .finally(() => markIdAsDone(id));
+            }
         }
     }
+    function markIdAsDone(id) {
+        registeredIds.delete(id);
+        checkIfCrawlEndAfterTimeout();
+    }
+    function checkIfCrawlEndAfterTimeout() {
+        if (cancelled || registeredIds.size > 0)
+            return;
+        if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+        timeoutHandle = setTimeout(callOnCrawlEndWhenIdle, callCrawlEndIfIdleAfterMs);
+    }
     async function callOnCrawlEndWhenIdle() {
-        if (cancelled || waitingOn.size > 0)
+        if (cancelled || registeredIds.size > 0)
             return;
-        const processingRegisteredIds = registeredIds;
-        registeredIds = [];
-        const donePromises = processingRegisteredIds.map(async (registeredId) => {
-            // During build, we need to cancel workers
-            let resolve;
-            const waitUntilDone = new Promise((_resolve) => {
-                resolve = _resolve;
-                registeredId
-                    .done()
-                    .catch(() => {
-                    // Ignore errors
-                })
-                    .finally(() => resolve());
-            });
-            waitingOn.set(registeredId.id, () => resolve());
-            await waitUntilDone;
-            waitingOn.delete(registeredId.id);
-        });
-        const afterLoad = () => {
-            if (cancelled)
-                return;
-            if (registeredIds.length > 0 &&
-                registeredIds.every((registeredId) => workersSources.has(registeredId.id))) {
-                return;
-            }
-            if (registeredIds.length > 0) {
-                callOnCrawlEndWhenIdle();
-            }
-            else {
-                callOnCrawlEnd();
-            }
-        };
-        await Promise.allSettled(donePromises);
-        if (registeredIds.length > 0) {
-            afterLoad();
-        }
-        else {
-            setTimeout(afterLoad, runOptimizerIfIdleAfterMs);
-        }
+        callOnCrawlEnd();
     }
     return {
         ensureFirstRun,
@@ -44038,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;
@@ -44300,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));
@@ -44315,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'
@@ -46307,6 +46285,7 @@ var build$1 = {
 	resolveBuildOutputs: resolveBuildOutputs,
 	resolveBuildPlugins: resolveBuildPlugins,
 	resolveLibFilename: resolveLibFilename,
+	resolveUserExternal: resolveUserExternal,
 	toOutputFilePathInCss: toOutputFilePathInCss,
 	toOutputFilePathInHtml: toOutputFilePathInHtml,
 	toOutputFilePathInJS: toOutputFilePathInJS,
@@ -63689,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/)) ||
@@ -63846,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',
@@ -63860,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);

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-631467cd.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-631467cd.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-631467cd.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-631467cd.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-631467cd.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.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-631467cd.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-631467cd.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.6",
+  "version": "4.3.0-beta.7",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",