vite 5.0.0-beta.8 → 5.0.0-beta.9

package/dist/node/chunks/{dep-3accc834.js → dep-6d23b7fa.js}

@@ -1,4 +1,4 @@
-import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-73034a1b.js';
+import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-ffdf177d.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-0b82e789.js → dep-e04185e5.js}

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-73034a1b.js';
+import { y as getDefaultExportFromCjs } from './dep-ffdf177d.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';

package/dist/node/chunks/{dep-73034a1b.js → dep-ffdf177d.js}

@@ -12,6 +12,7 @@ import * as require$$0$2 from 'fs';
 import require$$0__default, { existsSync, readFileSync, statSync as statSync$1, readdirSync } from 'fs';
 import require$$0$5 from 'events';
 import require$$5 from 'assert';
+import { createServer as createServer$3, STATUS_CODES, get as get$1 } from 'node:http';
 import require$$0$6 from 'util';
 import require$$4$1 from 'net';
 import require$$0$9 from 'url';
@@ -34,7 +35,6 @@ import { VERSION } from 'rollup';
 import * as qs from 'querystring';
 import readline from 'node:readline';
 import { EventEmitter as EventEmitter$4 } from 'node:events';
-import { createServer as createServer$3, STATUS_CODES } from 'node:http';
 import { createServer as createServer$2 } from 'node:https';
 import require$$0$a from 'zlib';
 import require$$0$b from 'buffer';
@@ -12442,21 +12442,17 @@ function ensureWatchedFile(watcher, file, root) {
 }
 const escapedSpaceCharacters = /( |\\t|\\n|\\f|\\r)+/g;
 const imageSetUrlRE = /^(?:[\w\-]+\(.*?\)|'.*?'|".*?"|\S*)/;
