vite 5.0.0-beta.4 → 5.0.0-beta.6

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 { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-69dc786c.js';
+import { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-db07a1ea.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -759,7 +759,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.H; });
+    const { createServer } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.H; });
     try {
         const server = await createServer({
             root,
@@ -840,7 +840,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-69dc786c.js').then(function (n) { return n.G; });
+    const { build } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.G; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -868,7 +868,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-69dc786c.js').then(function (n) { return n.F; });
+    const { optimizeDeps } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.F; });
     try {
         const config = await resolveConfig({
             root,
@@ -895,7 +895,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.I; });
+    const { preview } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.I; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -2194,13 +2194,6 @@ export declare interface ServerOptions extends CommonServerOptions {
      * sourcemap path and returns whether to ignore the source path.
      */
     sourcemapIgnoreList?: false | ((sourcePath: string, sourcemapPath: string) => boolean);
-    /**
-     * Force dep pre-optimization regardless of whether deps have changed.
-     *
-     * @deprecated Use optimizeDeps.force instead, this option may be removed
-     * in a future minor version without following semver
-     */
-    force?: boolean;
 }
 
 export declare function sortUserPlugins(plugins: (Plugin_2 | Plugin_2[])[] | undefined): [Plugin_2[], Plugin_2[], Plugin_2[]];
@@ -2237,6 +2230,22 @@ export declare interface SSROptions {
      * @experimental
      */
     optimizeDeps?: SsrDepOptimizationOptions;
+    resolve?: {
+        /**
+         * Conditions that are used in the plugin pipeline. The default value is the root config's `resolve.conditions`.
+         *
+         * Use this to override the default ssr conditions for the ssr build.
+         *
+         * @default rootConfig.resolve.conditions
+         */
+        conditions?: string[];
+        /**
+         * Conditions that are used during ssr import (including `ssrLoadModule`) of externalized dependencies.
+         *
+         * @default []
+         */
+        externalConditions?: string[];
+    };
 }
 
 export declare type SSRTarget = 'node' | 'webworker';

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-69dc786c.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, z as isFileServingAllowed, l as loadConfigFromFile, A 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, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-69dc786c.js';
+import { i as isInNodeModules } from './chunks/dep-db07a1ea.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, z as isFileServingAllowed, l as loadConfigFromFile, A 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, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-db07a1ea.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

@@ -3374,7 +3374,7 @@ 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 : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)));
+node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)));
 // set in bin/vite.js
 const filter = process.env.VITE_DEBUG_FILTER;
 const DEBUG = process.env.DEBUG;
@@ -3487,20 +3487,12 @@ function isFileReadable(filename) {
 function arraify(target) {
     return Array.isArray(target) ? target : [target];
 }
-// @ts-expect-error jest only exists when running Jest
-const usingDynamicImport = typeof jest === 'undefined';
 /**
  * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
  *
- * As a temporary workaround for Jest's lack of stable ESM support, we fallback to require
- * if we're in a Jest environment.
- * See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077
- *
  * @param file File path to import.
  */
-usingDynamicImport
-    ? new Function('file', 'return import(file)')
-    : _require;
+new Function('file', 'return import(file)');
 path$3.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))));
 function mergeConfigRecursively(defaults, overrides, rootPath) {
     const merged = { ...defaults };
@@ -4379,16 +4371,35 @@ class Mappings {
 
 	addEdit(sourceIndex, content, loc, nameIndex) {
 		if (content.length) {
+			let contentLineEnd = content.indexOf('\n', 0);
+			let previousContentLineEnd = -1;
+			while (contentLineEnd >= 0) {
+				const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
+				if (nameIndex >= 0) {
+					segment.push(nameIndex);
+				}
+				this.rawSegments.push(segment);
+
+				this.generatedCodeLine += 1;
+				this.raw[this.generatedCodeLine] = this.rawSegments = [];
+				this.generatedCodeColumn = 0;
+
+				previousContentLineEnd = contentLineEnd;
+				contentLineEnd = content.indexOf('\n', contentLineEnd + 1);
+			}
+
 			const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
 			if (nameIndex >= 0) {
 				segment.push(nameIndex);
 			}
 			this.rawSegments.push(segment);
+
+			this.advance(content.slice(previousContentLineEnd + 1));
 		} else if (this.pending) {
 			this.rawSegments.push(this.pending);
+			this.advance(content);
 		}
 
-		this.advance(content);
 		this.pending = null;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.4",
+  "version": "5.0.0-beta.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -62,7 +62,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.19.3",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "rollup": "^3.29.2"
   },
   "optionalDependencies": {
@@ -70,16 +70,16 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",
-    "@babel/parser": "^7.22.16",
-    "@babel/types": "^7.22.19",
+    "@babel/parser": "^7.23.0",
+    "@babel/types": "^7.23.0",
     "@jridgewell/trace-mapping": "^0.3.19",
-    "@rollup/plugin-alias": "^5.0.0",
-    "@rollup/plugin-commonjs": "^25.0.4",
-    "@rollup/plugin-dynamic-import-vars": "^2.0.5",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "15.2.1",
-    "@rollup/plugin-typescript": "^11.1.3",
-    "@rollup/pluginutils": "^5.0.4",
+    "@rollup/plugin-alias": "^5.0.1",
+    "@rollup/plugin-commonjs": "^25.0.5",
+    "@rollup/plugin-dynamic-import-vars": "^2.0.6",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-typescript": "^11.1.5",
+    "@rollup/pluginutils": "^5.0.5",
     "@types/escape-html": "^1.0.2",
     "@types/pnpapi": "^0.0.3",
     "acorn": "^8.10.0",
@@ -103,9 +103,9 @@
     "fast-glob": "^3.3.1",
     "http-proxy": "^1.18.1",
     "json-stable-stringify": "^1.0.2",
-    "launch-editor-middleware": "^2.6.0",
+    "launch-editor-middleware": "^2.6.1",
     "lightningcss": "^1.22.0",
-    "magic-string": "^0.30.3",
+    "magic-string": "^0.30.4",
     "micromatch": "^4.0.5",
     "mlly": "^1.4.2",
     "mrmime": "^1.0.1",
@@ -124,10 +124,10 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^1.3.0",
-    "tsconfck": "^3.0.0-next.8",
+    "tsconfck": "^3.0.0-next.9",
     "tslib": "^2.6.2",
     "types": "link:./types",
-    "ufo": "^1.3.0",
+    "ufo": "^1.3.1",
     "ws": "^8.14.2"
   },
   "peerDependencies": {