vite 5.0.0-beta.5 → 5.0.0-beta.6

package/dist/node/chunks/{dep-86245b77.js → dep-c3c41c00.js}

@@ -1,4 +1,4 @@
-import { E as commonjsGlobal, D as getDefaultExportFromCjs } from './dep-4109817a.js';
+import { E as commonjsGlobal, D as getDefaultExportFromCjs } from './dep-db07a1ea.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-958c4c65.js → dep-ce41d4ea.js}

@@ -1,4 +1,4 @@
-import { D as getDefaultExportFromCjs } from './dep-4109817a.js';
+import { D as getDefaultExportFromCjs } from './dep-db07a1ea.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-4109817a.js → dep-db07a1ea.js}

@@ -11876,11 +11876,22 @@ const replaceSlashOrColonRE = /[/:]/g;
 const replaceDotRE = /\./g;
 const replaceNestedIdRE = /(\s*>\s*)/g;
 const replaceHashRE = /#/g;
-const flattenId = (id) => id
-    .replace(replaceSlashOrColonRE, '_')
-    .replace(replaceDotRE, '__')
-    .replace(replaceNestedIdRE, '___')
-    .replace(replaceHashRE, '____');
+const flattenId = (id) => {
+    const flatId = limitFlattenIdLength(id
+        .replace(replaceSlashOrColonRE, '_')
+        .replace(replaceDotRE, '__')
+        .replace(replaceNestedIdRE, '___')
+        .replace(replaceHashRE, '____'));
+    return flatId;
+};
+const FLATTEN_ID_HASH_LENGTH = 8;
+const FLATTEN_ID_MAX_FILE_LENGTH = 170;
+const limitFlattenIdLength = (id, limit = FLATTEN_ID_MAX_FILE_LENGTH) => {
+    if (id.length <= limit) {
+        return id;
+    }
+    return id.slice(0, limit - (FLATTEN_ID_HASH_LENGTH + 1)) + '_' + getHash(id);
+};
 const normalizeId = (id) => id.replace(replaceNestedIdRE, ' > ');
 // Supported by Node, Deno, Bun
 const NODE_BUILTIN_NAMESPACE = 'node:';
@@ -39148,13 +39159,7 @@ function cssPostPlugin(config) {
                     .filter((chunk) => chunk.type === 'chunk')
                     .map((chunk) => [chunk.preliminaryFileName, chunk.fileName]));
                 const pureCssChunkNames = [...pureCssChunks].map((pureCssChunk) => prelimaryNameToChunkMap[pureCssChunk.fileName]);
-                const emptyChunkFiles = pureCssChunkNames
-                    .map((file) => path$o.basename(file))
-                    .join('|')
-                    .replace(/\./g, '\\.');
-                const emptyChunkRE = new RegExp(opts.format === 'es'
-                    ? `\\bimport\\s*["'][^"']*(?:${emptyChunkFiles})["'];\n?`
-                    : `\\brequire\\(\\s*["'][^"']*(?:${emptyChunkFiles})["']\\);\n?`, 'g');
+                const replaceEmptyChunk = getEmptyChunkReplacer(pureCssChunkNames, opts.format);
                 for (const file in bundle) {
                     const chunk = bundle[file];
                     if (chunk.type === 'chunk') {
@@ -39170,9 +39175,7 @@ function cssPostPlugin(config) {
                             }
                             return true;
                         });
-                        chunk.code = chunk.code.replace(emptyChunkRE, 
-                        // remove css import while preserving source map location
-                        (m) => `/* empty css ${''.padEnd(m.length - 15)}*/`);
+                        chunk.code = replaceEmptyChunk(chunk.code);
                     }
                 }
                 const removedPureCssFiles = removedPureCssFilesCache.get(config);
@@ -39213,6 +39216,23 @@ function cssPostPlugin(config) {
         },
     };
 }
