vite 3.2.0-beta.0 → 3.2.0-beta.1

package/dist/node/chunks/{dep-92763d7a.js → dep-34b5a6bf.js}

@@ -165,14 +165,21 @@ function getEntries({ entries, customResolver }) {
         return { find: key, replacement: value, resolverFunction: resolverFunctionFromOptions };
     });
 }
+function getHookFunction(hook) {
+    if (typeof hook === 'function') {
+        return hook;
+    }
+    if (hook && 'handler' in hook && typeof hook.handler === 'function') {
+        return hook.handler;
+    }
+    return null;
+}
 function resolveCustomResolver(customResolver) {
+    if (typeof customResolver === 'function') {
+        return customResolver;
+    }
     if (customResolver) {
-        if (typeof customResolver === 'function') {
-            return customResolver;
-        }
-        if (typeof customResolver.resolveId === 'function') {
-            return customResolver.resolveId;
-        }
+        return getHookFunction(customResolver.resolveId);
     }
     return null;
 }
@@ -187,10 +194,7 @@ function alias$1(options = {}) {
     return {
         name: 'alias',
         async buildStart(inputOptions) {
-            await Promise.all([...(Array.isArray(options.entries) ? options.entries : []), options].map(({ customResolver }) => customResolver &&
-                typeof customResolver === 'object' &&
-                typeof customResolver.buildStart === 'function' &&
-                customResolver.buildStart.call(this, inputOptions)));
+            await Promise.all([...(Array.isArray(options.entries) ? options.entries : []), options].map(({ customResolver }) => { var _a; return customResolver && ((_a = getHookFunction(customResolver.buildStart)) === null || _a === void 0 ? void 0 : _a.call(this, inputOptions)); }));
         },
         resolveId(importee, importer, resolveOptions) {
             if (!importer) {
@@ -9645,16 +9649,30 @@ const schemeRegex = /^[\w+.-]+:\/\//;
  * 3. Host, guaranteed.
  * 4. Port, including ":", optional.
  * 5. Path, including "/", optional.
+ * 6. Query, including "?", optional.
+ * 7. Hash, including "#", optional.
  */
-const urlRegex = /^([\w+.-]+:)\/\/([^@/#?]*@)?([^:/#?]*)(:\d+)?(\/[^#?]*)?/;
+const urlRegex = /^([\w+.-]+:)\/\/([^@/#?]*@)?([^:/#?]*)(:\d+)?(\/[^#?]*)?(\?[^#]*)?(#.*)?/;
 /**
  * File URLs are weird. They dont' need the regular `//` in the scheme, they may or may not start
  * with a leading `/`, they can have a domain (but only if they don't start with a Windows drive).
  *
  * 1. Host, optional.
- * 2. Path, which may inclue "/", guaranteed.
- */
-const fileRegex = /^file:(?:\/\/((?![a-z]:)[^/]*)?)?(\/?.*)/i;
+ * 2. Path, which may include "/", guaranteed.
+ * 3. Query, including "?", optional.
+ * 4. Hash, including "#", optional.
+ */
+const fileRegex = /^file:(?:\/\/((?![a-z]:)[^/#?]*)?)?(\/?[^#?]*)(\?[^#]*)?(#.*)?/i;
+var UrlType;
+(function (UrlType) {
+    UrlType[UrlType["Empty"] = 1] = "Empty";
+    UrlType[UrlType["Hash"] = 2] = "Hash";
+    UrlType[UrlType["Query"] = 3] = "Query";
+    UrlType[UrlType["RelativePath"] = 4] = "RelativePath";
+    UrlType[UrlType["AbsolutePath"] = 5] = "AbsolutePath";
+    UrlType[UrlType["SchemeRelative"] = 6] = "SchemeRelative";
+    UrlType[UrlType["Absolute"] = 7] = "Absolute";
+})(UrlType || (UrlType = {}));
 function isAbsoluteUrl(input) {
     return schemeRegex.test(input);
 }
@@ -9667,35 +9685,42 @@ function isAbsolutePath(input) {
 function isFileUrl(input) {
     return input.startsWith('file:');
 }
+function isRelative(input) {
+    return /^[.?#]/.test(input);
+}
 function parseAbsoluteUrl(input) {
     const match = urlRegex.exec(input);
-    return makeUrl(match[1], match[2] || '', match[3], match[4] || '', match[5] || '/');
+    return makeUrl(match[1], match[2] || '', match[3], match[4] || '', match[5] || '/', match[6] || '', match[7] || '');
 }
 function parseFileUrl(input) {
     const match = fileRegex.exec(input);
     const path = match[2];
-    return makeUrl('file:', '', match[1] || '', '', isAbsolutePath(path) ? path : '/' + path);
+    return makeUrl('file:', '', match[1] || '', '', isAbsolutePath(path) ? path : '/' + path, match[3] || '', match[4] || '');
 }
-function makeUrl(scheme, user, host, port, path) {
+function makeUrl(scheme, user, host, port, path, query, hash) {
     return {
         scheme,
         user,
         host,
         port,
         path,
-        relativePath: false,
+        query,
+        hash,
+        type: UrlType.Absolute,
     };
 }
 function parseUrl$2(input) {
     if (isSchemeRelativeUrl(input)) {
         const url = parseAbsoluteUrl('http:' + input);
         url.scheme = '';
+        url.type = UrlType.SchemeRelative;
         return url;
     }
     if (isAbsolutePath(input)) {
         const url = parseAbsoluteUrl('http://foo.com' + input);
         url.scheme = '';
         url.host = '';
+        url.type = UrlType.AbsolutePath;
         return url;
     }
     if (isFileUrl(input))
@@ -9705,7 +9730,13 @@ function parseUrl$2(input) {
     const url = parseAbsoluteUrl('http://foo.com/' + input);
     url.scheme = '';
     url.host = '';
-    url.relativePath = true;
+    url.type = input
+        ? input.startsWith('?')
+            ? UrlType.Query
+            : input.startsWith('#')
+                ? UrlType.Hash
+                : UrlType.RelativePath
+        : UrlType.Empty;
     return url;
 }
 function stripPathFilename(path) {
@@ -9717,10 +9748,7 @@ function stripPathFilename(path) {
     return path.slice(0, index + 1);
 }
 function mergePaths(url, base) {
-    // If we're not a relative path, then we're an absolute path, and it doesn't matter what base is.
-    if (!url.relativePath)
-        return;
-    normalizePath$5(base);
+    normalizePath$5(base, base.type);
     // If the path is just a "/", then it was an empty path to begin with (remember, we're a relative
     // path).
     if (url.path === '/') {
@@ -9730,15 +9758,13 @@ function mergePaths(url, base) {
         // Resolution happens relative to the base path's directory, not the file.
         url.path = stripPathFilename(base.path) + url.path;
     }
-    // If the base path is absolute, then our path is now absolute too.
-    url.relativePath = base.relativePath;
 }
 /**
  * The path can have empty directories "//", unneeded parents "foo/..", or current directory
  * "foo/.". We need to normalize to a standard representation.
  */
-function normalizePath$5(url) {
-    const { relativePath } = url;
+function normalizePath$5(url, type) {
+    const rel = type <= UrlType.RelativePath;
     const pieces = url.path.split('/');
     // We need to preserve the first piece always, so that we output a leading slash. The item at
     // pieces[0] is an empty string.
@@ -9770,7 +9796,7 @@ function normalizePath$5(url) {
                 positive--;
                 pointer--;
             }
-            else if (relativePath) {
+            else if (rel) {
                 // If we're in a relativePath, then we need to keep the excess parents. Else, in an absolute
                 // URL, protocol relative URL, or an absolute path, we don't need to keep excess.
                 pieces[pointer++] = piece;
@@ -9798,37 +9824,60 @@ function resolve$3(input, base) {
     if (!input && !base)
         return '';
     const url = parseUrl$2(input);
-    // If we have a base, and the input isn't already an absolute URL, then we need to merge.
-    if (base && !url.scheme) {
+    let inputType = url.type;
+    if (base && inputType !== UrlType.Absolute) {
         const baseUrl = parseUrl$2(base);
-        url.scheme = baseUrl.scheme;
-        // If there's no host, then we were just a path.
-        if (!url.host) {
-            // The host, user, and port are joined, you can't copy one without the others.
-            url.user = baseUrl.user;
-            url.host = baseUrl.host;
-            url.port = baseUrl.port;
-        }
-        mergePaths(url, baseUrl);
-    }
-    normalizePath$5(url);
-    // If the input (and base, if there was one) are both relative, then we need to output a relative.
-    if (url.relativePath) {
-        // The first char is always a "/".
-        const path = url.path.slice(1);
-        if (!path)
-            return '.';
-        // If base started with a leading ".", or there is no base and input started with a ".", then we
-        // need to ensure that the relative path starts with a ".". We don't know if relative starts
-        // with a "..", though, so check before prepending.
-        const keepRelative = (base || input).startsWith('.');
-        return !keepRelative || path.startsWith('.') ? path : './' + path;
+        const baseType = baseUrl.type;
+        switch (inputType) {
+            case UrlType.Empty:
+                url.hash = baseUrl.hash;
+            // fall through
+            case UrlType.Hash:
+                url.query = baseUrl.query;
+            // fall through
+            case UrlType.Query:
+            case UrlType.RelativePath:
+                mergePaths(url, baseUrl);
+            // fall through
+            case UrlType.AbsolutePath:
+                // The host, user, and port are joined, you can't copy one without the others.
+                url.user = baseUrl.user;
+                url.host = baseUrl.host;
+                url.port = baseUrl.port;
+            // fall through
+            case UrlType.SchemeRelative:
+                // The input doesn't have a schema at least, so we need to copy at least that over.
+                url.scheme = baseUrl.scheme;
+        }
+        if (baseType > inputType)
+            inputType = baseType;
+    }
+    normalizePath$5(url, inputType);
+    const queryHash = url.query + url.hash;
+    switch (inputType) {
+        // This is impossible, because of the empty checks at the start of the function.
+        // case UrlType.Empty:
+        case UrlType.Hash:
+        case UrlType.Query:
+            return queryHash;
+        case UrlType.RelativePath: {
+            // The first char is always a "/", and we need it to be relative.
+            const path = url.path.slice(1);
+            if (!path)
+                return queryHash || '.';
+            if (isRelative(base || input) && !isRelative(path)) {
+                // If base started with a leading ".", or there is no base and input started with a ".",
+                // then we need to ensure that the relative path starts with a ".". We don't know if
+                // relative starts with a "..", though, so check before prepending.
+                return './' + path + queryHash;
+            }
+            return path + queryHash;
+        }
+        case UrlType.AbsolutePath:
+            return url.path + queryHash;
+        default:
+            return url.scheme + '//' + url.user + url.host + url.port + url.path + queryHash;
     }
-    // If there's no host (and no scheme/user/port), then we need to output an absolute path.
-    if (!url.scheme && !url.host)
-        return url.path;
-    // We're outputting either an absolute URL, or a protocol relative one.
-    return `${url.scheme}//${url.user}${url.host}${url.port}${url.path}`;
 }
 
 function resolve$2(input, base) {
@@ -10033,7 +10082,9 @@ class TraceMap {
         // mapping (like a "//# sourceMappingURL=") at the end of the child file.
         if (line >= decoded.length)
             return null;
-        return traceSegmentInternal(decoded[line], map._decodedMemo, line, column, GREATEST_LOWER_BOUND);
+        const segments = decoded[line];
+        const index = traceSegmentInternal(segments, map._decodedMemo, line, column, GREATEST_LOWER_BOUND);
+        return index === -1 ? null : segments[index];
     };
     originalPositionFor$1 = (map, { line, column, bias }) => {
         line--;
@@ -10046,10 +10097,12 @@ class TraceMap {
         // mapping (like a "//# sourceMappingURL=") at the end of the child file.
         if (line >= decoded.length)
             return OMapping(null, null, null, null);
-        const segment = traceSegmentInternal(decoded[line], map._decodedMemo, line, column, bias || GREATEST_LOWER_BOUND);
-        if (segment == null)
+        const segments = decoded[line];
+        const index = traceSegmentInternal(segments, map._decodedMemo, line, column, bias || GREATEST_LOWER_BOUND);
+        if (index === -1)
             return OMapping(null, null, null, null);
-        if (segment.length == 1)
+        const segment = segments[index];
+        if (segment.length === 1)
             return OMapping(null, null, null, null);
         const { names, resolvedSources } = map;
         return OMapping(resolvedSources[segment[SOURCES_INDEX]], segment[SOURCE_LINE] + 1, segment[SOURCE_COLUMN], segment.length === 5 ? names[segment[NAMES_INDEX]] : null);
@@ -10066,8 +10119,8 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
     else if (bias === LEAST_UPPER_BOUND)
         index++;
     if (index === -1 || index === segments.length)
-        return null;
-    return segments[index];
+        return -1;
+    return index;
 }
 
 /**
@@ -26803,6 +26856,11 @@ class MagicString {
 	}
 
 	overwrite(start, end, content, options) {
+		options = options || {};
+		return this.update(start, end, content, { ...options, overwrite: !options.contentOnly });
+	}
+
+	update(start, end, content, options) {
 		if (typeof content !== 'string') throw new TypeError('replacement content must be a string');
 
 		while (start < 0) start += this.original.length;
@@ -26828,7 +26886,7 @@ class MagicString {
 			options = { storeName: true };
 		}
 		const storeName = options !== undefined ? options.storeName : false;
-		const contentOnly = options !== undefined ? options.contentOnly : false;
+		const overwrite = options !== undefined ? options.overwrite : false;
 
 		if (storeName) {
 			const original = this.original.slice(start, end);
@@ -26852,7 +26910,7 @@ class MagicString {
 				chunk.edit('', false);
 			}
 
-			first.edit(content, storeName, contentOnly);
+			first.edit(content, storeName, !overwrite);
 		} else {
 			// must be inserting at the end
 			const newChunk = new Chunk(start, end, '').edit(content, storeName);
@@ -33438,9 +33496,7 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
         const replacementString = typeof replacement === 'string'
             ? JSON.stringify(replacement).slice(1, -1)
             : `"+${replacement.runtime}+"`;
-        s.overwrite(match.index, match.index + full.length, replacementString, {
-            contentOnly: true
-        });
+        s.update(match.index, match.index + full.length, replacementString);
     }
     // Replace __VITE_PUBLIC_ASSET__5aa0ddc0__ with absolute paths
     const publicAssetUrlMap = publicAssetUrlCache.get(config);
@@ -33452,9 +33508,7 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
         const replacementString = typeof replacement === 'string'
             ? JSON.stringify(replacement).slice(1, -1)
             : `"+${replacement.runtime}+"`;
-        s.overwrite(match.index, match.index + full.length, replacementString, {
-            contentOnly: true
-        });
+        s.update(match.index, match.index + full.length, replacementString);
     }
     return s;
 }
@@ -34530,9 +34584,7 @@ function webWorkerPlugin(config) {
                     const replacementString = typeof replacement === 'string'
                         ? JSON.stringify(replacement).slice(1, -1)
                         : `"+${replacement.runtime}+"`;
-                    s.overwrite(match.index, match.index + full.length, replacementString, {
-                        contentOnly: true
-                    });
+                    s.update(match.index, match.index + full.length, replacementString);
                 }
             }
             return result();
@@ -38765,7 +38817,7 @@ function definePlugin(config) {
                 const start = match.index;
                 const end = start + match[0].length;
                 const replacement = '' + replacements[match[1]];
-                s.overwrite(start, end, replacement, { contentOnly: true });
+                s.update(start, end, replacement);
             }
             if (!hasReplaced) {
                 return null;
@@ -40333,7 +40385,7 @@ function workerImportMetaUrlPlugin(config) {
                         builtUrl = injectQuery(builtUrl, WORKER_FILE_ID);
                         builtUrl = injectQuery(builtUrl, `type=${workerType}`);
                     }
-                    s.overwrite(urlIndex, urlIndex + exp.length, `new URL(${JSON.stringify(builtUrl)}, self.location)`, { contentOnly: true });
+                    s.update(urlIndex, urlIndex + exp.length, `new URL(${JSON.stringify(builtUrl)}, self.location)`);
                 }
                 if (s) {
                     return transformStableResult(s, id, config);
@@ -40385,7 +40437,7 @@ function assetImportMetaUrlPlugin(config) {
                             // target so we use the global location here. It can be
                             // window.location or self.location in case it is used in a Web Worker.
                             // @see https://developer.mozilla.org/en-US/docs/Web/API/Window/self
-                            s.overwrite(index, index + exp.length, `new URL((import.meta.glob(${pattern}, { eager: true, import: 'default', as: 'url' }))[${rawUrl}], self.location)`, { contentOnly: true });
+                            s.update(index, index + exp.length, `new URL((import.meta.glob(${pattern}, { eager: true, import: 'default', as: 'url' }))[${rawUrl}], self.location)`);
                             continue;
                         }
                     }
@@ -40428,7 +40480,7 @@ function assetImportMetaUrlPlugin(config) {
                         config.logger.warnOnce(`\n${rawExp} doesn't exist at build time, it will remain unchanged to be resolved at runtime`);
                         builtUrl = url;
                     }
-                    s.overwrite(index, index + exp.length, `new URL(${JSON.stringify(builtUrl)}, self.location)`, { contentOnly: true });
+                    s.update(index, index + exp.length, `new URL(${JSON.stringify(builtUrl)}, self.location)`);
                 }
                 if (s) {
                     return transformStableResult(s, id, config);
@@ -43325,9 +43377,7 @@ function buildImportAnalysisPlugin(config) {
                                 let rewrittenUrl = JSON.stringify(file);
                                 if (!isDynamicImport)
                                     rewrittenUrl = rewrittenUrl.slice(1, -1);
-                                str().overwrite(start, end, rewrittenUrl, {
-                                    contentOnly: true
-                                });
+                                str().update(start, end, rewrittenUrl);
                             }
                         }
                     }
@@ -43346,9 +43396,7 @@ function buildImportAnalysisPlugin(config) {
                     // 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, isDynamicImport ? `'${url}'` : url, {
-                        contentOnly: true
-                    });
+                    str().update(start, end, isDynamicImport ? `'${url}'` : url);
                 }
             }
             if (needPreloadHelper &&
@@ -43372,7 +43420,7 @@ function buildImportAnalysisPlugin(config) {
                     const s = new MagicString(code);
                     let match;
                     while ((match = re.exec(code))) {
-                        s.overwrite(match.index, match.index + isModernFlag.length, isModern, { contentOnly: true });
+                        s.update(match.index, match.index + isModernFlag.length, isModern);
                     }
                     return {
                         code: s.toString(),
@@ -43452,9 +43500,7 @@ function buildImportAnalysisPlugin(config) {
                                                 });
                                                 hasRemovedPureCssChunk = true;
                                             }
-                                            s.overwrite(expStart, expEnd, 'Promise.resolve({})', {
-                                                contentOnly: true
-                                            });
+                                            s.update(expStart, expEnd, 'Promise.resolve({})');
                                         }
                                     }
                                 };
@@ -43512,7 +43558,7 @@ function buildImportAnalysisPlugin(config) {
                                         ? toRelativePath(d, file)
                                         : d));
                                 }
-                                s.overwrite(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, `[${renderedDeps.join(',')}]`, { contentOnly: true });
+                                s.update(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, `[${renderedDeps.join(',')}]`);
                                 rewroteMarkerStartPos.add(markerStartPos);
                             }
                         }
@@ -43522,7 +43568,7 @@ function buildImportAnalysisPlugin(config) {
                     let markerStartPos = code.indexOf(preloadMarkerWithQuote);
                     while (markerStartPos >= 0) {
                         if (!rewroteMarkerStartPos.has(markerStartPos)) {
-                            s.overwrite(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, 'void 0', { contentOnly: true });
+                            s.update(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, 'void 0');
                         }
                         markerStartPos = code.indexOf(preloadMarkerWithQuote, markerStartPos + preloadMarkerWithQuote.length);
                     }
@@ -43707,6 +43753,8 @@ function getScriptInfo(node) {
     let isModule = false;
     let isAsync = false;
     for (const p of node.attrs) {
+        if (p.prefix !== undefined)
+            continue;
         if (p.name === 'src') {
             if (!src) {
                 src = p;
@@ -43732,7 +43780,7 @@ function overwriteAttrValue(s, sourceCodeLocation, newValue) {
     }
     const wrapOffset = valueStart[1] === '"' || valueStart[1] === "'" ? 1 : 0;
     const valueOffset = valueStart.index + valueStart[0].length - 1;
-    s.overwrite(sourceCodeLocation.startOffset + valueOffset + wrapOffset, sourceCodeLocation.endOffset - wrapOffset, newValue, { contentOnly: true });
+    s.update(sourceCodeLocation.startOffset + valueOffset + wrapOffset, sourceCodeLocation.endOffset - wrapOffset, newValue);
     return s;
 }
 /**
@@ -43873,15 +43921,17 @@ function buildHtmlPlugin(config) {
                     const assetAttrs = assetAttrsConfig[node.nodeName];
                     if (assetAttrs) {
                         for (const p of node.attrs) {
-                            if (p.value && assetAttrs.includes(p.name)) {
-                                const attrSourceCodeLocation = node.sourceCodeLocation.attrs[p.name];
+                            const attrKey = getAttrKey(p);
+                            if (p.value && assetAttrs.includes(attrKey)) {
+                                const attrSourceCodeLocation = node.sourceCodeLocation.attrs[attrKey];
                                 // assetsUrl may be encodeURI
                                 const url = decodeURI(p.value);
                                 if (!isExcludedUrl(url)) {
                                     if (node.nodeName === 'link' &&
                                         isCSSRequest(url) &&
                                         // should not be converted if following attributes are present (#6748)
-                                        !node.attrs.some((p) => p.name === 'media' || p.name === 'disabled')) {
+                                        !node.attrs.some((p) => p.prefix === undefined &&
+                                            (p.name === 'media' || p.name === 'disabled'))) {
                                         // CSS references, convert to import
                                         const importExpression = `\nimport ${JSON.stringify(url)}`;
                                         styleUrls.push({
@@ -43906,7 +43956,9 @@ function buildHtmlPlugin(config) {
                     }
                     // <tag style="... url(...) ..."></tag>
                     // extract inline styles as virtual css and add class attribute to tag for selecting
-                    const inlineStyle = node.attrs.find((prop) => prop.name === 'style' && prop.value.includes('url(') // only url(...) in css need to emit file
+                    const inlineStyle = node.attrs.find((prop) => prop.prefix === undefined &&
+                        prop.name === 'style' &&
+                        prop.value.includes('url(') // only url(...) in css need to emit file
                     );
                     if (inlineStyle) {
                         inlineModuleIndex++;
@@ -43933,7 +43985,7 @@ function buildHtmlPlugin(config) {
                         js += `\nimport "${id}?html-proxy&inline-css&index=${inlineModuleIndex}.css"`;
                         const hash = getHash(cleanUrl(id));
                         // will transform in `applyHtmlTransforms`
-                        s.overwrite(styleNode.sourceCodeLocation.startOffset, styleNode.sourceCodeLocation.endOffset, `__VITE_INLINE_CSS__${hash}_${inlineModuleIndex}__`, { contentOnly: true });
+                        s.update(styleNode.sourceCodeLocation.startOffset, styleNode.sourceCodeLocation.endOffset, `__VITE_INLINE_CSS__${hash}_${inlineModuleIndex}__`);
                     }
                     if (shouldRemove) {
                         // remove the script tag from the html. we are going to inject new
@@ -43957,7 +44009,7 @@ function buildHtmlPlugin(config) {
                         !namedOutput.includes(content.replace(/^\//, '')) // Allow for absolute references as named output can't be an absolute path
                     ) {
                         try {
-                            const url = attr.name === 'srcset'
+                            const url = attr.prefix === undefined && attr.name === 'srcset'
                                 ? await processSrcSet(content, ({ url }) => urlToBuiltUrl(url, id, config, this))
                                 : await urlToBuiltUrl(content, id, config, this);
                             overwriteAttrValue(s, sourceCodeLocation, url);
@@ -43972,12 +44024,10 @@ function buildHtmlPlugin(config) {
                 // emit <script>import("./aaa")</script> asset
                 for (const { start, end, url } of scriptUrls) {
                     if (!isExcludedUrl(url)) {
-                        s.overwrite(start, end, await urlToBuiltUrl(url, id, config, this), { contentOnly: true });
+                        s.update(start, end, await urlToBuiltUrl(url, id, config, this));
                     }
                     else if (checkPublicFile(url, config)) {
-                        s.overwrite(start, end, toOutputPublicFilePath(url), {
-                            contentOnly: true
-                        });
+                        s.update(start, end, toOutputPublicFilePath(url));
                     }
                 }
                 // ignore <link rel="stylesheet"> if its url can't be resolved
@@ -44139,7 +44189,7 @@ function buildHtmlPlugin(config) {
                     s || (s = new MagicString(result));
                     const { 0: full, 1: scopedName } = match;
                     const cssTransformedCode = htmlProxyResult.get(scopedName);
-                    s.overwrite(match.index, match.index + full.length, cssTransformedCode, { contentOnly: true });
+                    s.update(match.index, match.index + full.length, cssTransformedCode);
                 }
                 if (s) {
                     result = s.toString();
@@ -44379,6 +44429,9 @@ function serializeAttrs(attrs) {
 function incrementIndent(indent = '') {
     return `${indent}${indent[0] === '\t' ? '\t' : '  '}`;
 }
+function getAttrKey(attr) {
+    return attr.prefix === undefined ? attr.name : `${attr.prefix}:${attr.name}`;
+}
 
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)($|\\?)`;
 const cssLangRE = new RegExp(cssLangs);
@@ -44919,7 +44972,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-553f6a62.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-46ac452b.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -46258,10 +46311,11 @@ function resolveLibFilename(libOptions, format, entryName, root, extension) {
 }
 function resolveBuildOutputs(outputs, libOptions, logger) {
     if (libOptions) {
-        const formats = libOptions.formats || ['es', 'umd'];
+        const hasMultipleEntries = typeof libOptions.entry !== 'string' &&
+            Object.values(libOptions.entry).length > 1;
+        const formats = libOptions.formats || (hasMultipleEntries ? ['es', 'cjs'] : ['es', 'umd']);
         if (formats.includes('umd') || formats.includes('iife')) {
-            if (typeof libOptions.entry !== 'string' &&
-                Object.values(libOptions.entry).length > 1) {
+            if (hasMultipleEntries) {
                 throw new Error(`Multiple entry points are not supported when output formats include "umd" or "iife".`);
             }
             if (!libOptions.name) {
@@ -46522,6 +46576,7 @@ var build$1 = {
 	resolveBuildPlugins: resolveBuildPlugins,
 	build: build,
 	resolveLibFilename: resolveLibFilename,
+	resolveBuildOutputs: resolveBuildOutputs,
 	onRollupWarning: onRollupWarning,
 	toOutputFilePathInJS: toOutputFilePathInJS,
 	createToImportMetaURLBasedRelativeRuntime: createToImportMetaURLBasedRelativeRuntime,
@@ -53346,7 +53401,7 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
             }
             else {
                 // anonymous default exports
-                s.overwrite(node.start, node.start + 14 /* 'export default'.length */, `${ssrModuleExportsKey}.default =`, { contentOnly: true });
+                s.update(node.start, node.start + 14 /* 'export default'.length */, `${ssrModuleExportsKey}.default =`);
             }
         }
         // export * from './foo'
@@ -53389,16 +53444,14 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
                 }
             }
             else {
-                s.overwrite(id.start, id.end, binding, { contentOnly: true });
+                s.update(id.start, id.end, binding);
             }
         },
         onImportMeta(node) {
-            s.overwrite(node.start, node.end, ssrImportMetaKey, { contentOnly: true });
+            s.update(node.start, node.end, ssrImportMetaKey);
         },
         onDynamicImport(node) {
-            s.overwrite(node.start, node.start + 6, ssrDynamicImportKey, {
-                contentOnly: true
-            });
+            s.update(node.start, node.start + 6, ssrDynamicImportKey);
             if (node.type === 'ImportExpression' && node.source.type === 'Literal') {
                 dynamicDeps.add(node.source.value);
             }
@@ -53437,6 +53490,7 @@ const isNodeInPattern = (node) => isNodeInPatternWeakSet.has(node);
  */
 function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
     const parentStack = [];
+    const varKindStack = [];
     const scopeMap = new WeakMap();
     const identifiers = [];
     const setScope = (node, name) => {
@@ -53495,6 +53549,10 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 !(parent.type === 'IfStatement' && node === parent.alternate)) {
                 parentStack.unshift(parent);
             }
+            // track variable declaration kind stack used by VariableDeclarator
+            if (node.type === 'VariableDeclaration') {
+                varKindStack.unshift(node.kind);
+            }
             if (node.type === 'MetaProperty' && node.meta.name === 'import') {
                 onImportMeta(node);
             }
@@ -53553,7 +53611,7 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 setIsNodeInPattern(node);
             }
             else if (node.type === 'VariableDeclarator') {
-                const parentFunction = findParentScope(parentStack);
+                const parentFunction = findParentScope(parentStack, varKindStack[0] === 'var');
                 if (parentFunction) {
                     handlePattern(node.id, parentFunction);
                 }
@@ -53565,6 +53623,9 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 !(parent.type === 'IfStatement' && node === parent.alternate)) {
                 parentStack.shift();
             }
+            if (node.type === 'VariableDeclaration') {
+                varKindStack.shift();
+            }
         }
     });
     // emit the identifier events in BFS so the hoisted declarations
@@ -53631,8 +53692,9 @@ function isFunction(node) {
     return functionNodeTypeRE.test(node.type);
 }
 const scopeNodeTypeRE = /(?:Function|Class)(?:Expression|Declaration)$|Method$|^IfStatement$/;
-function findParentScope(parentStack) {
-    return parentStack.find((i) => scopeNodeTypeRE.test(i.type));
+function findParentScope(parentStack, isVar = false) {
+    const regex = isVar ? functionNodeTypeRE : scopeNodeTypeRE;
+    return parentStack.find((i) => regex.test(i.type));
 }
 function isInDestructuringAssignment(parent, parentStack) {
     if (parent &&
@@ -60963,7 +61025,7 @@ const processNodeUrl = (attr, sourceCodeLocation, s, config, htmlPath, originalU
         // path will add `/a/` prefix, it will caused 404.
         // rewrite before `./index.js` -> `localhost:5173/a/index.js`.
         // rewrite after `../index.js` -> `localhost:5173/index.js`.
-        const processedUrl = attr.name === 'srcset'
+        const processedUrl = attr.name === 'srcset' && attr.prefix === undefined
             ? processSrcSetSync(url, ({ url }) => replacer(url))
             : replacer(url);
         overwriteAttrValue(s, sourceCodeLocation, processedUrl);
@@ -61014,7 +61076,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         if (module) {
             server?.moduleGraph.invalidateModule(module);
         }
-        s.overwrite(node.sourceCodeLocation.startOffset, node.sourceCodeLocation.endOffset, `<script type="module" src="${modulePath}"></script>`, { contentOnly: true });
+        s.update(node.sourceCodeLocation.startOffset, node.sourceCodeLocation.endOffset, `<script type="module" src="${modulePath}"></script>`);
     };
     await traverseHtml(html, htmlPath, (node) => {
         if (!nodeIsElement(node)) {
@@ -61042,8 +61104,9 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         const assetAttrs = assetAttrsConfig[node.nodeName];
         if (assetAttrs) {
             for (const p of node.attrs) {
-                if (p.value && assetAttrs.includes(p.name)) {
-                    processNodeUrl(p, node.sourceCodeLocation.attrs[p.name], s, config, htmlPath, originalUrl);
+                const attrKey = getAttrKey(p);
+                if (p.value && assetAttrs.includes(attrKey)) {
+                    processNodeUrl(p, node.sourceCodeLocation.attrs[attrKey], s, config, htmlPath, originalUrl);
                 }
             }
         }
@@ -63850,7 +63913,7 @@ async function bundleConfigFile(fileName, isESM) {
                         isRequire: !isESM,
                         preferRelative: false,
                         tryIndex: true,
-                        mainFields: DEFAULT_MAIN_FIELDS,
+                        mainFields: [],
                         browserField: false,
                         conditions: [],
                         dedupe: [],

package/dist/node/chunks/{dep-553f6a62.js → dep-46ac452b.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { z as commonjsGlobal } from './dep-92763d7a.js';
+import { z as commonjsGlobal } from './dep-34b5a6bf.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-92763d7a.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-34b5a6bf.js';
 import { VERSION } from './constants.js';
 import 'node:fs';
 import 'node:path';
@@ -695,7 +695,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-92763d7a.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-34b5a6bf.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -742,7 +742,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 import('./chunks/dep-92763d7a.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-34b5a6bf.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -766,7 +766,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 import('./chunks/dep-92763d7a.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-34b5a6bf.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -789,7 +789,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 import('./chunks/dep-92763d7a.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-34b5a6bf.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-var version = "3.2.0-beta.0";
+var version = "3.2.0-beta.1";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.d.ts

@@ -1252,6 +1252,8 @@ export declare interface ManifestChunk {
     dynamicImports?: string[];
 }
 
+export declare type MapToFunction<T> = T extends Function ? T : never
+
 export declare type Matcher = AnymatchPattern | AnymatchPattern[]
 
 export declare function mergeAlias(a?: AliasOptions, b?: AliasOptions): AliasOptions | undefined;
@@ -1685,7 +1687,7 @@ export declare function resolvePackageData(id: string, basedir: string, preserve
 
 export declare function resolvePackageEntry(id: string, { dir, data, setResolvedCache, getResolvedCache }: PackageData, targetWeb: boolean, options: InternalResolveOptions): string | undefined;
 
-export declare type ResolverFunction = PluginHooks['resolveId']
+export declare type ResolverFunction = MapToFunction<PluginHooks['resolveId']>
 
 export declare interface ResolverObject {
     buildStart?: PluginHooks['buildStart']

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-92763d7a.js';
+export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-34b5a6bf.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/dist/node-cjs/publicUtils.cjs

@@ -31,7 +31,7 @@ var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 
-var version = "3.2.0-beta.0";
+var version = "3.2.0-beta.1";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(
@@ -155,6 +155,18 @@ for (let i = 0; i < chars.length; i++) {
     charToInt[c] = i;
 }
 
+// Matches the scheme of a URL, eg "http://"
+var UrlType;
+(function (UrlType) {
+    UrlType[UrlType["Empty"] = 1] = "Empty";
+    UrlType[UrlType["Hash"] = 2] = "Hash";
+    UrlType[UrlType["Query"] = 3] = "Query";
+    UrlType[UrlType["RelativePath"] = 4] = "RelativePath";
+    UrlType[UrlType["AbsolutePath"] = 5] = "AbsolutePath";
+    UrlType[UrlType["SchemeRelative"] = 6] = "SchemeRelative";
+    UrlType[UrlType["Absolute"] = 7] = "Absolute";
+})(UrlType || (UrlType = {}));
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.2.0-beta.0",
+  "version": "3.2.0-beta.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -71,8 +71,8 @@
     "@ampproject/remapping": "^2.2.0",
     "@babel/parser": "^7.19.3",
     "@babel/types": "^7.19.3",
-    "@jridgewell/trace-mapping": "^0.3.15",
-    "@rollup/plugin-alias": "^3.1.9",
+    "@jridgewell/trace-mapping": "^0.3.16",
+    "@rollup/plugin-alias": "^4.0.0",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-dynamic-import-vars": "^1.4.4",
     "@rollup/plugin-json": "^4.1.0",
@@ -97,7 +97,7 @@
     "http-proxy": "^1.18.1",
     "json5": "^2.2.1",
     "launch-editor-middleware": "^2.6.0",
-    "magic-string": "^0.26.5",
+    "magic-string": "^0.26.7",
     "micromatch": "^4.0.5",
     "mlly": "^0.5.16",
     "mrmime": "^1.0.1",

package/types/package.json

@@ -0,0 +1,3 @@
+{
+  "//": "this file is here to make typescript happy when moduleResolution=node16+"
+}