vite 5.0.0-beta.1 → 5.0.0-beta.2

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-e31699fa.js';
+import { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-82f73734.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -31,13 +31,13 @@ import 'node:assert';
 import 'node:process';
 import 'node:v8';
 import 'rollup';
-import 'worker_threads';
 import 'node:http';
 import 'node:https';
 import 'zlib';
 import 'buffer';
 import 'https';
 import 'tls';
+import 'worker_threads';
 import 'querystring';
 import 'node:readline';
 import 'node:zlib';
@@ -758,7 +758,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-e31699fa.js').then(function (n) { return n.H; });
+    const { createServer } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.H; });
     try {
         const server = await createServer({
             root,
@@ -836,7 +836,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-e31699fa.js').then(function (n) { return n.G; });
+    const { build } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.G; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -864,7 +864,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-e31699fa.js').then(function (n) { return n.F; });
+    const { optimizeDeps } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.F; });
     try {
         const config = await resolveConfig({
             root,
@@ -891,7 +891,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-e31699fa.js').then(function (n) { return n.I; });
+    const { preview } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.I; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -296,7 +296,6 @@ export declare interface BuildOptions {
     ssrManifest?: boolean | string;
     /**
      * Emit assets during SSR.
-     * @experimental
      * @default false
      */
     ssrEmitAssets?: boolean;
@@ -1586,7 +1585,7 @@ declare interface Plugin_2 extends Plugin_3 {
      * Note: User plugins are resolved before running this hook so injecting other
      * plugins inside  the `config` hook will have no effect.
      */
-    config?: ObjectHook<(this: void, config: UserConfig, env: ConfigEnv) => UserConfig | null | void | Promise<UserConfig | null | void>>;
+    config?: ObjectHook<(this: void, config: UserConfig, env: ConfigEnv) => Omit<UserConfig, 'plugins'> | null | void | Promise<Omit<UserConfig, 'plugins'> | null | void>>;
     /**
      * Use this hook to read and store the final resolved vite config.
      */

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-e31699fa.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-e31699fa.js';
+import { i as isInNodeModules } from './chunks/dep-82f73734.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-82f73734.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -32,13 +32,13 @@ import 'module';
 import 'node:assert';
 import 'node:process';
 import 'node:v8';
-import 'worker_threads';
 import 'node:http';
 import 'node:https';
 import 'zlib';
 import 'buffer';
 import 'https';
 import 'tls';
+import 'worker_threads';
 import 'querystring';
 import 'node:readline';
 import 'node:zlib';

package/dist/node-cjs/publicUtils.cjs

@@ -1228,7 +1228,7 @@ if (typeof process === 'undefined' || process.type === 'renderer' || process.bro
 }
 
 var srcExports = src.exports;
-var debug$1 = /*@__PURE__*/getDefaultExportFromCjs(srcExports);
+var debug$2 = /*@__PURE__*/getDefaultExportFromCjs(srcExports);
 
 var utils$3 = {};
 
@@ -3385,7 +3385,7 @@ const _require = node_module.createRequire((typeof document === 'undefined' ? re
 const filter = process.env.VITE_DEBUG_FILTER;
 const DEBUG = process.env.DEBUG;
 function createDebugger(namespace, options = {}) {
-    const log = debug$1(namespace);
+    const log = debug$2(namespace);
     const { onlyWhenFocused } = options;
     let enabled = log.enabled;
     if (enabled && onlyWhenFocused) {
@@ -3704,6 +3704,245 @@ function splitVendorChunkPlugin() {
     };
 }
 
+var convertSourceMap$1 = {};
+
+(function (exports) {
+
+	Object.defineProperty(exports, 'commentRegex', {
+	  get: function getCommentRegex () {
+	    // Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+	    return /^\s*?\/[\/\*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/mg;
+	  }
+	});
+
+
+	Object.defineProperty(exports, 'mapFileCommentRegex', {
+	  get: function getMapFileCommentRegex () {
+	    // Matches sourceMappingURL in either // or /* comment styles.
+	    return /(?:\/\/[@#][ \t]+?sourceMappingURL=([^\s'"`]+?)[ \t]*?$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^*]+?)[ \t]*?(?:\*\/){1}[ \t]*?$)/mg;
+	  }
+	});
+
+	var decodeBase64;
+	if (typeof Buffer !== 'undefined') {
+	  if (typeof Buffer.from === 'function') {
+	    decodeBase64 = decodeBase64WithBufferFrom;
+	  } else {
+	    decodeBase64 = decodeBase64WithNewBuffer;
+	  }
+	} else {
+	  decodeBase64 = decodeBase64WithAtob;
+	}
+
+	function decodeBase64WithBufferFrom(base64) {
+	  return Buffer.from(base64, 'base64').toString();
+	}
+
+	function decodeBase64WithNewBuffer(base64) {
+	  if (typeof value === 'number') {
+	    throw new TypeError('The value to decode must not be of type number.');
+	  }
+	  return new Buffer(base64, 'base64').toString();
+	}
+
+	function decodeBase64WithAtob(base64) {
+	  return decodeURIComponent(escape(atob(base64)));
+	}
+
+	function stripComment(sm) {
+	  return sm.split(',').pop();
+	}
+
+	function readFromFileMap(sm, read) {
+	  var r = exports.mapFileCommentRegex.exec(sm);
+	  // for some odd reason //# .. captures in 1 and /* .. */ in 2
+	  var filename = r[1] || r[2];
+
+	  try {
+	    var sm = read(filename);
+	    if (sm != null && typeof sm.catch === 'function') {
+	      return sm.catch(throwError);
+	    } else {
+	      return sm;
+	    }
+	  } catch (e) {
+	    throwError(e);
+	  }
+
+	  function throwError(e) {
+	    throw new Error('An error occurred while trying to read the map file at ' + filename + '\n' + e.stack);
+	  }
+	}
+
+	function Converter (sm, opts) {
+	  opts = opts || {};
+
+	  if (opts.hasComment) {
+	    sm = stripComment(sm);
+	  }
+
+	  if (opts.encoding === 'base64') {
+	    sm = decodeBase64(sm);
+	  } else if (opts.encoding === 'uri') {
+	    sm = decodeURIComponent(sm);
+	  }
+
+	  if (opts.isJSON || opts.encoding) {
+	    sm = JSON.parse(sm);
+	  }
+
+	  this.sourcemap = sm;
+	}
+
+	Converter.prototype.toJSON = function (space) {
+	  return JSON.stringify(this.sourcemap, null, space);
+	};
+
+	if (typeof Buffer !== 'undefined') {
+	  if (typeof Buffer.from === 'function') {
+	    Converter.prototype.toBase64 = encodeBase64WithBufferFrom;
+	  } else {
+	    Converter.prototype.toBase64 = encodeBase64WithNewBuffer;
+	  }
+	} else {
+	  Converter.prototype.toBase64 = encodeBase64WithBtoa;
+	}
+
+	function encodeBase64WithBufferFrom() {
+	  var json = this.toJSON();
+	  return Buffer.from(json, 'utf8').toString('base64');
+	}
+
+	function encodeBase64WithNewBuffer() {
+	  var json = this.toJSON();
+	  if (typeof json === 'number') {
+	    throw new TypeError('The json to encode must not be of type number.');
+	  }
+	  return new Buffer(json, 'utf8').toString('base64');
+	}
+
+	function encodeBase64WithBtoa() {
+	  var json = this.toJSON();
+	  return btoa(unescape(encodeURIComponent(json)));
+	}
+
+	Converter.prototype.toURI = function () {
+	  var json = this.toJSON();
+	  return encodeURIComponent(json);
+	};
+
+	Converter.prototype.toComment = function (options) {
+	  var encoding, content, data;
+	  if (options != null && options.encoding === 'uri') {
+	    encoding = '';
+	    content = this.toURI();
+	  } else {
+	    encoding = ';base64';
+	    content = this.toBase64();
+	  }
+	  data = 'sourceMappingURL=data:application/json;charset=utf-8' + encoding + ',' + content;
+	  return options != null && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	};
+
+	// returns copy instead of original
+	Converter.prototype.toObject = function () {
+	  return JSON.parse(this.toJSON());
+	};
+
+	Converter.prototype.addProperty = function (key, value) {
+	  if (this.sourcemap.hasOwnProperty(key)) throw new Error('property "' + key + '" already exists on the sourcemap, use set property instead');
+	  return this.setProperty(key, value);
+	};
+
+	Converter.prototype.setProperty = function (key, value) {
+	  this.sourcemap[key] = value;
+	  return this;
+	};
+
+	Converter.prototype.getProperty = function (key) {
+	  return this.sourcemap[key];
+	};
+
+	exports.fromObject = function (obj) {
+	  return new Converter(obj);
+	};
+
+	exports.fromJSON = function (json) {
+	  return new Converter(json, { isJSON: true });
+	};
+
+	exports.fromURI = function (uri) {
+	  return new Converter(uri, { encoding: 'uri' });
+	};
+
+	exports.fromBase64 = function (base64) {
+	  return new Converter(base64, { encoding: 'base64' });
+	};
+
+	exports.fromComment = function (comment) {
+	  var m, encoding;
+	  comment = comment
+	    .replace(/^\/\*/g, '//')
+	    .replace(/\*\/$/g, '');
+	  m = exports.commentRegex.exec(comment);
+	  encoding = m && m[4] || 'uri';
+	  return new Converter(comment, { encoding: encoding, hasComment: true });
+	};
+
+	function makeConverter(sm) {
+	  return new Converter(sm, { isJSON: true });
+	}
+
+	exports.fromMapFileComment = function (comment, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileComment`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+
+	  var sm = readFromFileMap(comment, read);
+	  if (sm != null && typeof sm.then === 'function') {
+	    return sm.then(makeConverter);
+	  } else {
+	    return makeConverter(sm);
+	  }
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromSource = function (content) {
+	  var m = content.match(exports.commentRegex);
+	  return m ? exports.fromComment(m.pop()) : null;
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromMapFileSource = function (content, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileSource`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+	  var m = content.match(exports.mapFileCommentRegex);
+	  return m ? exports.fromMapFileComment(m.pop(), read) : null;
+	};
+
+	exports.removeComments = function (src) {
+	  return src.replace(exports.commentRegex, '');
+	};
+
+	exports.removeMapFileComments = function (src) {
+	  return src.replace(exports.mapFileCommentRegex, '');
+	};
+
+	exports.generateMapFileComment = function (file, options) {
+	  var data = 'sourceMappingURL=' + file;
+	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	}; 
+} (convertSourceMap$1));
+
+var convertSourceMap = /*@__PURE__*/getDefaultExportFromCjs(convertSourceMap$1);
+
 /*!
  * etag
  * Copyright(c) 2014-2016 Douglas Christopher Wilson
@@ -4016,7 +4255,7 @@ function getBtoa() {
 	}
 }
 
-const btoa = /*#__PURE__*/ getBtoa();
+const btoa$1 = /*#__PURE__*/ getBtoa();
 
 class SourceMap {
 	constructor(properties) {
@@ -4036,7 +4275,7 @@ class SourceMap {
 	}
 
 	toUrl() {
-		return 'data:application/json;charset=utf-8;base64,' + btoa(this.toString());
+		return 'data:application/json;charset=utf-8;base64,' + btoa$1(this.toString());
 	}
 }
 
@@ -5003,7 +5242,7 @@ class MagicString {
 	}
 }
 
-const debug = createDebugger('vite:sourcemap', {
+const debug$1 = createDebugger('vite:sourcemap', {
     onlyWhenFocused: true,
 });
 function genSourceMapUrl(map) {
@@ -5013,7 +5252,7 @@ function genSourceMapUrl(map) {
     return `data:application/json;base64,${Buffer.from(map).toString('base64')}`;
 }
 function getCodeWithSourcemap(type, code, map) {
-    if (debug) {
+    if (debug$1) {
         code += `\n/*${JSON.stringify(map, null, 2).replace(/\*\//g, '*\\/')}*/\n`;
     }
     if (type === 'js') {
@@ -5025,6 +5264,9 @@ function getCodeWithSourcemap(type, code, map) {
     return code;
 }
 
+const debug = createDebugger('vite:send', {
+    onlyWhenFocused: true,
+});
 const alias = {
     js: 'application/javascript',
     css: 'text/css',
@@ -5055,11 +5297,22 @@ function send(req, res, content, type, options) {
             content = getCodeWithSourcemap(type, content.toString(), map);
         }
     }
-    else {
-        if (type === 'js' && (!map || map.mappings !== '')) {
+    // inject fallback sourcemap for js for improved debugging
+    // https://github.com/vitejs/vite/pull/13514#issuecomment-1592431496
+    else if (type === 'js' && (!map || map.mappings !== '')) {
+        const code = content.toString();
+        // if the code has existing inline sourcemap, assume it's correct and skip
+        if (convertSourceMap.mapFileCommentRegex.test(code)) {
+            debug?.(`Skipped injecting fallback sourcemap for ${req.url}`);
+        }
+        else {
             const urlWithoutTimestamp = removeTimestampQuery(req.url);
-            const ms = new MagicString(content.toString());
-            content = getCodeWithSourcemap(type, content.toString(), ms.generateMap({ source: urlWithoutTimestamp, hires: 'boundary' }));
+            const ms = new MagicString(code);
+            content = getCodeWithSourcemap(type, code, ms.generateMap({
+                source: path$3.basename(urlWithoutTimestamp),
+                hires: 'boundary',
+                includeContent: true,
+            }));
         }
     }
     res.statusCode = 200;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -65,7 +65,7 @@
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",
     "@babel/parser": "^7.22.7",
-    "@babel/types": "^7.22.5",
+    "@babel/types": "^7.22.17",
     "@jridgewell/trace-mapping": "^0.3.18",
     "@rollup/plugin-alias": "^4.0.4",
     "@rollup/plugin-commonjs": "^25.0.3",
@@ -77,6 +77,7 @@
     "@types/escape-html": "^1.0.2",
     "@types/pnpapi": "^0.0.2",
     "acorn": "^8.10.0",
+    "acorn-import-assertions": "^1.9.0",
     "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
@@ -105,7 +106,7 @@
     "okie": "^1.0.1",
     "open": "^8.4.2",
     "parse5": "^7.1.2",
-    "periscopic": "^3.1.0",
+    "periscopic": "^4.0.2",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "postcss-import": "^15.1.0",
@@ -117,7 +118,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^1.3.0",
-    "tsconfck": "^2.1.2",
+    "tsconfck": "^3.0.0-next.8",
     "tslib": "^2.6.1",
     "types": "link:./types",
     "ufo": "^1.2.0",