+/**
+ * Create a replacer function that takes code and replaces given pure CSS chunk imports
+ * @param pureCssChunkNames The chunks that only contain pure CSS and should be replaced
+ * @param outputFormat The module output format to decide whether to replace `import` or `require`
+ */
+function getEmptyChunkReplacer(pureCssChunkNames, outputFormat) {
+    const emptyChunkFiles = pureCssChunkNames
+        .map((file) => path$o.basename(file))
+        .join('|')
+        .replace(/\./g, '\\.');
+    const emptyChunkRE = new RegExp(outputFormat === 'es'
+        ? `\\bimport\\s*["'][^"']*(?:${emptyChunkFiles})["'];\n?`
+        : `\\brequire\\(\\s*["'][^"']*(?:${emptyChunkFiles})["']\\);\n?`, 'g');
+    return (code) => code.replace(emptyChunkRE, 
+    // remove css import while preserving source map location
+    (m) => `/* empty css ${''.padEnd(m.length - 15)}*/`);
+}
 function createCSSResolvers(config) {
     let cssResolve;
     let sassResolve;
@@ -39508,8 +39528,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-958c4c65.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-86245b77.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-ce41d4ea.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-c3c41c00.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -47444,6 +47464,23 @@ function buildImportAnalysisPlugin(config) {
                     }
                     const s = new MagicString(code);
                     const rewroteMarkerStartPos = new Set(); // position of the leading double quote
+                    const fileDeps = [];
+                    const addFileDep = (url, runtime = false) => {
+                        const index = fileDeps.findIndex((dep) => dep.url === url);
+                        if (index === -1) {
+                            return fileDeps.push({ url, runtime }) - 1;
+                        }
+                        else {
+                            return index;
+                        }
+                    };
+                    const getFileDep = (index) => {
+                        const fileDep = fileDeps[index];
+                        if (!fileDep) {
+                            throw new Error(`Cannot find file dep at index ${index}`);
+                        }
+                        return fileDep;
+                    };
                     if (imports.length) {
                         for (let index = 0; index < imports.length; index++) {
                             // To handle escape sequences in specifier strings, the .n field will be provided where possible.
@@ -47471,12 +47508,12 @@ function buildImportAnalysisPlugin(config) {
                                     analyzed.add(filename);
                                     const chunk = bundle[filename];
                                     if (chunk) {
-                                        deps.add(chunk.fileName);
+                                        deps.add(addFileDep(chunk.fileName));
                                         chunk.imports.forEach(addDeps);
                                         // Ensure that the css imported by current chunk is loaded after the dependencies.
                                         // So the style of current chunk won't be overwritten unexpectedly.
                                         chunk.viteMetadata.importedCss.forEach((file) => {
-                                            deps.add(file);
+                                            deps.add(addFileDep(file));
                                         });
                                     }
                                     else {
@@ -47485,7 +47522,7 @@ function buildImportAnalysisPlugin(config) {
                                         if (chunk) {
                                             if (chunk.viteMetadata.importedCss.size) {
                                                 chunk.viteMetadata.importedCss.forEach((file) => {
-                                                    deps.add(file);
+                                                    deps.add(addFileDep(file));
                                                 });
                                                 hasRemovedPureCssChunk = true;
                                             }
@@ -47508,7 +47545,7 @@ function buildImportAnalysisPlugin(config) {
                                     ? modulePreload === false
                                         ? // CSS deps use the same mechanism as module preloads, so even if disabled,
                                             // we still need to pass these deps to the preload helper in dynamic imports.
-                                            [...deps].filter((d) => d.endsWith('.css'))
+                                            [...deps].filter((d) => getFileDep(d).url.endsWith('.css'))
                                         : [...deps]
                                     : [];
                                 let renderedDeps;
@@ -47524,13 +47561,18 @@ function buildImportAnalysisPlugin(config) {
                                         const cssDeps = [];
                                         const otherDeps = [];
                                         for (const dep of depsArray) {
-                                            (dep.endsWith('.css') ? cssDeps : otherDeps).push(dep);
+                                            if (getFileDep(dep).url.endsWith('.css')) {
+                                                cssDeps.push(dep);
+                                            }
+                                            else {
+                                                otherDeps.push(dep);
+                                            }
                                         }
                                         resolvedDeps = [
-                                            ...resolveDependencies(normalizedFile, otherDeps, {
+                                            ...resolveDependencies(normalizedFile, otherDeps.map((otherDep) => getFileDep(otherDep).url), {
                                                 hostId: file,
                                                 hostType: 'js',
-                                            }),
+                                            }).map((otherDep) => addFileDep(otherDep)),
                                             ...cssDeps,
                                         ];
                                     }
@@ -47538,26 +47580,36 @@ function buildImportAnalysisPlugin(config) {
                                         resolvedDeps = depsArray;
                                     }
                                     renderedDeps = resolvedDeps.map((dep) => {
-                                        const replacement = toOutputFilePathInJS(dep, 'asset', chunk.fileName, 'js', config, toRelativePath);
-                                        const replacementString = typeof replacement === 'string'
-                                            ? JSON.stringify(replacement)
-                                            : replacement.runtime;
-                                        return replacementString;
+                                        const replacement = toOutputFilePathInJS(getFileDep(dep).url, 'asset', chunk.fileName, 'js', config, toRelativePath);
+                                        if (typeof replacement === 'string') {
+                                            return addFileDep(replacement);
+                                        }
+                                        return addFileDep(replacement.runtime, true);
                                     });
                                 }
                                 else {
                                     renderedDeps = depsArray.map((d) => 
                                     // Don't include the assets dir if the default asset file names
                                     // are used, the path will be reconstructed by the import preload helper
-                                    JSON.stringify(optimizeModulePreloadRelativePaths
-                                        ? toRelativePath(d, file)
-                                        : d));
+                                    optimizeModulePreloadRelativePaths
+                                        ? addFileDep(toRelativePath(getFileDep(d).url, file))
+                                        : d);
                                 }
-                                s.update(markerStartPos, markerStartPos + preloadMarker.length + 2, `[${renderedDeps.join(',')}]`);
+                                s.update(markerStartPos, markerStartPos + preloadMarker.length + 2, `__vite__mapDeps([${renderedDeps.join(',')}])`);
                                 rewroteMarkerStartPos.add(markerStartPos);
                             }
                         }
                     }
+                    const fileDepsCode = `[${fileDeps
+                        .map((fileDep) => fileDep.runtime ? fileDep.url : JSON.stringify(fileDep.url))
+                        .join(',')}]`;
+                    s.append(`\
+function __vite__mapDeps(indexes) {
+  if (!__vite__mapDeps.viteFileDeps) {
+    __vite__mapDeps.viteFileDeps = ${fileDepsCode}
+  }
+  return indexes.map((i) => __vite__mapDeps.viteFileDeps[i])
+}`);
                     // there may still be markers due to inlined dynamic imports, remove
                     // all the markers regardless
                     let markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote);

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, x as createLogger, h as resolveConfig } from './chunks/dep-4109817a.js';
+import { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-db07a1ea.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -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-4109817a.js').then(function (n) { return n.H; });
+    const { createServer } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.H; });
     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-4109817a.js').then(function (n) { return n.G; });
+    const { build } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.G; });
     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-4109817a.js').then(function (n) { return n.F; });
+    const { optimizeDeps } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.F; });
     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-4109817a.js').then(function (n) { return n.I; });
+    const { preview } = await import('./chunks/dep-db07a1ea.js').then(function (n) { return n.I; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-4109817a.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-4109817a.js';
+import { i as isInNodeModules } from './chunks/dep-db07a1ea.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-db07a1ea.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": "5.0.0-beta.5",
+  "version": "5.0.0-beta.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",