vite 4.4.9 → 4.4.10

package/client.d.ts

@@ -221,7 +221,7 @@ declare module '*.txt' {
 // wasm?init
 declare module '*.wasm?init' {
   const initWasm: (
-    options: WebAssembly.Imports,
+    options?: WebAssembly.Imports,
   ) => Promise<WebAssembly.Instance>
   export default initWasm
 }

package/dist/node/chunks/{dep-df561101.js → dep-3bba9c7e.js}

@@ -11834,6 +11834,12 @@ const flattenId = (id) => id
     .replace(replaceNestedIdRE, '___')
     .replace(replaceHashRE, '____');
 const normalizeId = (id) => id.replace(replaceNestedIdRE, ' > ');
+// Supported by Node, Deno, Bun
+const NODE_BUILTIN_NAMESPACE = 'node:';
+// Supported by Deno
+const NPM_BUILTIN_NAMESPACE = 'npm:';
+// Supported by Bun
+const BUN_BUILTIN_NAMESPACE = 'bun:';
 //TODO: revisit later to see if the edge case that "compiling using node v12 code to be run in node v16 in the server" is what we intend to support.
 const builtins = new Set([
     ...builtinModules,
@@ -11851,17 +11857,26 @@ const builtins = new Set([
     'util/types',
     'wasi',
 ]);
-const NODE_BUILTIN_NAMESPACE = 'node:';
+// Some runtimes like Bun injects namespaced modules here, which is not a node builtin
+const nodeBuiltins = [...builtins].filter((id) => !id.includes(':'));
+// TODO: Use `isBuiltin` from `node:module`, but Deno doesn't support it
 function isBuiltin(id) {
-    return builtins.has(id.startsWith(NODE_BUILTIN_NAMESPACE)
-        ? id.slice(NODE_BUILTIN_NAMESPACE.length)
-        : id);
+    if (process.versions.deno && id.startsWith(NPM_BUILTIN_NAMESPACE))
+        return true;
+    if (process.versions.bun && id.startsWith(BUN_BUILTIN_NAMESPACE))
+        return true;
+    return isNodeBuiltin(id);
+}
+function isNodeBuiltin(id) {
+    if (id.startsWith(NODE_BUILTIN_NAMESPACE))
+        return true;
+    return nodeBuiltins.includes(id);
 }
 function isInNodeModules(id) {
     return id.includes('node_modules');
 }
 function moduleListContains(moduleList, id) {
-    return moduleList?.some((m) => m === id || id.startsWith(m + '/'));
+    return moduleList?.some((m) => m === id || id.startsWith(withTrailingSlash(m)));
 }
 function isOptimizable(id, optimizeDeps) {
     const { extensions } = optimizeDeps;
@@ -11923,6 +11938,12 @@ function fsPathFromId(id) {
 function fsPathFromUrl(url) {
     return fsPathFromId(cleanUrl(url));
 }
+function withTrailingSlash(path) {
+    if (path[path.length - 1] !== '/') {
+        return `${path}/`;
+    }
+    return path;
+}
 /**
  * Check if dir is a parent of file
  *
@@ -11933,9 +11954,7 @@ function fsPathFromUrl(url) {
  * @returns true if dir is a parent of file
  */
 function isParentDirectory(dir, file) {
-    if (dir[dir.length - 1] !== '/') {
-        dir = `${dir}/`;
-    }
+    dir = withTrailingSlash(dir);
     return (file.startsWith(dir) ||
         (isCaseInsensitiveFS && file.toLowerCase().startsWith(dir.toLowerCase())));
 }
@@ -12287,7 +12306,7 @@ function optimizeSafeRealPathSync() {
 function ensureWatchedFile(watcher, file, root) {
     if (file &&
         // only need to watch if out of root
-        !file.startsWith(root + '/') &&
+        !file.startsWith(withTrailingSlash(root)) &&
         // some rollup plugins use null bytes for private resolved Ids
         !file.includes('\0') &&
         fs$l.existsSync(file)) {
@@ -12727,7 +12746,7 @@ function stripBase(path, base) {
     if (path === base) {
         return '/';
     }
-    const devBase = base[base.length - 1] === '/' ? base : base + '/';
+    const devBase = withTrailingSlash(base);
     return path.startsWith(devBase) ? path.slice(devBase.length - 1) : path;
 }
 function arrayEqual(a, b) {
@@ -13084,9 +13103,10 @@ function buildReporterPlugin(config) {
                         if (isLarge)
                             hasLargeChunks = true;
                         const sizeColor = isLarge ? colors$1.yellow : colors$1.dim;
-                        let log = colors$1.dim(relativeOutDir + '/');
+                        let log = colors$1.dim(withTrailingSlash(relativeOutDir));
                         log +=
-                            !config.build.lib && entry.name.startsWith(assetsDir)
+                            !config.build.lib &&
+                                entry.name.startsWith(withTrailingSlash(assetsDir))
                                 ? colors$1.dim(assetsDir) +
                                     group.color(entry.name
                                         .slice(assetsDir.length)
@@ -13756,8 +13776,13 @@ function hasWorkspacePackageJSON(root) {
     if (!isFileReadable(path)) {
         return false;
     }
-    const content = JSON.parse(fs$l.readFileSync(path, 'utf-8')) || {};
-    return !!content.workspaces;
+    try {
+        const content = JSON.parse(fs$l.readFileSync(path, 'utf-8')) || {};
+        return !!content.workspaces;
+    }
+    catch {
+        return false;
+    }
 }
 function hasRootFile(root) {
     return ROOT_FILES.some((file) => fs$l.existsSync(join$2(root, file)));
@@ -13794,8 +13819,8 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
 }
 
 const debug$f = createDebugger('vite:esbuild');
-const INJECT_HELPERS_IIFE_RE = /^(.*?)((?:const|var)\s+\S+\s*=\s*function\s*\([^)]*\)\s*\{\s*"use strict";)/s;
-const INJECT_HELPERS_UMD_RE = /^(.*?)(\(function\([^)]*\)\s*\{.+?amd.+?function\([^)]*\)\s*\{\s*"use strict";)/s;
+// IIFE content looks like `var MyLib = function() {`. Spaces are removed when minified
+const IIFE_BEGIN_RE = /(const|var)\s+\S+\s*=\s*function\(\)\s*\{.*"use strict";/s;
 const validExtensionRE = /\.\w+$/;
 const jsxExtensionsRE = /\.(?:j|t)sx\b/;
 let server;
@@ -14028,16 +14053,26 @@ const buildEsbuildPlugin = (config) => {
             if (config.build.lib) {
                 // #7188, esbuild adds helpers out of the UMD and IIFE wrappers, and the
                 // names are minified potentially causing collision with other globals.
-                // We use a regex to inject the helpers inside the wrappers.
+                // We inject the helpers inside the wrappers.
+                // e.g. turn:
+                //    <esbuild helpers> (function(){ /*actual content/* })()
+                // into:
+                //    (function(){ <esbuild helpers> /*actual content/* })()
+                // Not using regex because it's too hard to rule out performance issues like #8738 #8099 #10900 #14065
+                // Instead, using plain string index manipulation (indexOf, slice) which is simple and performant
                 // We don't need to create a MagicString here because both the helpers and
                 // the headers don't modify the sourcemap
-                const injectHelpers = opts.format === 'umd'
-                    ? INJECT_HELPERS_UMD_RE
-                    : opts.format === 'iife'
-                        ? INJECT_HELPERS_IIFE_RE
-                        : undefined;
-                if (injectHelpers) {
-                    res.code = res.code.replace(injectHelpers, (_, helpers, header) => header + helpers);
+                const esbuildCode = res.code;
+                const contentIndex = opts.format === 'iife'
+                    ? esbuildCode.match(IIFE_BEGIN_RE)?.index || 0
+                    : opts.format === 'umd'
+                        ? esbuildCode.indexOf(`(function(`) // same for minified or not
+                        : 0;
+                if (contentIndex > 0) {
+                    const esbuildHelpers = esbuildCode.slice(0, contentIndex);
+                    res.code = esbuildCode
+                        .slice(contentIndex)
+                        .replace(`"use strict";`, `"use strict";` + esbuildHelpers);
                 }
             }
             return res;
@@ -16176,7 +16211,7 @@ function checkPublicFile(url, { publicDir }) {
         return;
     }
     const publicFile = path$o.join(publicDir, cleanUrl(url));
-    if (!publicFile.startsWith(publicDir)) {
+    if (!normalizePath$3(publicFile).startsWith(withTrailingSlash(normalizePath$3(publicDir)))) {
         // can happen if URL starts with '../'
         return;
     }
@@ -16201,7 +16236,7 @@ function fileToDevUrl(id, config) {
         // in public dir, keep the url as-is
         rtn = id;
     }
-    else if (id.startsWith(config.root)) {
+    else if (id.startsWith(withTrailingSlash(config.root))) {
         // in project root, infer short public path
         rtn = '/' + path$o.posix.relative(config.root, id);
     }
@@ -28086,7 +28121,9 @@ function resolvePlugin(resolveOptions) {
             }
             // URL
             // /foo -> /fs-root/foo
-            if (asSrc && id[0] === '/' && (rootInRoot || !id.startsWith(root))) {
+            if (asSrc &&
+                id[0] === '/' &&
+                (rootInRoot || !id.startsWith(withTrailingSlash(root)))) {
                 const fsPath = path$o.resolve(root, id.slice(1));
                 if ((res = tryFsResolve(fsPath, options))) {
                     debug$d?.(`[url] ${colors$1.cyan(id)} -> ${colors$1.dim(res)}`);
@@ -28402,8 +28439,10 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = f
             bareImportRE.test(id)) {
             const mainPkg = findNearestMainPackageData(basedir, packageCache)?.data;
             if (mainPkg) {
-                if (mainPkg.peerDependencies?.[id] &&
-                    mainPkg.peerDependenciesMeta?.[id]?.optional) {
+                const pkgName = getNpmPackageName(id);
+                if (pkgName != null &&
+                    mainPkg.peerDependencies?.[pkgName] &&
+                    mainPkg.peerDependenciesMeta?.[pkgName]?.optional) {
                     return {
                         id: `${optionalPeerDepId}:${id}:${mainPkg.name}`,
                     };
@@ -28580,7 +28619,7 @@ async function tryOptimizedResolve(depsOptimizer, id, importer, preserveSymlinks
             idPkgDir = normalizePath$3(idPkgDir);
         }
         // match by src to correctly identify if id belongs to nested dependency
-        if (optimizedData.src.startsWith(idPkgDir)) {
+        if (optimizedData.src.startsWith(withTrailingSlash(idPkgDir))) {
             return depsOptimizer.getOptimizedDepId(optimizedData);
         }
     }
@@ -36691,7 +36730,7 @@ function _stripLiteralAcorn(code, options) {
 
 const multilineCommentsRE = /\/\*([^*\/])*?\*\//gms;
 const singlelineCommentsRE = /(?:^|\n|\r)\s*\/\/.*(?:\r|\n|$)/gm;
-const templateLiteralRE = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
+const templateLiteralRE$1 = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
 const quotesRE = [
   /(["'`])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
   /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
@@ -36705,7 +36744,7 @@ function stripLiteralRegex(code, options) {
   let expanded = code;
   for (let i = 0; i < 16; i++) {
     const before = expanded;
-    expanded = expanded.replace(templateLiteralRE, "` $1`");
+    expanded = expanded.replace(templateLiteralRE$1, "` $1`");
     if (expanded === before)
       break;
   }
@@ -38345,7 +38384,7 @@ function cssPostPlugin(config) {
     };
     return {
         name: 'vite:css-post',
-        buildStart() {
+        renderStart() {
             // Ensure new caches for every build (i.e. rebuilding in watch mode)
             pureCssChunks = new Set();
             outputToExtractedCSSMap = new Map();
@@ -38633,9 +38672,9 @@ function cssPostPlugin(config) {
                         // chunks instead.
                         chunk.imports = chunk.imports.filter((file) => {
                             if (pureCssChunkNames.includes(file)) {
-                                const { importedCss } = bundle[file]
-                                    .viteMetadata;
+                                const { importedCss, importedAssets } = bundle[file].viteMetadata;
                                 importedCss.forEach((file) => chunk.viteMetadata.importedCss.add(file));
+                                importedAssets.forEach((file) => chunk.viteMetadata.importedAssets.add(file));
                                 return false;
                             }
                             return true;
@@ -38649,6 +38688,7 @@ function cssPostPlugin(config) {
                 pureCssChunkNames.forEach((fileName) => {
                     removedPureCssFiles.set(fileName, bundle[fileName]);
                     delete bundle[fileName];
+                    delete bundle[`${fileName}.map`];
                 });
             }
             let extractedCss = outputToExtractedCSSMap.get(opts);
@@ -38959,8 +38999,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-e0331088.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-73522cdf.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-fdea5ef1.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-809640fa.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40274,7 +40314,8 @@ function cjsShouldExternalizeForSSR(id, externals) {
         }
         // deep imports, check ext before externalizing - only externalize
         // extension-less imports and explicit .js imports
-        if (id.startsWith(e + '/') && (!path$o.extname(id) || id.endsWith('.js'))) {
+        if (id.startsWith(withTrailingSlash(e)) &&
+            (!path$o.extname(id) || id.endsWith('.js'))) {
             return true;
         }
     });
@@ -40784,8 +40825,11 @@ function getAffectedGlobModules(file, server) {
     for (const [id, allGlobs] of server._importGlobMap) {
         // (glob1 || glob2) && !glob3 && !glob4...
         if (allGlobs.some(({ affirmed, negated }) => (!affirmed.length || affirmed.some((glob) => isMatch$1(file, glob))) &&
-            (!negated.length || negated.every((glob) => isMatch$1(file, glob)))))
-            modules.push(...(server.moduleGraph.getModulesByFile(id) || []));
+            (!negated.length || negated.every((glob) => isMatch$1(file, glob))))) {
+            const mod = server.moduleGraph.getModuleById(id);
+            if (mod)
+                modules.push(mod);
+        }
     }
     modules.forEach((i) => {
         if (i?.file)
@@ -41216,7 +41260,9 @@ const debugHmr = createDebugger('vite:hmr');
 const whitespaceRE = /\s/;
 const normalizedClientDir = normalizePath$3(CLIENT_DIR);
 function getShortName(file, root) {
-    return file.startsWith(root + '/') ? path$o.posix.relative(root, file) : file;
+    return file.startsWith(withTrailingSlash(root))
+        ? path$o.posix.relative(root, file)
+        : file;
 }
 async function handleHMRUpdate(file, server, configOnly) {
     const { ws, config, moduleGraph } = server;
@@ -41243,7 +41289,7 @@ async function handleHMRUpdate(file, server, configOnly) {
     }
     debugHmr?.(`[file change] ${colors$1.dim(shortFile)}`);
     // (dev only) the client itself cannot be hot updated.
-    if (file.startsWith(normalizedClientDir)) {
+    if (file.startsWith(withTrailingSlash(normalizedClientDir))) {
         ws.send({
             type: 'full-reload',
             path: '*',
@@ -41607,6 +41653,7 @@ const hasImportInQueryParamsRE = /[?&]import=?\b/;
 const hasViteIgnoreRE = /\/\*\s*@vite-ignore\s*\*\//;
 const cleanUpRawUrlRE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
 const urlIsStringRE = /^(?:'.*'|".*"|`.*`)$/;
+const templateLiteralRE = /^\s*`(.*)`\s*$/;
 function isExplicitImportRequired(url) {
     return !isJSRequest(cleanUrl(url)) && !isCSSRequest(url);
 }
@@ -41764,7 +41811,6 @@ function importAnalysisPlugin(config) {
             let needQueryInjectHelper = false;
             let s;
             const str = () => s || (s = new MagicString(source));
-            const importedUrls = new Set();
             let isPartiallySelfAccepting = false;
             const importedBindings = enablePartialAccept
                 ? new Map()
@@ -41804,7 +41850,7 @@ function importAnalysisPlugin(config) {
                 const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js'`
-                if (resolved.id.startsWith(root + '/')) {
+                if (resolved.id.startsWith(withTrailingSlash(root))) {
                     // in root: infer short absolute path from root
                     url = resolved.id.slice(root.length);
                 }
@@ -41865,13 +41911,14 @@ function importAnalysisPlugin(config) {
                 }
                 return [url, resolved.id];
             };
+            const orderedImportedUrls = new Array(imports.length);
             const orderedAcceptedUrls = new Array(imports.length);
             const orderedAcceptedExports = new Array(imports.length);
             await Promise.all(imports.map(async (importSpecifier, index) => {
-                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, 
+                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, a: assertIndex, } = importSpecifier;
                 // #2083 User may use escape path,
                 // so use imports[index].n to get the unescaped string
-                n: specifier, a: assertIndex, } = importSpecifier;
+                let specifier = importSpecifier.n;
                 const rawUrl = source.slice(start, end);
                 // check import.meta usage
                 if (rawUrl === 'import.meta') {
@@ -41901,6 +41948,15 @@ function importAnalysisPlugin(config) {
                     }
                     return;
                 }
+                else if (templateLiteralRE.test(rawUrl)) {
+                    // If the import has backticks but isn't transformed as a glob import
+                    // (as there's nothing to glob), check if it's simply a plain string.
+                    // If so, we can replace the specifier as a plain string to prevent
+                    // an incorrect "cannot be analyzed" warning.
+                    if (!(rawUrl.includes('${') && rawUrl.includes('}'))) {
+                        specifier = rawUrl.replace(templateLiteralRE, '$1');
+                    }
+                }
                 const isDynamicImport = dynamicIndex > -1;
                 // strip import assertions as we can process them ourselves
                 if (!isDynamicImport && assertIndex > -1) {
@@ -42013,7 +42069,7 @@ function importAnalysisPlugin(config) {
                     const hmrUrl = unwrapId(stripBase(url, base));
                     const isLocalImport = !isExternalUrl(hmrUrl) && !isDataUrl(hmrUrl);
                     if (isLocalImport) {
-                        importedUrls.add(hmrUrl);
+                        orderedImportedUrls[index] = hmrUrl;
                     }
                     if (enablePartialAccept && importedBindings) {
                         extractImportedBindings(resolvedId, source, importSpecifier, importedBindings);
@@ -42036,7 +42092,7 @@ function importAnalysisPlugin(config) {
                         });
                     }
                 }
-                else if (!importer.startsWith(clientDir)) {
+                else if (!importer.startsWith(withTrailingSlash(clientDir))) {
                     if (!isInNodeModules(importer)) {
                         // check @vite-ignore which suppresses dynamic import warning
                         const hasViteIgnore = hasViteIgnoreRE.test(
@@ -42064,6 +42120,7 @@ function importAnalysisPlugin(config) {
                     }
                 }
             }));
+            const importedUrls = new Set(orderedImportedUrls.filter(Boolean));
             const acceptedUrls = mergeAcceptedUrls(orderedAcceptedUrls);
             const acceptedExports = mergeAcceptedUrls(orderedAcceptedExports);
             if (hasEnv) {
@@ -42145,23 +42202,32 @@ function mergeAcceptedUrls(orderedUrls) {
 function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex, importer, config) {
     const source = str.original;
     const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, } = importSpecifier;
+    const exp = source.slice(expStart, expEnd);
     if (dynamicIndex > -1) {
         // rewrite `import('package')` to expose the default directly
-        str.overwrite(expStart, expEnd, `import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))`, { contentOnly: true });
+        str.overwrite(expStart, expEnd, `import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))` +
+            getLineBreaks(exp), { contentOnly: true });
     }
     else {
-        const exp = source.slice(expStart, expEnd);
         const rawUrl = source.slice(start, end);
         const rewritten = transformCjsImport(exp, rewrittenUrl, rawUrl, importIndex, importer, config);
         if (rewritten) {
-            str.overwrite(expStart, expEnd, rewritten, { contentOnly: true });
+            str.overwrite(expStart, expEnd, rewritten + getLineBreaks(exp), {
+                contentOnly: true,
+            });
         }
         else {
             // #1439 export * from '...'
-            str.overwrite(start, end, rewrittenUrl, { contentOnly: true });
+            str.overwrite(start, end, rewrittenUrl + getLineBreaks(source.slice(start, end)), {
+                contentOnly: true,
+            });
         }
     }
 }
+// get line breaks to preserve line count for not breaking source maps
+function getLineBreaks(str) {
+    return str.includes('\n') ? '\n'.repeat(str.split('\n').length - 1) : '';
+}
 /**
  * Detect import statements to a known optimized CJS dependency and provide
  * ES named imports interop. We do this by rewriting named imports to a variable
@@ -42610,9 +42676,15 @@ function webWorkerPlugin(config) {
                         injectEnv = module?.transformResult?.code || '';
                     }
                 }
-                return {
-                    code: injectEnv + raw,
-                };
+                if (injectEnv) {
+                    const s = new MagicString(raw);
+                    s.prepend(injectEnv);
+                    return {
+                        code: s.toString(),
+                        map: s.generateMap({ hires: 'boundary' }),
+                    };
+                }
+                return;
             }
             if (query == null ||
                 (query && (query.worker ?? query.sharedworker) == null)) {
@@ -42805,7 +42877,7 @@ function matches(pattern, importee) {
     if (importee === pattern) {
         return true;
     }
-    return importee.startsWith(pattern + '/');
+    return importee.startsWith(withTrailingSlash(pattern));
 }
 function getAliasPatterns(entries) {
     if (!entries) {
@@ -45412,7 +45484,6 @@ async function createDepsOptimizer(config, server) {
         if (closed) {
             return;
         }
-        const crawlDeps = Object.keys(metadata.discovered);
         // Await for the scan+optimize step running in the background
         // It normally should be over by the time crawling of user code ended
         await depsOptimizer.scanProcessing;
@@ -45420,6 +45491,7 @@ async function createDepsOptimizer(config, server) {
             const result = await optimizationResult.result;
             optimizationResult = undefined;
             currentlyProcessing = false;
+            const crawlDeps = Object.keys(metadata.discovered);
             const scanDeps = Object.keys(result.metadata.optimized);
             if (scanDeps.length === 0 && crawlDeps.length === 0) {
                 debug$8?.(colors$1.green(`✨ no dependencies found by the scanner or crawling static imports`));
@@ -45452,6 +45524,7 @@ async function createDepsOptimizer(config, server) {
             }
         }
         else {
+            const crawlDeps = Object.keys(metadata.discovered);
             currentlyProcessing = false;
             if (crawlDeps.length === 0) {
                 debug$8?.(colors$1.green(`✨ no dependencies found while crawling the static imports`));
@@ -46615,7 +46688,7 @@ function buildImportAnalysisPlugin(config) {
                 }
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js'`
-                if (resolved.id.startsWith(root + '/')) {
+                if (resolved.id.startsWith(withTrailingSlash(root))) {
                     // in root: infer short absolute path from root
                     url = resolved.id.slice(root.length);
                 }
@@ -47614,7 +47687,7 @@ function serveStaticMiddleware(dir, server) {
         }
         if (redirectedPathname) {
             // dir is pre-normalized to posix style
-            if (redirectedPathname.startsWith(dir)) {
+            if (redirectedPathname.startsWith(withTrailingSlash(dir))) {
                 redirectedPathname = redirectedPathname.slice(dir.length);
             }
         }
@@ -47622,7 +47695,7 @@ function serveStaticMiddleware(dir, server) {
         let fileUrl = path$o.resolve(dir, removeLeadingSlash(resolvedPathname));
         if (resolvedPathname[resolvedPathname.length - 1] === '/' &&
             fileUrl[fileUrl.length - 1] !== '/') {
-            fileUrl = fileUrl + '/';
+            fileUrl = withTrailingSlash(fileUrl);
         }
         if (!ensureServingAccess(fileUrl, server, res, next)) {
             return;
@@ -48027,7 +48100,7 @@ function prepareOutDir(outDirs, emptyOutDir, config) {
     if (emptyOutDir == null) {
         for (const outDir of nonDuplicateDirs) {
             if (fs$l.existsSync(outDir) &&
-                !normalizePath$3(outDir).startsWith(config.root + '/')) {
+                !normalizePath$3(outDir).startsWith(withTrailingSlash(config.root))) {
                 // warn if outDir is outside of root
                 config.logger.warn(colors$1.yellow(`\n${colors$1.bold(`(!)`)} outDir ${colors$1.white(colors$1.dim(outDir))} is not inside project root and will not be emptied.\n` +
                     `Use --emptyOutDir to override.\n`));
@@ -48391,7 +48464,9 @@ const toOutputFilePathInHtml = toOutputFilePathWithoutRuntime;
 function areSeparateFolders(a, b) {
     const na = normalizePath$3(a);
     const nb = normalizePath$3(b);
-    return na !== nb && !na.startsWith(nb + '/') && !nb.startsWith(na + '/');
+    return (na !== nb &&
+        !na.startsWith(withTrailingSlash(nb)) &&
+        !nb.startsWith(withTrailingSlash(na)));
 }
 
 var build$1 = {
@@ -55995,7 +56070,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
 // In node@12+ we can use dynamic import to load CJS and ESM
 async function nodeImport(id, importer, resolveOptions) {
     let url;
-    if (id.startsWith('node:') || id.startsWith('data:') || isBuiltin(id)) {
+    if (id.startsWith('data:') || isBuiltin(id)) {
         url = id;
     }
     else {
@@ -61692,6 +61767,7 @@ function createWebSocketServer(server, config, httpsOptions) {
     // TODO: the main server port may not have been chosen yet as it may use the next available
     const portsAreCompatible = !hmrPort || hmrPort === config.server.port;
     const wsServer = hmrServer || (portsAreCompatible && server);
+    let hmrServerWsListener;
     const customListeners = new Map();
     const clientsMap = new WeakMap();
     const port = hmrPort || 24678;
@@ -61703,14 +61779,15 @@ function createWebSocketServer(server, config, httpsOptions) {
             hmrBase = path$o.posix.join(hmrBase, hmrPath);
         }
         wss = new WebSocketServerRaw({ noServer: true });
-        wsServer.on('upgrade', (req, socket, head) => {
+        hmrServerWsListener = (req, socket, head) => {
             if (req.headers['sec-websocket-protocol'] === HMR_HEADER &&
                 req.url === hmrBase) {
                 wss.handleUpgrade(req, socket, head, (ws) => {
                     wss.emit('connection', ws, req);
                 });
             }
-        });
+        };
+        wsServer.on('upgrade', hmrServerWsListener);
     }
     else {
         // http server request handler keeps the same with
@@ -61852,6 +61929,11 @@ function createWebSocketServer(server, config, httpsOptions) {
             });
         },
         close() {
+            // should remove listener if hmr.server is set
+            // otherwise the old listener swallows all WebSocket connections
+            if (hmrServerWsListener && wsServer) {
+                wsServer.off('upgrade', hmrServerWsListener);
+            }
             return new Promise((resolve, reject) => {
                 wss.clients.forEach((client) => {
                     client.terminate();
@@ -61909,7 +61991,7 @@ function baseMiddleware({ config, }) {
         }
         else if (req.headers.accept?.includes('text/html')) {
             // non-based page visit
-            const redirectPath = url + '/' !== base ? joinUrlSegments(base, url) : base;
+            const redirectPath = withTrailingSlash(url) !== base ? joinUrlSegments(base, url) : base;
             res.writeHead(404, {
                 'Content-Type': 'text/html',
             });
@@ -64289,10 +64371,10 @@ function transformMiddleware(server) {
             // check if public dir is inside root dir
             const publicDir = normalizePath$3(server.config.publicDir);
             const rootDir = normalizePath$3(server.config.root);
-            if (publicDir.startsWith(rootDir)) {
+            if (publicDir.startsWith(withTrailingSlash(rootDir))) {
                 const publicPath = `${publicDir.slice(rootDir.length)}/`;
                 // warn explicit public paths
-                if (url.startsWith(publicPath)) {
+                if (url.startsWith(withTrailingSlash(publicPath))) {
                     let warning;
                     if (isImportRequest(url)) {
                         const rawUrl = removeImportQuery(url);
@@ -65871,7 +65953,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         configFileDependencies: configFileDependencies.map((name) => normalizePath$3(path$o.resolve(name))),
         inlineConfig,
         root: resolvedRoot,
-        base: resolvedBase.endsWith('/') ? resolvedBase : resolvedBase + '/',
+        base: withTrailingSlash(resolvedBase),
         rawBase: resolvedBase,
         resolve: resolveOptions,
         publicDir: resolvedPublicDir,
@@ -65994,7 +66076,7 @@ assetFileNames isn't equal for every build.rollupOptions.output. A single patter
     if (config.legacy?.buildSsrCjsExternalHeuristics ||
         config.ssr?.format === 'cjs') {
         resolved.logger.warn(colors$1.yellow(`
-(!) Experimental legacy.buildSsrCjsExternalHeuristics and ssr.format: 'cjs' are going to be removed in Vite 5. 
+(!) Experimental legacy.buildSsrCjsExternalHeuristics and ssr.format: 'cjs' are going to be removed in Vite 5.
     Find more information and give feedback at https://github.com/vitejs/vite/discussions/13816.
 `));
     }
@@ -66158,11 +66240,13 @@ async function bundleConfigFile(fileName, isESM) {
                     build.onResolve({ filter: /^[^.].*/ }, async ({ path: id, importer, kind }) => {
                         if (kind === 'entry-point' ||
                             path$o.isAbsolute(id) ||
-                            isBuiltin(id)) {
+                            isNodeBuiltin(id)) {
                             return;
                         }
-                        // partial deno support as `npm:` does not work with esbuild
-                        if (id.startsWith('npm:')) {
+                        // With the `isNodeBuiltin` check above, this check captures if the builtin is a
+                        // non-node built-in, which esbuild doesn't know how to handle. In that case, we
+                        // externalize it so the non-node runtime handles it instead.
+                        if (isBuiltin(id)) {
                             return { external: true };
                         }
                         const isImport = isESM || kind === 'dynamic-import';

package/dist/node/chunks/{dep-73522cdf.js → dep-809640fa.js}

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

package/dist/node/chunks/{dep-e0331088.js → dep-fdea5ef1.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-df561101.js';
+import { E as getDefaultExportFromCjs } from './dep-3bba9c7e.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-df561101.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-3bba9c7e.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -714,9 +714,29 @@ function cleanOptions(options) {
     }
     return ret;
 }
+/**
+ * host may be a number (like 0), should convert to string
+ */
+const convertHost = (v) => {
+    if (typeof v === 'number') {
+        return String(v);
+    }
+    return v;
+};
+/**
+ * base may be a number (like 0), should convert to empty string
+ */
+const convertBase = (v) => {
+    if (v === 0) {
+        return '';
+    }
+    return v;
+};
 cli
     .option('-c, --config <file>', `[string] use specified config file`)
-    .option('--base <path>', `[string] public base path (default: /)`)
+    .option('--base <path>', `[string] public base path (default: /)`, {
+    type: [convertBase],
+})
     .option('-l, --logLevel <level>', `[string] info | warn | error | silent`)
     .option('--clearScreen', `[boolean] allow/disable clear screen when logging`)
     .option('-d, --debug [feat]', `[string | boolean] show debug logs`)
@@ -727,7 +747,7 @@ cli
     .command('[root]', 'start dev server') // default command
     .alias('serve') // the command is called 'serve' in Vite's API
     .alias('dev') // alias to align with the script name
-    .option('--host [host]', `[string] specify hostname`)
+    .option('--host [host]', `[string] specify hostname`, { type: [convertHost] })
     .option('--port <port>', `[number] specify port`)
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
@@ -738,7 +758,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-df561101.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-3bba9c7e.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -816,7 +836,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-df561101.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-3bba9c7e.js').then(function (n) { return n.H; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -844,7 +864,7 @@ cli
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-df561101.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-3bba9c7e.js').then(function (n) { return n.G; });
     try {
         const config = await resolveConfig({
             root,
@@ -863,7 +883,7 @@ cli
 // preview
 cli
     .command('preview [root]', 'locally preview production build')
-    .option('--host [host]', `[string] specify hostname`)
+    .option('--host [host]', `[string] specify hostname`, { type: [convertHost] })
     .option('--port <port>', `[number] specify port`)
     .option('--strictPort', `[boolean] exit if specified port is already in use`)
     .option('--https', `[boolean] use TLS + HTTP/2`)
@@ -871,7 +891,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-df561101.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-3bba9c7e.js').then(function (n) { return n.J; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-df561101.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-df561101.js';
+import { i as isInNodeModules } from './chunks/dep-3bba9c7e.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-3bba9c7e.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

@@ -3281,8 +3281,8 @@ const createFilter$1 = function createFilter(include, exclude, options) {
 };
 
 const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';
-const builtins = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
-const forbiddenIdentifiers = new Set(`${reservedWords} ${builtins}`.split(' '));
+const builtins$1 = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
+const forbiddenIdentifiers = new Set(`${reservedWords} ${builtins$1}`.split(' '));
 forbiddenIdentifiers.add('');
 
 if (process.versions.pnp) {
@@ -3297,6 +3297,25 @@ const windowsSlashRE = /\\/g;
 function slash(p) {
     return p.replace(windowsSlashRE, '/');
 }
+//TODO: revisit later to see if the edge case that "compiling using node v12 code to be run in node v16 in the server" is what we intend to support.
+const builtins = new Set([
+    ...node_module.builtinModules,
+    'assert/strict',
+    'diagnostics_channel',
+    'dns/promises',
+    'fs/promises',
+    'path/posix',
+    'path/win32',
+    'readline/promises',
+    'stream/consumers',
+    'stream/promises',
+    'stream/web',
+    'timers/promises',
+    'util/types',
+    'wasi',
+]);
+// Some runtimes like Bun injects namespaced modules here, which is not a node builtin
+[...builtins].filter((id) => !id.includes(':'));
 function isInNodeModules(id) {
     return id.includes('node_modules');
 }
@@ -3344,6 +3363,12 @@ function fsPathFromId(id) {
 function fsPathFromUrl(url) {
     return fsPathFromId(cleanUrl(url));
 }
+function withTrailingSlash(path) {
+    if (path[path.length - 1] !== '/') {
+        return `${path}/`;
+    }
+    return path;
+}
 /**
  * Check if dir is a parent of file
  *
@@ -3354,9 +3379,7 @@ function fsPathFromUrl(url) {
  * @returns true if dir is a parent of file
  */
 function isParentDirectory(dir, file) {
-    if (dir[dir.length - 1] !== '/') {
-        dir = `${dir}/`;
-    }
+    dir = withTrailingSlash(dir);
     return (file.startsWith(dir) ||
         (isCaseInsensitiveFS && file.toLowerCase().startsWith(dir.toLowerCase())));
 }
@@ -3928,8 +3951,13 @@ function hasWorkspacePackageJSON(root) {
     if (!isFileReadable(path)) {
         return false;
     }
-    const content = JSON.parse(fs$1.readFileSync(path, 'utf-8')) || {};
-    return !!content.workspaces;
+    try {
+        const content = JSON.parse(fs$1.readFileSync(path, 'utf-8')) || {};
+        return !!content.workspaces;
+    }
+    catch {
+        return false;
+    }
 }
 function hasRootFile(root) {
     return ROOT_FILES.some((file) => fs$1.existsSync(path$3.join(root, file)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.4.9",
+  "version": "4.4.10",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -28,6 +28,9 @@
       "types": "./client.d.ts"
     },
     "./dist/client/*": "./dist/client/*",
+    "./types/*": {
+      "types": "./types/*"
+    },
     "./package.json": "./package.json"
   },
   "files": [