vite 5.0.5 → 5.0.6

package/dist/node/chunks/{dep-mpgFWQ-7.js → dep-I1uDMLJL.js}

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-MF_y65BT.js';
+import { y as getDefaultExportFromCjs } from './dep-YJaePtkC.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-8a-6Quh6.js';

package/dist/node/chunks/{dep-IrrVD4is.js → dep-Sacttr-6.js}

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

package/dist/node/chunks/{dep-MF_y65BT.js → dep-YJaePtkC.js}

@@ -27,11 +27,11 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
 import { CLIENT_ENTRY, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, SPECIAL_QUERY_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$0$a from 'crypto';
-import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
 import assert$1 from 'node:assert';
 import process$1 from 'node:process';
 import v8 from 'node:v8';
+import { Buffer as Buffer$1 } from 'node:buffer';
 import { VERSION } from 'rollup';
 import { parseAstAsync, parseAst } from 'rollup/parseAst';
 import * as qs from 'querystring';
@@ -12419,6 +12419,27 @@ function copyDir(srcDir, destDir) {
         }
     }
 }
+async function recursiveReaddir(dir) {
+    if (!fs$l.existsSync(dir)) {
+        return [];
+    }
+    let dirents;
+    try {
+        dirents = await fsp.readdir(dir, { withFileTypes: true });
+    }
+    catch (e) {
+        if (e.code === 'EACCES') {
+            // Ignore permission errors
+            return [];
+        }
+        throw e;
+    }
+    const files = await Promise.all(dirents.map((dirent) => {
+        const res = path$o.resolve(dir, dirent.name);
+        return dirent.isDirectory() ? recursiveReaddir(res) : normalizePath$3(res);
+    }));
+    return files.flat(1);
+}
 // `fs.realpathSync.native` resolves differently in Windows network drive,
 // causing file read errors. skip for now.
 // https://github.com/nodejs/node/issues/37737
@@ -16401,6 +16422,39 @@ function lookup(extn) {
 	return mimes$1[!~idx ? tmp : tmp.substring(++idx)];
 }
 
+const publicFilesMap = new WeakMap();
+async function initPublicFiles(config) {
+    const fileNames = await recursiveReaddir(config.publicDir);
+    const publicFiles = new Set(fileNames.map((fileName) => fileName.slice(config.publicDir.length)));
+    publicFilesMap.set(config, publicFiles);
+    return publicFiles;
+}
+function getPublicFiles(config) {
+    return publicFilesMap.get(config);
+}
+function checkPublicFile(url, config) {
+    // note if the file is in /public, the resolver would have returned it
+    // as-is so it's not going to be a fully resolved path.
+    const { publicDir } = config;
+    if (!publicDir || url[0] !== '/') {
+        return;
+    }
+    const fileName = cleanUrl(url);
+    // short-circuit if we have an in-memory publicFiles cache
+    const publicFiles = getPublicFiles(config);
+    if (publicFiles) {
+        return publicFiles.has(fileName)
+            ? normalizePath$3(path$o.join(publicDir, fileName))
+            : undefined;
+    }
+    const publicFile = normalizePath$3(path$o.join(publicDir, fileName));
+    if (!publicFile.startsWith(withTrailingSlash(normalizePath$3(publicDir)))) {
+        // can happen if URL starts with '../'
+        return;
+    }
+    return fs$l.existsSync(publicFile) ? publicFile : undefined;
+}
+
 // referenceId is base64url but replaces - with $
 const assetUrlRE = /__VITE_ASSET__([\w$]+)__(?:\$_(.*?)__)?/g;
 const rawRE = /(?:\?|&)raw(?:&|$)/;
@@ -16550,24 +16604,6 @@ function assetPlugin(config) {
         },
     };
 }
