vite 4.1.1 → 4.1.2

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

@@ -35230,12 +35230,13 @@ function stripLiteralAcorn(code) {
   return result;
 }
 
-const multilineCommentsRE = /\/\*.*?\*\//gms;
+const multilineCommentsRE = /\/\*([^*\/])*?\*\//gms;
 const singlelineCommentsRE = /(?:^|\n|\r)\s*\/\/.*(?:\r|\n|$)/gm;
 const templateLiteralRE = /\$\{(\s*(?:(?!\$\{).|\n|\r)*?\s*)\}/g;
 const quotesRE = [
   /(["'`])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
   /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
+  // multi-line strings (i.e. template literals only)
 ];
 function stripLiteralRegex(code) {
   code = code.replace(multilineCommentsRE, (s) => " ".repeat(s.length)).replace(singlelineCommentsRE, (s) => " ".repeat(s.length));
@@ -35308,15 +35309,15 @@ function polyfill() {
             }
         }
     }).observe(document, { childList: true, subtree: true });
-    function getFetchOpts(script) {
+    function getFetchOpts(link) {
         const fetchOpts = {};
-        if (script.integrity)
-            fetchOpts.integrity = script.integrity;
-        if (script.referrerpolicy)
-            fetchOpts.referrerPolicy = script.referrerpolicy;
-        if (script.crossorigin === 'use-credentials')
+        if (link.integrity)
+            fetchOpts.integrity = link.integrity;
+        if (link.referrerPolicy)
+            fetchOpts.referrerPolicy = link.referrerPolicy;
+        if (link.crossOrigin === 'use-credentials')
             fetchOpts.credentials = 'include';
-        else if (script.crossorigin === 'anonymous')
+        else if (link.crossOrigin === 'anonymous')
             fetchOpts.credentials = 'omit';
         else
             fetchOpts.credentials = 'same-origin';
@@ -39767,13 +39768,14 @@ function importAnalysisPlugin(config) {
                     const prop = source.slice(end, end + 4);
                     if (prop === '.hot') {
                         hasHMR = true;
-                        if (source.slice(end + 4, end + 11) === '.accept') {
+                        const endHot = end + 4 + (source[end + 4] === '?' ? 1 : 0);
+                        if (source.slice(endHot, endHot + 7) === '.accept') {
                             // further analyze accepted modules
-                            if (source.slice(end + 4, end + 18) === '.acceptExports') {
-                                lexAcceptedHmrExports(source, source.indexOf('(', end + 18) + 1, acceptedExports);
+                            if (source.slice(endHot, endHot + 14) === '.acceptExports') {
+                                lexAcceptedHmrExports(source, source.indexOf('(', endHot + 14) + 1, acceptedExports);
                                 isPartiallySelfAccepting = true;
                             }
-                            else if (lexAcceptedHmrDeps(source, source.indexOf('(', end + 11) + 1, acceptedUrls)) {
+                            else if (lexAcceptedHmrDeps(source, source.indexOf('(', endHot + 7) + 1, acceptedUrls)) {
                                 isSelfAccepting = true;
                             }
                         }
@@ -40362,6 +40364,7 @@ function getAliasPatterns(entries) {
 }
 
 const nonJsRe = /\.json(?:$|\?)/;
+const metaEnvRe = /import\.meta\.env\.(.+)/;
 const isNonJsRequest = (request) => nonJsRe.test(request);
 function definePlugin(config) {
     const isBuild = config.command === 'build';
@@ -40383,20 +40386,23 @@ function definePlugin(config) {
             __vite_process_env_NODE_ENV: JSON.stringify(nodeEnv),
         });
     }
+    const env = { ...config.env };
     const userDefine = {};
     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;
+        }
     }
     // during dev, import.meta properties are handled by importAnalysis plugin.
     // ignore replace import.meta.env in lib build
     const importMetaKeys = {};
     const importMetaFallbackKeys = {};
     if (isBuild) {
-        const env = {
-            ...config.env,
-            SSR: !!config.build.ssr,
-        };
+        env.SSR = !!config.build.ssr;
         // set here to allow override with config.define
         importMetaKeys['import.meta.hot'] = `undefined`;
         for (const key in env) {
@@ -40404,7 +40410,7 @@ function definePlugin(config) {
         }
         Object.assign(importMetaFallbackKeys, {
             'import.meta.env.': `({}).`,
-            'import.meta.env': JSON.stringify(config.env),
+            'import.meta.env': JSON.stringify(env),
         });
     }
     function generatePattern(ssr) {
@@ -41399,12 +41405,8 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             err.id = ctx._activeId;
         if (ctx._activeCode) {
             err.pluginCode = ctx._activeCode;
-            const pos = position != null
-                ? position
-                : err.pos != null
-                    ? err.pos
-                    : // some rollup plugins, e.g. json, sets position instead of pos
-                        err.position;
+            // some rollup plugins, e.g. json, sets err.position instead of err.pos
+            const pos = position ?? err.pos ?? err.position;
             if (pos != null) {
                 let errLocation;
                 try {
@@ -42496,7 +42498,7 @@ async function createDepsOptimizer(config, server) {
             id,
             file: getOptimizedDepPath(id, config, ssr),
             src: resolved,
-            // Assing a browserHash to this missing dependency that is unique to
+            // Adding a browserHash to this missing dependency that is unique to
             // the current state of known + missing deps. If its optimizeDeps run
             // doesn't alter the bundled files of previous known dependencies,
             // we don't need a full reload and this browserHash will be kept
@@ -43491,7 +43493,7 @@ function buildImportAnalysisPlugin(config) {
                 // The importerUrl is passed as third parameter to __vitePreload in this case
                 `function(dep, importerUrl) { return new URL(dep, importerUrl).href }`
             : // If the base isn't relative, then the deps are relative to the projects `outDir` and the base
-                // is appendended inside __vitePreload too.
+                // is appended inside __vitePreload too.
                 `function(dep) { return ${JSON.stringify(config.base)}+dep }`;
     const preloadCode = `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};export const ${preloadMethod} = ${preload.toString()}`;
     return {
@@ -44259,6 +44261,10 @@ function _interpolate (envValue, environment, config) {
       replacePart = parts[0];
       value = replacePart.replace('\\$', '$');
     } else {
+      // PATCH: compatible with env variables ended with unescaped $
+      if(!parts[2]) {
+        return newEnv
+      }
       const keyParts = parts[2].split(':-');
       const key = keyParts[0];
       replacePart = parts[0].substring(prefix.length);
@@ -44335,18 +44341,9 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (parsed.BROWSER_ARGS && process.env.BROWSER_ARGS === undefined) {
         process.env.BROWSER_ARGS = parsed.BROWSER_ARGS;
     }
-    try {
-        // let environment variables use each other
-        expand_1({ parsed });
-    }
-    catch (e) {
-        // custom error handling until https://github.com/motdotla/dotenv-expand/issues/65 is fixed upstream
-        // check for message "TypeError: Cannot read properties of undefined (reading 'split')"
-        if (e.message.includes('split')) {
-            throw new Error('dotenv-expand failed to expand env vars. Maybe you need to escape `$`?');
-        }
-        throw e;
-    }
+    // let environment variables use each other
+    // `expand` patched in patches/dotenv-expand@9.0.0.patch
+    expand_1({ parsed });
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {
@@ -51811,7 +51808,7 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
         if (!err.loc || !err.loc.line)
             throw err;
         const line = err.loc.line;
-        throw new Error(`Parse failure: ${err.message}\nContents of line ${line}: ${code.split('\n')[line - 1]}`);
+        throw new Error(`Parse failure: ${err.message}\nAt file: ${url}\nContents of line ${line}: ${code.split('\n')[line - 1]}`);
     }
     let uid = 0;
     const deps = new Set();
@@ -52244,13 +52241,13 @@ function ssrRewriteStacktrace(stack, moduleGraph) {
             if (!pos.source || pos.line == null || pos.column == null) {
                 return input;
             }
-            const trimedVarName = varName.trim();
+            const trimmedVarName = varName.trim();
             const source = `${pos.source}:${pos.line}:${pos.column}`;
-            if (!trimedVarName || trimedVarName === 'eval') {
+            if (!trimmedVarName || trimmedVarName === 'eval') {
                 return `    at ${source}`;
             }
             else {
-                return `    at ${trimedVarName} (${source})`;
+                return `    at ${trimmedVarName} (${source})`;
             }
         });
     })

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-3007b26d.js';
+import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-9912c491.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-3007b26d.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-9912c491.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-3007b26d.js').then(function (n) { return n.D; });
+    const { build } = await import('./chunks/dep-9912c491.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-3007b26d.js').then(function (n) { return n.C; });
+    const { optimizeDeps } = await import('./chunks/dep-9912c491.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-3007b26d.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-9912c491.js').then(function (n) { return n.F; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -143,6 +143,7 @@ export declare interface BuildOptions {
      *
      * For custom targets, see https://esbuild.github.io/api/#target and
      * https://esbuild.github.io/content-types/#javascript for more details.
+     * @default 'modules'
      */
     target?: 'modules' | EsbuildTransformOptions['target'] | false;
     /**
@@ -190,6 +191,7 @@ export declare interface BuildOptions {
      * a niche browser that comes with most modern JavaScript features
      * but has poor CSS support, e.g. Android WeChat WebView, which
      * doesn't support the #RGBA syntax.
+     * @default target
      */
     cssTarget?: EsbuildTransformOptions['target'] | false;
     /**
@@ -264,16 +266,19 @@ export declare interface BuildOptions {
      * Build in library mode. The value should be the global name of the lib in
      * UMD mode. This will produce esm + cjs + umd bundle formats with default
      * configurations that are suitable for distributing libraries.
+     * @default false
      */
     lib?: LibraryOptions | false;
     /**
      * Produce SSR oriented build. Note this requires specifying SSR entry via
      * `rollupOptions.input`.
+     * @default false
      */
     ssr?: boolean | string;
     /**
      * Generate SSR manifest for determining style links and asset preload
      * directives in production.
+     * @default false
      */
     ssrManifest?: boolean | string;
     /**
@@ -285,6 +290,7 @@ export declare interface BuildOptions {
     /**
      * Set to false to disable reporting compressed chunk sizes.
      * Can slightly improve build speed.
+     * @default true
      */
     reportCompressedSize?: boolean;
     /**
@@ -295,6 +301,7 @@ export declare interface BuildOptions {
     /**
      * Rollup watch options
      * https://rollupjs.org/configuration-options/#watch
+     * @default null
      */
     watch?: WatcherOptions | null;
 }
@@ -1723,6 +1730,9 @@ export declare type ResolveModulePreloadDependenciesFn = (filename: string, deps
 }) => string[];
 
 export declare interface ResolveOptions {
+    /**
+     * @default ['module', 'jsnext:main', 'jsnext']
+     */
     mainFields?: string[];
     /**
      * @deprecated In future, `mainFields` should be used instead.
@@ -1730,8 +1740,14 @@ export declare interface ResolveOptions {
      */
     browserField?: boolean;
     conditions?: string[];
+    /**
+     * @default ['.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json']
+     */
     extensions?: string[];
     dedupe?: string[];
+    /**
+     * @default false
+     */
     preserveSymlinks?: boolean;
 }
 
@@ -2031,6 +2047,7 @@ export declare interface ServerOptions extends CommonServerOptions {
     watch?: WatchOptions;
     /**
      * Create Vite dev server to be used as a middleware in an existing server
+     * @default false
      */
     middlewareMode?: boolean | 'html' | 'ssr';
     /**
@@ -2086,7 +2103,7 @@ export declare interface SSROptions {
     /**
      * Define the target for the ssr build. The browser field in package.json
      * is ignored for node but used if webworker is the target
-     * Default: 'node'
+     * @default 'node'
      */
     target?: SSRTarget;
     /**
@@ -2095,6 +2112,7 @@ export declare interface SSROptions {
      * left marked as experimental to give users more time to update to ESM. CJS builds requires
      * complex externalization heuristics that aren't present in the ESM format.
      * @experimental
+     * @default 'esm'
      */
     format?: SSRFormat;
     /**

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-3007b26d.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-9912c491.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

@@ -4195,6 +4195,10 @@ function _interpolate (envValue, environment, config) {
       replacePart = parts[0];
       value = replacePart.replace('\\$', '$');
     } else {
+      // PATCH: compatible with env variables ended with unescaped $
+      if(!parts[2]) {
+        return newEnv
+      }
       const keyParts = parts[2].split(':-');
       const key = keyParts[0];
       replacePart = parts[0].substring(prefix.length);
@@ -4271,18 +4275,9 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (parsed.BROWSER_ARGS && process.env.BROWSER_ARGS === undefined) {
         process.env.BROWSER_ARGS = parsed.BROWSER_ARGS;
     }
-    try {
-        // let environment variables use each other
-        expand_1({ parsed });
-    }
-    catch (e) {
-        // custom error handling until https://github.com/motdotla/dotenv-expand/issues/65 is fixed upstream
-        // check for message "TypeError: Cannot read properties of undefined (reading 'split')"
-        if (e.message.includes('split')) {
-            throw new Error('dotenv-expand failed to expand env vars. Maybe you need to escape `$`?');
-        }
-        throw e;
-    }
+    // let environment variables use each other
+    // `expand` patched in patches/dotenv-expand@9.0.0.patch
+    expand_1({ parsed });
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -125,7 +125,7 @@
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.0.1",
-    "strip-literal": "^0.4.2",
+    "strip-literal": "^1.0.1",
     "tsconfck": "^2.0.2",
     "tslib": "^2.5.0",
     "types": "link:./types",