vite 5.4.0-beta.1 → 5.4.1

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

@@ -10781,17 +10781,34 @@ const glob$1 = Object.assign(glob_, {
 });
 glob$1.glob = glob$1;
 
-const comma$1 = ','.charCodeAt(0);
-const semicolon$1 = ';'.charCodeAt(0);
-const chars$2 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-const intToChar$1 = new Uint8Array(64); // 64 possible chars.
-const charToInt$1 = new Uint8Array(128); // z is 122 in ASCII
-for (let i = 0; i < chars$2.length; i++) {
-    const c = chars$2.charCodeAt(i);
-    intToChar$1[i] = c;
-    charToInt$1[c] = i;
-}
-function encodeInteger$1(builder, num, relative) {
+const comma = ','.charCodeAt(0);
+const semicolon = ';'.charCodeAt(0);
+const chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+const intToChar = new Uint8Array(64); // 64 possible chars.
+const charToInt = new Uint8Array(128); // z is 122 in ASCII
+for (let i = 0; i < chars$1.length; i++) {
+    const c = chars$1.charCodeAt(i);
+    intToChar[i] = c;
+    charToInt[c] = i;
+}
+function decodeInteger(reader, relative) {
+    let value = 0;
+    let shift = 0;
+    let integer = 0;
+    do {
+        const c = reader.next();
+        integer = charToInt[c];
+        value |= (integer & 31) << shift;
+        shift += 5;
+    } while (integer & 32);
+    const shouldNegate = value & 1;
+    value >>>= 1;
+    if (shouldNegate) {
+        value = -0x80000000 | -value;
+    }
+    return relative + value;
+}
+function encodeInteger(builder, num, relative) {
     let delta = num - relative;
     delta = delta < 0 ? (-delta << 1) | 1 : delta << 1;
     do {
@@ -10799,14 +10816,19 @@ function encodeInteger$1(builder, num, relative) {
         delta >>>= 5;
         if (delta > 0)
             clamped |= 0b100000;
-        builder.write(intToChar$1[clamped]);
+        builder.write(intToChar[clamped]);
     } while (delta > 0);
     return num;
 }
+function hasMoreVlq(reader, max) {
+    if (reader.pos >= max)
+        return false;
+    return reader.peek() !== comma;
+}
 
 const bufLength = 1024 * 16;
 // Provide a fallback for older environments.
-const td$1 = typeof TextDecoder !== 'undefined'
+const td = typeof TextDecoder !== 'undefined'
     ? /* #__PURE__ */ new TextDecoder()
     : typeof Buffer !== 'undefined'
         ? {
@@ -10834,16 +10856,86 @@ class StringWriter {
         const { buffer } = this;
         buffer[this.pos++] = v;
         if (this.pos === bufLength) {
-            this.out += td$1.decode(buffer);
+            this.out += td.decode(buffer);
             this.pos = 0;
         }
     }
     flush() {
         const { buffer, out, pos } = this;
-        return pos > 0 ? out + td$1.decode(buffer.subarray(0, pos)) : out;
+        return pos > 0 ? out + td.decode(buffer.subarray(0, pos)) : out;
+    }
+}
+class StringReader {
+    constructor(buffer) {
+        this.pos = 0;
+        this.buffer = buffer;
+    }
+    next() {
+        return this.buffer.charCodeAt(this.pos++);
+    }
+    peek() {
+        return this.buffer.charCodeAt(this.pos);
+    }
+    indexOf(char) {
+        const { buffer, pos } = this;
+        const idx = buffer.indexOf(char, pos);
+        return idx === -1 ? buffer.length : idx;
     }
 }
-function encode$2(decoded) {
+
+function decode(mappings) {
+    const { length } = mappings;
+    const reader = new StringReader(mappings);
+    const decoded = [];
+    let genColumn = 0;
+    let sourcesIndex = 0;
+    let sourceLine = 0;
+    let sourceColumn = 0;
+    let namesIndex = 0;
+    do {
+        const semi = reader.indexOf(';');
+        const line = [];
+        let sorted = true;
+        let lastCol = 0;
+        genColumn = 0;
+        while (reader.pos < semi) {
+            let seg;
+            genColumn = decodeInteger(reader, genColumn);
+            if (genColumn < lastCol)
+                sorted = false;
+            lastCol = genColumn;
+            if (hasMoreVlq(reader, semi)) {
+                sourcesIndex = decodeInteger(reader, sourcesIndex);
+                sourceLine = decodeInteger(reader, sourceLine);
+                sourceColumn = decodeInteger(reader, sourceColumn);
+                if (hasMoreVlq(reader, semi)) {
+                    namesIndex = decodeInteger(reader, namesIndex);
+                    seg = [genColumn, sourcesIndex, sourceLine, sourceColumn, namesIndex];
+                }
+                else {
+                    seg = [genColumn, sourcesIndex, sourceLine, sourceColumn];
+                }
+            }
+            else {
+                seg = [genColumn];
+            }
+            line.push(seg);
+            reader.pos++;
+        }
+        if (!sorted)
+            sort(line);
+        decoded.push(line);
+        reader.pos = semi + 1;
+    } while (reader.pos <= length);
+    return decoded;
+}
+function sort(line) {
+    line.sort(sortComparator$1);
+}
+function sortComparator$1(a, b) {
+    return a[0] - b[0];
+}
+function encode$1(decoded) {
     const writer = new StringWriter();
     let sourcesIndex = 0;
     let sourceLine = 0;
@@ -10852,23 +10944,23 @@ function encode$2(decoded) {
     for (let i = 0; i < decoded.length; i++) {
         const line = decoded[i];
         if (i > 0)
-            writer.write(semicolon$1);
+            writer.write(semicolon);
         if (line.length === 0)
             continue;
         let genColumn = 0;
         for (let j = 0; j < line.length; j++) {
             const segment = line[j];
             if (j > 0)
-                writer.write(comma$1);
-            genColumn = encodeInteger$1(writer, segment[0], genColumn);
+                writer.write(comma);
+            genColumn = encodeInteger(writer, segment[0], genColumn);
             if (segment.length === 1)
                 continue;
-            sourcesIndex = encodeInteger$1(writer, segment[1], sourcesIndex);
-            sourceLine = encodeInteger$1(writer, segment[2], sourceLine);
-            sourceColumn = encodeInteger$1(writer, segment[3], sourceColumn);
+            sourcesIndex = encodeInteger(writer, segment[1], sourcesIndex);
+            sourceLine = encodeInteger(writer, segment[2], sourceLine);
+            sourceColumn = encodeInteger(writer, segment[3], sourceColumn);
             if (segment.length === 4)
                 continue;
-            namesIndex = encodeInteger$1(writer, segment[4], namesIndex);
+            namesIndex = encodeInteger(writer, segment[4], namesIndex);
         }
     }
     return writer.flush();
@@ -11088,7 +11180,7 @@ let SourceMap$1 = class SourceMap {
 		this.sources = properties.sources;
 		this.sourcesContent = properties.sourcesContent;
 		this.names = properties.names;
-		this.mappings = encode$2(properties.mappings);
+		this.mappings = encode$1(properties.mappings);
 		if (typeof properties.x_google_ignoreList !== 'undefined') {
 			this.x_google_ignoreList = properties.x_google_ignoreList;
 		}
@@ -14448,168 +14540,6 @@ function commonjs(options = {}) {
   };
 }
 
-const comma = ','.charCodeAt(0);
-const semicolon = ';'.charCodeAt(0);
-const chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-const intToChar = new Uint8Array(64); // 64 possible chars.
-const charToInt = new Uint8Array(128); // z is 122 in ASCII
-for (let i = 0; i < chars$1.length; i++) {
-    const c = chars$1.charCodeAt(i);
-    intToChar[i] = c;
-    charToInt[c] = i;
-}
-// Provide a fallback for older environments.
-const td = typeof TextDecoder !== 'undefined'
-    ? /* #__PURE__ */ new TextDecoder()
-    : typeof Buffer !== 'undefined'
-        ? {
-            decode(buf) {
-                const out = Buffer.from(buf.buffer, buf.byteOffset, buf.byteLength);
-                return out.toString();
-            },
-        }
-        : {
-            decode(buf) {
-                let out = '';
-                for (let i = 0; i < buf.length; i++) {
-                    out += String.fromCharCode(buf[i]);
-                }
-                return out;
-            },
-        };
-function decode(mappings) {
-    const state = new Int32Array(5);
-    const decoded = [];
-    let index = 0;
-    do {
-        const semi = indexOf(mappings, index);
-        const line = [];
-        let sorted = true;
-        let lastCol = 0;
-        state[0] = 0;
-        for (let i = index; i < semi; i++) {
-            let seg;
-            i = decodeInteger(mappings, i, state, 0); // genColumn
-            const col = state[0];
-            if (col < lastCol)
-                sorted = false;
-            lastCol = col;
-            if (hasMoreVlq(mappings, i, semi)) {
-                i = decodeInteger(mappings, i, state, 1); // sourcesIndex
-                i = decodeInteger(mappings, i, state, 2); // sourceLine
-                i = decodeInteger(mappings, i, state, 3); // sourceColumn
-                if (hasMoreVlq(mappings, i, semi)) {
-                    i = decodeInteger(mappings, i, state, 4); // namesIndex
-                    seg = [col, state[1], state[2], state[3], state[4]];
-                }
-                else {
-                    seg = [col, state[1], state[2], state[3]];
-                }
-            }
-            else {
-                seg = [col];
-            }
-            line.push(seg);
-        }
-        if (!sorted)
-            sort(line);
-        decoded.push(line);
-        index = semi + 1;
-    } while (index <= mappings.length);
-    return decoded;
-}
-function indexOf(mappings, index) {
-    const idx = mappings.indexOf(';', index);
-    return idx === -1 ? mappings.length : idx;
-}
-function decodeInteger(mappings, pos, state, j) {
-    let value = 0;
-    let shift = 0;
-    let integer = 0;
-    do {
-        const c = mappings.charCodeAt(pos++);
-        integer = charToInt[c];
-        value |= (integer & 31) << shift;
-        shift += 5;
-    } while (integer & 32);
-    const shouldNegate = value & 1;
-    value >>>= 1;
-    if (shouldNegate) {
-        value = -0x80000000 | -value;
-    }
-    state[j] += value;
-    return pos;
-}
-function hasMoreVlq(mappings, i, length) {
-    if (i >= length)
-        return false;
-    return mappings.charCodeAt(i) !== comma;
-}
-function sort(line) {
-    line.sort(sortComparator$1);
-}
-function sortComparator$1(a, b) {
-    return a[0] - b[0];
-}
-function encode$1(decoded) {
-    const state = new Int32Array(5);
-    const bufLength = 1024 * 16;
-    const subLength = bufLength - 36;
-    const buf = new Uint8Array(bufLength);
-    const sub = buf.subarray(0, subLength);
-    let pos = 0;
-    let out = '';
-    for (let i = 0; i < decoded.length; i++) {
-        const line = decoded[i];
-        if (i > 0) {
-            if (pos === bufLength) {
-                out += td.decode(buf);
-                pos = 0;
-            }
-            buf[pos++] = semicolon;
-        }
-        if (line.length === 0)
-            continue;
-        state[0] = 0;
-        for (let j = 0; j < line.length; j++) {
-            const segment = line[j];
-            // We can push up to 5 ints, each int can take at most 7 chars, and we
-            // may push a comma.
-            if (pos > subLength) {
-                out += td.decode(sub);
-                buf.copyWithin(0, subLength, pos);
-                pos -= subLength;
-            }
-            if (j > 0)
-                buf[pos++] = comma;
-            pos = encodeInteger(buf, pos, state, segment, 0); // genColumn
-            if (segment.length === 1)
-                continue;
-            pos = encodeInteger(buf, pos, state, segment, 1); // sourcesIndex
-            pos = encodeInteger(buf, pos, state, segment, 2); // sourceLine
-            pos = encodeInteger(buf, pos, state, segment, 3); // sourceColumn
-            if (segment.length === 4)
-                continue;
-            pos = encodeInteger(buf, pos, state, segment, 4); // namesIndex
-        }
-    }
-    return out + td.decode(buf.subarray(0, pos));
-}
-function encodeInteger(buf, pos, state, segment, j) {
-    const next = segment[j];
-    let num = next - state[j];
-    state[j] = next;
-    num = num < 0 ? (-num << 1) | 1 : num << 1;
-    do {
-        let clamped = num & 0b011111;
-        num >>>= 5;
-        if (num > 0)
-            clamped |= 0b100000;
-        buf[pos++] = intToChar[clamped];
-    } while (num > 0);
-    return pos;
-}
-
 // Matches the scheme of a URL, eg "http://"
 const schemeRegex = /^[\w+.-]+:\/\//;
 /**
@@ -16732,11 +16662,6 @@ function watchPackageDataPlugin(packageCache) {
       if (id.endsWith("/package.json")) {
         invalidatePackageData(packageCache, path$n.normalize(id));
       }
-    },
-    handleHotUpdate({ file }) {
-      if (file.endsWith("/package.json")) {
-        invalidatePackageData(packageCache, path$n.normalize(file));
-      }
     }
   };
 }
@@ -27143,7 +27068,6 @@ class Collection extends NodeBase {
         }
     }
 }
-Collection.maxFlowStringSingleLineLength = 60;
 
 /**
  * Stringifies a comment.
@@ -27175,6 +27099,8 @@ const FOLD_QUOTED = 'quoted';
 function foldFlowLines(text, indent, mode = 'flow', { indentAtStart, lineWidth = 80, minContentWidth = 20, onFold, onOverflow } = {}) {
     if (!lineWidth || lineWidth < 0)
         return text;
+    if (lineWidth < minContentWidth)
+        minContentWidth = 0;
     const endStep = Math.max(1 + minContentWidth, 1 + lineWidth - indent.length);
     if (text.length <= endStep)
         return text;
@@ -29747,11 +29673,11 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
     let comment = '';
     let commentSep = '';
     let hasNewline = false;
-    let hasNewlineAfterProp = false;
     let reqSpace = false;
     let tab = null;
     let anchor = null;
     let tag = null;
+    let newlineAfterProp = null;
     let comma = null;
     let found = null;
     let start = null;
@@ -29805,7 +29731,7 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
                 atNewline = true;
                 hasNewline = true;
                 if (anchor || tag)
-                    hasNewlineAfterProp = true;
+                    newlineAfterProp = token;
                 hasSpace = true;
                 break;
             case 'anchor':
@@ -29879,9 +29805,9 @@ function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIn
         spaceBefore,
         comment,
         hasNewline,
-        hasNewlineAfterProp,
         anchor,
         tag,
+        newlineAfterProp,
         end,
         start: start ?? end
     };
@@ -29983,7 +29909,7 @@ function resolveBlockMap({ composeNode, composeEmptyNode }, ctx, bm, onError, ta
                 }
                 continue;
             }
-            if (keyProps.hasNewlineAfterProp || containsNewline(key)) {
+            if (keyProps.newlineAfterProp || containsNewline(key)) {
                 onError(key ?? start[start.length - 1], 'MULTILINE_IMPLICIT_KEY', 'Implicit keys need to be on a single line');
             }
         }
@@ -30337,10 +30263,23 @@ function resolveCollection(CN, ctx, token, onError, tagName, tag) {
         coll.tag = tagName;
     return coll;
 }
-function composeCollection(CN, ctx, token, tagToken, onError) {
+function composeCollection(CN, ctx, token, props, onError) {
+    const tagToken = props.tag;
     const tagName = !tagToken
         ? null
         : ctx.directives.tagName(tagToken.source, msg => onError(tagToken, 'TAG_RESOLVE_FAILED', msg));
+    if (token.type === 'block-seq') {
+        const { anchor, newlineAfterProp: nl } = props;
+        const lastProp = anchor && tagToken
+            ? anchor.offset > tagToken.offset
+                ? anchor
+                : tagToken
+            : (anchor ?? tagToken);
+        if (lastProp && (!nl || nl.offset < lastProp.offset)) {
+            const message = 'Missing newline after block sequence props';
+            onError(lastProp, 'MISSING_CHAR', message);
+        }
+    }
     const expType = token.type === 'block-map'
         ? 'map'
         : token.type === 'block-seq'
@@ -30354,8 +30293,7 @@ function composeCollection(CN, ctx, token, tagToken, onError) {
         !tagName ||
         tagName === '!' ||
         (tagName === YAMLMap.tagName && expType === 'map') ||
-        (tagName === YAMLSeq.tagName && expType === 'seq') ||
-        !expType) {
+        (tagName === YAMLSeq.tagName && expType === 'seq')) {
         return resolveCollection(CN, ctx, token, onError, tagName);
     }
     let tag = ctx.schema.tags.find(t => t.tag === tagName && t.collection === expType);
@@ -30923,7 +30861,7 @@ function composeNode(ctx, token, props, onError) {
         case 'block-map':
         case 'block-seq':
         case 'flow-collection':
-            node = composeCollection(CN, ctx, token, tag, onError);
+            node = composeCollection(CN, ctx, token, props, onError);
             if (anchor)
                 node.anchor = anchor.source.substring(1);
             break;
@@ -31995,15 +31933,11 @@ class Lexer {
             if (!this.atEnd && !this.hasChars(4))
                 return this.setNext('line-start');
             const s = this.peek(3);
-            if (s === '---' && isEmpty(this.charAt(3))) {
+            if ((s === '---' || s === '...') && isEmpty(this.charAt(3))) {
                 yield* this.pushCount(3);
                 this.indentValue = 0;
                 this.indentNext = 0;
-                return 'doc';
-            }
-            else if (s === '...' && isEmpty(this.charAt(3))) {
-                yield* this.pushCount(3);
-                return 'stream';
+                return s === '---' ? 'doc' : 'stream';
             }
         }
         this.indentValue = yield* this.pushSpaces(false);
@@ -35215,7 +35149,7 @@ function buildHtmlPlugin(config) {
     async transform(html, id) {
       if (id.endsWith(".html")) {
         id = normalizePath$3(id);
-        const relativeUrlPath = path$n.posix.relative(config.root, id);
+        const relativeUrlPath = normalizePath$3(path$n.relative(config.root, id));
         const publicPath = `/${relativeUrlPath}`;
         const publicBase = getBaseInHTML(relativeUrlPath, config);
         const publicToRelative = (filename, importer) => publicBase + filename;
@@ -35549,7 +35483,9 @@ ${js}`;
         return tags;
       };
       for (const [normalizedId, html] of processedHtml) {
-        const relativeUrlPath = path$n.posix.relative(config.root, normalizedId);
+        const relativeUrlPath = normalizePath$3(
+          path$n.relative(config.root, normalizedId)
+        );
         const assetsBase = getBaseInHTML(relativeUrlPath, config);
         const toOutputFilePath = (filename, type) => {
           if (isExternalUrl(filename)) {
@@ -36346,7 +36282,9 @@ function cssPostPlugin(config) {
         const relative = config.base === "./" || config.base === "";
         const cssAssetDirname = encodedPublicUrls || relative ? slash$1(getCssAssetDirname(cssAssetName)) : void 0;
         const toRelative = (filename) => {
-          const relativePath = path$n.posix.relative(cssAssetDirname, filename);
+          const relativePath = normalizePath$3(
+            path$n.relative(cssAssetDirname, filename)
+          );
           return relativePath[0] === "." ? relativePath : "./" + relativePath;
         };
         chunkCSS2 = chunkCSS2.replace(assetUrlRE, (_, fileHash, postfix = "") => {
@@ -36364,9 +36302,8 @@ function cssPostPlugin(config) {
           );
         });
         if (encodedPublicUrls) {
-          const relativePathToPublicFromCSS = path$n.posix.relative(
-            cssAssetDirname,
-            ""
+          const relativePathToPublicFromCSS = normalizePath$3(
+            path$n.relative(cssAssetDirname, "")
           );
           chunkCSS2 = chunkCSS2.replace(publicAssetUrlRE, (_, hash) => {
             const publicUrl = publicAssetUrlMap.get(hash).slice(1);
@@ -36988,8 +36925,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-y7MNyJvV.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-Du4V_m3I.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-SDtFYyy1.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-BkYu-SNl.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -37984,7 +37921,7 @@ async function compileLightningCSS(id, src, config, urlReplacer) {
         }
         deps.add(dep.url);
         if (urlReplacer) {
-          const replaceUrl = await urlReplacer(dep.url, id);
+          const replaceUrl = await urlReplacer(dep.url, dep.loc.filePath);
           css = css.replace(dep.placeholder, () => replaceUrl);
         } else {
           css = css.replace(dep.placeholder, () => dep.url);
@@ -45409,8 +45346,8 @@ function launchEditor (file, specifiedEditor, onErrorCallback) {
   // and
   // https://github.com/facebook/create-react-app/pull/5431)
 
-  // Allows alphanumeric characters, periods, dashes, slashes, and underscores.
-  const WINDOWS_CMD_SAFE_FILE_NAME_PATTERN = /^([A-Za-z]:[/\\])?[\p{L}0-9/.\-_\\]+$/u;
+  // Allows alphanumeric characters, periods, dashes, slashes, underscores, plus and space.
+  const WINDOWS_CMD_SAFE_FILE_NAME_PATTERN = /^([A-Za-z]:[/\\])?[\p{L}0-9/.\-\\_+ ]+$/u;
   if (
     process.platform === 'win32' &&
     !WINDOWS_CMD_SAFE_FILE_NAME_PATTERN.test(fileName.trim())
@@ -47232,8 +47169,7 @@ function throwFileNotFoundInOptimizedDep(id) {
 const nonJsRe = /\.json(?:$|\?)/;
 const isNonJsRequest = (request) => nonJsRe.test(request);
 const importMetaEnvMarker = "__vite_import_meta_env__";
-const bareImportMetaEnvRe = new RegExp(`${importMetaEnvMarker}(?!\\.)\\b`);
-const importMetaEnvKeyRe = new RegExp(`${importMetaEnvMarker}\\..+?\\b`, "g");
+const importMetaEnvKeyReCache = /* @__PURE__ */ new Map();
 function definePlugin(config) {
   const isBuild = config.command === "build";
   const isBuildLib = isBuild && config.build.lib;
@@ -47289,8 +47225,6 @@ function definePlugin(config) {
       SSR: ssr + "",
       ...userDefineEnv
     });
-    const banner = `const ${importMetaEnvMarker} = ${importMetaEnvVal};
-`;
     const patternKeys = Object.keys(userDefine);
     if (replaceProcessEnv && Object.keys(processEnv).length) {
       patternKeys.push("process.env");
@@ -47299,7 +47233,7 @@ function definePlugin(config) {
       patternKeys.push("import.meta.env", "import.meta.hot");
     }
     const pattern = patternKeys.length ? new RegExp(patternKeys.map(escapeRegex).join("|")) : null;
-    return [define, pattern, banner];
+    return [define, pattern, importMetaEnvVal];
   }
   const defaultPattern = generatePattern(false);
   const ssrPattern = generatePattern(true);
@@ -47316,21 +47250,35 @@ function definePlugin(config) {
       ) {
         return;
       }
-      const [define, pattern, banner] = ssr ? ssrPattern : defaultPattern;
+      let [define, pattern, importMetaEnvVal] = ssr ? ssrPattern : defaultPattern;
       if (!pattern) return;
       pattern.lastIndex = 0;
       if (!pattern.test(code)) return;
+      const hasDefineImportMetaEnv = "import.meta.env" in define;
+      let marker = importMetaEnvMarker;
+      if (hasDefineImportMetaEnv && code.includes(marker)) {
+        let i = 1;
+        do {
+          marker = importMetaEnvMarker + i++;
+        } while (code.includes(marker));
+        if (marker !== importMetaEnvMarker) {
+          define = { ...define, "import.meta.env": marker };
+        }
+      }
       const result = await replaceDefine(code, id, define, config);
-      result.code = result.code.replaceAll(
-        importMetaEnvKeyRe,
-        (m) => "undefined".padEnd(m.length)
-      );
-      if (bareImportMetaEnvRe.test(result.code)) {
-        result.code = banner + result.code;
-        if (result.map) {
-          const map = JSON.parse(result.map);
-          map.mappings = ";" + map.mappings;
-          result.map = map;
+      if (hasDefineImportMetaEnv) {
+        result.code = result.code.replaceAll(
+          getImportMetaEnvKeyRe(marker),
+          (m) => "undefined".padEnd(m.length)
+        );
+        if (result.code.includes(marker)) {
+          result.code = `const ${marker} = ${importMetaEnvVal};
+` + result.code;
+          if (result.map) {
+            const map = JSON.parse(result.map);
+            map.mappings = ";" + map.mappings;
+            result.map = map;
+          }
         }
       }
       return result;
@@ -47386,6 +47334,14 @@ function handleDefineValue(value) {
   if (typeof value === "string") return value;
   return JSON.stringify(value);
 }
+function getImportMetaEnvKeyRe(marker) {
+  let re = importMetaEnvKeyReCache.get(marker);
+  if (!re) {
+    re = new RegExp(`${marker}\\..+?\\b`, "g");
+    importMetaEnvKeyReCache.set(marker, re);
+  }
+  return re;
+}
 
 const normalizedClientEntry = normalizePath$3(CLIENT_ENTRY);
 const normalizedEnvEntry = normalizePath$3(ENV_ENTRY);
@@ -47710,7 +47666,7 @@ function webWorkerPlugin(config) {
         }
         if (injectEnv) {
           const s = new MagicString(raw);
-          s.prepend(injectEnv);
+          s.prepend(injectEnv + ";\n");
           return {
             code: s.toString(),
             map: s.generateMap({ hires: "boundary" })
@@ -47729,7 +47685,7 @@ function webWorkerPlugin(config) {
       }`;
       let urlCode;
       if (isBuild) {
-        if (isWorker && this.getModuleInfo(cleanUrl(id))?.isEntry) {
+        if (isWorker && config.bundleChain.at(-1) === cleanUrl(id)) {
           urlCode = "self.location.href";
         } else if (inlineRE.test(id)) {
           const chunk = await bundleWorkerEntry(config, id);
@@ -48058,7 +48014,7 @@ function workerImportMetaUrlPlugin(config) {
             file = await workerResolver(url, id);
             file ??= url[0] === "/" ? slash$1(path$n.join(config.publicDir, url)) : slash$1(path$n.resolve(path$n.dirname(id), url));
           }
-          if (isBuild && config.isWorker && this.getModuleInfo(cleanUrl(file))?.isEntry) {
+          if (isBuild && config.isWorker && config.bundleChain.at(-1) === cleanUrl(file)) {
             s.update(expStart, expEnd, "self.location.href");
           } else {
             let builtUrl;
@@ -52342,42 +52298,49 @@ Contents of line ${line}: ${code.split("\n")[line - 1]}`
 Object.defineProperty(${ssrModuleExportsKey}, "${name}", { enumerable: true, configurable: true, get(){ return ${local} }});`
     );
   }
+  const imports = [];
+  const exports = [];
   for (const node of ast.body) {
     if (node.type === "ImportDeclaration") {
-      const importId = defineImport(hoistIndex, node.source.value, {
-        importedNames: node.specifiers.map((s2) => {
-          if (s2.type === "ImportSpecifier")
-            return s2.imported.type === "Identifier" ? s2.imported.name : (
-              // @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-              s2.imported.value
-            );
-          else if (s2.type === "ImportDefaultSpecifier") return "default";
-        }).filter(isDefined)
-      });
-      s.remove(node.start, node.end);
-      for (const spec of node.specifiers) {
-        if (spec.type === "ImportSpecifier") {
-          if (spec.imported.type === "Identifier") {
-            idToImportMap.set(
-              spec.local.name,
-              `${importId}.${spec.imported.name}`
-            );
-          } else {
-            idToImportMap.set(
-              spec.local.name,
-              `${importId}[${// @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-              JSON.stringify(spec.imported.value)}]`
-            );
-          }
-        } else if (spec.type === "ImportDefaultSpecifier") {
-          idToImportMap.set(spec.local.name, `${importId}.default`);
+      imports.push(node);
+    } else if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportAllDeclaration") {
+      exports.push(node);
+    }
+  }
+  for (const node of imports) {
+    const importId = defineImport(hoistIndex, node.source.value, {
+      importedNames: node.specifiers.map((s2) => {
+        if (s2.type === "ImportSpecifier")
+          return s2.imported.type === "Identifier" ? s2.imported.name : (
+            // @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
+            s2.imported.value
+          );
+        else if (s2.type === "ImportDefaultSpecifier") return "default";
+      }).filter(isDefined)
+    });
+    s.remove(node.start, node.end);
+    for (const spec of node.specifiers) {
+      if (spec.type === "ImportSpecifier") {
+        if (spec.imported.type === "Identifier") {
+          idToImportMap.set(
+            spec.local.name,
+            `${importId}.${spec.imported.name}`
+          );
         } else {
-          idToImportMap.set(spec.local.name, importId);
+          idToImportMap.set(
+            spec.local.name,
+            `${importId}[${// @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
+            JSON.stringify(spec.imported.value)}]`
+          );
         }
+      } else if (spec.type === "ImportDefaultSpecifier") {
+        idToImportMap.set(spec.local.name, `${importId}.default`);
+      } else {
+        idToImportMap.set(spec.local.name, importId);
       }
     }
   }
-  for (const node of ast.body) {
+  for (const node of exports) {
     if (node.type === "ExportNamedDeclaration") {
       if (node.declaration) {
         if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
@@ -52771,13 +52734,13 @@ function ssrFixStacktrace(e, moduleGraph) {
 const pendingModules = /* @__PURE__ */ new Map();
 const pendingModuleDependencyGraph = /* @__PURE__ */ new Map();
 const importErrors = /* @__PURE__ */ new WeakMap();
-async function ssrLoadModule(url, server, context = { global }, fixStacktrace) {
+async function ssrLoadModule(url, server, fixStacktrace) {
   url = unwrapId$1(url);
   const pending = pendingModules.get(url);
   if (pending) {
     return pending;
   }
-  const modulePromise = instantiateModule(url, server, context, fixStacktrace);
+  const modulePromise = instantiateModule(url, server, fixStacktrace);
   pendingModules.set(url, modulePromise);
   modulePromise.catch(() => {
   }).finally(() => {
@@ -52785,7 +52748,7 @@ async function ssrLoadModule(url, server, context = { global }, fixStacktrace) {
   });
   return modulePromise;
 }
-async function instantiateModule(url, server, context = { global }, fixStacktrace) {
+async function instantiateModule(url, server, fixStacktrace) {
   const { moduleGraph } = server;
   const mod = await moduleGraph.ensureEntryFromUrl(url, true);
   if (mod.ssrError) {
@@ -52849,7 +52812,7 @@ async function instantiateModule(url, server, context = { global }, fixStacktrac
           return depSsrModule;
         }
       }
-      return ssrLoadModule(dep, server, context, fixStacktrace);
+      return ssrLoadModule(dep, server, fixStacktrace);
     } catch (err) {
       importErrors.set(err, { importee: dep });
       throw err;
@@ -52884,7 +52847,6 @@ async function instantiateModule(url, server, context = { global }, fixStacktrac
   }
   try {
     const initModule = new AsyncFunction(
-      `global`,
       ssrModuleExportsKey,
       ssrImportMetaKey,
       ssrImportKey,
@@ -52894,7 +52856,6 @@ async function instantiateModule(url, server, context = { global }, fixStacktrac
 //# sourceURL=${mod.id}${sourceMapSuffix}`
     );
     await initModule(
-      context.global,
       ssrModule,
       ssrImportMeta,
       ssrImport,
@@ -54281,10 +54242,10 @@ function resolveEmptyOutDir(emptyOutDir, root, outDirs, logger) {
   for (const outDir of outDirs) {
     if (!normalizePath$3(outDir).startsWith(withTrailingSlash(root))) {
       logger?.warn(
-        picocolorsExports.yellow(
+        colors$1.yellow(
           `
-${picocolorsExports.bold(`(!)`)} outDir ${picocolorsExports.white(
-            picocolorsExports.dim(outDir)
+${colors$1.bold(`(!)`)} outDir ${colors$1.white(
+            colors$1.dim(outDir)
           )} is not inside project root and will not be emptied.
 Use --emptyOutDir to override.
 `
@@ -62779,7 +62740,7 @@ async function _createServer(inlineConfig = {}, options) {
       return devHtmlTransformFn(server, url, html, originalUrl);
     },
     async ssrLoadModule(url, opts) {
-      return ssrLoadModule(url, server, void 0, opts?.fixStacktrace);
+      return ssrLoadModule(url, server, opts?.fixStacktrace);
     },
     async ssrFetchModule(url, importer) {
       return ssrFetchModule(server, url, importer);
@@ -64518,17 +64479,15 @@ function buildImportAnalysisPlugin(config) {
   const ssr = !!config.build.ssr;
   const isWorker = config.isWorker;
   const insertPreload = !(ssr || !!config.build.lib || isWorker);
-  const resolveModulePreloadDependencies = config.build.modulePreload && config.build.modulePreload.resolveDependencies;
   const renderBuiltUrl = config.experimental.renderBuiltUrl;
-  const customModulePreloadPaths = !!(resolveModulePreloadDependencies || renderBuiltUrl);
   const isRelativeBase = config.base === "./" || config.base === "";
-  const optimizeModulePreloadRelativePaths = isRelativeBase && !customModulePreloadPaths;
+  const optimizeModulePreloadRelativePaths = isRelativeBase && !renderBuiltUrl;
   const { modulePreload } = config.build;
   const scriptRel2 = modulePreload && modulePreload.polyfill ? `'modulepreload'` : `(${detectScriptRel.toString()})()`;
-  const assetsURL2 = customModulePreloadPaths ? (
-    // If `experimental.renderBuiltUrl` or `build.modulePreload.resolveDependencies` are used
-    // the dependencies are already resolved. To avoid the need for `new URL(dep, import.meta.url)`
-    // a helper `__vitePreloadRelativeDep` is used to resolve from relative paths which can be minimized.
+  const assetsURL2 = renderBuiltUrl ? (
+    // If `experimental.renderBuiltUrl` is used, the dependencies are already resolved.
+    // To avoid the need for `new URL(dep, import.meta.url)`, a helper `__vitePreloadRelativeDep` is
+    // used to resolve from relative paths which can be minimized.
     `function(dep, importerUrl) { return dep[0] === '.' ? new URL(dep, importerUrl).href : dep }`
   ) : optimizeModulePreloadRelativePaths ? (
     // If there isn't custom resolvers affecting the deps list, deps in the list are relative
@@ -64626,7 +64585,7 @@ function buildImportAnalysisPlugin(config) {
           }
           str().appendRight(
             expEnd,
-            `,${isModernFlag}?${preloadMarker}:void 0${optimizeModulePreloadRelativePaths || customModulePreloadPaths ? ",import.meta.url" : ""})`
+            `,${isModernFlag}?${preloadMarker}:void 0${optimizeModulePreloadRelativePaths || renderBuiltUrl ? ",import.meta.url" : ""})`
           );
         }
       }
@@ -64807,34 +64766,30 @@ function buildImportAnalysisPlugin(config) {
                 markerStartPos2 = indexOfMatchInSlice(code, preloadMarkerRE);
               }
               if (markerStartPos2 > 0) {
-                const depsArray = deps.size > 1 || // main chunk is removed
+                let depsArray = deps.size > 1 || // main chunk is removed
                 hasRemovedPureCssChunk && deps.size > 0 ? modulePreload === false ? (
                   // CSS deps use the same mechanism as module preloads, so even if disabled,
                   // we still need to pass these deps to the preload helper in dynamic imports.
                   [...deps].filter((d) => d.endsWith(".css"))
                 ) : [...deps] : [];
-                let renderedDeps;
-                if (normalizedFile && customModulePreloadPaths) {
-                  const { modulePreload: modulePreload2 } = config.build;
-                  const resolveDependencies = modulePreload2 ? modulePreload2.resolveDependencies : void 0;
-                  let resolvedDeps;
-                  if (resolveDependencies) {
-                    const cssDeps = [];
-                    const otherDeps = [];
-                    for (const dep of depsArray) {
-                      (dep.endsWith(".css") ? cssDeps : otherDeps).push(dep);
-                    }
-                    resolvedDeps = [
-                      ...resolveDependencies(normalizedFile, otherDeps, {
-                        hostId: file,
-                        hostType: "js"
-                      }),
-                      ...cssDeps
-                    ];
-                  } else {
-                    resolvedDeps = depsArray;
+                const resolveDependencies = modulePreload ? modulePreload.resolveDependencies : void 0;
+                if (resolveDependencies && normalizedFile) {
+                  const cssDeps = [];
+                  const otherDeps = [];
+                  for (const dep of depsArray) {
+                    (dep.endsWith(".css") ? cssDeps : otherDeps).push(dep);
                   }
-                  renderedDeps = resolvedDeps.map((dep) => {
+                  depsArray = [
+                    ...resolveDependencies(normalizedFile, otherDeps, {
+                      hostId: file,
+                      hostType: "js"
+                    }),
+                    ...cssDeps
+                  ];
+                }
+                let renderedDeps;
+                if (renderBuiltUrl) {
+                  renderedDeps = depsArray.map((dep) => {
                     const replacement = toOutputFilePathInJS(
                       dep,
                       "asset",