vite 3.1.4 → 3.1.6

package/dist/node/chunks/{dep-6b3a5aff.js → dep-db16f19c.js}

@@ -1,11 +1,11 @@
 import fs$l, { promises as promises$2 } from 'node:fs';
-import path$n, { posix as posix$2, isAbsolute as isAbsolute$2, resolve as resolve$6, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
+import path$n, { posix as posix$2, isAbsolute as isAbsolute$3, resolve as resolve$6, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
 import { URL as URL$3, pathToFileURL, URLSearchParams, parse as parse$k } from 'node:url';
 import { performance } from 'node:perf_hooks';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
 import require$$0$3 from 'tty';
 import { transform as transform$2, build as build$3, formatMessages } from 'esbuild';
-import require$$0$4, { sep, resolve as resolve$4, posix as posix$1, relative as relative$1, basename as basename$1, extname, dirname as dirname$1, join as join$1, win32 as win32$1, isAbsolute as isAbsolute$1, normalize } from 'path';
+import require$$0$4, { sep, resolve as resolve$4, posix as posix$1, relative as relative$1, basename as basename$1, extname, dirname as dirname$1, join as join$1, win32 as win32$1, isAbsolute as isAbsolute$2, normalize } from 'path';
 import * as require$$0$2 from 'fs';
 import require$$0__default, { existsSync, readFileSync, statSync as statSync$1, promises as promises$1, readdirSync } from 'fs';
 import require$$0$5 from 'events';
@@ -22,7 +22,7 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promisify as promisify$4 } from 'node:util';
 import { promises } from 'node:dns';
 import resolve$5 from 'resolve';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5 from 'crypto';
 import require$$0$a from 'buffer';
 import { Buffer as Buffer$1 } from 'node:buffer';
@@ -4327,7 +4327,7 @@ function ownProp (obj, field) {
 var fs$i = require$$0__default;
 var path$i = require$$0$4;
 var minimatch = minimatch_1;
-var isAbsolute = pathIsAbsolute.exports;
+var isAbsolute$1 = pathIsAbsolute.exports;
 var Minimatch = minimatch.Minimatch;
 
 function alphasort (a, b) {
@@ -4415,7 +4415,7 @@ function setopts (self, pattern, options) {
 
   // TODO: is an absolute `cwd` supposed to be resolved against `root`?
   // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
-  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
+  self.cwdAbs = isAbsolute$1(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
   if (process.platform === "win32")
     self.cwdAbs = self.cwdAbs.replace(/\\/g, "/");
   self.nomount = !!options.nomount;
@@ -4514,7 +4514,7 @@ function makeAbs (self, f) {
   var abs = f;
   if (f.charAt(0) === '/') {
     abs = path$i.join(self.root, f);
-  } else if (isAbsolute(f) || f === '') {
+  } else if (isAbsolute$1(f) || f === '') {
     abs = f;
   } else if (self.changedCwd) {
     abs = path$i.resolve(self.cwd, f);
@@ -11473,7 +11473,7 @@ const normalizePath$4 = function normalizePath(filename) {
 };
 
 function getMatcherString(id, resolutionBase) {
-    if (resolutionBase === false || isAbsolute$1(id) || id.startsWith('*')) {
+    if (resolutionBase === false || isAbsolute$2(id) || id.startsWith('*')) {
         return normalizePath$4(id);
     }
     // resolve('') is valid and will default to process.cwd()
@@ -34618,7 +34618,9 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         let resolvedId = id;
         if (isDeepImport) {
             if (!pkg?.data.exports && path$n.extname(id) !== resolvedExt) {
-                resolvedId += resolvedExt;
+                resolvedId = resolved.id.slice(resolved.id.indexOf(id));
+                isDebug$4 &&
+                    debug$c(`[processResult] ${picocolors.exports.cyan(id)} -> ${picocolors.exports.dim(resolvedId)}`);
             }
         }
         return { ...resolved, id: resolvedId, external: true };
@@ -36036,7 +36038,7 @@ async function toAbsoluteGlob(glob, root, importer, resolveId) {
     if (glob.startsWith('**'))
         return pre + glob;
     const resolved = normalizePath$3((await resolveId(glob, importer)) || glob);
-    if (isAbsolute$2(resolved)) {
+    if (isAbsolute$3(resolved)) {
         return pre + globSafeResolvedPath(resolved, glob);
     }
     throw new Error(`Invalid glob: "${glob}" (resolved: "${resolved}"). It must start with '/' or './'`);
@@ -36161,11 +36163,11 @@ function updateModules(file, modules, timestamp, { config, ws }) {
         updates.push(...[...boundaries].map(({ boundary, acceptedVia }) => ({
             type: `${boundary.type}-update`,
             timestamp,
-            path: boundary.url,
+            path: normalizeHmrUrl(boundary.url),
             explicitImportRequired: boundary.type === 'js'
                 ? isExplicitImportRequired(acceptedVia.url)
                 : undefined,
-            acceptedPath: acceptedVia.url
+            acceptedPath: normalizeHmrUrl(acceptedVia.url)
         })));
     }
     if (needFullReload) {
@@ -36433,6 +36435,12 @@ function lexAcceptedHmrExports(code, start, exportNames) {
     }
     return urls.size > 0;
 }
+function normalizeHmrUrl(url) {
+    if (!url.startsWith('.') && !url.startsWith('/')) {
+        url = wrapId(url);
+    }
+    return url;
+}
 function error$1(pos) {
     const err = new Error(`import.meta.hot.accept() can only accept string literals or an ` +
         `Array of string literals.`);
@@ -37828,7 +37836,7 @@ function importAnalysisPlugin(config) {
                             : `[detected api usage]`} ${prettyImporter}`);
                 // inject hot context
                 str().prepend(`import { createHotContext as __vite__createHotContext } from "${clientPublicPath}";` +
-                    `import.meta.hot = __vite__createHotContext(${JSON.stringify(importerModule.url)});`);
+                    `import.meta.hot = __vite__createHotContext(${JSON.stringify(normalizeHmrUrl(importerModule.url))});`);
             }
             if (needQueryInjectHelper) {
                 str().prepend(`import { injectQuery as __vite__injectQuery } from "${clientPublicPath}";`);
@@ -44300,7 +44308,7 @@ function cssPostPlugin(config) {
                     // the legacy build should avoid inserting entry CSS modules here, they
                     // will be collected into `chunk.viteMetadata.importedCss` and injected
                     // later by the `'vite:build-html'` plugin into the `index.html`
-                    if (chunk.isEntry) {
+                    if (chunk.isEntry && !config.build.lib) {
                         return null;
                     }
                     chunkCSS = await finalizeCss(chunkCSS, true, config);
@@ -44512,7 +44520,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-55b95cd5.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-f9780a5e.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -53063,35 +53071,35 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
     function isInScope(name, parents) {
         return parents.some((node) => node && scopeMap.get(node)?.has(name));
     }
-    function handlePattern(p, parentFunction) {
+    function handlePattern(p, parentScope) {
         if (p.type === 'Identifier') {
-            setScope(parentFunction, p.name);
+            setScope(parentScope, p.name);
         }
         else if (p.type === 'RestElement') {
-            handlePattern(p.argument, parentFunction);
+            handlePattern(p.argument, parentScope);
         }
         else if (p.type === 'ObjectPattern') {
             p.properties.forEach((property) => {
                 if (property.type === 'RestElement') {
-                    setScope(parentFunction, property.argument.name);
+                    setScope(parentScope, property.argument.name);
                 }
                 else {
-                    handlePattern(property.value, parentFunction);
+                    handlePattern(property.value, parentScope);
                 }
             });
         }
         else if (p.type === 'ArrayPattern') {
             p.elements.forEach((element) => {
                 if (element) {
-                    handlePattern(element, parentFunction);
+                    handlePattern(element, parentScope);
                 }
             });
         }
         else if (p.type === 'AssignmentPattern') {
-            handlePattern(p.left, parentFunction);
+            handlePattern(p.left, parentScope);
         }
         else {
-            setScope(parentFunction, p.name);
+            setScope(parentScope, p.name);
         }
     }
     walk$1(root, {
@@ -53099,7 +53107,12 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
             if (node.type === 'ImportDeclaration') {
                 return this.skip();
             }
-            parent && parentStack.unshift(parent);
+            // track parent stack, skip for "else-if"/"else" branches as acorn nests
+            // the ast within "if" nodes instead of flattening them
+            if (parent &&
+                !(parent.type === 'IfStatement' && node === parent.alternate)) {
+                parentStack.unshift(parent);
+            }
             if (node.type === 'MetaProperty' && node.meta.name === 'import') {
                 onImportMeta(node);
             }
@@ -53117,9 +53130,9 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 // If it is a function declaration, it could be shadowing an import
                 // Add its name to the scope so it won't get replaced
                 if (node.type === 'FunctionDeclaration') {
-                    const parentFunction = findParentFunction(parentStack);
-                    if (parentFunction) {
-                        setScope(parentFunction, node.id.name);
+                    const parentScope = findParentScope(parentStack);
+                    if (parentScope) {
+                        setScope(parentScope, node.id.name);
                     }
                 }
                 // walk function expressions and add its arguments to known identifiers
@@ -53158,14 +53171,18 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 setIsNodeInPattern(node);
             }
             else if (node.type === 'VariableDeclarator') {
-                const parentFunction = findParentFunction(parentStack);
+                const parentFunction = findParentScope(parentStack);
                 if (parentFunction) {
                     handlePattern(node.id, parentFunction);
                 }
             }
         },
         leave(node, parent) {
-            parent && parentStack.shift();
+            // untrack parent stack from above
+            if (parent &&
+                !(parent.type === 'IfStatement' && node === parent.alternate)) {
+                parentStack.shift();
+            }
         }
     });
     // emit the identifier events in BFS so the hoisted declarations
@@ -53227,11 +53244,13 @@ function isRefIdentifier(id, parent, parentStack) {
 }
 const isStaticProperty = (node) => node && node.type === 'Property' && !node.computed;
 const isStaticPropertyKey = (node, parent) => isStaticProperty(parent) && parent.key === node;
+const functionNodeTypeRE = /Function(?:Expression|Declaration)$|Method$/;
 function isFunction(node) {
-    return /Function(?:Expression|Declaration)$|Method$/.test(node.type);
+    return functionNodeTypeRE.test(node.type);
 }
-function findParentFunction(parentStack) {
-    return parentStack.find((i) => isFunction(i));
+const scopeNodeTypeRE = /(?:Function|Class)(?:Expression|Declaration)$|Method$|^IfStatement$/;
+function findParentScope(parentStack) {
+    return parentStack.find((i) => scopeNodeTypeRE.test(i.type));
 }
 function isInDestructuringAssignment(parent, parentStack) {
     if (parent &&
@@ -63421,40 +63440,31 @@ async function bundleConfigFile(fileName, isESM) {
             {
                 name: 'externalize-deps',
                 setup(build) {
-                    build.onResolve({ filter: /.*/ }, ({ path: id, importer }) => {
+                    const options = {
+                        root: path$n.dirname(fileName),
+                        isBuild: true,
+                        isProduction: true,
+                        isRequire: !isESM,
+                        preferRelative: false,
+                        tryIndex: true,
+                        mainFields: [],
+                        conditions: [],
+                        dedupe: [],
+                        extensions: DEFAULT_EXTENSIONS$1,
+                        preserveSymlinks: false
+                    };
+                    build.onResolve({ filter: /.*/ }, ({ path: id, importer, kind }) => {
                         // externalize bare imports
-                        if (id[0] !== '.' && !path$n.isAbsolute(id)) {
+                        if (id[0] !== '.' && !isAbsolute(id)) {
+                            let idFsPath = tryNodeResolve(id, importer, options, false)?.id;
+                            if (idFsPath && (isESM || kind === 'dynamic-import')) {
+                                idFsPath = pathToFileURL(idFsPath).href;
+                            }
                             return {
+                                path: idFsPath,
                                 external: true
                             };
                         }
-                        // bundle the rest and make sure that the we can also access
-                        // it's third-party dependencies. externalize if not.
-                        // monorepo/
-                        // ├─ package.json
-                        // ├─ utils.js -----------> bundle (share same node_modules)
-                        // ├─ vite-project/
-                        // │  ├─ vite.config.js --> entry
-                        // │  ├─ package.json
-                        // ├─ foo-project/
-                        // │  ├─ utils.js --------> external (has own node_modules)
-                        // │  ├─ package.json
-                        const idFsPath = path$n.resolve(path$n.dirname(importer), id);
-                        const idPkgPath = lookupFile(idFsPath, [`package.json`], {
-                            pathOnly: true
-                        });
-                        if (idPkgPath) {
-                            const idPkgDir = path$n.dirname(idPkgPath);
-                            // if this file needs to go up one or more directory to reach the vite config,
-                            // that means it has it's own node_modules (e.g. foo-project)
-                            if (path$n.relative(idPkgDir, fileName).startsWith('..')) {
-                                return {
-                                    // normalize actual import after bundled as a single vite config
-                                    path: isESM ? pathToFileURL(idFsPath).href : idFsPath,
-                                    external: true
-                                };
-                            }
-                        }
                     });
                 }
             },
@@ -63548,5 +63558,8 @@ function isDepsOptimizerEnabled(config, ssr) {
         (command === 'build' && disabled === 'build') ||
         (command === 'serve' && disabled === 'dev'));
 }
+function isAbsolute(id) {
+    return path$n.isAbsolute(id) || path$n.posix.isAbsolute(id);
+}
 
 export { index$1 as A, build$1 as B, index as C, preview$1 as D, resolvePackageData as a, build as b, createServer as c, defineConfig as d, resolveConfig as e, formatPostcssSourceMap as f, resolveBaseUrl as g, getDepOptimizationConfig as h, isDepsOptimizerEnabled as i, mergeAlias as j, createFilter as k, loadConfigFromFile as l, mergeConfig as m, normalizePath$3 as n, optimizeDeps as o, preview as p, send as q, resolvePackageEntry as r, sortUserPlugins as s, transformWithEsbuild as t, createLogger as u, searchForWorkspaceRoot as v, loadEnv as w, resolveEnvPrefix as x, picocolors as y, commonjsGlobal as z };

package/dist/node/chunks/{dep-55b95cd5.js → dep-f9780a5e.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { z as commonjsGlobal } from './dep-6b3a5aff.js';
+import { z as commonjsGlobal } from './dep-db16f19c.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-6b3a5aff.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-db16f19c.js';
 import { VERSION } from './constants.js';
 import 'node:fs';
 import 'node:path';
@@ -695,7 +695,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-6b3a5aff.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-db16f19c.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -742,7 +742,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build } = await import('./chunks/dep-6b3a5aff.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-db16f19c.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -766,7 +766,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await import('./chunks/dep-6b3a5aff.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-db16f19c.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -789,7 +789,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await import('./chunks/dep-6b3a5aff.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-db16f19c.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-var version = "3.1.4";
+var version = "3.1.6";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.js

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

@@ -31,7 +31,7 @@ var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 
-var version = "3.1.4";
+var version = "3.1.6";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -58,7 +58,7 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.15.6",
+    "esbuild": "^0.15.9",
     "postcss": "^8.4.16",
     "resolve": "^1.22.1",
     "rollup": "~2.78.0"