-function reduceSrcset(ret) {
-    return ret.reduce((prev, { url, descriptor }, index) => {
-        descriptor ??= '';
-        return (prev +=
-            url + ` ${descriptor}${index === ret.length - 1 ? '' : ', '}`);
-    }, '');
+function joinSrcset(ret) {
+    return ret.map(({ url, descriptor }) => `${url} ${descriptor}`).join(', ');
 }
 function splitSrcSetDescriptor(srcs) {
     return splitSrcSet(srcs)
         .map((s) => {
         const src = s.replace(escapedSpaceCharacters, ' ').trim();
-        const [url] = imageSetUrlRE.exec(src) || [''];
+        const url = imageSetUrlRE.exec(src)?.[0] ?? '';
         return {
             url,
-            descriptor: src?.slice(url.length).trim(),
+            descriptor: src.slice(url.length).trim(),
         };
     })
         .filter(({ url }) => !!url);
@@ -12465,10 +12461,10 @@ function processSrcSet(srcs, replacer) {
     return Promise.all(splitSrcSetDescriptor(srcs).map(async ({ url, descriptor }) => ({
         url: await replacer({ url, descriptor }),
         descriptor,
-    }))).then((ret) => reduceSrcset(ret));
+    }))).then(joinSrcset);
 }
 function processSrcSetSync(srcs, replacer) {
-    return reduceSrcset(splitSrcSetDescriptor(srcs).map(({ url, descriptor }) => ({
+    return joinSrcset(splitSrcSetDescriptor(srcs).map(({ url, descriptor }) => ({
         url: replacer({ url, descriptor }),
         descriptor,
     })));
@@ -12666,12 +12662,6 @@ function arraify(target) {
 const multilineCommentsRE$1 = /\/\*[^*]*\*+(?:[^/*][^*]*\*+)*\//g;
 const singlelineCommentsRE$1 = /\/\/.*/g;
 const requestQuerySplitRE = /\?(?!.*[/|}])/;
-/**
- * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
- *
- * @param file File path to import.
- */
-const dynamicImport = new Function('file', 'return import(file)');
 function parseRequest(id) {
     const [_, search] = id.split(requestQuerySplitRE, 2);
     if (!search) {
@@ -15517,8 +15507,8 @@ function assetPlugin(config) {
                 return;
             }
             id = id.replace(urlRE, '$1').replace(unnededFinalQueryCharRE, '');
-            const url = await fileToUrl(id, config, this);
-            return `export default ${JSON.stringify(url)}`;
+            const url = await fileToUrl$1(id, config, this);
+            return `export default ${JSON.stringify(config.command === 'serve' ? `${url}?t=${Date.now()}` : url)}`;
         },
         renderChunk(code, chunk, opts) {
             const s = renderAssetUrlInJS(this, config, chunk, opts, code);
@@ -15568,7 +15558,7 @@ function checkPublicFile(url, { publicDir }) {
         return;
     }
 }
-async function fileToUrl(id, config, ctx) {
+async function fileToUrl$1(id, config, ctx) {
     if (config.command === 'serve') {
         return fileToDevUrl(id, config);
     }
@@ -37694,7 +37684,7 @@ function cssPlugin(config) {
                 }
                 const resolved = await resolveUrl(url, importer);
                 if (resolved) {
-                    return fileToUrl(resolved, config, this);
+                    return fileToUrl$1(resolved, config, this);
                 }
                 if (config.command === 'build') {
                     const isExternal = config.build.rollupOptions.external
@@ -37734,7 +37724,7 @@ function cssPlugin(config) {
                         for (const file of deps) {
                             depModules.add(isCSSRequest(file)
                                 ? moduleGraph.createFileOnlyEntry(file)
-                                : await moduleGraph.ensureEntryFromUrl(stripBase(await fileToUrl(file, config, this), (config.server?.origin ?? '') + devBase), ssr));
+                                : await moduleGraph.ensureEntryFromUrl(stripBase(await fileToUrl$1(file, config, this), (config.server?.origin ?? '') + devBase), ssr));
                         }
                         moduleGraph.updateModuleInfo(thisModule, depModules, null, 
                         // The root CSS proxy module is self-accepting and should not
@@ -38420,8 +38410,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-0b82e789.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-3accc834.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-e04185e5.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-6d23b7fa.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -41924,7 +41914,7 @@ const wasmHelperPlugin = (config) => {
             if (!id.endsWith('.wasm?init')) {
                 return;
             }
-            const url = await fileToUrl(id, config, this);
+            const url = await fileToUrl$1(id, config, this);
             return `
 import initWasm from "${wasmHelperId}"
 export default opts => initWasm(opts, ${JSON.stringify(url)})
@@ -42216,7 +42206,7 @@ function webWorkerPlugin(config) {
                 }
             }
             else {
-                url = await fileToUrl(cleanUrl(id), config, this);
+                url = await fileToUrl$1(cleanUrl(id), config, this);
                 url = injectQuery(url, WORKER_FILE_ID);
                 url = injectQuery(url, `type=${workerType}`);
             }
@@ -42624,7 +42614,7 @@ function workerImportMetaUrlPlugin(config) {
                         builtUrl = await workerFileToUrl(config, file, query);
                     }
                     else {
-                        builtUrl = await fileToUrl(cleanUrl(file), config, this);
+                        builtUrl = await fileToUrl$1(cleanUrl(file), config, this);
                         builtUrl = injectQuery(builtUrl, WORKER_FILE_ID);
                         builtUrl = injectQuery(builtUrl, `type=${workerType}`);
                     }
@@ -42737,10 +42727,10 @@ function assetImportMetaUrlPlugin(config) {
                         try {
                             if (isParentDirectory(normalizedPublicDir, file)) {
                                 const publicPath = '/' + path$o.posix.relative(normalizedPublicDir, file);
-                                builtUrl = await fileToUrl(publicPath, config, this);
+                                builtUrl = await fileToUrl$1(publicPath, config, this);
                             }
                             else {
-                                builtUrl = await fileToUrl(file, config, this);
+                                builtUrl = await fileToUrl$1(file, config, this);
                             }
                         }
                         catch {
@@ -43006,14 +42996,17 @@ function parseDynamicImportPattern(strings) {
     }
     const [userPattern] = userPatternQuery.split(requestQuerySplitRE, 2);
     const [rawPattern] = filename.split(requestQuerySplitRE, 2);
-    if (rawQuery?.raw !== undefined) {
-        globParams = { as: 'raw' };
-    }
-    if (rawQuery?.url !== undefined) {
-        globParams = { as: 'url' };
+    const as = ['worker', 'url', 'raw'].find((key) => rawQuery && key in rawQuery);
+    if (as) {
+        globParams = {
+            as,
+            import: '*',
+        };
     }
-    if (rawQuery?.worker !== undefined) {
-        globParams = { as: 'worker' };
+    else if (rawQuery) {
+        globParams = {
+            query: rawQuery,
+        };
     }
     return {
         globParams,
@@ -43035,9 +43028,7 @@ async function transformDynamicImport(importSource, importer, resolve, root) {
         return null;
     }
     const { globParams, rawPattern, userPattern } = dynamicImportPattern;
-    const params = globParams
-        ? `, ${JSON.stringify({ ...globParams, import: '*' })}`
-        : '';
+    const params = globParams ? `, ${JSON.stringify(globParams)}` : '';
     let newRawPattern = posix$1.relative(posix$1.dirname(importer), await toAbsoluteGlob(rawPattern, root, importer, resolve));
     if (!relativePathRE.test(newRawPattern)) {
         newRawPattern = `./${newRawPattern}`;
@@ -55762,7 +55753,7 @@ async function nodeImport(id, importer, resolveOptions) {
         }
         url = pathToFileURL(resolved.id).toString();
     }
-    const mod = await dynamicImport(url);
+    const mod = await import(url);
     return proxyESM(mod);
 }
 // rollup-style default import interop for cjs
@@ -64271,31 +64262,24 @@ const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, s
             url = injectQuery(url, `t=${mod.lastHMRTimestamp}`);
         }
     }
-    const devBase = config.base;
-    if (url[0] === '/' && url[1] !== '/') {
-        // prefix with base (dev only, base is never relative)
-        const fullUrl = path$o.posix.join(devBase, url);
-        if (server && shouldPreTransform(url, config)) {
-            preTransformRequest(server, fullUrl, devBase);
-        }
-        return fullUrl;
-    }
-    else if ((url[0] === '.' || startsWithWordCharRE.test(url)) &&
-        originalUrl &&
-        originalUrl !== '/' &&
-        htmlPath === '/index.html') {
+    if ((url[0] === '/' && url[1] !== '/') ||
+        // #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`.
+        // rewrite after `../index.js` -> `localhost:5173/index.js`.
+        ((url[0] === '.' || startsWithWordCharRE.test(url)) &&
+            originalUrl &&
+            originalUrl !== '/' &&
+            htmlPath === '/index.html')) {
         // prefix with base (dev only, base is never relative)
         const replacer = (url) => {
+            const devBase = config.base;
             const fullUrl = path$o.posix.join(devBase, url);
             if (server && shouldPreTransform(url, config)) {
                 preTransformRequest(server, fullUrl, devBase);
             }
             return fullUrl;
         };
-        // #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`.
-        // rewrite after `../index.js` -> `localhost:5173/index.js`.
         const processedUrl = useSrcSetReplacer
             ? processSrcSetSync(url, ({ url }) => replacer(url))
             : replacer(url);
@@ -64827,6 +64811,71 @@ class ModuleGraph {
     }
 }
 
+function warmupFiles(server) {
+    const options = server.config.server.warmup;
+    const root = server.config.root;
+    if (options?.clientFiles?.length) {
+        mapFiles(options.clientFiles, root).then((files) => {
+            for (const file of files) {
+                warmupFile(server, file, false);
+            }
+        });
+    }
+    if (options?.ssrFiles?.length) {
+        mapFiles(options.ssrFiles, root).then((files) => {
+            for (const file of files) {
+                warmupFile(server, file, true);
+            }
+        });
+    }
+}
+async function warmupFile(server, file, ssr) {
+    try {
+        // transform html with the `transformIndexHtml` hook as Vite internals would
+        // pre-transform the imported JS modules linked. this may cause `transformIndexHtml`
+        // plugins to be executed twice, but that's probably fine.
+        if (file.endsWith('.html')) {
+            const url = htmlFileToUrl(file, server.config.root);
+            if (url) {
+                const html = await fsp.readFile(file, 'utf-8');
+                await server.transformIndexHtml(url, html);
+            }
+        }
+        // for other files, pass it through `transformRequest`. this is what Vite uses
+        // for it's `server.preTransformRequests` option.
+        else {
+            const url = fileToUrl(file, server.config.root);
+            await server.transformRequest(url, { ssr });
+        }
+    }
+    catch (e) {
+        server.config.logger.error(colors$1.red(`Failed to warm up ${colors$1.cyan(file)}:\n`) + e.message);
+    }
+}
+function htmlFileToUrl(file, root) {
+    const url = path$o.relative(root, file);
+    // out of root, ignore file
+    if (url[0] === '.')
+        return;
+    // file within root, create root-relative url
+    return '/' + normalizePath$3(url);
+}
+function fileToUrl(file, root) {
+    const url = path$o.relative(root, file);
+    // out of root, use /@fs/ prefix
+    if (url[0] === '.') {
+        return path$o.posix.join(FS_PREFIX, normalizePath$3(file));
+    }
+    // file within root, create root-relative url
+    return '/' + normalizePath$3(url);
+}
+function mapFiles(files, root) {
+    return glob(files, {
+        cwd: root,
+        absolute: true,
+    });
+}
+
 function createServer(inlineConfig = {}) {
     return _createServer(inlineConfig, { ws: true });
 }
@@ -64907,6 +64956,29 @@ async function _createServer(inlineConfig = {}, options) {
                 const path = typeof options.open === 'string'
                     ? new URL(options.open, url).href
                     : url;
+                // We know the url that the browser would be opened to, so we can
+                // start the request while we are awaiting the browser. This will
+                // start the crawling of static imports ~500ms before.
+                // preTransformRequests needs to be enabled for this optimization.
+                if (server.config.server.preTransformRequests) {
+                    setTimeout(() => {
+                        get$1(path, {
+                            headers: {
+                                // Allow the history middleware to redirect to /index.html
+                                Accept: 'text/html',
+                            },
+                        }, (res) => {
+                            res.on('end', () => {
+                                // Ignore response, scripts discovered while processing the entry
+                                // will be preprocessed (server.config.server.preTransformRequests)
+                            });
+                        })
+                            .on('error', () => {
+                            // Ignore errors
+                        })
+                            .end();
+                    }, 0);
+                }
                 openBrowser(path, true, server.config.logger);
             }
             else {
@@ -65110,6 +65182,7 @@ async function _createServer(inlineConfig = {}, options) {
             if (isDepsOptimizerEnabled(config, false)) {
                 await initDepsOptimizer(config, server);
             }
+            warmupFiles(server);
             initingServer = undefined;
             serverInited = true;
         })();
@@ -66097,7 +66170,7 @@ async function loadConfigFromBundledFile(fileName, bundledCode, isESM) {
         const fileUrl = `${pathToFileURL(fileBase)}.mjs`;
         await fsp.writeFile(fileNameTmp, bundledCode);
         try {
-            return (await dynamicImport(fileUrl)).default;
+            return (await import(fileUrl)).default;
         }
         finally {
             fs$l.unlink(fileNameTmp, () => { }); // Ignore errors

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 { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-73034a1b.js';
+import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-ffdf177d.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -13,6 +13,7 @@ import 'esbuild';
 import 'path';
 import 'fs';
 import 'assert';
+import 'node:http';
 import 'util';
 import 'net';
 import 'url';
@@ -34,7 +35,6 @@ import 'rollup';
 import 'querystring';
 import 'node:readline';
 import 'node:events';
-import 'node:http';
 import 'node:https';
 import 'zlib';
 import 'buffer';
@@ -759,7 +759,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-73034a1b.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-ffdf177d.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -840,7 +840,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-73034a1b.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-ffdf177d.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -868,7 +868,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-73034a1b.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-ffdf177d.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -895,7 +895,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-73034a1b.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-ffdf177d.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -1460,6 +1460,20 @@ interface ServerOptions extends CommonServerOptions {
      * Configure HMR-specific options (port, host, path & protocol)
      */
     hmr?: HmrOptions | boolean;
+    /**
+     * Warm-up files to transform and cache the results in advance. This improves the
+     * initial page load during server starts and prevents transform waterfalls.
+     */
+    warmup?: {
+        /**
+         * The files to be transformed and used on the client-side. Supports glob patterns.
+         */
+        clientFiles?: string[];
+        /**
+         * The files to be transformed and used in SSR. Supports glob patterns.
+         */
+        ssrFiles?: string[];
+    };
     /**
      * chokidar watch options or null to disable FS watching
      * https:

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-73034a1b.js';
-export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-73034a1b.js';
+import { i as isInNodeModules } from './chunks/dep-ffdf177d.js';
+export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-ffdf177d.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -15,6 +15,7 @@ import 'path';
 import 'fs';
 import 'events';
 import 'assert';
+import 'node:http';
 import 'util';
 import 'net';
 import 'url';
@@ -35,7 +36,6 @@ import 'node:v8';
 import 'querystring';
 import 'node:readline';
 import 'node:events';
-import 'node:http';
 import 'node:https';
 import 'zlib';
 import 'buffer';

package/dist/node-cjs/publicUtils.cjs

@@ -3487,12 +3487,6 @@ function isFileReadable(filename) {
 function arraify(target) {
     return Array.isArray(target) ? target : [target];
 }
-/**
- * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
- *
- * @param file File path to import.
- */
-new Function('file', 'return import(file)');
 path$3.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))));
 function mergeConfigRecursively(defaults, overrides, rootPath) {
     const merged = { ...defaults };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.8",
+  "version": "5.0.0-beta.9",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",