vite 4.4.0 → 4.4.2

package/dist/node/chunks/{dep-c8efd3d9.js → dep-1e231048.js}

@@ -1,4 +1,4 @@
-import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-1d3a4915.js';
+import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-8609dc5d.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-1d3a4915.js → dep-8609dc5d.js}

@@ -1,6 +1,6 @@
 import fs$l from 'node:fs';
 import fsp from 'node:fs/promises';
-import path$o, { dirname as dirname$2, join as join$2, isAbsolute as isAbsolute$2, posix as posix$1, relative as relative$2, basename as basename$2, extname as extname$1 } from 'node:path';
+import path$o, { dirname as dirname$2, join as join$2, posix as posix$1, isAbsolute as isAbsolute$2, relative as relative$2, basename as basename$2, extname as extname$1 } from 'node:path';
 import { fileURLToPath, URL as URL$3, URLSearchParams, 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';
@@ -38634,6 +38634,49 @@ function createCSSResolvers(config) {
 function getCssResolversKeys(resolvers) {
     return Object.keys(resolvers);
 }
+async function compileCSSPreprocessors(id, lang, code, config) {
+    const { preprocessorOptions, devSourcemap } = config.css ?? {};
+    const atImportResolvers = getAtImportResolvers(config);
+    const preProcessor = preProcessors[lang];
+    let opts = (preprocessorOptions && preprocessorOptions[lang]) || {};
+    // support @import from node dependencies by default
+    switch (lang) {
+        case "scss" /* PreprocessLang.scss */:
+        case "sass" /* PreprocessLang.sass */:
+            opts = {
+                includePaths: ['node_modules'],
+                alias: config.resolve.alias,
+                ...opts,
+            };
+            break;
+        case "less" /* PreprocessLang.less */:
+        case "styl" /* PreprocessLang.styl */:
+        case "stylus" /* PreprocessLang.stylus */:
+            opts = {
+                paths: ['node_modules'],
+                alias: config.resolve.alias,
+                ...opts,
+            };
+    }
+    // important: set this for relative import resolving
+    opts.filename = cleanUrl(id);
+    opts.enableSourcemap = devSourcemap ?? false;
+    const preprocessResult = await preProcessor(code, config.root, opts, atImportResolvers);
+    if (preprocessResult.error) {
+        throw preprocessResult.error;
+    }
+    let deps;
+    if (preprocessResult.deps) {
+        const normalizedFilename = normalizePath$3(opts.filename);
+        // sometimes sass registers the file itself as a dep
+        deps = new Set([...preprocessResult.deps].filter((dep) => normalizePath$3(dep) !== normalizedFilename));
+    }
+    return {
+        code: preprocessResult.code,
+        map: combineSourcemapsIfExists(opts.filename, preprocessResult.map, preprocessResult.additionalMap),
+        deps,
+    };
+}
 const configToAtImportResolvers = new WeakMap();
 function getAtImportResolvers(config) {
     let atImportResolvers = configToAtImportResolvers.get(config);
@@ -38647,7 +38690,7 @@ async function compileCSS(id, code, config, urlReplacer) {
     if (config.css?.transformer === 'lightningcss') {
         return compileLightningCSS(id, code, config, urlReplacer);
     }
-    const { modules: modulesOptions, preprocessorOptions, devSourcemap, } = config.css || {};
+    const { modules: modulesOptions, devSourcemap } = config.css || {};
     const isModule = modulesOptions !== false && cssModuleRE.test(id);
     // although at serve time it can work without processing, we do need to
     // crawl them in order to register watch dependencies.
@@ -38663,52 +38706,18 @@ async function compileCSS(id, code, config, urlReplacer) {
         !hasUrl) {
         return { code, map: null };
     }
-    let preprocessorMap;
     let modules;
     const deps = new Set();
-    const atImportResolvers = getAtImportResolvers(config);
     // 2. pre-processors: sass etc.
+    let preprocessorMap;
     if (isPreProcessor(lang)) {
-        const preProcessor = preProcessors[lang];
-        let opts = (preprocessorOptions && preprocessorOptions[lang]) || {};
-        // support @import from node dependencies by default
-        switch (lang) {
-            case "scss" /* PreprocessLang.scss */:
-            case "sass" /* PreprocessLang.sass */:
-                opts = {
-                    includePaths: ['node_modules'],
-                    alias: config.resolve.alias,
-                    ...opts,
-                };
-                break;
-            case "less" /* PreprocessLang.less */:
-            case "styl" /* PreprocessLang.styl */:
-            case "stylus" /* PreprocessLang.stylus */:
-                opts = {
-                    paths: ['node_modules'],
-                    alias: config.resolve.alias,
-                    ...opts,
-                };
-        }
-        // important: set this for relative import resolving
-        opts.filename = cleanUrl(id);
-        opts.enableSourcemap = devSourcemap ?? false;
-        const preprocessResult = await preProcessor(code, config.root, opts, atImportResolvers);
-        if (preprocessResult.error) {
-            throw preprocessResult.error;
-        }
-        code = preprocessResult.code;
-        preprocessorMap = combineSourcemapsIfExists(opts.filename, preprocessResult.map, preprocessResult.additionalMap);
-        if (preprocessResult.deps) {
-            preprocessResult.deps.forEach((dep) => {
-                // sometimes sass registers the file itself as a dep
-                if (normalizePath$3(dep) !== normalizePath$3(opts.filename)) {
-                    deps.add(dep);
-                }
-            });
-        }
+        const preprocessorResult = await compileCSSPreprocessors(id, lang, code, config);
+        code = preprocessorResult.code;
+        preprocessorMap = preprocessorResult.map;
+        preprocessorResult.deps?.forEach((dep) => deps.add(dep));
     }
     // 3. postcss
+    const atImportResolvers = getAtImportResolvers(config);
     const postcssOptions = (postcssConfig && postcssConfig.options) || {};
     const postcssPlugins = postcssConfig && postcssConfig.plugins ? postcssConfig.plugins.slice() : [];
     if (needInlineImport) {
@@ -38731,10 +38740,15 @@ async function compileCSS(id, code, config, urlReplacer) {
                 return id;
             },
             async load(id) {
-                const code = fs$l.readFileSync(id, 'utf-8');
-                const result = await compileCSS(id, code, config);
-                result.deps?.forEach((dep) => deps.add(dep));
-                return result.code;
+                const code = await fs$l.promises.readFile(id, 'utf-8');
+                const lang = id.match(CSS_LANGS_RE)?.[1];
+                if (isPreProcessor(lang)) {
+                    const result = await compileCSSPreprocessors(id, lang, code, config);
+                    result.deps?.forEach((dep) => deps.add(dep));
+                    // TODO: support source map
+                    return result.code;
+                }
+                return code;
             },
             nameLayer(index) {
                 return `vite--anon-layer-${getHash(id)}-${index}`;
@@ -38874,8 +38888,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-9afe96b1.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-c8efd3d9.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-a00d73d3.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-1e231048.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40903,7 +40917,7 @@ const createCssDefaultImportWarning = (globs, options) => `if (!${warnedCSSDefau
 async function transformGlobImport(code, id, root, resolveId, isProduction, restoreQueryExtension = false) {
     id = slash$1(id);
     root = slash$1(root);
-    const isVirtual = !isAbsolute$2(id);
+    const isVirtual = isVirtualModule(id);
     const dir = isVirtual ? undefined : dirname(id);
     const matches = await parseImportGlob(code, isVirtual ? undefined : id, root, resolveId);
     const matchedFiles = new Set();
@@ -41108,6 +41122,10 @@ function getCommonBase(globsResolved) {
         commonAncestor = '/';
     return commonAncestor;
 }
+function isVirtualModule(id) {
+    // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
+    return id.startsWith('virtual:') || id[0] === '\0' || !id.includes('/');
+}
 
 const debugHmr = createDebugger('vite:hmr');
 const whitespaceRE = /\s/;
@@ -41983,8 +42001,7 @@ function importAnalysisPlugin(config) {
             // normalize and rewrite accepted urls
             const normalizedAcceptedUrls = new Set();
             for (const { url, start, end } of acceptedUrls) {
-                const isRelative = url[0] === '.';
-                const [normalized] = await moduleGraph.resolveUrl(isRelative ? toAbsoluteUrl(url) : url, ssr);
+                const [normalized] = await moduleGraph.resolveUrl(toAbsoluteUrl(url), ssr);
                 normalizedAcceptedUrls.add(normalized);
                 str().overwrite(start, end, JSON.stringify(normalized), {
                     contentOnly: true,
@@ -66068,18 +66085,19 @@ const _require = createRequire$1(import.meta.url);
 async function loadConfigFromBundledFile(fileName, bundledCode, isESM) {
     // for esm, before we can register loaders without requiring users to run node
     // with --experimental-loader themselves, we have to do a hack here:
-    // convert to base64, load it with native Node ESM.
+    // write it to disk, load it with native Node ESM, then delete the file.
     if (isESM) {
+        const fileBase = `${fileName}.timestamp-${Date.now()}-${Math.random()
+            .toString(16)
+            .slice(2)}`;
+        const fileNameTmp = `${fileBase}.mjs`;
+        const fileUrl = `${pathToFileURL(fileBase)}.mjs`;
+        await fsp.writeFile(fileNameTmp, bundledCode);
         try {
-            // Postfix the bundled code with a timestamp to avoid Node's ESM loader cache
-            const configTimestamp = `${fileName}.timestamp:${Date.now()}-${Math.random()
-                .toString(16)
-                .slice(2)}`;
-            return (await dynamicImport('data:text/javascript;base64,' +
-                Buffer.from(`${bundledCode}\n//${configTimestamp}`).toString('base64'))).default;
+            return (await dynamicImport(fileUrl)).default;
         }
-        catch (e) {
-            throw new Error(`${e.message} at ${fileName}`);
+        finally {
+            fs$l.unlink(fileNameTmp, () => { }); // Ignore errors
         }
     }
     // for cjs, we can register a custom loader via `_require.extensions`

package/dist/node/chunks/{dep-9afe96b1.js → dep-a00d73d3.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-1d3a4915.js';
+import { E as getDefaultExportFromCjs } from './dep-8609dc5d.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.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 { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-1d3a4915.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-8609dc5d.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -738,7 +738,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-1d3a4915.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-8609dc5d.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -816,7 +816,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-1d3a4915.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-8609dc5d.js').then(function (n) { return n.H; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -844,7 +844,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-1d3a4915.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-8609dc5d.js').then(function (n) { return n.G; });
     try {
         const config = await resolveConfig({
             root,
@@ -871,7 +871,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-1d3a4915.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-8609dc5d.js').then(function (n) { return n.J; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-1d3a4915.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-1d3a4915.js';
+import { i as isInNodeModules } from './chunks/dep-8609dc5d.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-8609dc5d.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/package.json

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