vite 4.0.0-beta.4 → 4.0.0-beta.6

package/dist/node/chunks/{dep-3f45d7c9.js → dep-cf256579.js}

@@ -12597,8 +12597,9 @@ function printServerUrls(urls, optionsHost, info) {
         info(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Network')}: ${colorUrl(url)}`);
     }
     if (urls.network.length === 0 && optionsHost === undefined) {
-        const note = `use ${picocolors.exports.reset(picocolors.exports.bold('--host'))} to expose`;
-        info(picocolors.exports.dim(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Network')}: ${note}`));
+        info(picocolors.exports.dim(`  ${picocolors.exports.green('➜')}  ${picocolors.exports.bold('Network')}: use `) +
+            picocolors.exports.bold('--host') +
+            picocolors.exports.dim(' to expose'));
     }
 }
 
@@ -13391,8 +13392,6 @@ async function transformWithEsbuild(code, filename, options, inMap) {
         };
     }
     const resolvedOptions = {
-        // esbuild 0.16.0 & 0.16.1 defaults to 'browser': https://github.com/evanw/esbuild/issues/2718
-        platform: 'neutral',
         sourcemap: true,
         // ensure source file name contains full query
         sourcefile: filename,
@@ -37612,7 +37611,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-504e6b2a.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-da28aebd.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -42672,16 +42671,19 @@ async function scanImports(config) {
     const container = await createPluginContainer(config);
     const plugin = esbuildScanPlugin(config, container, deps, missing, entries);
     const { plugins = [], ...esbuildOptions } = config.optimizeDeps?.esbuildOptions ?? {};
-    await Promise.all(entries.map((entry) => build$3({
+    await build$3({
         absWorkingDir: process.cwd(),
         write: false,
-        entryPoints: [entry],
+        stdin: {
+            contents: entries.map((e) => `import ${JSON.stringify(e)}`).join('\n'),
+            loader: 'js',
+        },
         bundle: true,
         format: 'esm',
         logLevel: 'error',
         plugins: [...plugins, plugin],
         ...esbuildOptions,
-    })));
+    });
     debug$8(`Scan completed in ${(performance.now() - start).toFixed(2)}ms:`, deps);
     return {
         // Ensure a fixed order so hashes are stable and improve logs
@@ -43127,15 +43129,14 @@ async function createDepsOptimizer(config, server) {
     // If there wasn't a cache or it is outdated, we need to prepare a first run
     let firstRunCalled = !!cachedMetadata;
     let postScanOptimizationResult;
-    let discoverProjectDependenciesPromise;
     let optimizingNewDeps;
     async function close() {
         closed = true;
-        await discoverProjectDependenciesPromise?.catch(() => {
-            /* ignore error for scanner because it's not important */
-        });
-        await postScanOptimizationResult;
-        await optimizingNewDeps;
+        await Promise.allSettled([
+            depsOptimizer.scanProcessing,
+            postScanOptimizationResult,
+            optimizingNewDeps,
+        ]);
     }
     if (!cachedMetadata) {
         // Enter processing state until crawl of static imports ends
@@ -43153,43 +43154,41 @@ async function createDepsOptimizer(config, server) {
         }
         if (!isBuild) {
             // Important, the scanner is dev only
-            const scanPhaseProcessing = newDepOptimizationProcessing();
-            depsOptimizer.scanProcessing = scanPhaseProcessing.promise;
-            // Ensure server listen is called before the scanner
-            setTimeout(async () => {
-                try {
-                    debuggerViteDeps(picocolors.exports.green(`scanning for dependencies...`));
-                    discoverProjectDependenciesPromise =
-                        discoverProjectDependencies(config);
-                    const deps = await discoverProjectDependenciesPromise;
-                    debuggerViteDeps(picocolors.exports.green(Object.keys(deps).length > 0
-                        ? `dependencies found by scanner: ${depsLogString(Object.keys(deps))}`
-                        : `no dependencies found by scanner`));
-                    // Add these dependencies to the discovered list, as these are currently
-                    // used by the preAliasPlugin to support aliased and optimized deps.
-                    // This is also used by the CJS externalization heuristics in legacy mode
-                    for (const id of Object.keys(deps)) {
-                        if (!metadata.discovered[id]) {
-                            addMissingDep(id, deps[id]);
+            depsOptimizer.scanProcessing = new Promise((resolve) => {
+                // Ensure server listen is called before the scanner
+                setTimeout(async () => {
+                    try {
+                        debuggerViteDeps(picocolors.exports.green(`scanning for dependencies...`));
+                        const deps = await discoverProjectDependencies(config);
+                        debuggerViteDeps(picocolors.exports.green(Object.keys(deps).length > 0
+                            ? `dependencies found by scanner: ${depsLogString(Object.keys(deps))}`
+                            : `no dependencies found by scanner`));
+                        // Add these dependencies to the discovered list, as these are currently
+                        // used by the preAliasPlugin to support aliased and optimized deps.
+                        // This is also used by the CJS externalization heuristics in legacy mode
+                        for (const id of Object.keys(deps)) {
+                            if (!metadata.discovered[id]) {
+                                addMissingDep(id, deps[id]);
+                            }
+                        }
+                        if (!isBuild) {
+                            const knownDeps = prepareKnownDeps();
+                            // For dev, we run the scanner and the first optimization
+                            // run on the background, but we wait until crawling has ended
+                            // to decide if we send this result to the browser or we need to
+                            // do another optimize step
+                            postScanOptimizationResult = runOptimizeDeps(config, knownDeps);
                         }
                     }
-                    if (!isBuild) {
-                        const knownDeps = prepareKnownDeps();
-                        // For dev, we run the scanner and the first optimization
-                        // run on the background, but we wait until crawling has ended
-                        // to decide if we send this result to the browser or we need to
-                        // do another optimize step
-                        postScanOptimizationResult = runOptimizeDeps(config, knownDeps);
+                    catch (e) {
+                        logger.error(e.message);
                     }
-                }
-                catch (e) {
-                    logger.error(e.message);
-                }
-                finally {
-                    scanPhaseProcessing.resolve();
-                    depsOptimizer.scanProcessing = undefined;
-                }
-            }, 0);
+                    finally {
+                        resolve();
+                        depsOptimizer.scanProcessing = undefined;
+                    }
+                }, 0);
+            });
         }
     }
     function startNextDiscoveredBatch() {
@@ -53120,6 +53119,17 @@ function rebindErrorStacktrace(e, stacktrace) {
         e.stack = stacktrace;
     }
 }
+const rewroteStacktraces = new WeakSet();
+function ssrFixStacktrace(e, moduleGraph) {
+    if (!e.stack)
+        return;
+    // stacktrace shouldn't be rewritten more than once
+    if (rewroteStacktraces.has(e))
+        return;
+    const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph);
+    rebindErrorStacktrace(e, stacktrace);
+    rewroteStacktraces.add(e);
+}
 
 const pendingModules = new Map();
 const pendingImports = new Map();
@@ -53240,9 +53250,8 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     catch (e) {
         mod.ssrError = e;
         if (e.stack && fixStacktrace) {
-            const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph);
-            rebindErrorStacktrace(e, stacktrace);
-            server.config.logger.error(`Error when evaluating SSR module ${url}:\n${stacktrace}`, {
+            ssrFixStacktrace(e, moduleGraph);
+            server.config.logger.error(`Error when evaluating SSR module ${url}:\n${e.stack}`, {
                 timestamp: true,
                 clear: server.config.clearScreen,
                 error: e,
@@ -54425,8 +54434,9 @@ function startBrowserProcess(browser, url) {
 }
 
 function bindShortcuts(server, opts) {
-    if (!server.httpServer)
+    if (!server.httpServer || !process.stdin.isTTY || process.env.CI) {
         return;
+    }
     server._shortcutsOptions = opts;
     if (opts.print) {
         server.config.logger.info(picocolors.exports.dim(picocolors.exports.green('  ➜')) +
@@ -54447,11 +54457,13 @@ function bindShortcuts(server, opts) {
         if (actionRunning)
             return;
         if (input === 'h') {
-            server.config.logger.info(shortcuts
-                .map((shortcut) => picocolors.exports.dim('  press ') +
-                picocolors.exports.bold(shortcut.key) +
-                picocolors.exports.dim(` to ${shortcut.description}`))
-                .join('\n'));
+            server.config.logger.info([
+                '',
+                picocolors.exports.bold('  Shortcuts'),
+                ...shortcuts.map((shortcut) => picocolors.exports.dim('  press ') +
+                    picocolors.exports.bold(shortcut.key) +
+                    picocolors.exports.dim(` to ${shortcut.description}`)),
+            ].join('\n'));
         }
         const shortcut = shortcuts.find((shortcut) => shortcut.key === input);
         if (!shortcut)
@@ -54460,9 +54472,7 @@ function bindShortcuts(server, opts) {
         await shortcut.action(server);
         actionRunning = false;
     };
-    if (process.stdin.isTTY) {
-        process.stdin.setRawMode(true);
-    }
+    process.stdin.setRawMode(true);
     process.stdin.on('data', onInput).setEncoding('utf8').resume();
     server.httpServer.on('close', () => {
         process.stdin.off('data', onInput).pause();
@@ -61917,10 +61927,7 @@ async function createServer(inlineConfig = {}) {
             return ssrLoadModule(url, server, undefined, undefined, opts?.fixStacktrace);
         },
         ssrFixStacktrace(e) {
-            if (e.stack) {
-                const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph);
-                rebindErrorStacktrace(e, stacktrace);
-            }
+            ssrFixStacktrace(e, moduleGraph);
         },
         ssrRewriteStacktrace(stack) {
             return ssrRewriteStacktrace(stack, moduleGraph);
@@ -61944,7 +61951,7 @@ async function createServer(inlineConfig = {}) {
                     process.stdin.off('end', exitProcess);
                 }
             }
-            await Promise.all([
+            await Promise.allSettled([
                 watcher.close(),
                 ws.close(),
                 container.close(),

package/dist/node/chunks/{dep-504e6b2a.js → dep-da28aebd.js}

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

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 { A as picocolors, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-3f45d7c9.js';
+import { A as picocolors, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-cf256579.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -725,7 +725,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-3f45d7c9.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-cf256579.js').then(function (n) { return n.F; });
     try {
         const server = await createServer({
             root,
@@ -804,7 +804,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-3f45d7c9.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-cf256579.js').then(function (n) { return n.E; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -832,7 +832,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-3f45d7c9.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-cf256579.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -857,7 +857,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-3f45d7c9.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-cf256579.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, e as buildErrorMessage, u as createFilter, w as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, j as getDepOptimizationConfig, k as isDepsOptimizerEnabled, l as loadConfigFromFile, y as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, i as resolveBaseUrl, h as resolveConfig, z as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, x as searchForWorkspaceRoot, v as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-3f45d7c9.js';
+export { b as build, e as buildErrorMessage, u as createFilter, w as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, j as getDepOptimizationConfig, k as isDepsOptimizerEnabled, l as loadConfigFromFile, y as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, i as resolveBaseUrl, h as resolveConfig, z as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, x as searchForWorkspaceRoot, v as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-cf256579.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.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -58,10 +58,10 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.16.1",
+    "esbuild": "^0.16.2",
     "postcss": "^8.4.19",
     "resolve": "^1.22.1",
-    "rollup": "^3.6.0"
+    "rollup": "^3.7.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"