vite 5.0.0-beta.0 → 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, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-4033fb3a.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';
@@ -723,9 +723,20 @@ const convertHost = (v) => {
     }
     return v;
 };
+/**
+ * base may be a number (like 0), should convert to empty string
+ */
+const convertBase = (v) => {
+    if (v === 0) {
+        return '';
+    }
+    return v;
+};
 cli
     .option('-c, --config <file>', `[string] use specified config file`)
-    .option('--base <path>', `[string] public base path (default: /)`)
+    .option('--base <path>', `[string] public base path (default: /)`, {
+    type: [convertBase],
+})
     .option('-l, --logLevel <level>', `[string] info | warn | error | silent`)
     .option('--clearScreen', `[boolean] allow/disable clear screen when logging`)
     .option('-d, --debug [feat]', `[string | boolean] show debug logs`)
@@ -747,7 +758,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-4033fb3a.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.H; });
     try {
         const server = await createServer({
             root,
@@ -770,7 +781,7 @@ cli
             : '';
         info(`\n  ${colors.green(`${colors.bold('VITE')} v${VERSION}`)}  ${startupDurationString}\n`, { clear: !server.config.logger.hasWarned });
         server.printUrls();
-        bindShortcuts(server, {
+        server.bindCLIShortcuts({
             print: true,
             customShortcuts: [
                 profileSession && {
@@ -825,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-4033fb3a.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.G; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -853,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-4033fb3a.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.F; });
     try {
         const config = await resolveConfig({
             root,
@@ -880,7 +891,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-4033fb3a.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.I; });
     try {
         const server = await preview({
             root,
@@ -900,7 +911,7 @@ cli
             },
         });
         server.printUrls();
-        bindShortcuts(server, { print: true });
+        server.bindCLIShortcuts({ print: true });
     }
     catch (e) {
         createLogger(options.logLevel).error(colors.red(`error when starting preview server:\n${e.stack}`), { error: e });

package/dist/node/index.d.ts

@@ -2,12 +2,10 @@
 
 import type { Agent } from 'node:http';
 import type { BuildOptions as BuildOptions_2 } from 'esbuild';
-import type { BundleAsyncOptions } from 'lightningcss';
 import { ChunkMetadata } from "../../types/metadata.js";
 import type { ClientRequest } from 'node:http';
 import type { ClientRequestArgs } from 'node:http';
 import { ConnectedPayload } from "../../types/hmrPayload.js";
-import type { CustomAtRules } from 'lightningcss';
 import { CustomEventMap } from "../../types/customEvent.js";
 import { CustomPayload } from "../../types/hmrPayload.js";
 import type { CustomPluginOptions } from 'rollup';
@@ -121,6 +119,14 @@ export declare interface AwaitWriteFinishOptions {
     pollInterval?: number
 }
 
+export declare type BindCLIShortcutsOptions<Server = ViteDevServer | PreviewServer> = {
+    /**
+     * Print a one line hint to the terminal.
+     */
+    print?: boolean;
+    customShortcuts?: (CLIShortcut<Server> | undefined | null)[];
+};
+
 /**
  * Bundles the app for production.
  * Returns a Promise containing the build result.
@@ -290,7 +296,6 @@ export declare interface BuildOptions {
     ssrManifest?: boolean | string;
     /**
      * Emit assets during SSR.
-     * @experimental
      * @default false
      */
     ssrEmitAssets?: boolean;
@@ -315,6 +320,12 @@ export declare interface BuildOptions {
 
 export { ChunkMetadata }
 
+export declare type CLIShortcut<Server = ViteDevServer | PreviewServer> = {
+    key: string;
+    description: string;
+    action(server: Server): void | Promise<void>;
+};
+
 export declare interface CommonServerOptions {
     /**
      * Specify server port. Note if the port is already being used, Vite will
@@ -511,6 +522,13 @@ export declare function createLogger(level?: LogLevel, options?: LoggerOptions):
 
 export declare function createServer(inlineConfig?: InlineConfig): Promise<ViteDevServer>;
 
+declare interface CSSModulesConfig {
+    /** The pattern to use when renaming class names and other identifiers. Default is `[hash]_[local]`. */
+    pattern?: string,
+    /** Whether to rename dashed identifiers, e.g. custom properties. */
+    dashedIdents?: boolean
+}
+
 export declare interface CSSModulesOptions {
     getJSON?: (cssFileName: string, json: Record<string, string>, outputFileName: string) => void;
     scopeBehaviour?: 'global' | 'local';
@@ -709,6 +727,13 @@ export declare interface DepsOptimizer {
     options: DepOptimizationOptions;
 }
 
+declare interface Drafts {
+    /** Whether to enable CSS nesting. */
+    nesting?: boolean,
+    /** Whether to enable @custom-media rules. */
+    customMedia?: boolean
+}
+
 export { ErrorPayload }
 
 export declare interface ESBuildOptions extends EsbuildTransformOptions {
@@ -766,6 +791,32 @@ export declare type ExportsData = {
     jsxLoader?: boolean;
 };
 
+declare const enum Features {
+    Nesting = 1,
+    NotSelectorList = 2,
+    DirSelector = 4,
+    LangSelectorList = 8,
+    IsSelector = 16,
+    TextDecorationThicknessPercent = 32,
+    MediaIntervalSyntax = 64,
+    MediaRangeSyntax = 128,
+    CustomMediaQueries = 256,
+    ClampFunction = 512,
+    ColorFunction = 1024,
+    OklabColors = 2048,
+    LabColors = 4096,
+    P3Colors = 8192,
+    HexAlphaColors = 16384,
+    SpaceSeparatedColorNotation = 32768,
+    FontFamilySystemUi = 65536,
+    DoublePositionGradients = 131072,
+    VendorPrefixes = 262144,
+    LogicalProperties = 524288,
+    Selectors = 31,
+    MediaQueries = 448,
+    Colors = 64512,
+}
+
 export declare interface FileSystemServeOptions {
     /**
      * Strictly restrict file accessing outside of allowing paths.
@@ -1281,7 +1332,20 @@ export declare interface LibraryOptions {
     fileName?: string | ((format: ModuleFormat, entryName: string) => string);
 }
 
-export declare type LightningCSSOptions = Omit<BundleAsyncOptions<CustomAtRules>, 'filename' | 'resolver' | 'minify' | 'sourceMap' | 'analyzeDependencies'>;
+/**
+ * Options are spread, so you can also use options that are not typed here like
+ * visitor (not exposed because it would impact too much the bundle size)
+ */
+export declare type LightningCSSOptions = {
+    targets?: Targets
+    include?: Features
+    exclude?: Features
+    drafts?: Drafts
+    nonStandard?: NonStandard
+    pseudoClasses?: PseudoClasses
+    unusedSymbols?: string[]
+    cssModules?: CSSModulesConfig
+}
 
 export declare function loadConfigFromFile(configEnv: ConfigEnv, configFile?: string, configRoot?: string, logLevel?: LogLevel): Promise<{
     path: string;
@@ -1418,6 +1482,11 @@ export declare interface ModulePreloadOptions {
     resolveDependencies?: ResolveModulePreloadDependenciesFn;
 }
 
+declare interface NonStandard {
+    /** Whether to enable the non-standard >>> and /deep/ selector combinators used by Angular and Vue. */
+    deepSelectorCombinator?: boolean
+}
+
 export declare function normalizePath(id: string): string;
 
 export declare interface OptimizedDepInfo {
@@ -1516,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.
      */
@@ -1673,6 +1742,10 @@ export declare interface PreviewServer {
      * Print server urls
      */
     printUrls(): void;
+    /**
+     * Bind CLI shortcuts
+     */
+    bindCLIShortcuts(options?: BindCLIShortcutsOptions<PreviewServer>): void;
 }
 
 export declare type PreviewServerHook = (this: void, server: PreviewServer) => (() => void) | void | Promise<(() => void) | void>;
@@ -1694,6 +1767,14 @@ export declare interface ProxyOptions extends HttpProxy.ServerOptions {
 
 export { PrunePayload }
 
+declare interface PseudoClasses {
+    hover?: string,
+    active?: string,
+    focus?: string,
+    focusVisible?: string,
+    focusWithin?: string
+}
+
 export declare type RenderBuiltAssetUrl = (filename: string, type: {
     type: 'asset' | 'public';
     hostId: string;
@@ -2206,6 +2287,18 @@ export declare interface SSROptions {
 
 export declare type SSRTarget = 'node' | 'webworker';
 
+declare interface Targets {
+    android?: number,
+    chrome?: number,
+    edge?: number,
+    firefox?: number,
+    ie?: number,
+    ios_saf?: number,
+    opera?: number,
+    safari?: number,
+    samsung?: number
+}
+
 export declare namespace Terser {
     export type ECMA = 5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020
 
@@ -2694,6 +2787,10 @@ export declare interface ViteDevServer {
      * Print server urls
      */
     printUrls(): void;
+    /**
+     * Bind CLI shortcuts
+     */
+    bindCLIShortcuts(options?: BindCLIShortcutsOptions<ViteDevServer>): void;
     /**
      * Restart the server.
      *

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-4033fb3a.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-4033fb3a.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) {
@@ -3423,6 +3423,12 @@ function fsPathFromId(id) {
 function fsPathFromUrl(url) {
     return fsPathFromId(cleanUrl(url));
 }
+function withTrailingSlash(path) {
+    if (path[path.length - 1] !== '/') {
+        return `${path}/`;
+    }
+    return path;
+}
 /**
  * Check if dir is a parent of file
  *
@@ -3433,9 +3439,7 @@ function fsPathFromUrl(url) {
  * @returns true if dir is a parent of file
  */
 function isParentDirectory(dir, file) {
-    if (dir[dir.length - 1] !== '/') {
-        dir = `${dir}/`;
-    }
+    dir = withTrailingSlash(dir);
     return (file.startsWith(dir) ||
         (isCaseInsensitiveFS && file.toLowerCase().startsWith(dir.toLowerCase())));
 }
@@ -3700,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
@@ -4012,7 +4255,7 @@ function getBtoa() {
 	}
 }
 
-const btoa = /*#__PURE__*/ getBtoa();
+const btoa$1 = /*#__PURE__*/ getBtoa();
 
 class SourceMap {
 	constructor(properties) {
@@ -4032,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());
 	}
 }
 
@@ -4999,7 +5242,7 @@ class MagicString {
 	}
 }
 
-const debug = createDebugger('vite:sourcemap', {
+const debug$1 = createDebugger('vite:sourcemap', {
     onlyWhenFocused: true,
 });
 function genSourceMapUrl(map) {
@@ -5009,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') {
@@ -5021,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',
@@ -5051,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;