vite 5.4.2 → 5.4.3

package/dist/node/chunks/{dep-BzOvws4Y.js → dep-BaOMuo4I.js}

@@ -18326,8 +18326,8 @@ function pattern2regex(resolvedPattern, allowJs) {
 function replaceTokens(tsconfig, configDir) {
 	return JSON.parse(
 		JSON.stringify(tsconfig)
-			// replace ${configDir}, accounting for rebaseRelative emitted ../${configDir}
-			.replaceAll(/"(?:\.\.\/)*\${configDir}/g, `"${native2posix(configDir)}`)
+			// replace ${configDir}
+			.replaceAll(/"\${configDir}/g, `"${native2posix(configDir)}`)
 	);
 }
 
@@ -18921,7 +18921,7 @@ function rebaseRelative(key, value, prependPath) {
  * @returns {string}
  */
 function rebasePath(value, prependPath) {
-	if (path$n.isAbsolute(value)) {
+	if (path$n.isAbsolute(value) || value.startsWith('${configDir}')) {
 		return value;
 	} else {
 		// relative paths use posix syntax in tsconfig
@@ -20306,7 +20306,8 @@ function assetPlugin(config) {
         code: `export default ${JSON.stringify(encodeURIPath(url))}`,
         // Force rollup to keep this module from being shared between other entry points if it's an entrypoint.
         // If the resulting chunk is empty, it will be removed in generateBundle.
-        moduleSideEffects: config.command === "build" && this.getModuleInfo(id)?.isEntry ? "no-treeshake" : false
+        moduleSideEffects: config.command === "build" && this.getModuleInfo(id)?.isEntry ? "no-treeshake" : false,
+        meta: config.command === "build" ? { "vite:asset": true } : void 0
       };
     },
     renderChunk(code, chunk, opts) {
@@ -20323,7 +20324,7 @@ function assetPlugin(config) {
     generateBundle(_, bundle) {
       for (const file in bundle) {
         const chunk = bundle[file];
-        if (chunk.type === "chunk" && chunk.isEntry && chunk.moduleIds.length === 1 && config.assetsInclude(chunk.moduleIds[0])) {
+        if (chunk.type === "chunk" && chunk.isEntry && chunk.moduleIds.length === 1 && config.assetsInclude(chunk.moduleIds[0]) && this.getModuleInfo(chunk.moduleIds[0])?.meta["vite:asset"]) {
           delete bundle[file];
         }
       }
@@ -22768,7 +22769,12 @@ const util = require$$0$5;
 const braces$1 = braces_1;
 const picomatch$2 = picomatch$3;
 const utils$b = utils$k;
-const isEmptyString = val => val === '' || val === './';
+
+const isEmptyString = v => v === '' || v === './';
+const hasBraces = v => {
+  const index = v.indexOf('{');
+  return index > -1 && v.indexOf('}', index) > -1;
+};
 
 /**
  * Returns an array of strings that match one or more glob patterns.
@@ -23209,7 +23215,7 @@ micromatch$1.parse = (patterns, options) => {
 
 micromatch$1.braces = (pattern, options) => {
   if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
+  if ((options && options.nobrace === true) || !hasBraces(pattern)) {
     return [pattern];
   }
   return braces$1(pattern, options);
@@ -23228,6 +23234,8 @@ micromatch$1.braceExpand = (pattern, options) => {
  * Expose micromatch
  */
 
+// exposed for tests
+micromatch$1.hasBraces = hasBraces;
 var micromatch_1 = micromatch$1;
 
 var micromatch$2 = /*@__PURE__*/getDefaultExportFromCjs(micromatch_1);
@@ -35041,6 +35049,9 @@ function nodeIsElement(node) {
   return node.nodeName[0] !== "#";
 }
 function traverseNodes(node, visitor) {
+  if (node.nodeName === "template") {
+    node = node.content;
+  }
   visitor(node);
   if (nodeIsElement(node) || node.nodeName === "#document" || node.nodeName === "#document-fragment") {
     node.childNodes.forEach((childNode) => traverseNodes(childNode, visitor));
@@ -36633,14 +36644,23 @@ function createCSSResolvers(config) {
       }));
     },
     get sass() {
-      return sassResolve || (sassResolve = config.createResolver({
-        extensions: [".scss", ".sass", ".css"],
-        mainFields: ["sass", "style"],
-        conditions: ["sass", "style"],
-        tryIndex: true,
-        tryPrefix: "_",
-        preferRelative: true
-      }));
+      if (!sassResolve) {
+        const resolver = config.createResolver({
+          extensions: [".scss", ".sass", ".css"],
+          mainFields: ["sass", "style"],
+          conditions: ["sass", "style"],
+          tryIndex: true,
+          tryPrefix: "_",
+          preferRelative: true
+        });
+        sassResolve = async (...args) => {
+          if (args[0].startsWith("file://")) {
+            args[0] = fileURLToPath(args[0]);
+          }
+          return resolver(...args);
+        };
+      }
+      return sassResolve;
     },
     get less() {
       return lessResolve || (lessResolve = config.createResolver({
@@ -36933,8 +36953,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-CHbHjMYU.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-B8yndt7W.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-DmgIY-c5.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DlM3pmpg.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -37281,7 +37301,7 @@ function fixScssBugImportValue(data) {
   }
   return data;
 }
-const makeScssWorker = (resolvers, alias, maxWorkers) => {
+const makeScssWorker = (resolvers, alias, maxWorkers, packageName) => {
   const internalImporter = async (url, importer, filename) => {
     importer = cleanScssBugUrl(importer);
     const resolved = await resolvers.sass(url, importer);
@@ -37294,6 +37314,9 @@ const makeScssWorker = (resolvers, alias, maxWorkers) => {
           "$",
           resolvers.sass
         );
+        if (packageName === "sass-embedded") {
+          return data;
+        }
         return fixScssBugImportValue(data);
       } catch (data) {
         return data;
@@ -37490,7 +37513,12 @@ const scssProcessor = (maxWorkers) => {
       if (!workerMap.has(options.alias)) {
         workerMap.set(
           options.alias,
-          api === "modern-compiler" ? makeModernCompilerScssWorker(resolvers, options.alias) : api === "modern" ? makeModernScssWorker(resolvers, options.alias, maxWorkers) : makeScssWorker(resolvers, options.alias, maxWorkers)
+          api === "modern-compiler" ? makeModernCompilerScssWorker(resolvers, options.alias) : api === "modern" ? makeModernScssWorker(resolvers, options.alias, maxWorkers) : makeScssWorker(
+            resolvers,
+            options.alias,
+            maxWorkers,
+            sassPackage.name
+          )
         );
       }
       const worker = workerMap.get(options.alias);
@@ -37512,6 +37540,11 @@ const scssProcessor = (maxWorkers) => {
         );
         const deps = result.stats.includedFiles.map((f) => cleanScssBugUrl(f));
         const map2 = result.map ? JSON.parse(result.map.toString()) : void 0;
+        if (map2) {
+          map2.sources = map2.sources.map(
+            (url) => url.startsWith("file://") ? normalizePath$3(fileURLToPath(url)) : url
+          );
+        }
         return {
           code: result.css.toString(),
           map: map2,
@@ -51531,7 +51564,8 @@ function servePublicMiddleware(server, publicFiles) {
     return normalizePath$3(filePath);
   };
   return function viteServePublicMiddleware(req, res, next) {
-    if (publicFiles && !publicFiles.has(toFilePath(req.url)) || isImportRequest(req.url) || isInternalRequest(req.url)) {
+    if (publicFiles && !publicFiles.has(toFilePath(req.url)) || isImportRequest(req.url) || isInternalRequest(req.url) || // for `/public-file.js?url` to be transformed
+    urlRE.test(req.url)) {
       return next();
     }
     serve(req, res, next);
@@ -54268,14 +54302,14 @@ Use --emptyOutDir to override.
   }
   return true;
 }
-function resolveChokidarOptions(config, options, resolvedOutDirs, emptyOutDir) {
+function resolveChokidarOptions(options, resolvedOutDirs, emptyOutDir, cacheDir) {
   const { ignored: ignoredList, ...otherOptions } = options ?? {};
   const ignored = [
     "**/.git/**",
     "**/node_modules/**",
     "**/test-results/**",
     // Playwright
-    glob.escapePath(config.cacheDir) + "/**",
+    glob.escapePath(cacheDir) + "/**",
     ...arraify(ignoredList || [])
   ];
   if (emptyOutDir) {
@@ -62666,13 +62700,13 @@ async function _createServer(inlineConfig = {}, options) {
     resolvedOutDirs
   );
   const resolvedWatchOptions = resolveChokidarOptions(
-    config,
     {
       disableGlobbing: true,
       ...serverConfig.watch
     },
     resolvedOutDirs,
-    emptyOutDir
+    emptyOutDir,
+    config.cacheDir
   );
   const middlewares = connect$1();
   const httpServer = middlewareMode ? null : await resolveHttpServer(serverConfig, middlewares, httpsOptions);
@@ -63246,14 +63280,14 @@ function setupOnCrawlEnd(onCrawlEnd) {
     if (ignoredId) {
       seenIds.add(ignoredId);
       markIdAsDone(ignoredId);
+    } else {
+      checkIfCrawlEndAfterTimeout();
     }
     return onCrawlEndPromiseWithResolvers.promise;
   }
   function markIdAsDone(id) {
-    if (registeredIds.has(id)) {
-      registeredIds.delete(id);
-      checkIfCrawlEndAfterTimeout();
-    }
+    registeredIds.delete(id);
+    checkIfCrawlEndAfterTimeout();
   }
   function checkIfCrawlEndAfterTimeout() {
     if (cancelled || registeredIds.size > 0) return;
@@ -64457,8 +64491,8 @@ function preload(baseModule, deps, importerUrl) {
         link.rel = isCss ? "stylesheet" : scriptRel;
         if (!isCss) {
           link.as = "script";
-          link.crossOrigin = "";
         }
+        link.crossOrigin = "";
         link.href = dep;
         if (cspNonce) {
           link.setAttribute("nonce", cspNonce);
@@ -65129,7 +65163,7 @@ async function build(inlineConfig = {}) {
     "production"
   );
   const options = config.build;
-  const { logger } = config;
+  const { root, logger, packageCache } = config;
   const ssr = !!options.ssr;
   const libOptions = options.lib;
   logger.info(
@@ -65139,7 +65173,7 @@ async function build(inlineConfig = {}) {
       )}`
     )
   );
-  const resolve = (p) => path$n.resolve(config.root, p);
+  const resolve = (p) => path$n.resolve(root, p);
   const input = libOptions ? options.rollupOptions?.input || (typeof libOptions.entry === "string" ? resolve(libOptions.entry) : Array.isArray(libOptions.entry) ? libOptions.entry.map(resolve) : Object.fromEntries(
     Object.entries(libOptions.entry).map(([alias, file]) => [
       alias,
@@ -65240,7 +65274,7 @@ ${stackOnly}`;
       const format = output.format || "es";
       const jsExt = ssrNodeBuild || libOptions ? resolveOutputJsExtension(
         format,
-        findNearestPackageData(config.root, config.packageCache)?.data.type
+        findNearestPackageData(root, packageCache)?.data.type
       ) : "js";
       return {
         dir: outDir,
@@ -65258,9 +65292,9 @@ ${stackOnly}`;
           libOptions,
           format,
           name,
-          config.root,
+          root,
           jsExt,
-          config.packageCache
+          packageCache
         ) : path$n.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
         chunkFileNames: libOptions ? `[name]-[hash].${jsExt}` : path$n.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
         assetFileNames: libOptions ? `[name].[ext]` : path$n.posix.join(options.assetsDir, `[name]-[hash].[ext]`),
@@ -65282,13 +65316,13 @@ ${stackOnly}`;
       normalizedOutputs.push(buildOutputOptions(outputs));
     }
     const resolvedOutDirs = getResolvedOutDirs(
-      config.root,
+      root,
       options.outDir,
       options.rollupOptions?.output
     );
     const emptyOutDir = resolveEmptyOutDir(
       options.emptyOutDir,
-      config.root,
+      root,
       resolvedOutDirs,
       logger
     );
@@ -65296,10 +65330,10 @@ ${stackOnly}`;
       logger.info(colors$1.cyan(`
 watching for file changes...`));
       const resolvedChokidarOptions = resolveChokidarOptions(
-        config,
         config.build.watch.chokidar,
         resolvedOutDirs,
-        emptyOutDir
+        emptyOutDir,
+        config.cacheDir
       );
       const { watch } = await import('rollup');
       const watcher = watch({

package/dist/node/chunks/{dep-B8yndt7W.js → dep-DlM3pmpg.js}

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

package/dist/node/chunks/{dep-CHbHjMYU.js → dep-DmgIY-c5.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-BzOvws4Y.js';
+import { B as getDefaultExportFromCjs } from './dep-BaOMuo4I.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__default 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-BzOvws4Y.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-BaOMuo4I.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -730,7 +730,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.E; });
+  const { createServer } = await import('./chunks/dep-BaOMuo4I.js').then(function (n) { return n.E; });
   try {
     const server = await createServer({
       root,
@@ -822,7 +822,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
   `[boolean] force empty outDir when it's outside of root`
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { build } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.F; });
+  const { build } = await import('./chunks/dep-BaOMuo4I.js').then(function (n) { return n.F; });
   const buildOptions = cleanOptions(options);
   try {
     await build({
@@ -851,7 +851,7 @@ cli.command("optimize [root]", "pre-bundle dependencies").option(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-BaOMuo4I.js').then(function (n) { return n.D; });
     try {
       const config = await resolveConfig(
         {
@@ -877,7 +877,7 @@ ${e.stack}`),
 cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--open [path]", `[boolean | string] open browser on startup`).option("--outDir <dir>", `[string] output directory (default: dist)`).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-BaOMuo4I.js').then(function (n) { return n.G; });
     try {
       const server = await preview({
         root,

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-BzOvws4Y.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-BzOvws4Y.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-BaOMuo4I.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-BaOMuo4I.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/index.cjs

@@ -25,11 +25,36 @@ asyncFunctions.forEach((name) => {
 
 function warnCjsUsage() {
   if (process.env.VITE_CJS_IGNORE_WARNING) return
+  const logLevelIndex = process.argv.findIndex((arg) =>
+    /^(?:-l|--logLevel)/.test(arg),
+  )
+  if (logLevelIndex > 0) {
+    const logLevelValue = process.argv[logLevelIndex + 1]
+    if (logLevelValue === 'silent' || logLevelValue === 'error') {
+      return
+    }
+    if (/silent|error/.test(process.argv[logLevelIndex])) {
+      return
+    }
+  }
   const yellow = (str) => `\u001b[33m${str}\u001b[39m`
-  const log = process.env.VITE_CJS_TRACE ? console.trace : console.warn
-  log(
+  console.warn(
     yellow(
       `The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details.`,
     ),
   )
+  if (process.env.VITE_CJS_TRACE) {
+    const e = {}
+    const stackTraceLimit = Error.stackTraceLimit
+    Error.stackTraceLimit = 100
+    Error.captureStackTrace(e)
+    Error.stackTraceLimit = stackTraceLimit
+    console.log(
+      e.stack
+        .split('\n')
+        .slice(1)
+        .filter((line) => !line.includes('(node:'))
+        .join('\n'),
+    )
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -73,7 +73,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.21.3",
-    "postcss": "^8.4.41",
+    "postcss": "^8.4.43",
     "rollup": "^4.20.0"
   },
   "optionalDependencies": {
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.25.3",
+    "@babel/parser": "^7.25.6",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.0",
@@ -112,7 +112,7 @@
     "launch-editor-middleware": "^2.8.1",
     "lightningcss": "^1.26.0",
     "magic-string": "^0.30.11",
-    "micromatch": "^4.0.7",
+    "micromatch": "^4.0.8",
     "mlly": "^1.7.1",
     "mrmime": "^2.0.0",
     "open": "^8.4.2",
@@ -134,8 +134,8 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.1.0",
-    "tsconfck": "^3.1.1",
-    "tslib": "^2.6.3",
+    "tsconfck": "^3.1.3",
+    "tslib": "^2.7.0",
     "types": "link:./types",
     "ufo": "^1.5.4",
     "ws": "^8.18.0"