vite 4.0.0-alpha.1 → 4.0.0-alpha.2

package/dist/node/chunks/{dep-6d760e82.js → dep-2a67faac.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { A as commonjsGlobal } from './dep-7d777026.js';
+import { A as commonjsGlobal } from './dep-b8ca7cde.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/chunks/{dep-7d777026.js → dep-b8ca7cde.js}

@@ -11974,16 +11974,10 @@ function writeFile(filename, content) {
     }
     fs$l.writeFileSync(filename, content);
 }
-/**
- * Use fs.statSync(filename) instead of fs.existsSync(filename)
- * #2051 if we don't have read permission on a directory, existsSync() still
- * works and will result in massively slow subsequent checks (which are
- * unnecessary in the first place)
- */
 function isFileReadable(filename) {
     try {
-        const stat = fs$l.statSync(filename, { throwIfNoEntry: false });
-        return !!stat;
+        fs$l.accessSync(filename, fs$l.constants.R_OK);
+        return true;
     }
     catch {
         return false;
@@ -12492,18 +12486,22 @@ const isNonDriveRelativeAbsolutePath = (p) => {
  * consistent behaviour between dev and prod and across operating systems.
  */
 function shouldServe(url, assetsDir) {
-    // viteTestUrl is set to something like http://localhost:4173/ and then many tests make calls
-    // like `await page.goto(viteTestUrl + '/example')` giving us URLs beginning with a double slash
-    const pathname = decodeURI(new URL$3(url.startsWith('//') ? url.substring(1) : url, 'http://example.com')
-        .pathname);
-    const file = path$o.join(assetsDir, pathname);
-    if (!fs$l.existsSync(file) ||
-        (isCaseInsensitiveFS && // can skip case check on Linux
-            !fs$l.statSync(file).isDirectory() &&
-            !hasCorrectCase(file, assetsDir))) {
+    try {
+        // viteTestUrl is set to something like http://localhost:4173/ and then many tests make calls
+        // like `await page.goto(viteTestUrl + '/example')` giving us URLs beginning with a double slash
+        const pathname = decodeURI(new URL$3(url.startsWith('//') ? url.substring(1) : url, 'http://example.com').pathname);
+        const file = path$o.join(assetsDir, pathname);
+        if (!fs$l.existsSync(file) ||
+            (isCaseInsensitiveFS && // can skip case check on Linux
+                !fs$l.statSync(file).isDirectory() &&
+                !hasCorrectCase(file, assetsDir))) {
+            return false;
+        }
+        return true;
+    }
+    catch (err) {
         return false;
     }
-    return true;
 }
 /**
  * Note that we can't use realpath here, because we don't want to follow
@@ -32325,14 +32323,13 @@ function lookup(extn) {
 	return mimes$1[!~idx ? tmp : tmp.substring(++idx)];
 }
 
-const assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
-const duplicateAssets = new WeakMap();
+const assetUrlRE = /__VITE_ASSET__([a-z\d]+)__(?:\$_(.*?)__)?/g;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 const assetCache = new WeakMap();
-const assetHashToFilenameMap = new WeakMap();
-// save hashes of the files that has been emitted in build watch
-const emittedHashMap = new WeakMap();
+// chunk.name is the basename for the asset ignoring the directory structure
+// For the manifest, we need to preserve the original file path
+const generatedAssets = new WeakMap();
 // add own dictionary entry by directly assigning mrmime
 function registerCustomMime() {
     // https://github.com/lukeed/mrmime/issues/3
@@ -32355,10 +32352,8 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
     // In both cases, the wrapping should already be fine
     while ((match = assetUrlRE.exec(code))) {
         s || (s = new MagicString(code));
-        const [full, hash, postfix = ''] = match;
-        // some internal plugins may still need to emit chunks (e.g. worker) so
-        // fallback to this.getFileName for that. TODO: remove, not needed
-        const file = getAssetFilename(hash, config) || ctx.getFileName(hash);
+        const [full, referenceId, postfix = ''] = match;
+        const file = ctx.getFileName(referenceId);
         chunk.viteMetadata.importedAssets.add(cleanUrl(file));
         const filename = file + postfix;
         const replacement = toOutputFilePathInJS(filename, 'asset', chunk.fileName, 'js', config, toRelativeRuntime);
@@ -32385,15 +32380,12 @@ function renderAssetUrlInJS(ctx, config, chunk, opts, code) {
  * Also supports loading plain strings with import text from './foo.txt?raw'
  */
 function assetPlugin(config) {
-    // assetHashToFilenameMap initialization in buildStart causes getAssetFilename to return undefined
-    assetHashToFilenameMap.set(config, new Map());
     registerCustomMime();
     return {
         name: 'vite:asset',
         buildStart() {
             assetCache.set(config, new Map());
-            emittedHashMap.set(config, new Set());
-            duplicateAssets.set(config, new Map());
+            generatedAssets.set(config, new Map());
         },
         resolveId(id) {
             if (!config.assetsInclude(cleanUrl(id))) {
@@ -32490,9 +32482,6 @@ function fileToDevUrl(id, config) {
     const base = joinUrlSegments(config.server?.origin ?? '', config.base);
     return joinUrlSegments(base, rtn.replace(/^\//, ''));
 }
-function getAssetFilename(hash, config) {
-    return assetHashToFilenameMap.get(config)?.get(hash);
-}
 function getPublicAssetFilename(hash, config) {
     return publicAssetUrlCache.get(config)?.get(hash);
 }
@@ -32637,41 +32626,17 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
     }
     else {
         // emit as asset
-        // rollup supports `import.meta.ROLLUP_FILE_URL_*`, but it generates code
-        // that uses runtime url sniffing and it can be verbose when targeting
-        // non-module format. It also fails to cascade the asset content change
-        // into the chunk's hash, so we have to do our own content hashing here.
-        // https://bundlers.tooling.report/hashing/asset-cascade/
-        // https://github.com/rollup/rollup/issues/3415
-        const map = assetHashToFilenameMap.get(config);
-        const contentHash = getHash(content);
         const { search, hash } = parse$j(id);
         const postfix = (search || '') + (hash || '');
-        const fileName = assetFileNamesToFileName(resolveAssetFileNames(config), file, contentHash, content);
-        if (!map.has(contentHash)) {
-            map.set(contentHash, fileName);
-        }
-        const emittedSet = emittedHashMap.get(config);
-        const duplicates = duplicateAssets.get(config);
-        const name = normalizePath$3(path$o.relative(config.root, file));
-        if (!emittedSet.has(contentHash)) {
-            pluginContext.emitFile({
-                name,
-                fileName,
-                type: 'asset',
-                source: content
-            });
-            emittedSet.add(contentHash);
-        }
-        else {
-            duplicates.set(name, {
-                name,
-                fileName: map.get(contentHash),
-                type: 'asset',
-                source: content
-            });
-        }
-        url = `__VITE_ASSET__${contentHash}__${postfix ? `$_${postfix}__` : ``}`; // TODO_BASE
+        const referenceId = pluginContext.emitFile({
+            // Ignore directory structure for asset file names
+            name: path$o.basename(file),
+            type: 'asset',
+            source: content
+        });
+        const originalName = normalizePath$3(path$o.relative(config.root, file));
+        generatedAssets.get(config).set(referenceId, { originalName });
+        url = `__VITE_ASSET__${referenceId}__${postfix ? `$_${postfix}__` : ``}`; // TODO_BASE
     }
     cache.set(id, url);
     return url;
@@ -33747,9 +33712,6 @@ function tryFsResolve(fsPath, options, tryIndex = true, targetWeb = true) {
     }
 }
 function tryResolveFile(file, postfix, options, tryIndex, targetWeb, tryPrefix, skipPackageJson) {
-    // #2051 if we don't have read permission on a directory, existsSync() still
-    // works and will result in massively slow subsequent checks (which are
-    // unnecessary in the first place)
     if (isFileReadable(file)) {
         if (!fs$l.statSync(file).isDirectory()) {
             return getRealPath(file, options.preserveSymlinks) + postfix;
@@ -35501,9 +35463,8 @@ function updateModules(file, modules, timestamp, { config, ws }) {
         debugHmr(picocolors.exports.yellow(`no update happened `) + picocolors.exports.dim(file));
         return;
     }
-    config.logger.info(updates
-        .map(({ path }) => picocolors.exports.green(`hmr update `) + picocolors.exports.dim(path))
-        .join('\n'), { clear: true, timestamp: true });
+    config.logger.info(picocolors.exports.green(`hmr update `) +
+        picocolors.exports.dim([...new Set(updates.map((u) => u.path))].join(', ')), { clear: true, timestamp: true });
     ws.send({
         type: 'update',
         updates
@@ -43059,7 +43020,7 @@ function buildHtmlPlugin(config) {
                 });
                 // resolve asset url references
                 result = result.replace(assetUrlRE, (_, fileHash, postfix = '') => {
-                    return (toOutputAssetFilePath(getAssetFilename(fileHash, config)) + postfix);
+                    return toOutputAssetFilePath(this.getFileName(fileHash)) + postfix;
                 });
                 result = result.replace(publicAssetUrlRE, (_, fileHash) => {
                     return normalizePath$3(toOutputPublicAssetFilePath(getPublicAssetFilename(fileHash, config)));
@@ -43555,7 +43516,7 @@ function cssPostPlugin(config) {
             const cssEntryFiles = cssEntryFilesCache.get(config);
             const publicAssetUrlMap = publicAssetUrlCache.get(config);
             // resolve asset URL placeholders to their built file URLs
-            function resolveAssetUrlsInCss(chunkCSS, cssAssetName) {
+            const resolveAssetUrlsInCss = (chunkCSS, cssAssetName) => {
                 const encodedPublicUrls = encodePublicUrlsInCSS(config);
                 const relative = config.base === './' || config.base === '';
                 const cssAssetDirname = encodedPublicUrls || relative
@@ -43570,7 +43531,7 @@ function cssPostPlugin(config) {
                 };
                 // replace asset url references with resolved url.
                 chunkCSS = chunkCSS.replace(assetUrlRE, (_, fileHash, postfix = '') => {
-                    const filename = getAssetFilename(fileHash, config) + postfix;
+                    const filename = this.getFileName(fileHash) + postfix;
                     chunk.viteMetadata.importedAssets.add(cleanUrl(filename));
                     return toOutputFilePathInCss(filename, 'asset', cssAssetName, 'css', config, toRelative);
                 });
@@ -43583,7 +43544,7 @@ function cssPostPlugin(config) {
                     });
                 }
                 return chunkCSS;
-            }
+            };
             function ensureFileExt(name, ext) {
                 return normalizePath$3(path$o.format({ ...path$o.parse(name), base: undefined, ext }));
             }
@@ -43853,10 +43814,9 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-6d760e82.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-2a67faac.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
-            // TODO: convert null to undefined (`null` should be removed from `CSSModulesOptions.localsConvention`)
-            localsConvention: modulesOptions?.localsConvention ?? undefined,
+            localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
                 if (modulesOptions && typeof modulesOptions.getJSON === 'function') {
@@ -44620,28 +44580,43 @@ function manifestPlugin(config) {
                 }
                 return manifestChunk;
             }
-            function createAsset(chunk) {
+            function createAsset(chunk, src) {
                 const manifestChunk = {
                     file: chunk.fileName,
-                    src: chunk.name
+                    src
                 };
                 if (cssEntryFiles.has(chunk.name))
                     manifestChunk.isEntry = true;
                 return manifestChunk;
             }
             const cssEntryFiles = cssEntryFilesCache.get(config);
+            const fileNameToAssetMeta = new Map();
+            generatedAssets.get(config).forEach((asset, referenceId) => {
+                const fileName = this.getFileName(referenceId);
+                fileNameToAssetMeta.set(fileName, asset);
+            });
+            const fileNameToAsset = new Map();
             for (const file in bundle) {
                 const chunk = bundle[file];
                 if (chunk.type === 'chunk') {
                     manifest[getChunkName(chunk)] = createChunk(chunk);
                 }
                 else if (chunk.type === 'asset' && typeof chunk.name === 'string') {
-                    manifest[chunk.name] = createAsset(chunk);
+                    // Add every unique asset to the manifest, keyed by its original name
+                    const src = fileNameToAssetMeta.get(chunk.fileName)?.originalName ?? chunk.name;
+                    const asset = createAsset(chunk, src);
+                    manifest[src] = asset;
+                    fileNameToAsset.set(chunk.fileName, asset);
+                }
+            }
+            // Add duplicate assets to the manifest
+            fileNameToAssetMeta.forEach(({ originalName }, fileName) => {
+                if (!manifest[originalName]) {
+                    const asset = fileNameToAsset.get(fileName);
+                    if (asset) {
+                        manifest[originalName] = asset;
+                    }
                 }
-            }
-            duplicateAssets.get(config).forEach((asset) => {
-                const chunk = createAsset(asset);
-                manifest[asset.name] = chunk;
             });
             outputCount++;
             const output = config.build.rollupOptions?.output;

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

package/dist/node/index.d.ts

@@ -498,9 +498,9 @@ export declare interface CSSModulesOptions {
     generateScopedName?: string | ((name: string, filename: string, css: string) => string);
     hashPrefix?: string;
     /**
-     * default: null
+     * default: undefined
      */
-    localsConvention?: 'camelCase' | 'camelCaseOnly' | 'dashes' | 'dashesOnly' | null;
+    localsConvention?: 'camelCase' | 'camelCaseOnly' | 'dashes' | 'dashesOnly';
 }
 
 export declare interface CSSOptions {

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-7d777026.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-b8ca7cde.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

@@ -3444,16 +3444,10 @@ function lookupFile(dir, formats, options) {
         return lookupFile(parentDir, formats, options);
     }
 }
-/**
- * Use fs.statSync(filename) instead of fs.existsSync(filename)
- * #2051 if we don't have read permission on a directory, existsSync() still
- * works and will result in massively slow subsequent checks (which are
- * unnecessary in the first place)
- */
 function isFileReadable(filename) {
     try {
-        const stat = fs$1.statSync(filename, { throwIfNoEntry: false });
-        return !!stat;
+        fs$1.accessSync(filename, fs$1.constants.R_OK);
+        return true;
     }
     catch {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",

package/types/alias.d.ts

@@ -1,6 +0,0 @@
-export type {
-  Alias,
-  ResolverFunction,
-  ResolverObject,
-  AliasOptions
-} from '../dist/node'

package/types/anymatch.d.ts

@@ -1 +0,0 @@
-export type { AnymatchFn, AnymatchPattern, Matcher } from '../dist/node'

package/types/chokidar.d.ts

@@ -1,11 +0,0 @@
-export type {
-  FSWatcher,
-  WatchOptions,
-  AwaitWriteFinishOptions
-} from '../dist/node'
-
-import type { FSWatcher, WatchOptions } from '../dist/node'
-export function watch(
-  paths: string | ReadonlyArray<string>,
-  options?: WatchOptions
-): FSWatcher

package/types/commonjs.d.ts

@@ -1 +0,0 @@
-export type { RollupCommonJSOptions } from '../dist/node'

package/types/connect.d.ts

@@ -1 +0,0 @@
-export type { Connect } from '../dist/node'

package/types/dynamicImportVars.d.ts

@@ -1 +0,0 @@
-export type { RollupDynamicImportVarsOptions } from '../dist/node'

package/types/http-proxy.d.ts

@@ -1 +0,0 @@
-export type { HttpProxy } from '../dist/node'

package/types/terser.d.ts

@@ -1 +0,0 @@
-export type { Terser } from '../dist/node'

package/types/ws.d.ts

@@ -1 +0,0 @@
-export type { WebSocket, WebSocketAlias } from '../dist/node'