vite 5.4.0-beta.0 → 5.4.0-beta.1

package/dist/node/chunks/{dep-AVIP6AlI.js → dep-Du4V_m3I.js}

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

package/dist/node/chunks/{dep-BuSuK4CE.js → dep-gy9yrVx2.js}

@@ -20428,7 +20428,7 @@ function fileToDevUrl(id, config) {
   } else {
     rtn = path$n.posix.join(FS_PREFIX, id);
   }
-  const base = joinUrlSegments(config.server?.origin ?? "", config.base);
+  const base = joinUrlSegments(config.server?.origin ?? "", config.decodedBase);
   return joinUrlSegments(base, removeLeadingSlash(rtn));
 }
 function getPublicAssetFilename(hash, config) {
@@ -20438,7 +20438,7 @@ const publicAssetUrlCache = /* @__PURE__ */ new WeakMap();
 const publicAssetUrlRE = /__VITE_PUBLIC_ASSET__([a-z\d]{8})__/g;
 function publicFileToBuiltUrl(url, config) {
   if (config.command !== "build") {
-    return joinUrlSegments(config.base, url);
+    return joinUrlSegments(config.decodedBase, url);
   }
   const hash = getHash(url);
   let cache = publicAssetUrlCache.get(config);
@@ -36988,8 +36988,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-C5hW-0CE.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-AVIP6AlI.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-y7MNyJvV.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-Du4V_m3I.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -37296,6 +37296,19 @@ ${e.message}`
     }
   }
 }
+function loadSassPackage(root) {
+  try {
+    const path2 = loadPreprocessorPath("sass-embedded", root);
+    return { name: "sass-embedded", path: path2 };
+  } catch (e1) {
+    try {
+      const path2 = loadPreprocessorPath("sass" /* sass */, root);
+      return { name: "sass", path: path2 };
+    } catch (e2) {
+      throw e1;
+    }
+  }
+}
 let cachedSss;
 function loadSss(root) {
   if (cachedSss) return cachedSss;
@@ -37410,18 +37423,18 @@ const makeModernScssWorker = (resolvers, alias, maxWorkers) => {
     () => async (sassPath, data, options) => {
       const sass = require(sassPath);
       const path2 = require("node:path");
-      const { fileURLToPath, pathToFileURL } = (
+      const { fileURLToPath: fileURLToPath2, pathToFileURL: pathToFileURL2 } = (
         // eslint-disable-next-line no-restricted-globals
         require("node:url")
       );
       const sassOptions = { ...options };
-      sassOptions.url = pathToFileURL(options.filename);
+      sassOptions.url = pathToFileURL2(options.filename);
       sassOptions.sourceMap = options.enableSourcemap;
       const internalImporter = {
         async canonicalize(url, context) {
-          const importer = context.containingUrl ? fileURLToPath(context.containingUrl) : options.filename;
+          const importer = context.containingUrl ? fileURLToPath2(context.containingUrl) : options.filename;
           const resolved = await internalCanonicalize(url, importer);
-          return resolved ? pathToFileURL(resolved) : null;
+          return resolved ? pathToFileURL2(resolved) : null;
         },
         async load(canonicalUrl) {
           const ext = path2.extname(canonicalUrl.pathname);
@@ -37432,7 +37445,7 @@ const makeModernScssWorker = (resolvers, alias, maxWorkers) => {
             syntax = "css";
           }
           const contents = await internalLoad(
-            fileURLToPath(canonicalUrl),
+            fileURLToPath2(canonicalUrl),
             options.filename
           );
           return { contents, syntax };
@@ -37447,7 +37460,7 @@ const makeModernScssWorker = (resolvers, alias, maxWorkers) => {
         css: result.css,
         map: result.sourceMap ? JSON.stringify(result.sourceMap) : void 0,
         stats: {
-          includedFiles: result.loadedUrls.filter((url) => url.protocol === "file:").map((url) => fileURLToPath(url))
+          includedFiles: result.loadedUrls.filter((url) => url.protocol === "file:").map((url) => fileURLToPath2(url))
         }
       };
     },
@@ -37464,6 +37477,60 @@ const makeModernScssWorker = (resolvers, alias, maxWorkers) => {
   );
   return worker;
 };
+const makeModernCompilerScssWorker = (resolvers, alias, _maxWorkers) => {
+  let compiler;
+  const worker = {
+    async run(sassPath, data, options) {
+      const sass = (await import(pathToFileURL(sassPath).href)).default;
+      compiler ??= await sass.initAsyncCompiler();
+      const sassOptions = { ...options };
+      sassOptions.url = pathToFileURL(options.filename);
+      sassOptions.sourceMap = options.enableSourcemap;
+      const internalImporter = {
+        async canonicalize(url, context) {
+          const importer = context.containingUrl ? fileURLToPath(context.containingUrl) : options.filename;
+          const resolved = await resolvers.sass(url, cleanScssBugUrl(importer));
+          return resolved ? pathToFileURL(resolved) : null;
+        },
+        async load(canonicalUrl) {
+          const ext = path$n.extname(canonicalUrl.pathname);
+          let syntax = "scss";
+          if (ext === ".sass") {
+            syntax = "indented";
+          } else if (ext === ".css") {
+            syntax = "css";
+          }
+          const result2 = await rebaseUrls(
+            fileURLToPath(canonicalUrl),
+            options.filename,
+            alias,
+            "$",
+            resolvers.sass
+          );
+          const contents = result2.contents ?? await fsp.readFile(result2.file, "utf-8");
+          return { contents, syntax };
+        }
+      };
+      sassOptions.importers = [
+        ...sassOptions.importers ?? [],
+        internalImporter
+      ];
+      const result = await compiler.compileStringAsync(data, sassOptions);
+      return {
+        css: result.css,
+        map: result.sourceMap ? JSON.stringify(result.sourceMap) : void 0,
+        stats: {
+          includedFiles: result.loadedUrls.filter((url) => url.protocol === "file:").map((url) => fileURLToPath(url))
+        }
+      };
+    },
+    async stop() {
+      compiler?.dispose();
+      compiler = void 0;
+    }
+  };
+  return worker;
+};
 const scssProcessor = (maxWorkers) => {
   const workerMap = /* @__PURE__ */ new Map();
   return {
@@ -37473,11 +37540,12 @@ const scssProcessor = (maxWorkers) => {
       }
     },
     async process(source, root, options, resolvers) {
-      const sassPath = loadPreprocessorPath("sass" /* sass */, root);
+      const sassPackage = loadSassPackage(root);
+      const api = options.api ?? "legacy";
       if (!workerMap.has(options.alias)) {
         workerMap.set(
           options.alias,
-          options.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)
         );
       }
       const worker = workerMap.get(options.alias);
@@ -37493,7 +37561,7 @@ const scssProcessor = (maxWorkers) => {
       };
       try {
         const result = await worker.run(
-          sassPath,
+          sassPackage.path,
           data,
           optionsWithoutAdditionalData
         );
@@ -45531,7 +45599,7 @@ const cachedFsUtilsMap = /* @__PURE__ */ new WeakMap();
 function getFsUtils(config) {
   let fsUtils = cachedFsUtilsMap.get(config);
   if (!fsUtils) {
-    if (config.command !== "serve" || config.server.fs.cachedChecks === false || config.server.watch?.ignored || process.versions.pnp) {
+    if (config.command !== "serve" || config.server.fs.cachedChecks !== true || config.server.watch?.ignored || process.versions.pnp) {
       fsUtils = commonFsUtils;
     } else if (!config.resolve.preserveSymlinks && config.root !== getRealPath(config.root)) {
       fsUtils = commonFsUtils;
@@ -61890,7 +61958,12 @@ const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, s
         );
       }
       if (preTransformUrl) {
-        preTransformRequest(server, preTransformUrl, config.base);
+        try {
+          preTransformUrl = decodeURI(preTransformUrl);
+        } catch (err) {
+          return url2;
+        }
+        preTransformRequest(server, preTransformUrl, config.decodedBase);
       }
     }
     return url2;
@@ -61901,6 +61974,7 @@ const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, s
 const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl }) => {
   const { config, moduleGraph, watcher } = server;
   const base = config.base || "/";
+  const decodedBase = config.decodedBase || "/";
   let proxyModulePath;
   let proxyModuleUrl;
   const trailingSlash = htmlPath.endsWith("/");
@@ -61912,7 +61986,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
     proxyModulePath = `\0${validPath}`;
     proxyModuleUrl = wrapId$1(proxyModulePath);
   }
-  proxyModuleUrl = joinUrlSegments(base, proxyModuleUrl);
+  proxyModuleUrl = joinUrlSegments(decodedBase, proxyModuleUrl);
   const s = new MagicString(html);
   let inlineModuleIndex = -1;
   const proxyCacheUrl = decodeURI(
@@ -61944,7 +62018,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
       node.sourceCodeLocation.endOffset,
       `<script type="module" src="${modulePath}"><\/script>`
     );
-    preTransformRequest(server, modulePath, base);
+    preTransformRequest(server, modulePath, decodedBase);
   };
   await traverseHtml(html, filename, (node) => {
     if (!nodeIsElement(node)) {
@@ -62106,14 +62180,10 @@ function indexHtmlMiddleware(root, server) {
     next();
   };
 }
-function preTransformRequest(server, url, base) {
+function preTransformRequest(server, decodedUrl, decodedBase) {
   if (!server.config.server.preTransformRequests) return;
-  try {
-    url = unwrapId$1(stripBase(decodeURI(url), base));
-  } catch {
-    return;
-  }
-  server.warmupRequest(url);
+  decodedUrl = unwrapId$1(stripBase(decodedUrl, decodedBase));
+  server.warmupRequest(decodedUrl);
 }
 
 const logTime = createDebugger("vite:time");
@@ -65616,7 +65686,7 @@ function toOutputFilePathInJS(filename, type, hostId, hostType, config, toRelati
   if (relative && !config.build.ssr) {
     return toRelative(filename, hostId);
   }
-  return joinUrlSegments(config.base, filename);
+  return joinUrlSegments(config.decodedBase, filename);
 }
 function createToImportMetaURLBasedRelativeRuntime(format, isWorker) {
   const formatLong = isWorker && format === "iife" ? "worker-iife" : format;
@@ -65653,7 +65723,7 @@ function toOutputFilePathWithoutRuntime(filename, type, hostId, hostType, config
   if (relative && !config.build.ssr) {
     return toRelative(filename, hostId);
   } else {
-    return joinUrlSegments(config.base, filename);
+    return joinUrlSegments(config.decodedBase, filename);
   }
 }
 const toOutputFilePathInCss = toOutputFilePathWithoutRuntime;
@@ -66185,6 +66255,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     plugins: createWorkerPlugins,
     rollupOptions: config.worker?.rollupOptions || {}
   };
+  const base = withTrailingSlash(resolvedBase);
   resolved = {
     configFile: configFile ? normalizePath$3(configFile) : void 0,
     configFileDependencies: configFileDependencies.map(
@@ -66192,7 +66263,8 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     ),
     inlineConfig,
     root: resolvedRoot,
-    base: withTrailingSlash(resolvedBase),
+    base,
+    decodedBase: decodeURI(base),
     rawBase: resolvedBase,
     resolve: resolveOptions,
     publicDir: resolvedPublicDir,

package/dist/node/chunks/{dep-C5hW-0CE.js → dep-y7MNyJvV.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-BuSuK4CE.js';
+import { B as getDefaultExportFromCjs } from './dep-gy9yrVx2.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-BuSuK4CE.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-gy9yrVx2.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-BuSuK4CE.js').then(function (n) { return n.E; });
+  const { createServer } = await import('./chunks/dep-gy9yrVx2.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-BuSuK4CE.js').then(function (n) { return n.F; });
+  const { build } = await import('./chunks/dep-gy9yrVx2.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-BuSuK4CE.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-gy9yrVx2.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-BuSuK4CE.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-gy9yrVx2.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-BuSuK4CE.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-BuSuK4CE.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-gy9yrVx2.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-gy9yrVx2.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.4.0-beta.0",
+  "version": "5.4.0-beta.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -129,6 +129,7 @@
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-license": "^3.5.2",
     "sass": "^1.77.8",
+    "sass-embedded": "^1.77.8",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
@@ -144,6 +145,7 @@
     "less": "*",
     "lightningcss": "^1.21.0",
     "sass": "*",
+    "sass-embedded": "*",
     "stylus": "*",
     "sugarss": "*",
     "terser": "^5.4.0"
@@ -155,6 +157,9 @@
     "sass": {
       "optional": true
     },
+    "sass-embedded": {
+      "optional": true
+    },
     "stylus": {
       "optional": true
     },