vite 4.3.0-beta.0 → 4.3.0-beta.1

package/dist/node/cli.js

@@ -2,8 +2,9 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-7f82b32e.js';
+import { B as picocolorsExports, C as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-f365bad6.js';
 import { VERSION } from './constants.js';
+import 'node:fs/promises';
 import 'node:url';
 import 'node:module';
 import 'tty';
@@ -19,13 +20,13 @@ import 'stream';
 import 'os';
 import 'child_process';
 import 'node:os';
+import 'node:child_process';
 import 'node:crypto';
-import 'node:util';
 import 'node:dns';
 import 'resolve';
 import 'crypto';
 import 'node:buffer';
-import 'node:fs/promises';
+import 'node:util';
 import 'module';
 import 'node:assert';
 import 'node:process';
@@ -40,7 +41,6 @@ import 'node:https';
 import 'rollup';
 import 'querystring';
 import 'node:readline';
-import 'node:child_process';
 import 'node:zlib';
 
 function toArr(any) {
@@ -729,7 +729,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-7f82b32e.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-f365bad6.js').then(function (n) { return n.G; });
     try {
         const server = await createServer({
             root,
@@ -807,7 +807,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-7f82b32e.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-f365bad6.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -835,7 +835,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-7f82b32e.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-f365bad6.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-7f82b32e.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-f365bad6.js').then(function (n) { return n.H; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -663,6 +663,9 @@ export declare interface DepOptimizationResult {
      * to be able to discard the result
      */
     commit: () => Promise<void>;
+    /**
+     * @deprecated noop
+     */
     cancel: () => void;
 }
 
@@ -680,6 +683,7 @@ export declare interface DepsOptimizer {
     ensureFirstRun: () => void;
     close: () => Promise<void>;
     options: DepOptimizationOptions;
+    server?: ViteDevServer;
 }
 
 export { ErrorPayload }
@@ -1493,8 +1497,9 @@ declare interface Plugin_2 extends Plugin_3 {
      */
     configureServer?: ObjectHook<ServerHook>;
     /**
-     * Configure the preview server. The hook receives the connect server and
-     * its underlying http server.
+     * Configure the preview server. The hook receives the {@link PreviewServerForHook}
+     * instance. This can also be used to store a reference to the server
+     * for use in other hooks.
      *
      * The hooks are called before other middlewares are applied. A hook can
      * return a post hook that will be called after other middlewares are
@@ -1601,11 +1606,24 @@ export declare function preview(inlineConfig?: InlineConfig): Promise<PreviewSer
 export declare interface PreviewOptions extends CommonServerOptions {
 }
 
-export declare interface PreviewServer {
+export declare interface PreviewServer extends PreviewServerForHook {
+    resolvedUrls: ResolvedServerUrls;
+}
+
+export declare interface PreviewServerForHook {
     /**
      * The resolved vite config object
      */
     config: ResolvedConfig;
+    /**
+     * A connect app instance.
+     * - Can be used to attach custom middlewares to the preview server.
+     * - Can also be used as the handler function of a custom http server
+     *   or as a middleware in any connect-style Node.js frameworks
+     *
+     * https://github.com/senchalabs/connect#use-middleware
+     */
+    middlewares: Connect.Server;
     /**
      * native Node http server instance
      */
@@ -1613,17 +1631,14 @@ export declare interface PreviewServer {
     /**
      * The resolved urls Vite prints on the CLI
      */
-    resolvedUrls: ResolvedServerUrls;
+    resolvedUrls: ResolvedServerUrls | null;
     /**
      * Print server urls
      */
     printUrls(): void;
 }
 
-export declare type PreviewServerHook = (this: void, server: {
-    middlewares: Connect.Server;
-    httpServer: http.Server;
-}) => (() => void) | void | Promise<(() => void) | void>;
+export declare type PreviewServerHook = (this: void, server: PreviewServerForHook) => (() => void) | void | Promise<(() => void) | void>;
 
 export declare interface ProxyOptions extends HttpProxy.ServerOptions {
     /**

package/dist/node/index.js

@@ -1,8 +1,10 @@
-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-7f82b32e.js';
+import { i as isInNodeModules } from './chunks/dep-f365bad6.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-f365bad6.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
 import 'node:fs';
+import 'node:fs/promises';
 import 'node:path';
 import 'node:url';
 import 'node:perf_hooks';
@@ -20,13 +22,13 @@ import 'stream';
 import 'os';
 import 'child_process';
 import 'node:os';
+import 'node:child_process';
 import 'node:crypto';
-import 'node:util';
 import 'node:dns';
 import 'resolve';
 import 'crypto';
 import 'node:buffer';
-import 'node:fs/promises';
+import 'node:util';
 import 'module';
 import 'node:assert';
 import 'node:process';
@@ -40,7 +42,6 @@ import 'node:http';
 import 'node:https';
 import 'querystring';
 import 'node:readline';
-import 'node:child_process';
 import 'node:zlib';
 
 // This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
@@ -67,7 +68,7 @@ class SplitVendorChunkCache {
 function splitVendorChunk(options = {}) {
     const cache = options.cache ?? new SplitVendorChunkCache();
     return (id, { getModuleInfo }) => {
-        if (id.includes('node_modules') &&
+        if (isInNodeModules(id) &&
             !isCSSRequest(id) &&
             staticImportedByEntry(id, getModuleInfo, cache.cache)) {
             return 'vendor';

package/dist/node-cjs/publicUtils.cjs

@@ -6,7 +6,6 @@ var fs$1 = require('node:fs');
 var esbuild = require('esbuild');
 var rollup = require('rollup');
 var os$1 = require('node:os');
-var node_util = require('node:util');
 var node_module = require('node:module');
 var require$$0 = require('tty');
 var require$$1 = require('util');
@@ -25,113 +24,6 @@ const CLIENT_ENTRY = path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/client.mjs');
 path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/env.mjs');
 path$3.dirname(CLIENT_ENTRY);
 
-// This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
-// copy from constants.ts
-const CSS_LANGS_RE = 
-// eslint-disable-next-line regexp/no-unused-capturing-group
-/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
-const isCSSRequest = (request) => CSS_LANGS_RE.test(request);
-// Use splitVendorChunkPlugin() to get the same manualChunks strategy as Vite 2.7
-// We don't recommend using this strategy as a general solution moving forward
-// splitVendorChunk is a simple index/vendor strategy that was used in Vite
-// until v2.8. It is exposed to let people continue to use it in case it was
-// working well for their setups.
-// The cache needs to be reset on buildStart for watch mode to work correctly
-// Don't use this manualChunks strategy for ssr, lib mode, and 'umd' or 'iife'
-class SplitVendorChunkCache {
-    constructor() {
-        this.cache = new Map();
-    }
-    reset() {
-        this.cache = new Map();
-    }
-}
-function splitVendorChunk(options = {}) {
-    const cache = options.cache ?? new SplitVendorChunkCache();
-    return (id, { getModuleInfo }) => {
-        if (id.includes('node_modules') &&
-            !isCSSRequest(id) &&
-            staticImportedByEntry(id, getModuleInfo, cache.cache)) {
-            return 'vendor';
-        }
-    };
-}
-function staticImportedByEntry(id, getModuleInfo, cache, importStack = []) {
-    if (cache.has(id)) {
-        return cache.get(id);
-    }
-    if (importStack.includes(id)) {
-        // circular deps!
-        cache.set(id, false);
-        return false;
-    }
-    const mod = getModuleInfo(id);
-    if (!mod) {
-        cache.set(id, false);
-        return false;
-    }
-    if (mod.isEntry) {
-        cache.set(id, true);
-        return true;
-    }
-    const someImporterIs = mod.importers.some((importer) => staticImportedByEntry(importer, getModuleInfo, cache, importStack.concat(id)));
-    cache.set(id, someImporterIs);
-    return someImporterIs;
-}
-function splitVendorChunkPlugin() {
-    const caches = [];
-    function createSplitVendorChunk(output, config) {
-        const cache = new SplitVendorChunkCache();
-        caches.push(cache);
-        const build = config.build ?? {};
-        const format = output?.format;
-        if (!build.ssr && !build.lib && format !== 'umd' && format !== 'iife') {
-            return splitVendorChunk({ cache });
-        }
-    }
-    return {
-        name: 'vite:split-vendor-chunk',
-        config(config) {
-            let outputs = config?.build?.rollupOptions?.output;
-            if (outputs) {
-                outputs = Array.isArray(outputs) ? outputs : [outputs];
-                for (const output of outputs) {
-                    const viteManualChunks = createSplitVendorChunk(output, config);
-                    if (viteManualChunks) {
-                        if (output.manualChunks) {
-                            if (typeof output.manualChunks === 'function') {
-                                const userManualChunks = output.manualChunks;
-                                output.manualChunks = (id, api) => {
-                                    return userManualChunks(id, api) ?? viteManualChunks(id, api);
-                                };
-                            }
-                            // else, leave the object form of manualChunks untouched, as
-                            // we can't safely replicate rollup handling.
-                        }
-                        else {
-                            output.manualChunks = viteManualChunks;
-                        }
-                    }
-                }
-            }
-            else {
-                return {
-                    build: {
-                        rollupOptions: {
-                            output: {
-                                manualChunks: createSplitVendorChunk({}, config),
-                            },
-                        },
-                    },
-                };
-            }
-        },
-        buildStart() {
-            caches.forEach((cache) => cache.reset());
-        },
-    };
-}
-
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 const intToChar = new Uint8Array(64); // 64 possible chars.
 const charToInt = new Uint8Array(128); // z is 122 in ASCII
@@ -3408,6 +3300,9 @@ const windowsSlashRE = /\\/g;
 function slash(p) {
     return p.replace(windowsSlashRE, '/');
 }
+function isInNodeModules(id) {
+    return id.includes('node_modules');
+}
 // TODO: use import()
 const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)));
 // set in bin/vite.js
@@ -3445,22 +3340,12 @@ function normalizePath(id) {
 function isObject(value) {
     return Object.prototype.toString.call(value) === '[object Object]';
 }
-function lookupFile(dir, formats, options) {
-    for (const format of formats) {
-        const fullPath = path$3.join(dir, format);
-        if (fs$1.existsSync(fullPath) && fs$1.statSync(fullPath).isFile()) {
-            const result = options?.pathOnly
-                ? fullPath
-                : fs$1.readFileSync(fullPath, 'utf-8');
-            if (!options?.predicate || options.predicate(result)) {
-                return result;
-            }
-        }
+function tryStatSync(file) {
+    try {
+        return fs$1.statSync(file, { throwIfNoEntry: false });
     }
-    const parentDir = path$3.dirname(dir);
-    if (parentDir !== dir &&
-        (!options?.rootDir || parentDir.startsWith(options?.rootDir))) {
-        return lookupFile(parentDir, formats, options);
+    catch {
+        // Ignore errors
     }
 }
 function isFileReadable(filename) {
@@ -3472,17 +3357,6 @@ function isFileReadable(filename) {
         return false;
     }
 }
-isWindows
-    ? node_util.promisify(gracefulRemoveDir)
-    : function removeDirSync(dir) {
-        // when removing `.vite/deps`, if it doesn't exist, nodejs may also remove
-        // other directories within `.vite/`, including `.vite/deps_temp` (bug).
-        // workaround by checking for directory existence before removing for now.
-        if (fs$1.existsSync(dir)) {
-            fs$1.rmSync(dir, { recursive: true, force: true });
-        }
-    };
-isWindows ? node_util.promisify(gracefulRename) : fs$1.renameSync;
 function arraify(target) {
     return Array.isArray(target) ? target : [target];
 }
@@ -3500,63 +3374,6 @@ const usingDynamicImport = typeof jest === 'undefined';
 usingDynamicImport
     ? new Function('file', 'return import(file)')
     : _require;
-// Based on node-graceful-fs
-// The ISC License
-// Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
-// https://github.com/isaacs/node-graceful-fs/blob/main/LICENSE
-// On Windows, A/V software can lock the directory, causing this
-// to fail with an EACCES or EPERM if the directory contains newly
-// created files. The original tried for up to 60 seconds, we only
-// wait for 5 seconds, as a longer time would be seen as an error
-const GRACEFUL_RENAME_TIMEOUT = 5000;
-function gracefulRename(from, to, cb) {
-    const start = Date.now();
-    let backoff = 0;
-    fs$1.rename(from, to, function CB(er) {
-        if (er &&
-            (er.code === 'EACCES' || er.code === 'EPERM') &&
-            Date.now() - start < GRACEFUL_RENAME_TIMEOUT) {
-            setTimeout(function () {
-                fs$1.stat(to, function (stater, st) {
-                    if (stater && stater.code === 'ENOENT')
-                        fs$1.rename(from, to, CB);
-                    else
-                        CB(er);
-                });
-            }, backoff);
-            if (backoff < 100)
-                backoff += 10;
-            return;
-        }
-        if (cb)
-            cb(er);
-    });
-}
-const GRACEFUL_REMOVE_DIR_TIMEOUT = 5000;
-function gracefulRemoveDir(dir, cb) {
-    const start = Date.now();
-    let backoff = 0;
-    fs$1.rm(dir, { recursive: true }, function CB(er) {
-        if (er) {
-            if ((er.code === 'ENOTEMPTY' ||
-                er.code === 'EACCES' ||
-                er.code === 'EPERM') &&
-                Date.now() - start < GRACEFUL_REMOVE_DIR_TIMEOUT) {
-                setTimeout(function () {
-                    fs$1.rm(dir, { recursive: true }, CB);
-                }, backoff);
-                if (backoff < 100)
-                    backoff += 10;
-                return;
-            }
-            if (er.code === 'ENOENT') {
-                er = null;
-            }
-        }
-        if (cb)
-            cb(er);
-    });
-}
 function mergeConfigRecursively(defaults, overrides, rootPath) {
     const merged = { ...defaults };
     for (const key in overrides) {
@@ -3638,6 +3455,113 @@ function normalizeSingleAlias({ find, replacement, customResolver, }) {
     return alias;
 }
 
+// This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
+// copy from constants.ts
+const CSS_LANGS_RE = 
+// eslint-disable-next-line regexp/no-unused-capturing-group
+/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
+const isCSSRequest = (request) => CSS_LANGS_RE.test(request);
+// Use splitVendorChunkPlugin() to get the same manualChunks strategy as Vite 2.7
+// We don't recommend using this strategy as a general solution moving forward
+// splitVendorChunk is a simple index/vendor strategy that was used in Vite
+// until v2.8. It is exposed to let people continue to use it in case it was
+// working well for their setups.
+// The cache needs to be reset on buildStart for watch mode to work correctly
+// Don't use this manualChunks strategy for ssr, lib mode, and 'umd' or 'iife'
+class SplitVendorChunkCache {
+    constructor() {
+        this.cache = new Map();
+    }
+    reset() {
+        this.cache = new Map();
+    }
+}
+function splitVendorChunk(options = {}) {
+    const cache = options.cache ?? new SplitVendorChunkCache();
+    return (id, { getModuleInfo }) => {
+        if (isInNodeModules(id) &&
+            !isCSSRequest(id) &&
+            staticImportedByEntry(id, getModuleInfo, cache.cache)) {
+            return 'vendor';
+        }
+    };
+}
+function staticImportedByEntry(id, getModuleInfo, cache, importStack = []) {
+    if (cache.has(id)) {
+        return cache.get(id);
+    }
+    if (importStack.includes(id)) {
+        // circular deps!
+        cache.set(id, false);
+        return false;
+    }
+    const mod = getModuleInfo(id);
+    if (!mod) {
+        cache.set(id, false);
+        return false;
+    }
+    if (mod.isEntry) {
+        cache.set(id, true);
+        return true;
+    }
+    const someImporterIs = mod.importers.some((importer) => staticImportedByEntry(importer, getModuleInfo, cache, importStack.concat(id)));
+    cache.set(id, someImporterIs);
+    return someImporterIs;
+}
+function splitVendorChunkPlugin() {
+    const caches = [];
+    function createSplitVendorChunk(output, config) {
+        const cache = new SplitVendorChunkCache();
+        caches.push(cache);
+        const build = config.build ?? {};
+        const format = output?.format;
+        if (!build.ssr && !build.lib && format !== 'umd' && format !== 'iife') {
+            return splitVendorChunk({ cache });
+        }
+    }
+    return {
+        name: 'vite:split-vendor-chunk',
+        config(config) {
+            let outputs = config?.build?.rollupOptions?.output;
+            if (outputs) {
+                outputs = Array.isArray(outputs) ? outputs : [outputs];
+                for (const output of outputs) {
+                    const viteManualChunks = createSplitVendorChunk(output, config);
+                    if (viteManualChunks) {
+                        if (output.manualChunks) {
+                            if (typeof output.manualChunks === 'function') {
+                                const userManualChunks = output.manualChunks;
+                                output.manualChunks = (id, api) => {
+                                    return userManualChunks(id, api) ?? viteManualChunks(id, api);
+                                };
+                            }
+                            // else, leave the object form of manualChunks untouched, as
+                            // we can't safely replicate rollup handling.
+                        }
+                        else {
+                            output.manualChunks = viteManualChunks;
+                        }
+                    }
+                }
+            }
+            else {
+                return {
+                    build: {
+                        rollupOptions: {
+                            output: {
+                                manualChunks: createSplitVendorChunk({}, config),
+                            },
+                        },
+                    },
+                };
+            }
+        },
+        buildStart() {
+            caches.forEach((cache) => cache.reset());
+        },
+    };
+}
+
 /*!
  * etag
  * Copyright(c) 2014-2016 Douglas Christopher Wilson
@@ -4253,13 +4177,10 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
         /** mode local file */ `.env.${mode}.local`,
     ];
     const parsed = Object.fromEntries(envFiles.flatMap((file) => {
-        const path = lookupFile(envDir, [file], {
-            pathOnly: true,
-            rootDir: envDir,
-        });
-        if (!path)
+        const filePath = path$3.join(envDir, file);
+        if (!tryStatSync(filePath)?.isFile())
             return [];
-        return Object.entries(parse_1(fs$1.readFileSync(path)));
+        return Object.entries(parse_1(fs$1.readFileSync(filePath)));
     }));
     // test NODE_ENV override before expand as otherwise process.env.NODE_ENV would override this
     if (parsed.NODE_ENV && process.env.VITE_USER_NODE_ENV === undefined) {

package/package.json

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