vite 4.0.0-alpha.3 → 4.0.0-alpha.5

package/dist/node/chunks/{dep-f5aa12ea.js → dep-fadb3c21.js}

@@ -1,6 +1,6 @@
 import fs$l, { promises as promises$2 } from 'node:fs';
-import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, resolve as resolve$6, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
-import { URL as URL$3, URLSearchParams, parse as parse$j, pathToFileURL as pathToFileURL$1 } from 'node:url';
+import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
+import { URL as URL$3, URLSearchParams, parse as parse$j, pathToFileURL } from 'node:url';
 import { performance } from 'node:perf_hooks';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
 import require$$0$3 from 'tty';
@@ -12,7 +12,7 @@ import require$$0$5 from 'events';
 import assert$1 from 'assert';
 import require$$0$6, { format as format$2, inspect } from 'util';
 import require$$3$1 from 'net';
-import require$$0$9, { pathToFileURL } from 'url';
+import require$$0$9 from 'url';
 import require$$1$1 from 'http';
 import require$$0$7 from 'stream';
 import require$$2 from 'os';
@@ -22,7 +22,7 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promisify as promisify$4 } from 'node:util';
 import { promises } from 'node:dns';
 import resolve$5 from 'resolve';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5 from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -32,6 +32,7 @@ import require$$1$2 from 'https';
 import require$$4 from 'tls';
 import { STATUS_CODES } from 'node:http';
 import { createServer as createServer$2 } from 'node:https';
+import { VERSION } from 'rollup';
 import * as qs from 'querystring';
 import readline from 'node:readline';
 import { execSync } from 'node:child_process';
