vite 3.2.0-beta.1 → 3.2.0-beta.2

package/dist/node/chunks/{dep-46ac452b.js → dep-0726141c.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { z as commonjsGlobal } from './dep-34b5a6bf.js';
+import { z as commonjsGlobal } from './dep-0856a44a.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/chunks/{dep-34b5a6bf.js → dep-0856a44a.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$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 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 { 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$2, 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$1, 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';
@@ -4331,7 +4331,7 @@ function ownProp (obj, field) {
 var fs$i = require$$0__default;
 var path$i = require$$0$4;
 var minimatch = minimatch_1;
-var isAbsolute$1 = pathIsAbsolute.exports;
+var isAbsolute = pathIsAbsolute.exports;
 var Minimatch = minimatch.Minimatch;
 
 function alphasort (a, b) {
@@ -4419,7 +4419,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$1(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
+  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
   if (process.platform === "win32")
     self.cwdAbs = self.cwdAbs.replace(/\\/g, "/");
   self.nomount = !!options.nomount;
@@ -4518,7 +4518,7 @@ function makeAbs (self, f) {
   var abs = f;
   if (f.charAt(0) === '/') {
     abs = path$i.join(self.root, f);
-  } else if (isAbsolute$1(f) || f === '') {
+  } else if (isAbsolute(f) || f === '') {
     abs = f;
   } else if (self.changedCwd) {
     abs = path$i.resolve(self.cwd, f);
@@ -11526,7 +11526,7 @@ const normalizePath$4 = function normalizePath(filename) {
 };
 
 function getMatcherString(id, resolutionBase) {
-    if (resolutionBase === false || isAbsolute$2(id) || id.startsWith('*')) {
+    if (resolutionBase === false || isAbsolute$1(id) || id.startsWith('*')) {
         return normalizePath$4(id);
     }
     // resolve('') is valid and will default to process.cwd()
@@ -34968,12 +34968,24 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
     if (nestedRoot) {
         basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks);
     }
+    // nearest package.json
+    let nearestPkg;
+    // nearest package.json that may have the `exports` field
     let pkg;
-    const pkgId = possiblePkgIds.reverse().find((pkgId) => {
-        pkg = resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache);
-        return pkg;
+    let pkgId = possiblePkgIds.reverse().find((pkgId) => {
+        nearestPkg = resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache);
+        return nearestPkg;
     });
-    if (!pkg) {
+    const rootPkgId = possiblePkgIds[0];
+    const rootPkg = resolvePackageData(rootPkgId, basedir, preserveSymlinks, packageCache);
+    if (rootPkg?.data?.exports) {
+        pkg = rootPkg;
+        pkgId = rootPkgId;
+    }
+    else {
+        pkg = nearestPkg;
+    }
+    if (!pkg || !nearestPkg) {
         // if import can't be found, check if it's an optional peer dep.
         // if so, we can resolve to a special id that errors only when imported.
         if (basedir !== root && // root has no peer dep
@@ -35060,7 +35072,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         });
     }
     const ext = path$n.extname(resolved);
-    const isCJS = ext === '.cjs' || (ext === '.js' && pkg.data.type !== 'module');
+    const isCJS = ext === '.cjs' || (ext === '.js' && nearestPkg.data.type !== 'module');
     if (!options.ssrOptimizeCheck &&
         (!resolved.includes('node_modules') || // linked
             !depsOptimizer || // resolving before listening to the server
@@ -35541,8 +35553,7 @@ function esbuildDepPlugin(qualified, exportsData, external, config, ssr) {
                 const flatId = flattenId(id);
                 if (flatId in qualified) {
                     return {
-                        path: flatId,
-                        namespace: 'dep'
+                        path: qualified[flatId]
                     };
                 }
             }
@@ -35571,43 +35582,6 @@ function esbuildDepPlugin(qualified, exportsData, external, config, ssr) {
                     return resolveResult(id, resolved);
                 }
             });
-            // For entry files, we'll read it ourselves and construct a proxy module
-            // to retain the entry's raw id instead of file path so that esbuild
-            // outputs desired output file structure.
-            // It is necessary to do the re-exporting to separate the virtual proxy
-            // module from the actual module since the actual module may get
-            // referenced via relative imports - if we don't separate the proxy and
-            // the actual module, esbuild will create duplicated copies of the same
-            // module!
-            const root = path$n.resolve(config.root);
-            build.onLoad({ filter: /.*/, namespace: 'dep' }, ({ path: id }) => {
-                const entryFile = qualified[id];
-                let relativePath = normalizePath$3(path$n.relative(root, entryFile));
-                if (!relativePath.startsWith('./') &&
-                    !relativePath.startsWith('../') &&
-                    relativePath !== '.') {
-                    relativePath = `./${relativePath}`;
-                }
-                let contents = '';
-                const { hasImports, exports, hasReExports } = exportsData[id];
-                if (!hasImports && !exports.length) {
-                    // cjs
-                    contents += `export default require("${relativePath}");`;
-                }
-                else {
-                    if (exports.includes('default')) {
-                        contents += `import d from "${relativePath}";export default d;`;
-                    }
-                    if (hasReExports || exports.length > 1 || exports[0] !== 'default') {
-                        contents += `\nexport * from "${relativePath}"`;
-                    }
-                }
-                return {
-                    loader: 'js',
-                    contents,
-                    resolveDir: root
-                };
-            });
             build.onLoad({ filter: /.*/, namespace: 'browser-external' }, ({ path }) => {
                 if (config.isProduction) {
                     return {
@@ -36497,7 +36471,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$3(resolved)) {
+    if (isAbsolute$2(resolved)) {
         return pre + globSafeResolvedPath(resolved, glob);
     }
     throw new Error(`Invalid glob: "${glob}" (resolved: "${resolved}"). It must start with '/' or './'`);
@@ -44972,7 +44946,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-46ac452b.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-0726141c.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -53825,7 +53799,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
         preserveSymlinks,
         isBuild: true,
         isProduction,
-        isRequire: true,
+        isRequire: false,
         root
     };
     // Since dynamic imports can happen in parallel, we need to
@@ -53896,6 +53870,11 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     }
     return Object.freeze(ssrModule);
 }
+// `nodeImport` may run in parallel on multiple `ssrLoadModule` calls.
+// We keep track of the current importing count so that the first import
+// would `hookNodeResolve`, and the last import would `unhookNodeResolve`.
+let importingCount = 0;
+let unhookNodeResolve;
 // In node@12+ we can use dynamic import to load CJS and ESM
 async function nodeImport(id, importer, resolveOptions) {
     // Node's module resolution is hi-jacked so Vite can ensure the
@@ -53909,30 +53888,32 @@ async function nodeImport(id, importer, resolveOptions) {
         }
         return resolved.id;
     };
-    // When an ESM module imports an ESM dependency, this hook is *not* used.
-    const unhookNodeResolve = hookNodeResolve((nodeResolve) => (id, parent, isMain, options) => {
-        // Use the Vite resolver only for bare imports while skipping
-        // any absolute paths, built-in modules and binary modules.
-        if (!bareImportRE.test(id) ||
-            path$n.isAbsolute(id) ||
-            isBuiltin(id) ||
-            id.endsWith('.node')) {
-            return nodeResolve(id, parent, isMain, options);
-        }
-        if (parent) {
-            let resolved = viteResolve(id, parent.id);
-            if (resolved) {
-                // hookNodeResolve must use platform-specific path.normalize
-                // to be compatible with dynamicImport (#6080)
-                resolved = path$n.normalize(resolved);
+    if (importingCount === 0) {
+        // When an ESM module imports an ESM dependency, this hook is *not* used.
+        unhookNodeResolve = hookNodeResolve((nodeResolve) => (id, parent, isMain, options) => {
+            // Use the Vite resolver only for bare imports while skipping
+            // any absolute paths, built-in modules and binary modules.
+            if (!bareImportRE.test(id) ||
+                path$n.isAbsolute(id) ||
+                isBuiltin(id) ||
+                id.endsWith('.node')) {
+                return nodeResolve(id, parent, isMain, options);
+            }
+            if (parent) {
+                let resolved = viteResolve(id, parent.id);
+                if (resolved) {
+                    // hookNodeResolve must use platform-specific path.normalize
+                    // to be compatible with dynamicImport (#6080)
+                    resolved = path$n.normalize(resolved);
+                }
+                return resolved;
             }
-            return resolved;
-        }
-        // Importing a CJS module from an ESM module. In this case, the import
-        // specifier is already an absolute path, so this is a no-op.
-        // Options like `resolve.dedupe` and `mode` are not respected.
-        return id;
-    });
+            // Importing a CJS module from an ESM module. In this case, the import
+            // specifier is already an absolute path, so this is a no-op.
+            // Options like `resolve.dedupe` and `mode` are not respected.
+            return id;
+        });
+    }
     let url;
     if (id.startsWith('node:') || isBuiltin(id)) {
         url = id;
@@ -53950,11 +53931,15 @@ async function nodeImport(id, importer, resolveOptions) {
         }
     }
     try {
+        importingCount++;
         const mod = await dynamicImport(url);
         return proxyESM(mod);
     }
     finally {
-        unhookNodeResolve();
+        importingCount--;
+        if (importingCount === 0) {
+            unhookNodeResolve?.();
+        }
     }
 }
 // rollup-style default import interop for cjs
@@ -62582,6 +62567,11 @@ async function createServer(inlineConfig = {}) {
         ssrRewriteStacktrace(stack) {
             return ssrRewriteStacktrace(stack, moduleGraph);
         },
+        async reloadModule(module) {
+            if (serverConfig.hmr !== false && module.file) {
+                updateModules(module.file, [module], Date.now(), server);
+            }
+        },
         async listen(port, isRestart) {
             await startServer(server, port, isRestart);
             if (httpServer) {
@@ -63922,7 +63912,11 @@ async function bundleConfigFile(fileName, isESM) {
                     };
                     build.onResolve({ filter: /.*/ }, ({ path: id, importer, kind }) => {
                         // externalize bare imports
-                        if (id[0] !== '.' && !isAbsolute(id)) {
+                        if (id[0] !== '.' && !path$n.isAbsolute(id) && !isBuiltin(id)) {
+                            // partial deno support as `npm:` does not work in `tryNodeResolve`
+                            if (id.startsWith('npm:')) {
+                                return { external: true };
+                            }
                             let idFsPath = tryNodeResolve(id, importer, options, false)?.id;
                             if (idFsPath && (isESM || kind === 'dynamic-import')) {
                                 idFsPath = pathToFileURL(idFsPath).href;
@@ -64025,8 +64019,5 @@ 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/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-34b5a6bf.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-0856a44a.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-34b5a6bf.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-0856a44a.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-34b5a6bf.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-0856a44a.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-34b5a6bf.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-0856a44a.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-34b5a6bf.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-0856a44a.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.2.0-beta.1";
+var version = "3.2.0-beta.2";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.d.ts

@@ -2521,6 +2521,11 @@ export declare interface ViteDevServer {
      * Mutates the given SSR error by rewriting the stacktrace
      */
     ssrFixStacktrace(e: Error): void;
+    /**
+     * Triggers HMR for a module in the module graph. You can use the `server.moduleGraph`
+     * API to retrieve the module to be reloaded. If `hmr` is false, this is a no-op.
+     */
+    reloadModule(module: ModuleNode): Promise<void>;
     /**
      * Start the server.
      */

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-34b5a6bf.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-0856a44a.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.2.0-beta.1";
+var version = "3.2.0-beta.2";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(

package/package.json

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