vite 4.0.3 → 4.0.4

package/dist/node/chunks/{dep-80491704.js → dep-3049ac5d.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { C as commonjsGlobal } from './dep-0bae2027.js';
+import { C as commonjsGlobal } from './dep-5e7f419b.js';
 import require$$0$1 from 'path';
 import require$$5 from 'crypto';
 import require$$0$2 from 'util';

package/dist/node/chunks/{dep-0bae2027.js → dep-5e7f419b.js}

@@ -11968,7 +11968,12 @@ function copyDir(srcDir, destDir) {
 const removeDir = isWindows$4
     ? promisify$4(gracefulRemoveDir)
     : function removeDirSync(dir) {
-        fs$l.rmSync(dir, { recursive: true, force: true });
+        // when removing `.vite/deps`, if it doesn't exist, nodejs may also remove
+        // other directories within `.vite/`, including `.vite/deps_temp` (bug).
+        // workaround by checking for directory existence before removing for now.
+        if (fs$l.existsSync(dir)) {
+            fs$l.rmSync(dir, { recursive: true, force: true });
+        }
     };
 const renameDir = isWindows$4 ? promisify$4(gracefulRename) : fs$l.renameSync;
 function ensureWatchedFile(watcher, file, root) {
@@ -12152,8 +12157,8 @@ async function resolveServerUrls(server, options, config) {
     const base = config.rawBase === './' || config.rawBase === '' ? '/' : config.rawBase;
     if (hostname.host && loopbackHosts.has(hostname.host)) {
         let hostnameName = hostname.name;
-        if (hostnameName === '::1' ||
-            hostnameName === '0000:0000:0000:0000:0000:0000:0000:0001') {
+        // ipv6 host
+        if (hostnameName.includes(':')) {
             hostnameName = `[${hostnameName}]`;
         }
         local.push(`${protocol}://${hostnameName}:${port}${base}`);
@@ -12167,7 +12172,11 @@ async function resolveServerUrls(server, options, config) {
                 // @ts-expect-error Node 18.0 - 18.3 returns number
                 (typeof detail.family === 'number' && detail.family === 4)))
             .forEach((detail) => {
-            const host = detail.address.replace('127.0.0.1', hostname.name);
+            let host = detail.address.replace('127.0.0.1', hostname.name);
+            // ipv6 host
+            if (host.includes(':')) {
+                host = `[${host}]`;
+            }
             const url = `${protocol}://${host}:${port}${base}`;
             if (detail.address.includes('127.0.0.1')) {
                 local.push(url);
@@ -14282,6 +14291,7 @@ function lookup(extn) {
 const assetUrlRE = /__VITE_ASSET__([a-z\d]+)__(?:\$_(.*?)__)?/g;
 const rawRE = /(?:\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
+const jsSourceMapRE = /\.[cm]?js\.map$/;
 const assetCache = new WeakMap();
 const generatedAssets = new WeakMap();
 // add own dictionary entry by directly assigning mrmime
@@ -14390,7 +14400,8 @@ function assetPlugin(config) {
             if (config.command === 'build' && config.build.ssr) {
                 for (const file in bundle) {
                     if (bundle[file].type === 'asset' &&
-                        !file.includes('ssr-manifest.json')) {
+                        !file.endsWith('ssr-manifest.json') &&
+                        !jsSourceMapRE.test(file)) {
                         delete bundle[file];
                     }
                 }
@@ -14405,6 +14416,10 @@ function checkPublicFile(url, { publicDir }) {
         return;
     }
     const publicFile = path$o.join(publicDir, cleanUrl(url));
+    if (!publicFile.startsWith(publicDir)) {
+        // can happen if URL starts with '../'
+        return;
+    }
     if (fs$l.existsSync(publicFile)) {
         return publicFile;
     }
@@ -35157,6 +35172,8 @@ const inlineImportRE = /(?<!(?<!\.\.)\.)\bimport\s*\(("(?:[^"]|(?<=\\)")*"|'(?:[
 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;
+const modulePreloadLinkRE = /[ \t]*<link[^>]*rel\s*=\s*(?:"modulepreload"|'modulepreload'|modulepreload)[\s\S]*?\/>/i;
+const importMapAppendRE = new RegExp([moduleScriptRE, modulePreloadLinkRE].map((r) => r.source).join('|'), 'i');
 const isHTMLProxy = (id) => htmlProxyRE$1.test(id);
 const isHTMLRequest = (request) => htmlLangRE.test(request);
 // HTML Proxy Caches are stored by config -> filePath -> index
@@ -35719,21 +35736,21 @@ function preImportMapHook(config) {
         const importMapIndex = html.match(importMapRE)?.index;
         if (importMapIndex === undefined)
             return;
-        const moduleScriptIndex = html.match(moduleScriptRE)?.index;
-        if (moduleScriptIndex === undefined)
+        const importMapAppendIndex = html.match(importMapAppendRE)?.index;
+        if (importMapAppendIndex === undefined)
             return;
-        if (moduleScriptIndex < importMapIndex) {
+        if (importMapAppendIndex < importMapIndex) {
             const relativeHtml = normalizePath$3(path$o.relative(config.root, ctx.filename));
-            config.logger.warnOnce(picocolorsExports.yellow(picocolorsExports.bold(`(!) <script type="importmap"> should come before <script type="module"> in /${relativeHtml}`)));
+            config.logger.warnOnce(picocolorsExports.yellow(picocolorsExports.bold(`(!) <script type="importmap"> should come before <script type="module"> and <link rel="modulepreload"> in /${relativeHtml}`)));
         }
     };
 }
 /**
- * Move importmap before the first module script
+ * Move importmap before the first module script and modulepreload link
  */
 function postImportMapHook() {
     return (html) => {
-        if (!moduleScriptRE.test(html))
+        if (!importMapAppendRE.test(html))
             return;
         let importMap;
         html = html.replace(importMapRE, (match) => {
@@ -35741,7 +35758,7 @@ function postImportMapHook() {
             return '';
         });
         if (importMap) {
-            html = html.replace(moduleScriptRE, (match) => `${importMap}\n${match}`);
+            html = html.replace(importMapAppendRE, (match) => `${importMap}\n${match}`);
         }
         return html;
     };
@@ -36297,6 +36314,15 @@ function cssPostPlugin(config) {
             }
             return null;
         },
+        augmentChunkHash(chunk) {
+            if (chunk.viteMetadata?.importedCss.size) {
+                let hash = '';
+                for (const id of chunk.viteMetadata.importedCss) {
+                    hash += id;
+                }
+                return hash;
+            }
+        },
         async generateBundle(opts, bundle) {
             // @ts-expect-error asset emits are skipped in legacy bundle
             if (opts.__vite_skip_asset_emit__) {
@@ -36500,7 +36526,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-80491704.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-3049ac5d.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {

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 { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-0bae2027.js';
+import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-5e7f419b.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -724,7 +724,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-0bae2027.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-5e7f419b.js').then(function (n) { return n.F; });
     try {
         const server = await createServer({
             root,
@@ -802,7 +802,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-0bae2027.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-5e7f419b.js').then(function (n) { return n.E; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -830,7 +830,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-0bae2027.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-5e7f419b.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -855,7 +855,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-0bae2027.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-5e7f419b.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, e as buildErrorMessage, u as createFilter, w as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, j as getDepOptimizationConfig, k as isDepsOptimizerEnabled, l as loadConfigFromFile, y as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, i as resolveBaseUrl, h as resolveConfig, z as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, x as searchForWorkspaceRoot, v as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-0bae2027.js';
+export { b as build, e as buildErrorMessage, u as createFilter, w as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, j as getDepOptimizationConfig, k as isDepsOptimizerEnabled, l as loadConfigFromFile, y as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, i as resolveBaseUrl, h as resolveConfig, z as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, x as searchForWorkspaceRoot, v as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-5e7f419b.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

@@ -3478,7 +3478,12 @@ function isFileReadable(filename) {
 isWindows
     ? node_util.promisify(gracefulRemoveDir)
     : function removeDirSync(dir) {
-        fs$1.rmSync(dir, { recursive: true, force: true });
+        // when removing `.vite/deps`, if it doesn't exist, nodejs may also remove
+        // other directories within `.vite/`, including `.vite/deps_temp` (bug).
+        // workaround by checking for directory existence before removing for now.
+        if (fs$1.existsSync(dir)) {
+            fs$1.rmSync(dir, { recursive: true, force: true });
+        }
     };
 isWindows ? node_util.promisify(gracefulRename) : fs$1.renameSync;
 function arraify(target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -75,7 +75,7 @@
     "@rollup/plugin-alias": "^4.0.2",
     "@rollup/plugin-commonjs": "^24.0.0",
     "@rollup/plugin-dynamic-import-vars": "^2.0.1",
-    "@rollup/plugin-json": "^5.0.2",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-typescript": "^10.0.1",
     "@rollup/pluginutils": "^5.0.2",