vite 5.0.3 → 5.0.4

package/dist/node/chunks/{dep-vyqc0_aB.js → dep-4RECYSE1.js}

@@ -12955,6 +12955,15 @@ function getPackageManagerCommand(type = 'install') {
 function isDevServer(server) {
     return 'pluginContainer' in server;
 }
+function promiseWithResolvers() {
+    let resolve;
+    let reject;
+    const promise = new Promise((_resolve, _reject) => {
+        resolve = _resolve;
+        reject = _reject;
+    });
+    return { promise, resolve, reject };
+}
 
 /* eslint no-console: 0 */
 const LogLevels = {
@@ -17141,11 +17150,6 @@ async function injectSourcesContent(map, file, logger) {
         debug$g?.(`Missing sources:\n  ` + missingSources.join(`\n  `));
     }
 }
-async function getOriginalContent(filepath) {
-    if (virtualSourceRE.test(filepath))
-        return undefined;
-    return await fsp.readFile(filepath, 'utf-8').catch(() => undefined);
-}
 function genSourceMapUrl(map) {
     if (typeof map !== 'string') {
         map = JSON.stringify(map);
@@ -28986,49 +28990,18 @@ function resolvePackageEntry(id, { dir, data, setResolvedCache, getResolvedCache
         if (data.exports) {
             entryPoint = resolveExportsOrImports(data, '.', options, targetWeb, 'exports');
         }
-        // handle edge case with browser and module field semantics
-        if (!entryPoint && targetWeb && options.mainFields.includes('browser')) {
-            // check browser field
-            // https://github.com/defunctzombie/package-browser-field-spec
-            const browserEntry = typeof data.browser === 'string'
-                ? data.browser
-                : isObject$1(data.browser) && data.browser['.'];
-            if (browserEntry) {
-                // check if the package also has a "module" field.
-                if (!options.isRequire &&
-                    options.mainFields.includes('module') &&
-                    typeof data.module === 'string' &&
-                    data.module !== browserEntry) {
-                    // if both are present, we may have a problem: some package points both
-                    // to ESM, with "module" targeting Node.js, while some packages points
-                    // "module" to browser ESM and "browser" to UMD/IIFE.
-                    // the heuristics here is to actually read the browser entry when
-                    // possible and check for hints of ESM. If it is not ESM, prefer "module"
-                    // instead; Otherwise, assume it's ESM and use it.
-                    const resolvedBrowserEntry = tryFsResolve(path$o.join(dir, browserEntry), options);
-                    if (resolvedBrowserEntry) {
-                        const content = fs$l.readFileSync(resolvedBrowserEntry, 'utf-8');
-                        if (hasESMSyntax(content)) {
-                            // likely ESM, prefer browser
-                            entryPoint = browserEntry;
-                        }
-                        else {
-                            // non-ESM, UMD or IIFE or CJS(!!! e.g. firebase 7.x), prefer module
-                            entryPoint = data.module;
-                        }
-                    }
-                }
-                else {
-                    entryPoint = browserEntry;
-                }
-            }
-        }
         // fallback to mainFields if still not resolved
         if (!entryPoint) {
             for (const field of options.mainFields) {
-                if (field === 'browser')
-                    continue; // already checked above
-                if (typeof data[field] === 'string') {
+                if (field === 'browser') {
+                    if (targetWeb) {
+                        entryPoint = tryResolveBrowserEntry(dir, data, options);
+                        if (entryPoint) {
+                            break;
+                        }
+                    }
+                }
+                else if (typeof data[field] === 'string') {
                     entryPoint = data[field];
                     break;
                 }
@@ -29187,6 +29160,43 @@ function tryResolveBrowserMapping(id, importer, options, isFilePath, externalize
         }
     }
 }
+function tryResolveBrowserEntry(dir, data, options) {
+    // handle edge case with browser and module field semantics
+    // check browser field
+    // https://github.com/defunctzombie/package-browser-field-spec
+    const browserEntry = typeof data.browser === 'string'
+        ? data.browser
+        : isObject$1(data.browser) && data.browser['.'];
+    if (browserEntry) {
+        // check if the package also has a "module" field.
+        if (!options.isRequire &&
+            options.mainFields.includes('module') &&
+            typeof data.module === 'string' &&
+            data.module !== browserEntry) {
+            // if both are present, we may have a problem: some package points both
+            // to ESM, with "module" targeting Node.js, while some packages points
+            // "module" to browser ESM and "browser" to UMD/IIFE.
+            // the heuristics here is to actually read the browser entry when
+            // possible and check for hints of ESM. If it is not ESM, prefer "module"
+            // instead; Otherwise, assume it's ESM and use it.
+            const resolvedBrowserEntry = tryFsResolve(path$o.join(dir, browserEntry), options);
+            if (resolvedBrowserEntry) {
+                const content = fs$l.readFileSync(resolvedBrowserEntry, 'utf-8');
+                if (hasESMSyntax(content)) {
+                    // likely ESM, prefer browser
+                    return browserEntry;
+                }
+                else {
+                    // non-ESM, UMD or IIFE or CJS(!!! e.g. firebase 7.x), prefer module
+                    return data.module;
+                }
+            }
+        }
+        else {
+            return browserEntry;
+        }
+    }
+}
 /**
  * given a relative path in pkg dir,
  * return a relative path in pkg dir,
@@ -39653,8 +39663,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-_rppyaaB.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-m-h4L35S.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-nbvvoiwS.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-GiiHpyM6.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -58388,9 +58398,7 @@ function send(req, res, content, type, options) {
     }
     // inject fallback sourcemap for js for improved debugging
     // https://github.com/vitejs/vite/pull/13514#issuecomment-1592431496
-    // for { mappings: "" }, we don't inject fallback sourcemap
-    // because it indicates generating a sourcemap is meaningless
-    else if (type === 'js' && map == null) {
+    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)) {
@@ -58399,15 +58407,11 @@ function send(req, res, content, type, options) {
         else {
             const urlWithoutTimestamp = removeTimestampQuery(req.url);
             const ms = new MagicString(code);
-            const map = ms.generateMap({
+            content = getCodeWithSourcemap(type, code, ms.generateMap({
                 source: path$o.basename(urlWithoutTimestamp),
                 hires: 'boundary',
-                includeContent: !options.originalContent,
-            });
-            if (options.originalContent != null) {
-                map.sourcesContent = [options.originalContent];
-            }
-            content = getCodeWithSourcemap(type, code, map);
+                includeContent: true,
+            }));
         }
     }
     res.statusCode = 200;
@@ -58543,19 +58547,12 @@ function transformMiddleware(server) {
                     const depsOptimizer = getDepsOptimizer(server.config, false); // non-ssr
                     const type = isDirectCSSRequest(url) ? 'css' : 'js';
                     const isDep = DEP_VERSION_RE.test(url) || depsOptimizer?.isOptimizedDepUrl(url);
-                    let originalContent;
-                    if (type === 'js' && result.map == null) {
-                        const filepath = (await server.moduleGraph.getModuleByUrl(url, false))?.file;
-                        originalContent =
-                            filepath != null ? await getOriginalContent(filepath) : undefined;
-                    }
                     return send(req, res, result.code, type, {
                         etag: result.etag,
                         // allow browser to cache npm deps!
                         cacheControl: isDep ? 'max-age=31536000,immutable' : 'no-cache',
                         headers: server.config.server.headers,
                         map: result.map,
-                        originalContent,
                     });
                 }
             }
@@ -59944,25 +59941,37 @@ async function restartServer(server) {
             },
         });
     }
-    let newServer = null;
-    try {
-        // delay ws server listen
-        newServer = await _createServer(inlineConfig, { ws: false });
-    }
-    catch (err) {
-        server.config.logger.error(err.message, {
-            timestamp: true,
-        });
-        server.config.logger.error('server restart failed', { timestamp: true });
-        return;
+    // Reinit the server by creating a new instance using the same inlineConfig
+    // This will triger a reload of the config file and re-create the plugins and
+    // middlewares. We then assign all properties of the new server to the existing
+    // server instance and set the user instance to be used in the new server.
+    // This allows us to keep the same server instance for the user.
+    {
+        let newServer = null;
+        try {
+            // delay ws server listen
+            newServer = await _createServer(inlineConfig, { ws: false });
+        }
+        catch (err) {
+            server.config.logger.error(err.message, {
+                timestamp: true,
+            });
+            server.config.logger.error('server restart failed', { timestamp: true });
+            return;
+        }
+        await server.close();
+        // Assign new server props to existing server instance
+        const middlewares = server.middlewares;
+        newServer._configServerPort = server._configServerPort;
+        newServer._currentServerPort = server._currentServerPort;
+        Object.assign(server, newServer);
+        // Keep the same connect instance so app.use(vite.middlewares) works
+        // after a restart in middlewareMode (.route is always '/')
+        middlewares.stack = newServer.middlewares.stack;
+        server.middlewares = middlewares;
+        // Rebind internal server variable so functions reference the user server
+        newServer._setInternalServer(server);
     }
-    await server.close();
-    // Assign new server props to existing server instance
-    newServer._configServerPort = server._configServerPort;
-    newServer._currentServerPort = server._currentServerPort;
-    Object.assign(server, newServer);
-    // Rebind internal server variable so functions reference the user server
-    newServer._setInternalServer(server);
     const { logger, server: { port, middlewareMode }, } = server.config;
     if (!middlewareMode) {
         await server.listen(port, true);
@@ -59973,7 +59982,7 @@ async function restartServer(server) {
     logger.info('server restarted.', { timestamp: true });
     if (shortcutsOptions) {
         shortcutsOptions.print = false;
-        bindCLIShortcuts(newServer, shortcutsOptions);
+        bindCLIShortcuts(server, shortcutsOptions);
     }
 }
 /**
@@ -60474,15 +60483,12 @@ function definePlugin(config) {
     const isBuildLib = isBuild && config.build.lib;
     // ignore replace process.env in lib build
     const processEnv = {};
-    const processNodeEnv = {};
     if (!isBuildLib) {
         const nodeEnv = process.env.NODE_ENV || config.mode;
         Object.assign(processEnv, {
             'process.env': `{}`,
             'global.process.env': `{}`,
             'globalThis.process.env': `{}`,
-        });
-        Object.assign(processNodeEnv, {
             'process.env.NODE_ENV': JSON.stringify(nodeEnv),
             'global.process.env.NODE_ENV': JSON.stringify(nodeEnv),
             'globalThis.process.env.NODE_ENV': JSON.stringify(nodeEnv),
@@ -60515,11 +60521,10 @@ function definePlugin(config) {
     function generatePattern(ssr) {
         const replaceProcessEnv = !ssr || config.ssr?.target === 'webworker';
         const define = {
-            ...(replaceProcessEnv ? processNodeEnv : {}),
+            ...(replaceProcessEnv ? processEnv : {}),
             ...importMetaKeys,
             ...userDefine,
             ...importMetaFallbackKeys,
-            ...(replaceProcessEnv ? processEnv : {}),
         };
         // Additional define fixes based on `ssr` value
         if ('import.meta.env.SSR' in define) {
@@ -63952,7 +63957,7 @@ async function createDepsOptimizer(config, server) {
             newDepsToLog = [];
         }
     };
-    let depOptimizationProcessing = newDepOptimizationProcessing();
+    let depOptimizationProcessing = promiseWithResolvers();
     let depOptimizationProcessingQueue = [];
     const resolveEnqueuedProcessingPromises = () => {
         // Resolve all the processings (including the ones which were delayed)
@@ -64047,7 +64052,7 @@ async function createDepsOptimizer(config, server) {
         depOptimizationProcessingQueue.push(depOptimizationProcessing);
         // Create a new promise for the next rerun, discovered missing
         // dependencies will be assigned this promise from this point
-        depOptimizationProcessing = newDepOptimizationProcessing();
+        depOptimizationProcessing = promiseWithResolvers();
     }
     function prepareKnownDeps() {
         const knownDeps = {};
@@ -64954,13 +64959,6 @@ async function addManuallyIncludedOptimizeDeps(deps, config, ssr, extra = [], fi
         }
     }
 }
-function newDepOptimizationProcessing() {
-    let resolve;
-    const promise = new Promise((_resolve) => {
-        resolve = _resolve;
-    });
-    return { promise, resolve: resolve };
-}
 // Convert to { id: src }
 function depsFromOptimizedDepInfo(depsInfo) {
     const obj = {};
@@ -65327,7 +65325,6 @@ var index = {
 	initDepsOptimizerMetadata: initDepsOptimizerMetadata,
 	initDevSsrDepsOptimizer: initDevSsrDepsOptimizer,
 	loadCachedDepOptimizationMetadata: loadCachedDepOptimizationMetadata,
-	newDepOptimizationProcessing: newDepOptimizationProcessing,
 	optimizeDeps: optimizeDeps,
 	optimizeServerSsrDeps: optimizeServerSsrDeps,
 	optimizedDepInfoFromFile: optimizedDepInfoFromFile,

package/dist/node/chunks/{dep-m-h4L35S.js → dep-GiiHpyM6.js}

@@ -1,4 +1,4 @@
-import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-vyqc0_aB.js';
+import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-4RECYSE1.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-_rppyaaB.js → dep-nbvvoiwS.js}

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-vyqc0_aB.js';
+import { y as getDefaultExportFromCjs } from './dep-4RECYSE1.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-8a-6Quh6.js';

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 { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-vyqc0_aB.js';
+import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-4RECYSE1.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-vyqc0_aB.js').then(function (n) { return n.A; });
+    const { createServer } = await import('./chunks/dep-4RECYSE1.js').then(function (n) { return n.A; });
     try {
         const server = await createServer({
             root,
@@ -839,7 +839,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-vyqc0_aB.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-4RECYSE1.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -867,7 +867,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-vyqc0_aB.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-4RECYSE1.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -893,7 +893,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-vyqc0_aB.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-4RECYSE1.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -3285,8 +3285,6 @@ interface SendOptions {
     map?: SourceMap | {
         mappings: '';
     } | null;
-    /** only used when type === 'js' && map == null (when the fallback sourcemap is used) */
-    originalContent?: string;
 }
 declare function send(req: IncomingMessage, res: ServerResponse, content: string | Buffer, type: string, options: SendOptions): void;
 

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules } from './chunks/dep-vyqc0_aB.js';
-export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-vyqc0_aB.js';
+import { i as isInNodeModules } from './chunks/dep-4RECYSE1.js';
+export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-4RECYSE1.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

@@ -5329,9 +5329,7 @@ function send(req, res, content, type, options) {
     }
     // inject fallback sourcemap for js for improved debugging
     // https://github.com/vitejs/vite/pull/13514#issuecomment-1592431496
-    // for { mappings: "" }, we don't inject fallback sourcemap
-    // because it indicates generating a sourcemap is meaningless
-    else if (type === 'js' && map == null) {
+    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)) {
@@ -5340,15 +5338,11 @@ function send(req, res, content, type, options) {
         else {
             const urlWithoutTimestamp = removeTimestampQuery(req.url);
             const ms = new MagicString(code);
-            const map = ms.generateMap({
+            content = getCodeWithSourcemap(type, code, ms.generateMap({
                 source: path$3.basename(urlWithoutTimestamp),
                 hires: 'boundary',
-                includeContent: !options.originalContent,
-            });
-            if (options.originalContent != null) {
-                map.sourcesContent = [options.originalContent];
-            }
-            content = getCodeWithSourcemap(type, code, map);
+                includeContent: true,
+            }));
         }
     }
     res.statusCode = 200;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",