-function checkPublicFile(url, { publicDir }) {
-    // note if the file is in /public, the resolver would have returned it
-    // as-is so it's not going to be a fully resolved path.
-    if (!publicDir || url[0] !== '/') {
-        return;
-    }
-    const publicFile = path$o.join(publicDir, cleanUrl(url));
-    if (!normalizePath$3(publicFile).startsWith(withTrailingSlash(normalizePath$3(publicDir)))) {
-        // can happen if URL starts with '../'
-        return;
-    }
-    if (fs$l.existsSync(publicFile)) {
-        return publicFile;
-    }
-    else {
-        return;
-    }
-}
 async function fileToUrl$1(id, config, ctx) {
     if (config.command === 'serve') {
         return fileToDevUrl(id, config);
@@ -37976,9 +38012,7 @@ function polyfill() {
 const htmlProxyRE$1 = /\?html-proxy=?(?:&inline-css)?(?:&style-attr)?&index=(\d+)\.(js|css)$/;
 const inlineCSSRE$1 = /__VITE_INLINE_CSS__([a-z\d]{8}_\d+)__/g;
 // Do not allow preceding '.', but do allow preceding '...' for spread operations
-const inlineImportRE = 
-// eslint-disable-next-line regexp/no-unused-capturing-group -- https://github.com/ota-meshi/eslint-plugin-regexp/issues/675
-/(?<!(?<!\.\.)\.)\bimport\s*\(("(?:[^"]|(?<=\\)")*"|'(?:[^']|(?<=\\)')*')\)/dg;
+const inlineImportRE = /(?<!(?<!\.\.)\.)\bimport\s*\(("(?:[^"]|(?<=\\)")*"|'(?:[^']|(?<=\\)')*')\)/dg;
 const htmlLangRE = /\.(?:html|htm)$/;
 const importMapRE = /[ \t]*<script[^>]*type\s*=\s*(?:"importmap"|'importmap'|importmap)[^>]*>.*?<\/script>/is;
 const moduleScriptRE = /[ \t]*<script[^>]*type\s*=\s*(?:"module"|'module'|module)[^>]*>/i;
@@ -39703,8 +39737,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-mpgFWQ-7.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-IrrVD4is.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-I1uDMLJL.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-Sacttr-6.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -48640,7 +48674,7 @@ function sirv (dir, opts={}) {
 }
 
 const knownJavascriptExtensionRE = /\.[tj]sx?$/;
-const sirvOptions = ({ getHeaders, shouldServe, }) => {
+const sirvOptions = ({ getHeaders, }) => {
     return {
         dev: true,
         etag: true,
@@ -48661,19 +48695,33 @@ const sirvOptions = ({ getHeaders, shouldServe, }) => {
                 }
             }
         },
-        shouldServe,
     };
 };
