vite 2.9.12 → 2.9.15

package/dist/node/chunks/{dep-985abbbd.js → dep-0fd6fea3.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-8f5c9290.js');
+var index = require('./dep-689425f3.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {

package/dist/node/chunks/{dep-ad22985c.js → dep-24755698.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-8f5c9290.js');
+var index = require('./dep-689425f3.js');
 var require$$1 = require('crypto');
 require('fs');
 require('path');

package/dist/node/chunks/{dep-8f5c9290.js → dep-689425f3.js}

@@ -22715,239 +22715,6 @@ const JSON5 = {
 
 var lib$2 = JSON5;
 
-function formatGlobRelativePattern(base, pattern) {
-    let parentDepth = 0;
-    while (pattern.startsWith('../')) {
-        pattern = pattern.slice(3);
-        base = path__default.resolve(base, '../');
-        parentDepth++;
-    }
-    if (pattern.startsWith('./')) {
-        pattern = pattern.slice(2);
-    }
-    return { base, pattern, parentDepth, isAbsolute: false };
-}
-async function transformImportGlob(source, pos, importer, importIndex, root, logger, normalizeUrl, resolve, preload = true) {
-    var _a;
-    const isEager = source.slice(pos, pos + 21) === 'import.meta.globEager';
-    const isEagerDefault = isEager && source.slice(pos + 21, pos + 28) === 'Default';
-    const err = (msg) => {
-        const e = new Error(`Invalid glob import syntax: ${msg}`);
-        e.pos = pos;
-        return e;
-    };
-    importer = cleanUrl(importer);
-    const importerBasename = path__default.basename(importer);
-    const [userPattern, options, endIndex] = lexGlobPattern(source, pos);
-    let globParams = null;
-    if (userPattern.startsWith('/')) {
-        globParams = {
-            isAbsolute: true,
-            base: path__default.resolve(root),
-            pattern: userPattern.slice(1),
-            parentDepth: 0
-        };
-    }
-    else if (userPattern.startsWith('.')) {
-        globParams = formatGlobRelativePattern(path__default.dirname(importer), userPattern);
-    }
-    else if (resolve) {
-        const resolvedId = await resolve(userPattern, importer);
-        if (resolvedId) {
-            const importerDirname = path__default.dirname(importer);
-            globParams = formatGlobRelativePattern(importerDirname, normalizePath$3(path__default.relative(importerDirname, resolvedId)));
-        }
-    }
-    if (!globParams) {
-        throw err(`pattern must start with "." or "/" (relative to project root) or alias path`);
-    }
-    const { base, parentDepth, isAbsolute, pattern } = globParams;
-    const files = out.sync(pattern, {
-        cwd: base,
-        // Ignore node_modules by default unless explicitly indicated in the pattern
-        ignore: /(^|\/)node_modules\//.test(pattern) ? [] : ['**/node_modules/**']
-    });
-    const imports = [];
-    let importsString = ``;
-    let entries = ``;
-    for (let i = 0; i < files.length; i++) {
-        // skip importer itself
-        if (files[i] === importerBasename)
-            continue;
-        const file = isAbsolute
-            ? `/${files[i]}`
-            : parentDepth
-                ? `${'../'.repeat(parentDepth)}${files[i]}`
-                : `./${files[i]}`;
-        let importee = file;
-        if (normalizeUrl) {
-            [importee] = await normalizeUrl(file, pos);
-        }
-        imports.push(importee);
-        // TODO remove assert syntax for the Vite 3.0 release.
-        const isRawAssert = ((_a = options === null || options === void 0 ? void 0 : options.assert) === null || _a === void 0 ? void 0 : _a.type) === 'raw';
-        const isRawType = (options === null || options === void 0 ? void 0 : options.as) === 'raw';
-        if (isRawType || isRawAssert) {
-            if (isRawAssert) {
-                logger.warn(colors$1.yellow(colors$1.bold("(!) import.meta.glob('...', { assert: { type: 'raw' }}) is deprecated. Use import.meta.glob('...', { as: 'raw' }) instead.")));
-            }
-            entries += ` ${JSON.stringify(file)}: ${JSON.stringify(await fs$n.promises.readFile(path__default.join(base, files[i]), 'utf-8'))},`;
-        }
-        else {
-            if (isEager) {
-                const identifier = `__glob_${importIndex}_${i}`;
-                importsString += `import ${isEagerDefault ? `` : `* as `}${identifier} from ${JSON.stringify(importee)};`;
-                entries += ` ${JSON.stringify(file)}: ${identifier},`;
-            }
-            else {
-                let imp = `import(${JSON.stringify(importee)})`;
-                if (!normalizeUrl && preload) {
-                    imp =
-                        `(${isModernFlag}` +
-                            `? ${preloadMethod}(()=>${imp},"${preloadMarker}")` +
-                            `: ${imp})`;
-                }
-                entries += ` ${JSON.stringify(file)}: () => ${imp},`;
-            }
-        }
-    }
-    return {
-        imports,
-        importsString,
-        exp: `{${entries}}`,
-        endIndex,
-        isEager,
-        pattern,
-        base
-    };
-}
-function lexGlobPattern(code, pos) {
-    let state = 0 /* inCall */;
-    let pattern = '';
-    let i = code.indexOf(`(`, pos) + 1;
-    outer: for (; i < code.length; i++) {
-        const char = code.charAt(i);
-        switch (state) {
-            case 0 /* inCall */:
-                if (char === `'`) {
-                    state = 1 /* inSingleQuoteString */;
-                }
-                else if (char === `"`) {
-                    state = 2 /* inDoubleQuoteString */;
-                }
-                else if (char === '`') {
-                    state = 3 /* inTemplateString */;
-                }
-                else if (/\s/.test(char)) {
-                    continue;
-                }
-                else {
-                    error$2(i);
-                }
-                break;
-            case 1 /* inSingleQuoteString */:
-                if (char === `'`) {
-                    break outer;
-                }
-                else {
-                    pattern += char;
-                }
-                break;
-            case 2 /* inDoubleQuoteString */:
-                if (char === `"`) {
-                    break outer;
-                }
-                else {
-                    pattern += char;
-                }
-                break;
-            case 3 /* inTemplateString */:
-                if (char === '`') {
-                    break outer;
-                }
-                else {
-                    pattern += char;
-                }
-                break;
-            default:
-                throw new Error('unknown import.meta.glob lexer state');
-        }
-    }
-    const noCommentCode = code
-        .slice(i + 1)
-        .replace(singlelineCommentsRE, blankReplacer)
-        .replace(multilineCommentsRE, blankReplacer);
-    const endIndex = noCommentCode.indexOf(')');
-    const optionString = noCommentCode.substring(0, endIndex);
-    const commaIndex = optionString.indexOf(',');
-    let options = {};
-    if (commaIndex > -1) {
-        options = lib$2.parse(optionString.substring(commaIndex + 1));
-    }
-    return [pattern, options, endIndex + i + 2];
-}
-function error$2(pos) {
-    const err = new Error(`import.meta.glob() can only accept string literals.`);
-    err.pos = pos;
-    throw err;
-}
-
-const isDebug$6 = !!process.env.DEBUG;
-const debug$e = createDebugger('vite:sourcemap', {
-    onlyWhenFocused: true
-});
-// Virtual modules should be prefixed with a null byte to avoid a
-// false positive "missing source" warning. We also check for certain
-// prefixes used for special handling in esbuildDepPlugin.
-const virtualSourceRE = /^(\0|dep:|browser-external:)/;
-async function injectSourcesContent(map, file, logger) {
-    let sourceRoot;
-    try {
-        // The source root is undefined for virtual modules and permission errors.
-        sourceRoot = await fs$n.promises.realpath(path__default.resolve(path__default.dirname(file), map.sourceRoot || ''));
-    }
-    catch { }
-    const missingSources = [];
-    map.sourcesContent = await Promise.all(map.sources.map((sourcePath) => {
-        if (sourcePath && !virtualSourceRE.test(sourcePath)) {
-            sourcePath = decodeURI(sourcePath);
-            if (sourceRoot) {
-                sourcePath = path__default.resolve(sourceRoot, sourcePath);
-            }
-            return fs$n.promises.readFile(sourcePath, 'utf-8').catch(() => {
-                missingSources.push(sourcePath);
-                return null;
-            });
-        }
-        return null;
-    }));
-    // Use this command…
-    //    DEBUG="vite:sourcemap" vite build
-    // …to log the missing sources.
-    if (missingSources.length) {
-        logger.warnOnce(`Sourcemap for "${file}" points to missing source files`);
-        isDebug$6 && debug$e(`Missing sources:\n  ` + missingSources.join(`\n  `));
-    }
-}
-function genSourceMapUrl(map) {
-    if (typeof map !== 'string') {
-        map = JSON.stringify(map);
-    }
-    return `data:application/json;base64,${Buffer.from(map).toString('base64')}`;
-}
-function getCodeWithSourcemap(type, code, map) {
-    if (isDebug$6) {
-        code += `\n/*${JSON.stringify(map, null, 2).replace(/\*\//g, '*\\/')}*/\n`;
-    }
-    if (type === 'js') {
-        code += `\n//# sourceMappingURL=${genSourceMapUrl(map !== null && map !== void 0 ? map : undefined)}`;
-    }
-    else if (type === 'css') {
-        code += `\n/*# sourceMappingURL=${genSourceMapUrl(map !== null && map !== void 0 ? map : undefined)} */`;
-    }
-    return code;
-}
-
 var dist$1 = {};
 
 (function (exports) {
@@ -30103,6 +29870,62 @@ rc.sync = withTypeScriptLoader((ctx, path, options) => {
  */
 var src$1 = rc;
 
+const isDebug$6 = !!process.env.DEBUG;
+const debug$e = createDebugger('vite:sourcemap', {
+    onlyWhenFocused: true
+});
+// Virtual modules should be prefixed with a null byte to avoid a
+// false positive "missing source" warning. We also check for certain
+// prefixes used for special handling in esbuildDepPlugin.
+const virtualSourceRE = /^(\0|dep:|browser-external:)/;
+async function injectSourcesContent(map, file, logger) {
+    let sourceRoot;
+    try {
+        // The source root is undefined for virtual modules and permission errors.
+        sourceRoot = await fs$n.promises.realpath(path__default.resolve(path__default.dirname(file), map.sourceRoot || ''));
+    }
+    catch { }
+    const missingSources = [];
+    map.sourcesContent = await Promise.all(map.sources.map((sourcePath) => {
+        if (sourcePath && !virtualSourceRE.test(sourcePath)) {
+            sourcePath = decodeURI(sourcePath);
+            if (sourceRoot) {
+                sourcePath = path__default.resolve(sourceRoot, sourcePath);
+            }
+            return fs$n.promises.readFile(sourcePath, 'utf-8').catch(() => {
+                missingSources.push(sourcePath);
+                return null;
+            });
+        }
+        return null;
+    }));
+    // Use this command…
+    //    DEBUG="vite:sourcemap" vite build
+    // …to log the missing sources.
+    if (missingSources.length) {
+        logger.warnOnce(`Sourcemap for "${file}" points to missing source files`);
+        isDebug$6 && debug$e(`Missing sources:\n  ` + missingSources.join(`\n  `));
+    }
+}
+function genSourceMapUrl(map) {
+    if (typeof map !== 'string') {
+        map = JSON.stringify(map);
+    }
+    return `data:application/json;base64,${Buffer.from(map).toString('base64')}`;
+}
+function getCodeWithSourcemap(type, code, map) {
+    if (isDebug$6) {
+        code += `\n/*${JSON.stringify(map, null, 2).replace(/\*\//g, '*\\/')}*/\n`;
+    }
+    if (type === 'js') {
+        code += `\n//# sourceMappingURL=${genSourceMapUrl(map !== null && map !== void 0 ? map : undefined)}`;
+    }
+    else if (type === 'css') {
+        code += `\n/*# sourceMappingURL=${genSourceMapUrl(map !== null && map !== void 0 ? map : undefined)} */`;
+    }
+    return code;
+}
+
 // This file was generated. Do not modify manually!
 var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 
@@ -36554,7 +36377,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-985abbbd.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-0fd6fea3.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -37135,6 +36958,7 @@ const htmlProxyRE = /(\?|&)html-proxy\b/;
 const commonjsProxyRE = /\?commonjs-proxy/;
 const inlineRE = /(\?|&)inline\b/;
 const inlineCSSRE = /(\?|&)inline-css\b/;
+const usedRE = /(\?|&)used\b/;
 const varRE = /^var\(/i;
 const isCSSRequest = (request) => cssLangRE.test(request);
 const isDirectCSSRequest = (request) => cssLangRE.test(request) && directRequestRE.test(request);
@@ -37310,18 +37134,24 @@ function cssPostPlugin(config) {
                 styles.set(id, css);
             }
             let code;
-            if (modulesCode) {
-                code = modulesCode;
+            if (usedRE.test(id)) {
+                if (modulesCode) {
+                    code = modulesCode;
+                }
+                else {
+                    let content = css;
+                    if (config.build.minify) {
+                        content = await minifyCSS(content, config);
+                    }
+                    code = `export default ${JSON.stringify(content)}`;
+                }
             }
             else {
-                let content = css;
-                if (config.build.minify) {
-                    content = await minifyCSS(content, config);
-                }
-                // marking as pure to make it tree-shakable by minifier
-                // but the module itself is still treated as a non tree-shakable module
-                // because moduleSideEffects is 'no-treeshake'
-                code = `export default /* #__PURE__ */ (() => ${JSON.stringify(content)})()`;
+                // if moduleCode exists return it **even if** it does not have `?used`
+                // this will disable tree-shake to work with `import './foo.module.css'` but this usually does not happen
+                // this is a limitation of the current approach by `?used` to make tree-shake work
+                // See #8936 for more details
+                code = modulesCode || `export default ''`;
             }
             return {
                 code,
@@ -37604,7 +37434,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-b27bdd3c.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-aa4ab47b.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -38253,6 +38083,185 @@ function isPreProcessor(lang) {
     return lang && lang in preProcessors;
 }
 
+function formatGlobRelativePattern(base, pattern) {
+    let parentDepth = 0;
+    while (pattern.startsWith('../')) {
+        pattern = pattern.slice(3);
+        base = path__default.resolve(base, '../');
+        parentDepth++;
+    }
+    if (pattern.startsWith('./')) {
+        pattern = pattern.slice(2);
+    }
+    return { base, pattern, parentDepth, isAbsolute: false };
+}
+async function transformImportGlob(source, pos, importer, importIndex, root, logger, normalizeUrl, resolve, preload = true) {
+    var _a;
+    const isEager = source.slice(pos, pos + 21) === 'import.meta.globEager';
+    const isEagerDefault = isEager && source.slice(pos + 21, pos + 28) === 'Default';
+    const err = (msg) => {
+        const e = new Error(`Invalid glob import syntax: ${msg}`);
+        e.pos = pos;
+        return e;
+    };
+    importer = cleanUrl(importer);
+    const importerBasename = path__default.basename(importer);
+    const [userPattern, options, endIndex] = lexGlobPattern(source, pos);
+    let globParams = null;
+    if (userPattern.startsWith('/')) {
+        globParams = {
+            isAbsolute: true,
+            base: path__default.resolve(root),
+            pattern: userPattern.slice(1),
+            parentDepth: 0
+        };
+    }
+    else if (userPattern.startsWith('.')) {
+        globParams = formatGlobRelativePattern(path__default.dirname(importer), userPattern);
+    }
+    else if (resolve) {
+        const resolvedId = await resolve(userPattern, importer);
+        if (resolvedId) {
+            const importerDirname = path__default.dirname(importer);
+            globParams = formatGlobRelativePattern(importerDirname, normalizePath$3(path__default.relative(importerDirname, resolvedId)));
+        }
+    }
+    if (!globParams) {
+        throw err(`pattern must start with "." or "/" (relative to project root) or alias path`);
+    }
+    const { base, parentDepth, isAbsolute, pattern } = globParams;
+    const files = out.sync(pattern, {
+        cwd: base,
+        // Ignore node_modules by default unless explicitly indicated in the pattern
+        ignore: /(^|\/)node_modules\//.test(pattern) ? [] : ['**/node_modules/**']
+    });
+    const imports = [];
+    let importsString = ``;
+    let entries = ``;
+    for (let i = 0; i < files.length; i++) {
+        // skip importer itself
+        if (files[i] === importerBasename)
+            continue;
+        const file = isAbsolute
+            ? `/${files[i]}`
+            : parentDepth
+                ? `${'../'.repeat(parentDepth)}${files[i]}`
+                : `./${files[i]}`;
+        let importee = file;
+        if (normalizeUrl) {
+            [importee] = await normalizeUrl(file, pos);
+        }
+        imports.push(importee);
+        // TODO remove assert syntax for the Vite 3.0 release.
+        const isRawAssert = ((_a = options === null || options === void 0 ? void 0 : options.assert) === null || _a === void 0 ? void 0 : _a.type) === 'raw';
+        const isRawType = (options === null || options === void 0 ? void 0 : options.as) === 'raw';
+        if (isRawType || isRawAssert) {
+            if (isRawAssert) {
+                logger.warn(colors$1.yellow(colors$1.bold("(!) import.meta.glob('...', { assert: { type: 'raw' }}) is deprecated. Use import.meta.glob('...', { as: 'raw' }) instead.")));
+            }
+            entries += ` ${JSON.stringify(file)}: ${JSON.stringify(await fs$n.promises.readFile(path__default.join(base, files[i]), 'utf-8'))},`;
+        }
+        else {
+            const importeeUrl = isCSSRequest(importee) ? `${importee}?used` : importee;
+            if (isEager) {
+                const identifier = `__glob_${importIndex}_${i}`;
+                // css imports injecting a ?used query to export the css string
+                importsString += `import ${isEagerDefault ? `` : `* as `}${identifier} from ${JSON.stringify(importeeUrl)};`;
+                entries += ` ${JSON.stringify(file)}: ${identifier},`;
+            }
+            else {
+                let imp = `import(${JSON.stringify(importeeUrl)})`;
+                if (!normalizeUrl && preload) {
+                    imp =
+                        `(${isModernFlag}` +
+                            `? ${preloadMethod}(()=>${imp},"${preloadMarker}")` +
+                            `: ${imp})`;
+                }
+                entries += ` ${JSON.stringify(file)}: () => ${imp},`;
+            }
+        }
+    }
+    return {
+        imports,
+        importsString,
+        exp: `{${entries}}`,
+        endIndex,
+        isEager,
+        pattern,
+        base
+    };
+}
+function lexGlobPattern(code, pos) {
+    let state = 0 /* inCall */;
+    let pattern = '';
+    let i = code.indexOf(`(`, pos) + 1;
+    outer: for (; i < code.length; i++) {
+        const char = code.charAt(i);
+        switch (state) {
+            case 0 /* inCall */:
+                if (char === `'`) {
+                    state = 1 /* inSingleQuoteString */;
+                }
+                else if (char === `"`) {
+                    state = 2 /* inDoubleQuoteString */;
+                }
+                else if (char === '`') {
+                    state = 3 /* inTemplateString */;
+                }
+                else if (/\s/.test(char)) {
+                    continue;
+                }
+                else {
+                    error$2(i);
+                }
+                break;
+            case 1 /* inSingleQuoteString */:
+                if (char === `'`) {
+                    break outer;
+                }
+                else {
+                    pattern += char;
+                }
+                break;
+            case 2 /* inDoubleQuoteString */:
+                if (char === `"`) {
+                    break outer;
+                }
+                else {
+                    pattern += char;
+                }
+                break;
+            case 3 /* inTemplateString */:
+                if (char === '`') {
+                    break outer;
+                }
+                else {
+                    pattern += char;
+                }
+                break;
+            default:
+                throw new Error('unknown import.meta.glob lexer state');
+        }
+    }
+    const noCommentCode = code
+        .slice(i + 1)
+        .replace(singlelineCommentsRE, blankReplacer)
+        .replace(multilineCommentsRE, blankReplacer);
+    const endIndex = noCommentCode.indexOf(')');
+    const optionString = noCommentCode.substring(0, endIndex);
+    const commaIndex = optionString.indexOf(',');
+    let options = {};
+    if (commaIndex > -1) {
+        options = lib$2.parse(optionString.substring(commaIndex + 1));
+    }
+    return [pattern, options, endIndex + i + 2];
+}
+function error$2(pos) {
+    const err = new Error(`import.meta.glob() can only accept string literals.`);
+    err.pos = pos;
+    throw err;
+}
+
 /**
  * A flag for injected helpers. This flag will be set to `false` if the output
  * target is not native es - so that injected helper logic can be conditionally
@@ -38364,7 +38373,8 @@ function buildImportAnalysisPlugin(config) {
             const str = () => s || (s = new MagicString(source));
             let needPreloadHelper = false;
             for (let index = 0; index < imports.length; index++) {
-                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex } = imports[index];
+                const { s: start, e: end, ss: expStart, se: expEnd, n: specifier, d: dynamicIndex } = imports[index];
+                const isDynamic = dynamicIndex > -1;
                 // import.meta.glob
                 if (source.slice(start, end) === 'import.meta' &&
                     source.slice(end, end + 5) === '.glob') {
@@ -38383,11 +38393,26 @@ function buildImportAnalysisPlugin(config) {
                     }
                     continue;
                 }
-                if (dynamicIndex > -1 && insertPreload) {
+                if (isDynamic && insertPreload) {
                     needPreloadHelper = true;
-                    const original = source.slice(expStart, expEnd);
-                    const replacement = `${preloadMethod}(() => ${original},${isModernFlag}?"${preloadMarker}":void 0)`;
-                    str().overwrite(expStart, expEnd, replacement, { contentOnly: true });
+                    str().prependLeft(expStart, `${preloadMethod}(() => `);
+                    str().appendRight(expEnd, `,${isModernFlag}?"${preloadMarker}":void 0)`);
+                }
+                // Differentiate CSS imports that use the default export from those that
+                // do not by injecting a ?used query - this allows us to avoid including
+                // the CSS string when unnecessary (esbuild has trouble tree-shaking
+                // them)
+                if (specifier &&
+                    isCSSRequest(specifier) &&
+                    // always inject ?used query when it is a dynamic import
+                    // because there is no way to check whether the default export is used
+                    (source.slice(expStart, start).includes('from') || isDynamic) &&
+                    // edge case for package names ending with .css (e.g normalize.css)
+                    !(bareImportRE.test(specifier) && !specifier.includes('/'))) {
+                    const url = specifier.replace(/\?|$/, (m) => `?used${m ? '&' : ''}`);
+                    str().overwrite(start, end, isDynamic ? `'${url}'` : url, {
+                        contentOnly: true
+                    });
                 }
             }
             if (needPreloadHelper &&
@@ -41258,7 +41283,7 @@ function ssrManifestPlugin(config) {
                         const code = chunk.code;
                         let imports;
                         try {
-                            imports = parse$e(code)[0].filter((i) => i.d > -1);
+                            imports = parse$e(code)[0].filter((i) => i.n && i.d > -1);
                         }
                         catch (e) {
                             this.error(e, e.idx);
@@ -48163,7 +48188,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await Promise.resolve().then(function () { return require('./dep-ad22985c.js'); })).createCertificate();
+        const content = (await Promise.resolve().then(function () { return require('./dep-24755698.js'); })).createCertificate();
         fs$n.promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => fs$n.promises.writeFile(cachePath, content))
@@ -49750,32 +49775,36 @@ function serveStaticMiddleware(dir, server) {
             isInternalRequest(req.url)) {
             return next();
         }
-        const url = decodeURI(req.url);
+        const url = new URL(req.url, 'http://example.com');
+        const pathname = decodeURIComponent(url.pathname);
         // apply aliases to static requests as well
-        let redirected;
+        let redirectedPathname;
         for (const { find, replacement } of server.config.resolve.alias) {
-            const matches = typeof find === 'string' ? url.startsWith(find) : find.test(url);
+            const matches = typeof find === 'string'
+                ? pathname.startsWith(find)
+                : find.test(pathname);
             if (matches) {
-                redirected = url.replace(find, replacement);
+                redirectedPathname = pathname.replace(find, replacement);
                 break;
             }
         }
-        if (redirected) {
+        if (redirectedPathname) {
             // dir is pre-normalized to posix style
-            if (redirected.startsWith(dir)) {
-                redirected = redirected.slice(dir.length);
+            if (redirectedPathname.startsWith(dir)) {
+                redirectedPathname = redirectedPathname.slice(dir.length);
             }
         }
-        const resolvedUrl = redirected || url;
-        let fileUrl = path__default.resolve(dir, resolvedUrl.replace(/^\//, ''));
-        if (resolvedUrl.endsWith('/') && !fileUrl.endsWith('/')) {
+        const resolvedPathname = redirectedPathname || pathname;
+        let fileUrl = path__default.resolve(dir, resolvedPathname.replace(/^\//, ''));
+        if (resolvedPathname.endsWith('/') && !fileUrl.endsWith('/')) {
             fileUrl = fileUrl + '/';
         }
         if (!ensureServingAccess(fileUrl, server, res, next)) {
             return;
         }
-        if (redirected) {
-            req.url = redirected;
+        if (redirectedPathname) {
+            url.pathname = encodeURIComponent(redirectedPathname);
+            req.url = url.href.slice(url.origin.length);
         }
         serve(req, res, next);
     };
@@ -49784,20 +49813,22 @@ function serveRawFsMiddleware(server) {
     const serveFromRoot = sirv('/', sirvOptions(server.config.server.headers));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServeRawFsMiddleware(req, res, next) {
-        let url = decodeURI(req.url);
+        const url = new URL(req.url, 'http://example.com');
         // In some cases (e.g. linked monorepos) files outside of root will
         // reference assets that are also out of served root. In such cases
         // the paths are rewritten to `/@fs/` prefixed paths and must be served by
         // searching based from fs root.
-        if (url.startsWith(FS_PREFIX)) {
+        if (url.pathname.startsWith(FS_PREFIX)) {
+            const pathname = decodeURIComponent(url.pathname);
             // restrict files outside of `fs.allow`
-            if (!ensureServingAccess(slash(path__default.resolve(fsPathFromId(url))), server, res, next)) {
+            if (!ensureServingAccess(slash(path__default.resolve(fsPathFromId(pathname))), server, res, next)) {
                 return;
             }
-            url = url.slice(FS_PREFIX.length);
+            let newPathname = pathname.slice(FS_PREFIX.length);
             if (isWindows$3)
-                url = url.replace(/^[A-Z]:/i, '');
-            req.url = url;
+                newPathname = newPathname.replace(/^[A-Z]:/i, '');
+            url.pathname = encodeURIComponent(newPathname);
+            req.url = url.href.slice(url.origin.length);
             serveFromRoot(req, res, next);
         }
         else {
@@ -53068,7 +53099,7 @@ const http$3 = require$$1__default$1;
 const net = require$$3__default;
 const tls = require$$4__default;
 const { randomBytes, createHash: createHash$1 } = require$$1__default$2;
-const { URL: URL$1 } = require$$0__default$5;
+const { URL: URL$2 } = require$$0__default$5;
 
 const PerMessageDeflate$1 = permessageDeflate;
 const Receiver = receiver;
@@ -53722,12 +53753,12 @@ function initAsClient(websocket, address, protocols, options) {
 
   let parsedUrl;
 
-  if (address instanceof URL$1) {
+  if (address instanceof URL$2) {
     parsedUrl = address;
     websocket._url = address.href;
   } else {
     try {
-      parsedUrl = new URL$1(address);
+      parsedUrl = new URL$2(address);
     } catch (e) {
       throw new SyntaxError(`Invalid URL: ${address}`);
     }
@@ -53920,7 +53951,7 @@ function initAsClient(websocket, address, protocols, options) {
       let addr;
 
       try {
-        addr = new URL$1(location, address);
+        addr = new URL$2(location, address);
       } catch (e) {
         const err = new SyntaxError(`Invalid URL: ${location}`);
         emitErrorAndClose(websocket, err);
@@ -55923,7 +55954,7 @@ var debug_1 = function () {
 };
 
 var url = require$$0__default$5;
-var URL = url.URL;
+var URL$1 = url.URL;
 var http$1 = require$$1__default$1;
 var https$1 = require$$1__default$3;
 var Writable = require$$0__default$3.Writable;
@@ -56374,14 +56405,14 @@ function wrap(protocols) {
       if (typeof input === "string") {
         var urlStr = input;
         try {
-          input = urlToOptions(new URL(urlStr));
+          input = urlToOptions(new URL$1(urlStr));
         }
         catch (err) {
           /* istanbul ignore next */
           input = url.parse(urlStr);
         }
       }
-      else if (URL && (input instanceof URL)) {
+      else if (URL$1 && (input instanceof URL$1)) {
         input = urlToOptions(input);
       }
       else {
@@ -60803,11 +60834,21 @@ const wasmHelperId = '/__vite-wasm-helper';
 const wasmHelper = async (opts = {}, url) => {
     let result;
     if (url.startsWith('data:')) {
-        // @ts-ignore
-        const binaryString = atob(url.replace(/^data:.*?base64,/, ''));
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
+        const urlContent = url.replace(/^data:.*?base64,/, '');
+        let bytes;
+        if (typeof Buffer === 'function' && typeof Buffer.from === 'function') {
+            bytes = Buffer.from(urlContent, 'base64');
+        }
+        else if (typeof atob === 'function') {
+            // @ts-ignore
+            const binaryString = atob(urlContent);
+            bytes = new Uint8Array(binaryString.length);
+            for (let i = 0; i < binaryString.length; i++) {
+                bytes[i] = binaryString.charCodeAt(i);
+            }
+        }
+        else {
+            throw new Error('Failed to decode base64-encoded data URL, Buffer and atob are not supported');
         }
         // @ts-ignore
         result = await WebAssembly.instantiate(bytes, opts);
@@ -61861,7 +61902,6 @@ async function loadConfigFromFile(configEnv, configFile, configRoot = process.cw
     try {
         let userConfig;
         if (isESM) {
-            const fileUrl = require('url').pathToFileURL(resolvedPath);
             const bundled = await bundleConfigFile(resolvedPath, true);
             dependencies = bundled.dependencies;
             if (isTS) {
@@ -61869,13 +61909,16 @@ async function loadConfigFromFile(configEnv, configFile, configRoot = process.cw
                 // with --experimental-loader themselves, we have to do a hack here:
                 // bundle the config file w/ ts transforms first, write it to disk,
                 // load it with native Node ESM, then delete the file.
-                fs__default.writeFileSync(resolvedPath + '.js', bundled.code);
-                userConfig = (await dynamicImport(`${fileUrl}.js?t=${Date.now()}`))
-                    .default;
-                fs__default.unlinkSync(resolvedPath + '.js');
+                const fileBase = `${resolvedPath}.timestamp-${Date.now()}`;
+                const fileNameTmp = `${fileBase}.js`;
+                const fileUrl = `${require('url').pathToFileURL(fileBase)}.js`;
+                fs__default.writeFileSync(fileNameTmp, bundled.code);
+                userConfig = (await dynamicImport(fileUrl)).default;
+                fs__default.unlinkSync(fileNameTmp);
                 debug(`TS + native esm config loaded in ${getTime()}`, fileUrl);
             }
             else {
+                const fileUrl = require('url').pathToFileURL(resolvedPath);
                 // using Function to avoid this from being compiled away by TS/Rollup
                 // append a query so that we force reload fresh config in case of
                 // server restart

package/dist/node/chunks/{dep-b27bdd3c.js → dep-aa4ab47b.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('postcss');
-var index$1 = require('./dep-8f5c9290.js');
+var index$1 = require('./dep-689425f3.js');
 var path$2 = require('path');
 var require$$1 = require('crypto');
 var fs = require('fs');

package/dist/node/cli.js

@@ -2,7 +2,7 @@
 
 var perf_hooks = require('perf_hooks');
 var require$$0 = require('events');
-var index = require('./chunks/dep-8f5c9290.js');
+var index = require('./chunks/dep-689425f3.js');
 require('fs');
 require('path');
 require('url');
@@ -683,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-8f5c9290.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-689425f3.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -732,7 +732,7 @@ cli
     .option('--emptyOutDir', `[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) => {
-    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-8f5c9290.js'); }).then(function (n) { return n.build$1; });
+    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-689425f3.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -755,7 +755,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-8f5c9290.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-689425f3.js'); }).then(function (n) { return n.index; });
     try {
         const config = await index.resolveConfig({
             root,
@@ -778,7 +778,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-8f5c9290.js'); }).then(function (n) { return n.preview$1; });
+    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-689425f3.js'); }).then(function (n) { return n.preview$1; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./chunks/dep-8f5c9290.js');
+var index = require('./chunks/dep-689425f3.js');
 require('fs');
 require('path');
 require('url');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.9.12",
+  "version": "2.9.15",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -46,7 +46,7 @@
     "esbuild": "^0.14.27",
     "postcss": "^8.4.13",
     "resolve": "^1.22.0",
-    "rollup": "^2.59.0"
+    "rollup": ">=2.59.0 <2.78.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"