vite 4.1.2 → 4.1.4

package/dist/node/chunks/{dep-9912c491.js → dep-ca21228b.js}

@@ -13307,7 +13307,7 @@ var TSConfckParseError = class extends Error {
 
 const debug$f = createDebugger('vite:esbuild');
 const INJECT_HELPERS_IIFE_RE = /^(.*?)((?:const|var)\s+\S+\s*=\s*function\s*\([^)]*\)\s*\{.*?"use strict";)/s;
-const INJECT_HELPERS_UMD_RE = /^(.*?)(\(function\([^)]*\)\s*\{.+amd.+function\([^)]*\)\s*\{.*?"use strict";)/s;
+const INJECT_HELPERS_UMD_RE = /^(.*?)(\(function\([^)]*\)\s*\{.+?amd.+?function\([^)]*\)\s*\{.*?"use strict";)/s;
 let server;
 async function transformWithEsbuild(code, filename, options, inMap) {
     let loader = options?.loader;
@@ -21367,6 +21367,7 @@ function resolvePlugin(resolveOptions) {
             }
             const ensureVersionQuery = (resolved) => {
                 if (!options.isBuild &&
+                    !options.scan &&
                     depsOptimizer &&
                     !(resolved === normalizedClientEntry$1 ||
                         resolved === normalizedEnvEntry$1)) {
@@ -35417,6 +35418,7 @@ async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
     const { parse } = await import('./dep-98d07f71.js');
     const ast = parse(html, {
+        scriptingEnabled: false,
         sourceCodeLocationInfo: true,
         onParseError: (e) => {
             handleParseError(e, html, filePath);
@@ -35827,20 +35829,20 @@ function buildHtmlPlugin(config) {
                         assetTags = imports.map((chunk) => toScriptTag(chunk, toOutputAssetFilePath, isAsync));
                     }
                     else {
+                        assetTags = [toScriptTag(chunk, toOutputAssetFilePath, isAsync)];
                         const { modulePreload } = config.build;
-                        const resolveDependencies = typeof modulePreload === 'object' &&
-                            modulePreload.resolveDependencies;
-                        const importsFileNames = imports.map((chunk) => chunk.fileName);
-                        const resolvedDeps = resolveDependencies
-                            ? resolveDependencies(chunk.fileName, importsFileNames, {
-                                hostId: relativeUrlPath,
-                                hostType: 'html',
-                            })
-                            : importsFileNames;
-                        assetTags = [
-                            toScriptTag(chunk, toOutputAssetFilePath, isAsync),
-                            ...resolvedDeps.map((i) => toPreloadTag(i, toOutputAssetFilePath)),
-                        ];
+                        if (modulePreload !== false) {
+                            const resolveDependencies = typeof modulePreload === 'object' &&
+                                modulePreload.resolveDependencies;
+                            const importsFileNames = imports.map((chunk) => chunk.fileName);
+                            const resolvedDeps = resolveDependencies
+                                ? resolveDependencies(chunk.fileName, importsFileNames, {
+                                    hostId: relativeUrlPath,
+                                    hostType: 'html',
+                                })
+                                : importsFileNames;
+                            assetTags.push(...resolvedDeps.map((i) => toPreloadTag(i, toOutputAssetFilePath)));
+                        }
                     }
                     assetTags.push(...getCssTagsForChunk(chunk, toOutputAssetFilePath));
                     result = injectToHead(result, assetTags);
@@ -36372,13 +36374,18 @@ function cssPostPlugin(config) {
             let isPureCssChunk = true;
             const ids = Object.keys(chunk.modules);
             for (const id of ids) {
-                if (!isCSSRequest(id) ||
-                    cssModuleRE.test(id) ||
-                    commonjsProxyRE.test(id)) {
-                    isPureCssChunk = false;
-                }
                 if (styles.has(id)) {
                     chunkCSS += styles.get(id);
+                    // a css module contains JS, so it makes this not a pure css chunk
+                    if (cssModuleRE.test(id)) {
+                        isPureCssChunk = false;
+                    }
+                }
+                else {
+                    // if the module does not have a style, then it's not a pure css chunk.
+                    // this is true because in the `transform` hook above, only modules
+                    // that are css gets added to the `styles` map.
+                    isPureCssChunk = false;
                 }
             }
             if (!chunkCSS) {
@@ -39455,7 +39462,12 @@ async function loadAndTransform(id, url, server, options, timestamp) {
                 `going through the plugin transforms, and therefore should not be ` +
                 `imported from source code. It can only be referenced via HTML tags.`
             : `Does the file exist?`;
-        const err = new Error(`Failed to load url ${url} (resolved id: ${id}). ${msg}`);
+        const importerMod = server.moduleGraph.idToModuleMap
+            .get(id)
+            ?.importers.values()
+            .next().value;
+        const importer = importerMod?.file || importerMod?.url;
+        const err = new Error(`Failed to load url ${url} (resolved id: ${id})${importer ? ` in ${importer}` : ''}. ${msg}`);
         err.code = isPublicFile ? ERR_LOAD_PUBLIC_URL : ERR_LOAD_URL;
         throw err;
     }
@@ -40386,15 +40398,23 @@ function definePlugin(config) {
             __vite_process_env_NODE_ENV: JSON.stringify(nodeEnv),
         });
     }
-    const env = { ...config.env };
     const userDefine = {};
+    const userDefineEnv = {};
     for (const key in config.define) {
         const val = config.define[key];
         userDefine[key] = typeof val === 'string' ? val : JSON.stringify(val);
         // make sure `import.meta.env` object has user define properties
-        const match = key.match(metaEnvRe);
-        if (match) {
-            env[match[1]] = val;
+        if (isBuild) {
+            const match = key.match(metaEnvRe);
+            if (match) {
+                userDefineEnv[match[1]] =
+                    // test if value is raw identifier to wrap with __vite__ so when
+                    // stringified for `import.meta.env`, we can remove the quotes and
+                    // retain being an identifier
+                    typeof val === 'string' && /^[\p{L}_$]/u.test(val.trim())
+                        ? `__vite__${val}__vite__`
+                        : val;
+            }
         }
     }
     // during dev, import.meta properties are handled by importAnalysis plugin.
@@ -40402,7 +40422,10 @@ function definePlugin(config) {
     const importMetaKeys = {};
     const importMetaFallbackKeys = {};
     if (isBuild) {
-        env.SSR = !!config.build.ssr;
+        const env = {
+            ...config.env,
+            SSR: !!config.build.ssr,
+        };
         // set here to allow override with config.define
         importMetaKeys['import.meta.hot'] = `undefined`;
         for (const key in env) {
@@ -40410,7 +40433,7 @@ function definePlugin(config) {
         }
         Object.assign(importMetaFallbackKeys, {
             'import.meta.env.': `({}).`,
-            'import.meta.env': JSON.stringify(env),
+            'import.meta.env': JSON.stringify({ ...env, ...userDefineEnv }).replace(/"__vite__(.+?)__vite__"/g, (_, val) => val),
         });
     }
     function generatePattern(ssr) {
@@ -58106,6 +58129,12 @@ function createWebSocketServer(server, config, httpsOptions) {
             const client = getSocketClient(socket);
             listeners.forEach((listener) => listener(parsed.data, client));
         });
+        socket.on('error', (err) => {
+            config.logger.error(`${picocolorsExports.red(`ws error:`)}\n${err.stack}`, {
+                timestamp: true,
+                error: err,
+            });
+        });
         socket.send(JSON.stringify({ type: 'connected' }));
         if (bufferedError) {
             socket.send(JSON.stringify(bufferedError));
@@ -61671,6 +61700,16 @@ function resolvePreviewOptions(preview, server) {
  */
 async function preview(inlineConfig = {}) {
     const config = await resolveConfig(inlineConfig, 'serve', 'production', 'production');
+    const distDir = path$o.resolve(config.root, config.build.outDir);
+    if (!fs$l.existsSync(distDir) &&
+        // error if no plugins implement `configurePreviewServer`
+        config.plugins.every((plugin) => !plugin.configurePreviewServer) &&
+        // error if called in CLI only. programmatic usage could access `httpServer`
+        // and affect file serving
+        process.argv[1]?.endsWith(path$o.normalize('bin/vite.js')) &&
+        process.argv[2] === 'preview') {
+        throw new Error(`The directory "${config.build.outDir}" does not exist. Did you build your project?`);
+    }
     const app = connect();
     const httpServer = await resolveHttpServer(config.preview, app, await resolveHttpsConfig(config.preview?.https));
     setClientErrorHandler(httpServer, config.logger);
@@ -61692,7 +61731,6 @@ async function preview(inlineConfig = {}) {
     app.use(compression());
     const previewBase = config.base === './' || config.base === '' ? '/' : config.base;
     // static assets
-    const distDir = path$o.resolve(config.root, config.build.outDir);
     const headers = config.preview.headers;
     const assetServer = sirv(distDir, {
         etag: true,

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-9912c491.js';
+import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-ca21228b.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -729,7 +729,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-9912c491.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-ca21228b.js').then(function (n) { return n.E; });
     try {
         const server = await createServer({
             root,
@@ -807,7 +807,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-9912c491.js').then(function (n) { return n.D; });
+    const { build } = await import('./chunks/dep-ca21228b.js').then(function (n) { return n.D; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -835,7 +835,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-9912c491.js').then(function (n) { return n.C; });
+    const { optimizeDeps } = await import('./chunks/dep-ca21228b.js').then(function (n) { return n.C; });
     try {
         const config = await resolveConfig({
             root,
@@ -860,7 +860,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-9912c491.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-ca21228b.js').then(function (n) { return n.F; });
     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-9912c491.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-ca21228b.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": "4.1.2",
+  "version": "4.1.4",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",