@@ -12671,21 +12672,21 @@ function buildReporterPlugin(config) {
     const chunkLimit = config.build.chunkSizeWarningLimit;
     function isLarge(code) {
         // bail out on particularly large chunks
-        return code.length / 1024 > chunkLimit;
+        return code.length / 1000 > chunkLimit;
     }
     async function getCompressedSize(code) {
         if (config.build.ssr || !config.build.reportCompressedSize) {
             return '';
         }
-        return ` / gzip: ${((await compress(typeof code === 'string' ? code : Buffer.from(code)))
-            .length / 1024).toFixed(2)} KiB`;
+        return ` / gzip: ${displaySize((await compress(typeof code === 'string' ? code : Buffer.from(code)))
+            .length / 1000)}`;
     }
     function printFileInfo(filePath, content, type, maxLength, outDir = config.build.outDir, compressedSize = '') {
         outDir =
             normalizePath$3(path$o.relative(config.root, path$o.resolve(config.root, outDir))) + '/';
-        const kibs = content.length / 1024;
-        const sizeColor = kibs > chunkLimit ? picocolors.exports.yellow : picocolors.exports.dim;
-        config.logger.info(`${picocolors.exports.gray(picocolors.exports.white(picocolors.exports.dim(outDir)))}${writeColors[type](filePath.padEnd(maxLength + 2))} ${sizeColor(`${kibs.toFixed(2)} KiB${compressedSize}`)}`);
+        const kB = content.length / 1000;
+        const sizeColor = kB > chunkLimit ? picocolors.exports.yellow : picocolors.exports.dim;
+        config.logger.info(`${picocolors.exports.gray(picocolors.exports.white(picocolors.exports.dim(outDir)))}${writeColors[type](filePath.padEnd(maxLength + 2))} ${sizeColor(`${displaySize(kB)}${compressedSize}`)}`);
     }
     const tty = process.stdout.isTTY && !process.env.CI;
     const shouldLogInfo = LogLevels[config.logLevel || 'info'] >= LogLevels.info;
@@ -12792,14 +12793,14 @@ function buildReporterPlugin(config) {
             else {
                 hasLargeChunks = Object.keys(output).some((file) => {
                     const chunk = output[file];
-                    return chunk.type === 'chunk' && chunk.code.length / 1024 > chunkLimit;
+                    return chunk.type === 'chunk' && chunk.code.length / 1000 > chunkLimit;
                 });
             }
             if (hasLargeChunks &&
                 config.build.minify &&
                 !config.build.lib &&
                 !config.build.ssr) {
-                config.logger.warn(picocolors.exports.yellow(`\n(!) Some chunks are larger than ${chunkLimit} KiB after minification. Consider:\n` +
+                config.logger.warn(picocolors.exports.yellow(`\n(!) Some chunks are larger than ${chunkLimit} kBs after minification. Consider:\n` +
                     `- Using dynamic import() to code-split the application\n` +
                     `- Use build.rollupOptions.output.manualChunks to improve chunking: https://rollupjs.org/guide/en/#outputmanualchunks\n` +
                     `- Adjust chunk size limit for this warning via build.chunkSizeWarningLimit.`));
@@ -12828,6 +12829,12 @@ function throttle(fn) {
         }, 100);
     };
 }
+function displaySize(kB) {
+    return `${kB.toLocaleString('en', {
+        maximumFractionDigits: 2,
+        minimumFractionDigits: 2
+    })} kB`;
+}
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -20457,43 +20464,6 @@ var acorn = {
 	version: version
 };
 
-const HASH_RE = /#/g;
-const AMPERSAND_RE = /&/g;
-const EQUAL_RE = /=/g;
-const PLUS_RE = /\+/g;
-const ENC_BRACKET_OPEN_RE = /%5B/gi;
-const ENC_BRACKET_CLOSE_RE = /%5D/gi;
-const ENC_CARET_RE = /%5E/gi;
-const ENC_BACKTICK_RE = /%60/gi;
-const ENC_CURLY_OPEN_RE = /%7B/gi;
-const ENC_PIPE_RE = /%7C/gi;
-const ENC_CURLY_CLOSE_RE = /%7D/gi;
-const ENC_SPACE_RE = /%20/gi;
-function encode(text) {
-  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
-}
-function encodeQueryValue(text) {
-  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
-}
-function encodeQueryKey(text) {
-  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
-}
-function encodeQueryItem(key, val) {
-  if (typeof val === "number" || typeof val === "boolean") {
-    val = String(val);
-  }
-  if (!val) {
-    return encodeQueryKey(key);
-  }
-  if (Array.isArray(val)) {
-    return val.map((_val) => `${encodeQueryKey(key)}=${encodeQueryValue(_val)}`).join("&");
-  }
-  return `${encodeQueryKey(key)}=${encodeQueryValue(val)}`;
-}
-function stringifyQuery(query) {
-  return Object.keys(query).map((k) => encodeQueryItem(k, query[k])).join("&");
-}
-
 function matchAll(regex, string, addition) {
   const matches = [];
   for (const match of string.matchAll(regex)) {
@@ -20699,22 +20669,22 @@ function getMessage(key, args, self) {
 Object.freeze(["node", "import"]);
 pathToFileURL(process.cwd());
 
-const ESM_STATIC_IMPORT_RE = /(?<=\s|^|;)import\s*(["'\s]*(?<imports>[\w*${}\n\r\t, /]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^"\s](?=\s*")|(?<='\s*)[^']*[^'\s](?=\s*'))\s*["'][\s;]*/gm;
+const ESM_STATIC_IMPORT_RE = /(?<=\s|^|;)import\s*([\s"']*(?<imports>[\w\t\n\r $*,/{}]+)from\s*)?["']\s*(?<specifier>(?<="\s*)[^"]*[^\s"](?=\s*")|(?<='\s*)[^']*[^\s'](?=\s*'))\s*["'][\s;]*/gm;
 function findStaticImports(code) {
   return matchAll(ESM_STATIC_IMPORT_RE, code, { type: "static" });
 }
 function parseStaticImport(matched) {
   const cleanedImports = (matched.imports || "").replace(/(\/\/[^\n]*\n|\/\*.*\*\/)/g, "").replace(/\s+/g, " ");
   const namedImports = {};
-  for (const namedImport of cleanedImports.match(/\{([^}]*)\}/)?.[1]?.split(",") || []) {
-    const [, source = namedImport.trim(), importName = source] = namedImport.match(/^\s*([^\s]*) as ([^\s]*)\s*$/) || [];
+  for (const namedImport of cleanedImports.match(/{([^}]*)}/)?.[1]?.split(",") || []) {
+    const [, source = namedImport.trim(), importName = source] = namedImport.match(/^\s*(\S*) as (\S*)\s*$/) || [];
     if (source) {
       namedImports[source] = importName;
     }
   }
-  const topLevelImports = cleanedImports.replace(/\{([^}]*)\}/, "");
-  const namespacedImport = topLevelImports.match(/\* as \s*([^\s]*)/)?.[1];
-  const defaultImport = topLevelImports.split(",").find((i) => !i.match(/[*{}]/))?.trim() || void 0;
+  const topLevelImports = cleanedImports.replace(/{([^}]*)}/, "");
+  const namespacedImport = topLevelImports.match(/\* as \s*(\S*)/)?.[1];
+  const defaultImport = topLevelImports.split(",").find((index) => !/[*{}]/.test(index))?.trim() || void 0;
   return {
     ...matched,
     defaultImport,
@@ -20723,7 +20693,7 @@ function parseStaticImport(matched) {
   };
 }
 
-const ESM_RE = /([\s;]|^)(import[\w,{}\s*]*from|import\s*['"*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
+const ESM_RE = /([\s;]|^)(import[\s\w*,{}]*from|import\s*["'*{]|export\b\s*(?:[*{]|default|class|type|function|const|var|let|async function)|import\.meta\b)/m;
 function hasESMSyntax(code) {
   return ESM_RE.test(code);
 }
@@ -20884,9 +20854,9 @@ async function bundleWorkerEntry(config, id, query) {
                 : workerOutputConfig
             : {};
         const { output: [outputChunk, ...outputChunks] } = await bundle.generate({
-            entryFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].js'),
-            chunkFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].js'),
-            assetFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].[ext]'),
+            entryFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].js'),
+            chunkFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].js'),
+            assetFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].[ext]'),
             ...workerConfig,
             format,
             sourcemap: config.build.sourcemap
@@ -35190,7 +35160,7 @@ function traverseNodes(node, visitor) {
 }
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse } = await import('./dep-adb60dd8.js');
+    const { parse } = await import('./dep-31fe3c68.js');
     const ast = parse(html, {
         sourceCodeLocationInfo: true,
         onParseError: (e) => {
@@ -36451,7 +36421,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-b522a97d.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-72c42a3f.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -36460,9 +36430,9 @@ async function compileCSS(id, code, config, urlReplacer) {
                     modulesOptions.getJSON(cssFileName, _modules, outputFileName);
                 }
             },
-            async resolve(id) {
+            async resolve(id, importer) {
                 for (const key of getCssResolversKeys(atImportResolvers)) {
-                    const resolved = await atImportResolvers[key](id);
+                    const resolved = await atImportResolvers[key](id, importer);
                     if (resolved) {
                         return path$o.resolve(resolved);
                     }
@@ -37153,6 +37123,43 @@ function getCssDialect(lang) {
     return lang === 'sss' ? 'sss' : 'css';
 }
 
+const HASH_RE = /#/g;
+const AMPERSAND_RE = /&/g;
+const EQUAL_RE = /=/g;
+const PLUS_RE = /\+/g;
+const ENC_BRACKET_OPEN_RE = /%5B/gi;
+const ENC_BRACKET_CLOSE_RE = /%5D/gi;
+const ENC_CARET_RE = /%5E/gi;
+const ENC_BACKTICK_RE = /%60/gi;
+const ENC_CURLY_OPEN_RE = /%7B/gi;
+const ENC_PIPE_RE = /%7C/gi;
+const ENC_CURLY_CLOSE_RE = /%7D/gi;
+const ENC_SPACE_RE = /%20/gi;
+function encode(text) {
+  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
+}
+function encodeQueryValue(text) {
+  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
+}
+function encodeQueryKey(text) {
+  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
+}
+function encodeQueryItem(key, val) {
+  if (typeof val === "number" || typeof val === "boolean") {
+    val = String(val);
+  }
+  if (!val) {
+    return encodeQueryKey(key);
+  }
+  if (Array.isArray(val)) {
+    return val.map((_val) => `${encodeQueryKey(key)}=${encodeQueryValue(_val)}`).join("&");
+  }
+  return `${encodeQueryKey(key)}=${encodeQueryValue(val)}`;
+}
+function stringifyQuery(query) {
+  return Object.keys(query).map((k) => encodeQueryItem(k, query[k])).join("&");
+}
+
 const { isMatch: isMatch$1, scan } = micromatch_1;
 function getAffectedGlobModules(file, server) {
     const modules = [];
@@ -37616,7 +37623,7 @@ async function handleHMRUpdate(file, server) {
     }
     updateModules(shortFile, hmrContext.modules, timestamp, server);
 }
-function updateModules(file, modules, timestamp, { config, ws }) {
+function updateModules(file, modules, timestamp, { config, ws }, afterInvalidation) {
     const updates = [];
     const invalidatedModules = new Set();
     let needFullReload = false;
@@ -37643,7 +37650,7 @@ function updateModules(file, modules, timestamp, { config, ws }) {
     }
     if (needFullReload) {
         config.logger.info(picocolors.exports.green(`page reload `) + picocolors.exports.dim(file), {
-            clear: true,
+            clear: !afterInvalidation,
             timestamp: true
         });
         ws.send({
@@ -37656,7 +37663,7 @@ function updateModules(file, modules, timestamp, { config, ws }) {
         return;
     }
     config.logger.info(picocolors.exports.green(`hmr update `) +
-        picocolors.exports.dim([...new Set(updates.map((u) => u.path))].join(', ')), { clear: true, timestamp: true });
+        picocolors.exports.dim([...new Set(updates.map((u) => u.path))].join(', ')), { clear: !afterInvalidation, timestamp: true });
     ws.send({
         type: 'update',
         updates
@@ -38992,7 +38999,7 @@ function importAnalysisPlugin(config) {
                 // properly finish the request with a 504 sent to the browser.
                 throwOutdatedRequest(importer);
             }
-            if (!imports.length) {
+            if (!imports.length && !this._addedImports) {
                 importerModule.isSelfAccepting = false;
                 isDebug$1 &&
                     debug$9(`${timeFrom(start)} ${picocolors.exports.dim(`[no imports] ${prettyImporter}`)}`);
@@ -39013,7 +39020,7 @@ function importAnalysisPlugin(config) {
                 ? new Map()
                 : null;
             const toAbsoluteUrl = (url) => path$o.posix.resolve(path$o.posix.dirname(importerModule.url), url);
-            const normalizeUrl = async (url, pos) => {
+            const normalizeUrl = async (url, pos, forceSkipImportAnalysis = false) => {
                 url = stripBase(url, base);
                 let importerFile = importer;
                 const optimizeDeps = getDepOptimizationConfig(config, ssr);
@@ -39091,7 +39098,7 @@ function importAnalysisPlugin(config) {
                     // up-to-date version of this module.
                     try {
                         // delay setting `isSelfAccepting` until the file is actually used (#7870)
-                        const depModule = await moduleGraph.ensureEntryFromUrl(unwrapId(url), ssr, canSkipImportAnalysis(url));
+                        const depModule = await moduleGraph.ensureEntryFromUrl(unwrapId(url), ssr, canSkipImportAnalysis(url) || forceSkipImportAnalysis);
                         if (depModule.lastHMRTimestamp > 0) {
                             url = injectQuery(url, `t=${depModule.lastHMRTimestamp}`);
                         }
@@ -39306,7 +39313,7 @@ function importAnalysisPlugin(config) {
                 // attached by pluginContainer.addWatchFile
                 const pluginImports = this._addedImports;
                 if (pluginImports) {
-                    (await Promise.all([...pluginImports].map((id) => normalizeUrl(id, 0)))).forEach(([url]) => importedUrls.add(url));
+                    (await Promise.all([...pluginImports].map((id) => normalizeUrl(id, 0, true)))).forEach(([url]) => importedUrls.add(url));
                 }
                 // HMR transforms are no-ops in SSR, so an `accept` call will
                 // never be injected. Avoid updating the `isSelfAccepting`
@@ -42032,14 +42039,9 @@ async function createPluginContainer(config, moduleGraph, watcher) {
     });
     // ---------------------------------------------------------------------------
     const watchFiles = new Set();
-    // TODO: use import()
-    const _require = createRequire$1(import.meta.url);
-    // get rollup version
-    const rollupPkgPath = resolve$6(_require.resolve('rollup'), '../../package.json');
     const minimalContext = {
         meta: {
-            rollupVersion: JSON.parse(fs$l.readFileSync(rollupPkgPath, 'utf-8'))
-                .version,
+            rollupVersion: VERSION,
             watchMode: true
         }
     };
@@ -45215,7 +45217,7 @@ async function doBuild(inlineConfig = {}) {
     const options = config.build;
     const ssr = !!options.ssr;
     const libOptions = options.lib;
-    config.logger.info(picocolors.exports.cyan(`vite v${VERSION} ${picocolors.exports.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
+    config.logger.info(picocolors.exports.cyan(`vite v${VERSION$1} ${picocolors.exports.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
     const resolve = (p) => path$o.resolve(config.root, p);
     const input = libOptions
         ? options.rollupOptions?.input ||
@@ -45304,13 +45306,13 @@ async function doBuild(inlineConfig = {}) {
                     ? `[name].${jsExt}`
                     : libOptions
                         ? ({ name }) => resolveLibFilename(libOptions, format, name, config.root, jsExt)
-                        : path$o.posix.join(options.assetsDir, `[name].[hash].${jsExt}`),
+                        : path$o.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
                 chunkFileNames: libOptions
-                    ? `[name].[hash].${jsExt}`
-                    : path$o.posix.join(options.assetsDir, `[name].[hash].${jsExt}`),
+                    ? `[name]-[hash].${jsExt}`
+                    : path$o.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
                 assetFileNames: libOptions
                     ? `[name].[ext]`
-                    : path$o.posix.join(options.assetsDir, `[name].[hash].[ext]`),
+                    : path$o.posix.join(options.assetsDir, `[name]-[hash].[ext]`),
                 inlineDynamicImports: output.format === 'umd' ||
                     output.format === 'iife' ||
                     (ssrWorkerBuild &&
@@ -52951,7 +52953,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     mod.ssrModule = ssrModule;
     const ssrImportMeta = {
         // The filesystem URL, matching native Node.js modules
-        url: pathToFileURL$1(mod.file).toString()
+        url: pathToFileURL(mod.file).toString()
     };
     urlStack = urlStack.concat(url);
     const isCircular = (url) => urlStack.includes(url);
@@ -53097,7 +53099,7 @@ async function nodeImport(id, importer, resolveOptions) {
             ? { ...resolveOptions, tryEsmOnly: true }
             : resolveOptions);
         if (usingDynamicImport) {
-            url = pathToFileURL$1(url).toString();
+            url = pathToFileURL(url).toString();
         }
     }
     try {
@@ -59780,11 +59782,6 @@ function proxyMiddleware(httpServer, options, config) {
                         debug$1(`bypass: ${req.url} -> ${bypassResult}`);
                         return next();
                     }
-                    else if (isObject$1(bypassResult)) {
-                        Object.assign(options, bypassResult);
-                        debug$1(`bypass: ${req.url} use modified options: %O`, options);
-                        return next();
-                    }
                     else if (bypassResult === false) {
                         debug$1(`bypass: ${req.url} -> 404`);
                         return res.end(404);
@@ -59940,16 +59937,12 @@ function htmlFallbackMiddleware(root, spaFallback) {
         rewrites: [
             {
                 from: /\/$/,
-                to({ parsedUrl }) {
+                to({ parsedUrl, request }) {
                     const rewritten = decodeURIComponent(parsedUrl.pathname) + 'index.html';
                     if (fs$l.existsSync(path$o.join(root, rewritten))) {
                         return rewritten;
                     }
-                    else {
-                        if (spaFallback) {
-                            return `/index.html`;
-                        }
-                    }
+                    return spaFallback ? `/index.html` : request.url;
                 }
             }
         ]
@@ -60164,14 +60157,15 @@ const processNodeUrl = (attr, sourceCodeLocation, s, config, htmlPath, originalU
     const devBase = config.base;
     if (startsWithSingleSlashRE.test(url)) {
         // prefix with base (dev only, base is never relative)
-        const fullUrl = joinUrlSegments(devBase, url);
+        const fullUrl = path$o.posix.join(devBase, url);
         overwriteAttrValue(s, sourceCodeLocation, fullUrl);
     }
     else if (url.startsWith('.') &&
         originalUrl &&
         originalUrl !== '/' &&
         htmlPath === '/index.html') {
-        const replacer = (url) => path$o.posix.join(devBase, path$o.posix.relative(originalUrl, devBase), url.slice(1));
+        // prefix with base (dev only, base is never relative)
+        const replacer = (url) => path$o.posix.join(devBase, url);
         // #3230 if some request url (localhost:3000/a/b) return to fallback html, the relative assets
         // path will add `/a/` prefix, it will caused 404.
         // rewrite before `./index.js` -> `localhost:5173/a/index.js`.
@@ -61794,11 +61788,14 @@ async function createServer(inlineConfig = {}) {
     watcher.on('unlink', (file) => {
         handleFileAddUnlink(normalizePath$3(file), server);
     });
-    ws.on('vite:invalidate', async ({ path }) => {
+    ws.on('vite:invalidate', async ({ path, message }) => {
         const mod = moduleGraph.urlToModuleMap.get(path);
         if (mod && mod.isSelfAccepting && mod.lastHMRTimestamp > 0) {
+            config.logger.info(picocolors.exports.yellow(`hmr invalidate `) +
+                picocolors.exports.dim(path) +
+                (message ? ` ${message}` : ''), { timestamp: true });
             const file = getShortName(mod.file, config.root);
-            updateModules(file, [...mod.importers], mod.lastHMRTimestamp, server);
+            updateModules(file, [...mod.importers], mod.lastHMRTimestamp, server, true);
         }
     });
     if (!middlewareMode && httpServer) {
@@ -62427,7 +62424,8 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         : pkgPath
             ? path$o.join(path$o.dirname(pkgPath), `node_modules/.vite`)
             : path$o.join(resolvedRoot, `.vite`);
-    const assetsFilter = config.assetsInclude
+    const assetsFilter = config.assetsInclude &&
+        (!Array.isArray(config.assetsInclude) || config.assetsInclude.length)
         ? createFilter(config.assetsInclude)
         : () => false;
     // create an internal resolver to be used in special scenarios, e.g.
@@ -62772,7 +62770,7 @@ async function bundleConfigFile(fileName, isESM) {
                         }
                         let idFsPath = tryNodeResolve(id, importer, options, false)?.id;
                         if (idFsPath && (isESM || kind === 'dynamic-import')) {
-                            idFsPath = pathToFileURL$1(idFsPath).href;
+                            idFsPath = pathToFileURL(idFsPath).href;
                         }
                         return {
                             path: idFsPath,
@@ -62788,7 +62786,7 @@ async function bundleConfigFile(fileName, isESM) {
                         const contents = await fs$l.promises.readFile(args.path, 'utf8');
                         const injectValues = `const ${dirnameVarName} = ${JSON.stringify(path$o.dirname(args.path))};` +
                             `const ${filenameVarName} = ${JSON.stringify(args.path)};` +
-                            `const ${importMetaUrlVarName} = ${JSON.stringify(pathToFileURL$1(args.path).href)};`;
+                            `const ${importMetaUrlVarName} = ${JSON.stringify(pathToFileURL(args.path).href)};`;
                         return {
                             loader: args.path.endsWith('ts') ? 'ts' : 'js',
                             contents: injectValues + contents
@@ -62812,7 +62810,7 @@ async function loadConfigFromBundledFile(fileName, bundledCode, isESM) {
     if (isESM) {
         const fileBase = `${fileName}.timestamp-${Date.now()}`;
         const fileNameTmp = `${fileBase}.mjs`;
-        const fileUrl = `${pathToFileURL$1(fileBase)}.mjs`;
+        const fileUrl = `${pathToFileURL(fileBase)}.mjs`;
         fs$l.writeFileSync(fileNameTmp, bundledCode);
         try {
             return (await dynamicImport(fileUrl)).default;

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 { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-f5aa12ea.js';
+import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-fadb3c21.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -32,6 +32,7 @@ import 'https';
 import 'tls';
 import 'node:http';
 import 'node:https';
+import 'rollup';
 import 'querystring';
 import 'node:readline';
 import 'node:child_process';
@@ -719,7 +720,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.D; });
+    const { createServer } = await import('./chunks/dep-fadb3c21.js').then(function (n) { return n.D; });
     try {
         const server = await createServer({
             root,
@@ -772,7 +773,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-f5aa12ea.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-fadb3c21.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -800,7 +801,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-f5aa12ea.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-fadb3c21.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -825,7 +826,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.E; });
+    const { preview } = await import('./chunks/dep-fadb3c21.js').then(function (n) { return n.E; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.5",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -76,7 +76,7 @@
     "@rollup/plugin-dynamic-import-vars": "^2.0.1",
     "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup/plugin-typescript": "^8.5.0",
+    "@rollup/plugin-typescript": "^9.0.2",
     "@rollup/pluginutils": "^4.2.1",
     "acorn": "^8.8.1",
     "cac": "^6.7.14",
@@ -99,17 +99,17 @@
     "launch-editor-middleware": "^2.6.0",
     "magic-string": "^0.26.7",
     "micromatch": "^4.0.5",
-    "mlly": "^0.5.16",
+    "mlly": "^0.5.17",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
-    "parse5": "^7.1.1",
+    "parse5": "^7.1.2",
     "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "postcss-import": "^15.0.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-modules": "^5.0.0",
+    "postcss-modules": "^6.0.0",
     "resolve.exports": "^1.1.0",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",

package/types/customEvent.d.ts

@@ -16,6 +16,7 @@ export interface CustomEventMap {
 
 export interface InvalidatePayload {
   path: string
+  message: string | undefined
 }
 
 export type InferCustomEventPayload<T extends string> =

package/types/hot.d.ts

@@ -23,7 +23,7 @@ export interface ViteHotContext {
 
   dispose(cb: (data: any) => void): void
   decline(): void
-  invalidate(): void
+  invalidate(message?: string): void
 
   on<T extends string>(
     event: T,