vite 5.2.9 → 5.2.10

package/dist/node/chunks/{dep-DbzVZKyq.js → dep-DI-l0F6S.js}

@@ -1,4 +1,4 @@
-import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-_QLjGPdL.js';
+import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-DkOS1hkm.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-_QLjGPdL.js → dep-DkOS1hkm.js}

@@ -1,6 +1,6 @@
 import fs$l, { promises as promises$1 } from 'node:fs';
 import fsp from 'node:fs/promises';
-import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, dirname as dirname$2, join as join$2, extname as extname$1, relative as relative$2, basename as basename$2 } from 'node:path';
+import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, join as join$2, extname as extname$1, dirname as dirname$2, relative as relative$2, basename as basename$2 } from 'node:path';
 import { fileURLToPath, URL as URL$3, parse as parse$i, pathToFileURL } from 'node:url';
 import { promisify as promisify$4, format as format$2, inspect } from 'node:util';
 import { performance } from 'node:perf_hooks';
@@ -12243,7 +12243,9 @@ function testCaseInsensitiveFS() {
     }
     return fs$l.existsSync(CLIENT_ENTRY.replace('client.mjs', 'cLiEnT.mjs'));
 }
-const urlCanParse = URL$3.canParse ??
+const urlCanParse = 
+// eslint-disable-next-line n/no-unsupported-features/node-builtins
+URL$3.canParse ??
     // URL.canParse is supported from Node.js 18.17.0+, 20.0.0+
     ((path, base) => {
         try {
@@ -31237,14 +31239,21 @@ function injectNonceAttributeTagHook(config) {
             if (!nodeIsElement(node)) {
                 return;
             }
-            if (node.nodeName === 'script' ||
-                (node.nodeName === 'link' &&
-                    node.attrs.some((attr) => attr.name === 'rel' &&
+            const { nodeName, attrs, sourceCodeLocation } = node;
+            if (nodeName === 'script' ||
+                nodeName === 'style' ||
+                (nodeName === 'link' &&
+                    attrs.some((attr) => attr.name === 'rel' &&
                         parseRelAttr(attr.value).some((a) => processRelType.has(a))))) {
+                // If we already have a nonce attribute, we don't need to add another one
+                if (attrs.some(({ name }) => name === 'nonce')) {
+                    return;
+                }
+                const startTagEndOffset = sourceCodeLocation.startTag.endOffset;
                 // if the closing of the start tag includes a `/`, the offset should be 2 so the nonce
                 // is appended prior to the `/`
-                const appendOffset = html[node.sourceCodeLocation.startTag.endOffset - 2] === '/' ? 2 : 1;
-                s.appendRight(node.sourceCodeLocation.startTag.endOffset - appendOffset, ` nonce="${nonce}"`);
+                const appendOffset = html[startTagEndOffset - 2] === '/' ? 2 : 1;
+                s.appendRight(startTagEndOffset - appendOffset, ` nonce="${nonce}"`);
             }
         });
         return s.toString();
@@ -32356,8 +32365,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-DHU7GEFN.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-DbzVZKyq.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-irZ_Evzk.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DI-l0F6S.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -47137,68 +47146,6 @@ function setClientErrorHandler(server, logger) {
     });
 }
 
-// https://github.com/vitejs/vite/issues/2820#issuecomment-812495079
-const ROOT_FILES = [
-    // '.git',
-    // https://pnpm.io/workspaces/
-    'pnpm-workspace.yaml',
-    // https://rushjs.io/pages/advanced/config_files/
-    // 'rush.json',
-    // https://nx.dev/latest/react/getting-started/nx-setup
-    // 'workspace.json',
-    // 'nx.json',
-    // https://github.com/lerna/lerna#lernajson
-    'lerna.json',
-];
-// npm: https://docs.npmjs.com/cli/v7/using-npm/workspaces#installing-workspaces
-// yarn: https://classic.yarnpkg.com/en/docs/workspaces/#toc-how-to-use-it
-function hasWorkspacePackageJSON(root) {
-    const path = join$2(root, 'package.json');
-    if (!isFileReadable(path)) {
-        return false;
-    }
-    try {
-        const content = JSON.parse(fs$l.readFileSync(path, 'utf-8')) || {};
-        return !!content.workspaces;
-    }
-    catch {
-        return false;
-    }
-}
-function hasRootFile(root) {
-    return ROOT_FILES.some((file) => fs$l.existsSync(join$2(root, file)));
-}
-function hasPackageJSON(root) {
-    const path = join$2(root, 'package.json');
-    return fs$l.existsSync(path);
-}
-/**
- * Search up for the nearest `package.json`
- */
-function searchForPackageRoot(current, root = current) {
-    if (hasPackageJSON(current))
-        return current;
-    const dir = dirname$2(current);
-    // reach the fs root
-    if (!dir || dir === current)
-        return root;
-    return searchForPackageRoot(dir, root);
-}
-/**
- * Search up for the nearest workspace root
- */
-function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
-    if (hasRootFile(current))
-        return current;
-    if (hasWorkspacePackageJSON(current))
-        return current;
-    const dir = dirname$2(current);
-    // reach the fs root
-    if (!dir || dir === current)
-        return root;
-    return searchForWorkspaceRoot(dir, root);
-}
-
 // An implementation of fsUtils without caching
 const commonFsUtils = {
     existsSync: fs$l.existsSync,
@@ -47274,7 +47221,7 @@ function pathUntilPart(root, parts, i) {
     return p;
 }
 function createCachedFsUtils(config) {
-    const root = normalizePath$3(searchForWorkspaceRoot(config.root));
+    const root = config.root; // root is resolved and normalized, so it doesn't have a trailing slash
     const rootDirPath = `${root}/`;
     const rootCache = { type: 'directory' }; // dirents will be computed lazily
     const getDirentCacheSync = (parts) => {
@@ -53065,9 +53012,9 @@ async function extractExportsData(filePath, config, ssr) {
             write: false,
             format: 'esm',
         });
-        const [imports, exports] = parse$e(result.outputFiles[0].text);
+        const [, exports, , hasModuleSyntax] = parse$e(result.outputFiles[0].text);
         return {
-            hasImports: imports.length > 0,
+            hasModuleSyntax,
             exports: exports.map((e) => e.n),
         };
     }
@@ -53086,9 +53033,9 @@ async function extractExportsData(filePath, config, ssr) {
         parseResult = parse$e(transformed.code);
         usedJsxLoader = true;
     }
-    const [imports, exports] = parseResult;
+    const [, exports, , hasModuleSyntax] = parseResult;
     const exportsData = {
-        hasImports: imports.length > 0,
+        hasModuleSyntax,
         exports: exports.map((e) => e.n),
         jsxLoader: usedJsxLoader,
     };
@@ -53098,9 +53045,9 @@ function needsInterop(config, ssr, id, exportsData, output) {
     if (getDepOptimizationConfig(config, ssr)?.needsInterop?.includes(id)) {
         return true;
     }
-    const { hasImports, exports } = exportsData;
+    const { hasModuleSyntax, exports } = exportsData;
     // entry has no ESM syntax - likely CJS or UMD
-    if (!exports.length && !hasImports) {
+    if (!hasModuleSyntax) {
         return true;
     }
     if (output) {
@@ -56436,7 +56383,26 @@ const BASE_PREVIEW_SHORTCUTS = [
     },
 ];
 
-function resolveChokidarOptions(config, options) {
+function getResolvedOutDirs(root, outDir, outputOptions) {
+    const resolvedOutDir = path$o.resolve(root, outDir);
+    if (!outputOptions)
+        return new Set([resolvedOutDir]);
+    return new Set(arraify(outputOptions).map(({ dir }) => dir ? path$o.resolve(root, dir) : resolvedOutDir));
+}
+function resolveEmptyOutDir(emptyOutDir, root, outDirs, logger) {
+    if (emptyOutDir != null)
+        return emptyOutDir;
+    for (const outDir of outDirs) {
+        if (!normalizePath$3(outDir).startsWith(withTrailingSlash(root))) {
+            // warn if outDir is outside of root
+            logger?.warn(picocolorsExports.yellow(`\n${picocolorsExports.bold(`(!)`)} outDir ${picocolorsExports.white(picocolorsExports.dim(outDir))} is not inside project root and will not be emptied.\n` +
+                `Use --emptyOutDir to override.\n`));
+            return false;
+        }
+    }
+    return true;
+}
+function resolveChokidarOptions(config, options, resolvedOutDirs, emptyOutDir) {
     const { ignored: ignoredList, ...otherOptions } = options ?? {};
     const ignored = [
         '**/.git/**',
@@ -56445,8 +56411,8 @@ function resolveChokidarOptions(config, options) {
         glob.escapePath(config.cacheDir) + '/**',
         ...arraify(ignoredList || []),
     ];
-    if (config.build.outDir) {
-        ignored.push(glob.escapePath(path$o.resolve(config.root, config.build.outDir)) + '/**');
+    if (emptyOutDir) {
+        ignored.push(...[...resolvedOutDirs].map((outDir) => glob.escapePath(outDir) + '/**'));
     }
     const resolvedWatchOptions = {
         ignored,
@@ -63980,7 +63946,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
     const trailingSlash = htmlPath.endsWith('/');
     if (!trailingSlash && getFsUtils(config).existsSync(filename)) {
         proxyModulePath = htmlPath;
-        proxyModuleUrl = joinUrlSegments(base, htmlPath);
+        proxyModuleUrl = proxyModulePath;
     }
     else {
         // There are users of vite.transformIndexHtml calling it with url '/'
@@ -63992,6 +63958,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         proxyModulePath = `\0${validPath}`;
         proxyModuleUrl = wrapId$1(proxyModulePath);
     }
+    proxyModuleUrl = joinUrlSegments(base, proxyModuleUrl);
     const s = new MagicString(html);
     let inlineModuleIndex = -1;
     // The key to the proxyHtml cache is decoded, as it will be compared
@@ -64598,6 +64565,68 @@ function notFoundMiddleware() {
     };
 }
 
+// https://github.com/vitejs/vite/issues/2820#issuecomment-812495079
+const ROOT_FILES = [
+    // '.git',
+    // https://pnpm.io/workspaces/
+    'pnpm-workspace.yaml',
+    // https://rushjs.io/pages/advanced/config_files/
+    // 'rush.json',
+    // https://nx.dev/latest/react/getting-started/nx-setup
+    // 'workspace.json',
+    // 'nx.json',
+    // https://github.com/lerna/lerna#lernajson
+    'lerna.json',
+];
+// npm: https://docs.npmjs.com/cli/v7/using-npm/workspaces#installing-workspaces
+// yarn: https://classic.yarnpkg.com/en/docs/workspaces/#toc-how-to-use-it
+function hasWorkspacePackageJSON(root) {
+    const path = join$2(root, 'package.json');
+    if (!isFileReadable(path)) {
+        return false;
+    }
+    try {
+        const content = JSON.parse(fs$l.readFileSync(path, 'utf-8')) || {};
+        return !!content.workspaces;
+    }
+    catch {
+        return false;
+    }
+}
+function hasRootFile(root) {
+    return ROOT_FILES.some((file) => fs$l.existsSync(join$2(root, file)));
+}
+function hasPackageJSON(root) {
+    const path = join$2(root, 'package.json');
+    return fs$l.existsSync(path);
+}
+/**
+ * Search up for the nearest `package.json`
+ */
+function searchForPackageRoot(current, root = current) {
+    if (hasPackageJSON(current))
+        return current;
+    const dir = dirname$2(current);
+    // reach the fs root
+    if (!dir || dir === current)
+        return root;
+    return searchForPackageRoot(dir, root);
+}
+/**
+ * Search up for the nearest workspace root
+ */
+function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
+    if (hasRootFile(current))
+        return current;
+    if (hasWorkspacePackageJSON(current))
+        return current;
+    const dir = dirname$2(current);
+    // reach the fs root
+    if (!dir || dir === current)
+        return root;
+    return searchForWorkspaceRoot(dir, root);
+}
+
 function warmupFiles(server) {
     const options = server.config.server.warmup;
     const root = server.config.root;
@@ -64675,10 +64704,12 @@ async function _createServer(inlineConfig = {}, options) {
     const { root, server: serverConfig } = config;
     const httpsOptions = await resolveHttpsConfig(config.server.https);
     const { middlewareMode } = serverConfig;
+    const resolvedOutDirs = getResolvedOutDirs(config.root, config.build.outDir, config.build.rollupOptions?.output);
+    const emptyOutDir = resolveEmptyOutDir(config.build.emptyOutDir, config.root, resolvedOutDirs);
     const resolvedWatchOptions = resolveChokidarOptions(config, {
         disableGlobbing: true,
         ...serverConfig.watch,
-    });
+    }, resolvedOutDirs, emptyOutDir);
     const middlewares = connect$1();
     const httpServer = middlewareMode
         ? null
@@ -67414,11 +67445,12 @@ async function build(inlineConfig = {}) {
         else {
             normalizedOutputs.push(buildOutputOptions(outputs));
         }
-        const outDirs = normalizedOutputs.map(({ dir }) => resolve(dir));
+        const resolvedOutDirs = getResolvedOutDirs(config.root, options.outDir, options.rollupOptions?.output);
+        const emptyOutDir = resolveEmptyOutDir(options.emptyOutDir, config.root, resolvedOutDirs, config.logger);
         // watch file changes with rollup
         if (config.build.watch) {
             config.logger.info(colors$1.cyan(`\nwatching for file changes...`));
-            const resolvedChokidarOptions = resolveChokidarOptions(config, config.build.watch.chokidar);
+            const resolvedChokidarOptions = resolveChokidarOptions(config, config.build.watch.chokidar, resolvedOutDirs, emptyOutDir);
             const { watch } = await import('rollup');
             const watcher = watch({
                 ...rollupOptions,
@@ -67432,7 +67464,7 @@ async function build(inlineConfig = {}) {
                 if (event.code === 'BUNDLE_START') {
                     config.logger.info(colors$1.cyan(`\nbuild started...`));
                     if (options.write) {
-                        prepareOutDir(outDirs, options.emptyOutDir, config);
+                        prepareOutDir(resolvedOutDirs, emptyOutDir, config);
                     }
                 }
                 else if (event.code === 'BUNDLE_END') {
@@ -67450,7 +67482,7 @@ async function build(inlineConfig = {}) {
         startTime = Date.now();
         bundle = await rollup(rollupOptions);
         if (options.write) {
-            prepareOutDir(outDirs, options.emptyOutDir, config);
+            prepareOutDir(resolvedOutDirs, emptyOutDir, config);
         }
         const res = [];
         for (const output of normalizedOutputs) {
@@ -67474,24 +67506,11 @@ async function build(inlineConfig = {}) {
     }
 }
 function prepareOutDir(outDirs, emptyOutDir, config) {
-    const nonDuplicateDirs = new Set(outDirs);
-    let outside = false;
-    if (emptyOutDir == null) {
-        for (const outDir of nonDuplicateDirs) {
-            if (fs$l.existsSync(outDir) &&
-                !normalizePath$3(outDir).startsWith(withTrailingSlash(config.root))) {
-                // warn if outDir is outside of root
-                config.logger.warn(colors$1.yellow(`\n${colors$1.bold(`(!)`)} outDir ${colors$1.white(colors$1.dim(outDir))} is not inside project root and will not be emptied.\n` +
-                    `Use --emptyOutDir to override.\n`));
-                outside = true;
-                break;
-            }
-        }
-    }
-    for (const outDir of nonDuplicateDirs) {
-        if (!outside && emptyOutDir !== false && fs$l.existsSync(outDir)) {
+    const outDirsArray = [...outDirs];
+    for (const outDir of outDirs) {
+        if (emptyOutDir !== false && fs$l.existsSync(outDir)) {
             // skip those other outDirs which are nested in current outDir
-            const skipDirs = outDirs
+            const skipDirs = outDirsArray
                 .map((dir) => {
                 const relative = path$o.relative(outDir, dir);
                 if (relative &&
@@ -68465,6 +68484,13 @@ assetFileNames isn't equal for every build.rollupOptions.output. A single patter
         resolved.logger.warn(colors$1.yellow(`
 (!) Experimental legacy.buildSsrCjsExternalHeuristics and ssr.format were be removed in Vite 5.
     The only SSR Output format is ESM. Find more information at https://github.com/vitejs/vite/discussions/13816.
+`));
+    }
+    const resolvedBuildOutDir = normalizePath$3(path$o.resolve(resolved.root, resolved.build.outDir));
+    if (isParentDirectory(resolvedBuildOutDir, resolved.root) ||
+        resolvedBuildOutDir === resolved.root) {
+        resolved.logger.warn(colors$1.yellow(`
+(!) build.outDir must not be the same directory of root or a parent directory of root as this could cause Vite to overwriting source files with build outputs.
 `));
     }
     return resolved;

package/dist/node/chunks/{dep-DHU7GEFN.js → dep-irZ_Evzk.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-_QLjGPdL.js';
+import { B as getDefaultExportFromCjs } from './dep-DkOS1hkm.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-IQS-Za7F.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 { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-_QLjGPdL.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-DkOS1hkm.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -757,7 +757,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-_QLjGPdL.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-DkOS1hkm.js').then(function (n) { return n.E; });
     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-_QLjGPdL.js').then(function (n) { return n.F; });
+    const { build } = await import('./chunks/dep-DkOS1hkm.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -863,7 +863,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-_QLjGPdL.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-DkOS1hkm.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -889,7 +889,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-_QLjGPdL.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-DkOS1hkm.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -2548,7 +2548,7 @@ type ESBuildTransformResult = Omit<esbuild_TransformResult, 'map'> & {
 declare function transformWithEsbuild(code: string, filename: string, options?: esbuild_TransformOptions, inMap?: object): Promise<ESBuildTransformResult>;
 
 type ExportsData = {
-    hasImports: boolean;
+    hasModuleSyntax: boolean;
     exports: readonly string[];
     jsxLoader?: boolean;
 };

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, a as arraify } from './chunks/dep-_QLjGPdL.js';
-export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-_QLjGPdL.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-DkOS1hkm.js';
+export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-DkOS1hkm.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/index.cjs

@@ -6,6 +6,7 @@ warnCjsUsage()
 module.exports.defineConfig = (config) => config
 
 // proxy cjs utils (sync functions)
+// eslint-disable-next-line n/no-missing-require -- will be generated by build
 Object.assign(module.exports, require('./dist/node-cjs/publicUtils.cjs'))
 
 // async functions, can be redirect from ESM build

package/package.json

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