-function servePublicMiddleware(server) {
+function servePublicMiddleware(server, publicFiles) {
     const dir = server.config.publicDir;
     const serve = sirv(dir, sirvOptions({
         getHeaders: () => server.config.server.headers,
-        shouldServe: (filePath) => shouldServeFile(filePath, dir),
     }));
+    const toFilePath = (url) => {
+        let filePath = cleanUrl(url);
+        if (filePath.indexOf('%') !== -1) {
+            try {
+                filePath = decodeURI(filePath);
+            }
+            catch (err) {
+                /* malform uri */
+            }
+        }
+        return normalizePath$3(filePath);
+    };
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServePublicMiddleware(req, res, next) {
-        // skip import request and internal requests `/@fs/ /@vite-client` etc...
-        if (isImportRequest(req.url) || isInternalRequest(req.url)) {
+        // To avoid the performance impact of `existsSync` on every request, we check against an
+        // in-memory set of known public files. This set is updated on restarts.
+        // also skip import request and internal requests `/@fs/ /@vite-client` etc...
+        if (!publicFiles.has(toFilePath(req.url)) ||
+            isImportRequest(req.url) ||
+            isInternalRequest(req.url)) {
             return next();
         }
         serve(req, res, next);
@@ -59546,6 +59594,7 @@ function createServer(inlineConfig = {}) {
 }
 async function _createServer(inlineConfig = {}, options) {
     const config = await resolveConfig(inlineConfig, 'serve');
+    const initPublicFilesPromise = initPublicFiles(config);
     const { root, server: serverConfig } = config;
     const httpsOptions = await resolveHttpsConfig(config.server.https);
     const { middlewareMode } = serverConfig;
@@ -59744,6 +59793,7 @@ async function _createServer(inlineConfig = {}, options) {
             process.stdin.on('end', exitProcess);
         }
     }
+    const publicFiles = await initPublicFilesPromise;
     const onHMRUpdate = async (file, configOnly) => {
         if (serverConfig.hmr !== false) {
             try {
@@ -59760,6 +59810,9 @@ async function _createServer(inlineConfig = {}, options) {
     const onFileAddUnlink = async (file, isUnlink) => {
         file = normalizePath$3(file);
         await container.watchChange(file, { event: isUnlink ? 'delete' : 'create' });
+        if (config.publicDir && file.startsWith(config.publicDir)) {
+            publicFiles[isUnlink ? 'delete' : 'add'](file.slice(config.publicDir.length));
+        }
         await handleFileAddUnlink(file, server, isUnlink);
         await onHMRUpdate(file, true);
     };
@@ -59831,7 +59884,7 @@ async function _createServer(inlineConfig = {}, options) {
     // this applies before the transform middleware so that these files are served
     // as-is without transforms.
     if (config.publicDir) {
-        middlewares.use(servePublicMiddleware(server));
+        middlewares.use(servePublicMiddleware(server, publicFiles));
     }
     // main transform middleware
     middlewares.use(transformMiddleware(server));
@@ -62061,9 +62114,7 @@ function workerImportMetaUrlPlugin(config) {
                 const query = parseRequest(id);
                 let s;
                 const cleanString = stripLiteral(code);
-                const workerImportMetaUrlRE = 
-                // eslint-disable-next-line regexp/no-unused-capturing-group -- https://github.com/ota-meshi/eslint-plugin-regexp/issues/675
-                /\bnew\s+(?:Worker|SharedWorker)\s*\(\s*(new\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\))/dg;
+                const workerImportMetaUrlRE = /\bnew\s+(?:Worker|SharedWorker)\s*\(\s*(new\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\))/dg;
                 let match;
                 while ((match = workerImportMetaUrlRE.exec(cleanString))) {
                     const [[, endIndex], [expStart, expEnd], [urlStart, urlEnd]] = match.indices;
@@ -62146,9 +62197,7 @@ function assetImportMetaUrlPlugin(config) {
                 code.includes('new URL') &&
                 code.includes(`import.meta.url`)) {
                 let s;
-                const assetImportMetaUrlRE = 
-                // eslint-disable-next-line regexp/no-unused-capturing-group -- https://github.com/ota-meshi/eslint-plugin-regexp/issues/675
-                /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/dg;
+                const assetImportMetaUrlRE = /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/dg;
                 const cleanString = stripLiteral(code);
                 let match;
                 while ((match = assetImportMetaUrlRE.exec(cleanString))) {

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-MF_y65BT.js';
+import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-YJaePtkC.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -27,11 +27,11 @@ import 'node:child_process';
 import 'node:crypto';
 import 'node:dns';
 import 'crypto';
-import 'node:buffer';
 import 'module';
 import 'node:assert';
 import 'node:process';
 import 'node:v8';
+import 'node:buffer';
 import 'rollup';
 import 'rollup/parseAst';
 import 'querystring';
@@ -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-MF_y65BT.js').then(function (n) { return n.A; });
+    const { createServer } = await import('./chunks/dep-YJaePtkC.js').then(function (n) { return n.A; });
     try {
         const server = await createServer({
             root,
@@ -839,7 +839,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-MF_y65BT.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-YJaePtkC.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -867,7 +867,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-MF_y65BT.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-YJaePtkC.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -893,7 +893,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-MF_y65BT.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-YJaePtkC.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules } from './chunks/dep-MF_y65BT.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-MF_y65BT.js';
+import { i as isInNodeModules } from './chunks/dep-YJaePtkC.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-YJaePtkC.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -30,11 +30,11 @@ import 'node:child_process';
 import 'node:crypto';
 import 'node:dns';
 import 'crypto';
-import 'node:buffer';
 import 'module';
 import 'node:assert';
 import 'node:process';
 import 'node:v8';
+import 'node:buffer';
 import 'querystring';
 import 'node:readline';
 import 'node:events';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",