vite 3.2.3 → 4.0.0-alpha.1

package/dist/node/cli.js

@@ -1,9 +1,9 @@
+import path from 'node:path';
+import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-51c4f80a.js';
+import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-7d777026.js';
 import { VERSION } from './constants.js';
-import 'node:fs';
-import 'node:path';
 import 'node:url';
 import 'node:module';
 import 'tty';
@@ -651,6 +651,23 @@ class CAC extends EventEmitter {
 const cac = (name = "") => new CAC(name);
 
 const cli = cac('vite');
+const stopProfiler = (log) => {
+    // @ts-ignore
+    const profileSession = global.__vite_profile_session;
+    if (profileSession) {
+        profileSession.post('Profiler.stop', (err, { profile }) => {
+            // Write profile to disk, upload, etc.
+            if (!err) {
+                const outPath = path.resolve('./vite-profile.cpuprofile');
+                fs.writeFileSync(outPath, JSON.stringify(profile));
+                log(picocolors.exports.yellow(`CPU profile written to ${picocolors.exports.white(picocolors.exports.dim(outPath))}`));
+            }
+            else {
+                throw err;
+            }
+        });
+    }
+};
 const filterDuplicateOptions = (options) => {
     for (const [key, value] of Object.entries(options)) {
         if (Array.isArray(value)) {
@@ -702,7 +719,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-51c4f80a.js').then(function (n) { return n.D; });
+    const { createServer } = await import('./chunks/dep-7d777026.js').then(function (n) { return n.D; });
     try {
         const server = await createServer({
             root,
@@ -726,9 +743,14 @@ cli
             : '';
         info(`\n  ${picocolors.exports.green(`${picocolors.exports.bold('VITE')} v${VERSION}`)}  ${startupDurationString}\n`, { clear: !server.config.logger.hasWarned });
         server.printUrls();
+        stopProfiler((message) => server.config.logger.info(`  ${message}`));
     }
     catch (e) {
-        createLogger(options.logLevel).error(picocolors.exports.red(`error when starting dev server:\n${e.stack}`), { error: e });
+        const logger = createLogger(options.logLevel);
+        logger.error(picocolors.exports.red(`error when starting dev server:\n${e.stack}`), {
+            error: e
+        });
+        stopProfiler(logger.info);
         process.exit(1);
     }
 });
@@ -750,7 +772,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-51c4f80a.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-7d777026.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -768,6 +790,9 @@ cli
         createLogger(options.logLevel).error(picocolors.exports.red(`error during build:\n${e.stack}`), { error: e });
         process.exit(1);
     }
+    finally {
+        stopProfiler((message) => createLogger(options.logLevel).info(message));
+    }
 });
 // optimize
 cli
@@ -775,7 +800,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-51c4f80a.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-7d777026.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -800,7 +825,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-51c4f80a.js').then(function (n) { return n.E; });
+    const { preview } = await import('./chunks/dep-7d777026.js').then(function (n) { return n.E; });
     try {
         const server = await preview({
             root,
@@ -825,7 +850,12 @@ cli
         createLogger(options.logLevel).error(picocolors.exports.red(`error when starting preview server:\n${e.stack}`), { error: e });
         process.exit(1);
     }
+    finally {
+        stopProfiler((message) => createLogger(options.logLevel).info(message));
+    }
 });
 cli.help();
 cli.version(VERSION);
 cli.parse();
+
+export { stopProfiler };

package/dist/node/constants.js

@@ -1,8 +1,8 @@
 import path, { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { readFileSync } from 'node:fs';
 
-var version = "3.2.3";
-
+const { version } = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)).toString());
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [
     'module',

package/dist/node/index.d.ts

@@ -1493,6 +1493,7 @@ declare interface Plugin_2 extends Plugin_3 {
      * extend hooks with ssr flag
      */
     resolveId?: ObjectHook<(this: PluginContext, source: string, importer: string | undefined, options: {
+        assertions: Record<string, string>;
         custom?: CustomPluginOptions;
         ssr?: boolean;
         /* Excluded from this release type: scan */
@@ -1512,6 +1513,7 @@ export declare interface PluginContainer {
     getModuleInfo(id: string): ModuleInfo | null;
     buildStart(options: InputOptions): Promise<void>;
     resolveId(id: string, importer?: string, options?: {
+        assertions?: Record<string, string>;
         custom?: CustomPluginOptions;
         skip?: Set<Plugin_2>;
         ssr?: boolean;
@@ -1624,6 +1626,7 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'asse
     inlineConfig: InlineConfig;
     root: string;
     base: string;
+    /* Excluded from this release type: rawBase */
     publicDir: string;
     cacheDir: string;
     command: 'build' | 'serve';

package/dist/node/index.js

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

package/dist/node-cjs/publicUtils.cjs

@@ -1,12 +1,10 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var path$3 = require('node:path');
 var node_url = require('node:url');
+var fs$1 = require('node:fs');
 var esbuild = require('esbuild');
 var rollup = require('rollup');
-var fs$1 = require('node:fs');
 var os$1 = require('node:os');
 var node_util = require('node:util');
 var node_module = require('node:module');
@@ -18,28 +16,14 @@ var require$$1$1 = require('fs');
 var readline = require('node:readline');
 var require$$2 = require('os');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
-
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path$3);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs$1);
-var os__default = /*#__PURE__*/_interopDefaultLegacy(os$1);
-var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
-var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
-var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
-var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
-var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
-
-var version = "3.2.3";
-
+const { version } = JSON.parse(fs$1.readFileSync(new URL('../../package.json', (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)))).toString());
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(
 // import.meta.url is `dist/node/constants.js` after bundle
 node_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))), '../../..');
 const CLIENT_ENTRY = path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/client.mjs');
 path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/env.mjs');
-path__default.dirname(CLIENT_ENTRY);
+path$3.dirname(CLIENT_ENTRY);
 
 // This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
@@ -173,7 +157,7 @@ function getDefaultExportFromCjs (x) {
 
 var picocolors = {exports: {}};
 
-let tty = require$$0__default;
+let tty = require$$0;
 
 let isColorSupported =
 	!("NO_COLOR" in process.env || process.argv.includes("--no-color")) &&
@@ -980,8 +964,8 @@ function requireNode () {
 	if (hasRequiredNode) return node.exports;
 	hasRequiredNode = 1;
 	(function (module, exports) {
-		const tty = require$$0__default;
-		const util = require$$1__default;
+		const tty = require$$0;
+		const util = require$$1;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -1262,7 +1246,7 @@ var picomatch$1 = {exports: {}};
 
 var utils$3 = {};
 
-const path$2 = require$$0__default$1;
+const path$2 = require$$0$1;
 const WIN_SLASH = '\\\\/';
 const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
@@ -1442,7 +1426,7 @@ var constants$2 = {
 
 (function (exports) {
 
-	const path = require$$0__default$1;
+	const path = require$$0$1;
 	const win32 = process.platform === 'win32';
 	const {
 	  REGEX_BACKSLASH,
@@ -2979,7 +2963,7 @@ parse$2.fastpaths = (input, options) => {
 
 var parse_1 = parse$2;
 
-const path$1 = require$$0__default$1;
+const path$1 = require$$0$1;
 const scan = scan_1;
 const parse$1 = parse_1;
 const utils = utils$3;
@@ -3428,33 +3412,33 @@ function testCaseInsensitiveFS() {
     if (!CLIENT_ENTRY.endsWith('client.mjs')) {
         throw new Error(`cannot test case insensitive FS, CLIENT_ENTRY const doesn't contain client.mjs`);
     }
-    if (!fs__default.existsSync(CLIENT_ENTRY)) {
+    if (!fs$1.existsSync(CLIENT_ENTRY)) {
         throw new Error('cannot test case insensitive FS, CLIENT_ENTRY does not point to an existing file: ' +
             CLIENT_ENTRY);
     }
-    return fs__default.existsSync(CLIENT_ENTRY.replace('client.mjs', 'cLiEnT.mjs'));
+    return fs$1.existsSync(CLIENT_ENTRY.replace('client.mjs', 'cLiEnT.mjs'));
 }
 testCaseInsensitiveFS();
-const isWindows = os__default.platform() === 'win32';
+const isWindows = os$1.platform() === 'win32';
 function normalizePath(id) {
-    return path__default.posix.normalize(isWindows ? slash(id) : id);
+    return path$3.posix.normalize(isWindows ? slash(id) : 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__default.join(dir, format);
-        if (fs__default.existsSync(fullPath) && fs__default.statSync(fullPath).isFile()) {
+        const fullPath = path$3.join(dir, format);
+        if (fs$1.existsSync(fullPath) && fs$1.statSync(fullPath).isFile()) {
             const result = options?.pathOnly
                 ? fullPath
-                : fs__default.readFileSync(fullPath, 'utf-8');
+                : fs$1.readFileSync(fullPath, 'utf-8');
             if (!options?.predicate || options.predicate(result)) {
                 return result;
             }
         }
     }
-    const parentDir = path__default.dirname(dir);
+    const parentDir = path$3.dirname(dir);
     if (parentDir !== dir &&
         (!options?.rootDir || parentDir.startsWith(options?.rootDir))) {
         return lookupFile(parentDir, formats, options);
@@ -3468,7 +3452,7 @@ function lookupFile(dir, formats, options) {
  */
 function isFileReadable(filename) {
     try {
-        const stat = fs__default.statSync(filename, { throwIfNoEntry: false });
+        const stat = fs$1.statSync(filename, { throwIfNoEntry: false });
         return !!stat;
     }
     catch {
@@ -3478,9 +3462,9 @@ function isFileReadable(filename) {
 isWindows
     ? node_util.promisify(gracefulRemoveDir)
     : function removeDirSync(dir) {
-        fs__default.rmSync(dir, { recursive: true, force: true });
+        fs$1.rmSync(dir, { recursive: true, force: true });
     };
-isWindows ? node_util.promisify(gracefulRename) : fs__default.renameSync;
+isWindows ? node_util.promisify(gracefulRename) : fs$1.renameSync;
 function arraify(target) {
     return Array.isArray(target) ? target : [target];
 }
@@ -3510,14 +3494,14 @@ const GRACEFUL_RENAME_TIMEOUT = 5000;
 function gracefulRename(from, to, cb) {
     const start = Date.now();
     let backoff = 0;
-    fs__default.rename(from, to, function CB(er) {
+    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__default.stat(to, function (stater, st) {
+                fs$1.stat(to, function (stater, st) {
                     if (stater && stater.code === 'ENOENT')
-                        fs__default.rename(from, to, CB);
+                        fs$1.rename(from, to, CB);
                     else
                         CB(er);
                 });
@@ -3534,14 +3518,14 @@ const GRACEFUL_REMOVE_DIR_TIMEOUT = 5000;
 function gracefulRemoveDir(dir, cb) {
     const start = Date.now();
     let backoff = 0;
-    fs__default.rm(dir, { recursive: true }, function CB(er) {
+    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__default.rm(dir, { recursive: true }, CB);
+                    fs$1.rm(dir, { recursive: true }, CB);
                 }, backoff);
                 if (backoff < 100)
                     backoff += 10;
@@ -3654,8 +3638,8 @@ var etag_1 = etag;
  * @private
  */
 
-var crypto = require$$0__default$2;
-var Stats = require$$1__default$1.Stats;
+var crypto = require$$0$2;
+var Stats = require$$1$1.Stats;
 
 /**
  * Module variables.
@@ -3838,8 +3822,8 @@ function clearScreen() {
     const repeatCount = process.stdout.rows - 2;
     const blank = repeatCount > 0 ? '\n'.repeat(repeatCount) : '';
     console.log(blank);
-    readline__default.cursorTo(process.stdout, 0, 0);
-    readline__default.clearScreenDown(process.stdout);
+    readline.cursorTo(process.stdout, 0, 0);
+    readline.clearScreenDown(process.stdout);
 }
 function createLogger(level = 'info', options = {}) {
     if (options.customLogger) {
@@ -3943,15 +3927,15 @@ function hasWorkspacePackageJSON(root) {
     if (!isFileReadable(path)) {
         return false;
     }
-    const content = JSON.parse(fs__default.readFileSync(path, 'utf-8')) || {};
+    const content = JSON.parse(fs$1.readFileSync(path, 'utf-8')) || {};
     return !!content.workspaces;
 }
 function hasRootFile(root) {
-    return ROOT_FILES.some((file) => fs__default.existsSync(path$3.join(root, file)));
+    return ROOT_FILES.some((file) => fs$1.existsSync(path$3.join(root, file)));
 }
 function hasPackageJSON(root) {
     const path = path$3.join(root, 'package.json');
-    return fs__default.existsSync(path);
+    return fs$1.existsSync(path);
 }
 /**
  * Search up for the nearest `package.json`
@@ -3982,9 +3966,9 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
 
 var main$1 = {exports: {}};
 
-const fs = require$$1__default$1;
-const path = require$$0__default$1;
-const os = require$$2__default;
+const fs = require$$1$1;
+const path = require$$0$1;
+const os = require$$2;
 
 function log (message) {
   console.log(`[dotenv][DEBUG] ${message}`);
@@ -4190,15 +4174,21 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
         });
         if (!path)
             return [];
-        return Object.entries(main$1.exports.parse(fs__default.readFileSync(path), {
+        return Object.entries(main$1.exports.parse(fs$1.readFileSync(path), {
             debug: process.env.DEBUG?.includes('vite:dotenv')
         }));
     }));
     // let environment variables use each other
-    main({
-        parsed,
+    const expandParsed = main({
+        parsed: {
+            ...process.env,
+            ...parsed
+        },
         // prevent process.env mutation
         ignoreProcessEnv: true
+    }).parsed;
+    Object.keys(parsed).forEach((key) => {
+        parsed[key] = expandParsed[key];
     });
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.2.3",
+  "version": "4.0.0-alpha.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -61,20 +61,20 @@
     "esbuild": "^0.15.9",
     "postcss": "^8.4.18",
     "resolve": "^1.22.1",
-    "rollup": "^2.79.1"
+    "rollup": "~3.3.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.20.0",
-    "@babel/types": "^7.20.0",
+    "@babel/parser": "^7.20.2",
+    "@babel/types": "^7.20.2",
     "@jridgewell/trace-mapping": "^0.3.17",
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-commonjs": "^23.0.2",
     "@rollup/plugin-dynamic-import-vars": "^2.0.1",
-    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-node-resolve": "14.1.0",
     "@rollup/plugin-typescript": "^8.5.0",
     "@rollup/pluginutils": "^4.2.1",
@@ -117,10 +117,10 @@
     "strip-ansi": "^7.0.1",
     "strip-literal": "^0.4.2",
     "tsconfck": "^2.0.1",
-    "tslib": "^2.4.0",
+    "tslib": "^2.4.1",
     "types": "link:./types",
     "ufo": "^0.8.6",
-    "ws": "^8.10.0"
+    "ws": "^8.11.0"
   },
   "peerDependencies": {
     "@types/node": ">= 14",