vite 4.3.0-beta.2 → 4.3.0-beta.3

package/dist/node/chunks/{dep-53dc1ef4.js → dep-0eeee069.js}

@@ -1,5 +1,4 @@
 import require$$0 from 'path';
-import resolve$2 from 'resolve';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';
 
@@ -58,47 +57,6 @@ var joinLayer$1 = function (parentLayer, childLayer) {
   return parentLayer.concat(childLayer)
 };
 
-// external tooling
-const resolve$1 = resolve$2;
-
-const moduleDirectories = ["web_modules", "node_modules"];
-
-function resolveModule(id, opts) {
-  return new Promise((res, rej) => {
-    resolve$1(id, opts, (err, path) => (err ? rej(err) : res(path)));
-  })
-}
-
-var resolveId$1 = function (id, base, options) {
-  const paths = options.path;
-
-  const resolveOpts = {
-    basedir: base,
-    moduleDirectory: moduleDirectories.concat(options.addModulesDirectories),
-    paths,
-    extensions: [".css"],
-    packageFilter: function processPackage(pkg) {
-      if (pkg.style) pkg.main = pkg.style;
-      else if (!pkg.main || !/\.css$/.test(pkg.main)) pkg.main = "index.css";
-      return pkg
-    },
-    preserveSymlinks: false,
-  };
-
-  return resolveModule(`./${id}`, resolveOpts)
-    .catch(() => resolveModule(id, resolveOpts))
-    .catch(() => {
-      if (paths.indexOf(base) === -1) paths.unshift(base);
-
-      throw new Error(
-        `Failed to find '${id}'
-  in [
-    ${paths.join(",\n        ")}
-  ]`
-      )
-    })
-};
-
 var readCacheExports = {};
 var readCache$1 = {
   get exports(){ return readCacheExports; },
@@ -535,7 +493,7 @@ const path = require$$0;
 // internal tooling
 const joinMedia = joinMedia$1;
 const joinLayer = joinLayer$1;
-const resolveId = resolveId$1;
+const resolveId = undefined;
 const loadContent = loadContent$1;
 const processContent = processContent$1;
 const parseStatements = parseStatements$1;

package/dist/node/chunks/{dep-281af434.js → dep-366ea021.js}

@@ -22,8 +22,7 @@ import os$3 from 'node:os';
 import { exec } from 'node:child_process';
 import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
-import resolve$4 from 'resolve';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, CSS_LANGS_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, SPECIAL_QUERY_RE, DEP_VERSION_RE, CSS_LANGS_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5$1 from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import { promisify as promisify$4, format as format$2, inspect } from 'node:util';
@@ -11549,7 +11548,6 @@ if (process.versions.pnp) {
     catch { }
 }
 function invalidatePackageData(packageCache, pkgPath) {
-    packageCache.delete(pkgPath);
     const pkgDir = path$o.dirname(pkgPath);
     packageCache.forEach((pkg, cacheKey) => {
         if (pkg.dir === pkgDir) {
@@ -11687,32 +11685,40 @@ function loadPackageData(pkgPath) {
     };
     return pkg;
 }
-function watchPackageDataPlugin(config) {
+function watchPackageDataPlugin(packageCache) {
+    // a list of files to watch before the plugin is ready
     const watchQueue = new Set();
-    let watchFile = (id) => {
+    const watchedDirs = new Set();
+    const watchFileStub = (id) => {
         watchQueue.add(id);
     };
-    const { packageCache } = config;
+    let watchFile = watchFileStub;
     const setPackageData = packageCache.set.bind(packageCache);
     packageCache.set = (id, pkg) => {
-        if (id.endsWith('.json')) {
-            watchFile(id);
+        if (!isInNodeModules(pkg.dir) && !watchedDirs.has(pkg.dir)) {
+            watchedDirs.add(pkg.dir);
+            watchFile(path$o.join(pkg.dir, 'package.json'));
         }
         return setPackageData(id, pkg);
     };
     return {
         name: 'vite:watch-package-data',
         buildStart() {
-            watchFile = this.addWatchFile;
+            watchFile = this.addWatchFile.bind(this);
             watchQueue.forEach(watchFile);
             watchQueue.clear();
         },
         buildEnd() {
-            watchFile = (id) => watchQueue.add(id);
+            watchFile = watchFileStub;
         },
         watchChange(id) {
             if (id.endsWith('/package.json')) {
-                invalidatePackageData(packageCache, id);
+                invalidatePackageData(packageCache, path$o.normalize(id));
+            }
+        },
+        handleHotUpdate({ file }) {
+            if (file.endsWith('/package.json')) {
+                invalidatePackageData(packageCache, path$o.normalize(file));
             }
         },
     };
@@ -11854,16 +11860,6 @@ const bareImportRE = /^[\w@](?!.*:\/\/)/;
 const deepImportRE = /^([^@][^/]*)\/|^(@[^/]+\/[^/]+)\//;
 // TODO: use import()
 const _require$3 = createRequire$1(import.meta.url);
-const ssrExtensions = ['.js', '.cjs', '.json', '.node'];
-function resolveFrom(id, basedir, preserveSymlinks = false, ssr = false) {
-    return resolve$4.sync(id, {
-        basedir,
-        paths: [],
-        extensions: ssr ? ssrExtensions : DEFAULT_EXTENSIONS$1,
-        // necessary to work with pnpm
-        preserveSymlinks: preserveSymlinks || !!process.versions.pnp || false,
-    });
-}
 // set in bin/vite.js
 const filter = process.env.VITE_DEBUG_FILTER;
 const DEBUG = process.env.DEBUG;
@@ -11876,9 +11872,9 @@ function createDebugger(namespace, options = {}) {
         enabled = !!DEBUG?.includes(ns);
     }
     if (enabled) {
-        return (msg, ...args) => {
-            if (!filter || msg.includes(filter)) {
-                log(msg, ...args);
+        return (...args) => {
+            if (!filter || args.some((a) => a?.includes(filter))) {
+                log(...args);
             }
         };
     }
@@ -22705,12 +22701,12 @@ function resolvePlugin(resolveOptions) {
             }
             // explicit fs paths that starts with /@fs/*
             if (asSrc && id.startsWith(FS_PREFIX)) {
-                const fsPath = fsPathFromId(id);
-                res = tryFsResolve(fsPath, options);
-                debug$d?.(`[@fs] ${picocolorsExports.cyan(id)} -> ${picocolorsExports.dim(res)}`);
+                res = fsPathFromId(id);
+                // We don't need to resolve these paths since they are already resolved
                 // always return here even if res doesn't exist since /@fs/ is explicit
-                // if the file doesn't exist it should be a 404
-                return ensureVersionQuery(res || fsPath, id, options, depsOptimizer);
+                // if the file doesn't exist it should be a 404.
+                debug$d?.(`[@fs] ${picocolorsExports.cyan(id)} -> ${picocolorsExports.dim(res)}`);
+                return ensureVersionQuery(res, id, options, depsOptimizer);
             }
             // URL
             // /foo -> /fs-root/foo
@@ -22791,7 +22787,7 @@ function resolvePlugin(resolveOptions) {
                     asSrc &&
                     depsOptimizer &&
                     !options.scan &&
-                    (res = await tryOptimizedResolve(depsOptimizer, id, importer))) {
+                    (res = await tryOptimizedResolve(depsOptimizer, id, importer, options.preserveSymlinks, options.packageCache))) {
                     return res;
                 }
                 if (targetWeb &&
@@ -23158,7 +23154,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = f
         return { id: resolved };
     }
 }
-async function tryOptimizedResolve(depsOptimizer, id, importer) {
+async function tryOptimizedResolve(depsOptimizer, id, importer, preserveSymlinks, packageCache) {
     // TODO: we need to wait until scanning is done here as this function
     // is used in the preAliasPlugin to decide if an aliased dep is optimized,
     // and avoid replacing the bare import with the resolved path.
@@ -23172,30 +23168,25 @@ async function tryOptimizedResolve(depsOptimizer, id, importer) {
     if (!importer)
         return;
     // further check if id is imported by nested dependency
-    let resolvedSrc;
+    let idPkgDir;
+    const nestedIdMatch = `> ${id}`;
     for (const optimizedData of metadata.depInfoList) {
         if (!optimizedData.src)
             continue; // Ignore chunks
-        const pkgPath = optimizedData.id;
-        // check for scenarios, e.g.
-        //   pkgPath  => "my-lib > foo"
-        //   id       => "foo"
-        // this narrows the need to do a full resolve
-        if (!pkgPath.endsWith(id))
+        // check where "foo" is nested in "my-lib > foo"
+        if (!optimizedData.id.endsWith(nestedIdMatch))
             continue;
-        // lazily initialize resolvedSrc
-        if (resolvedSrc == null) {
-            try {
-                // this may throw errors if unable to resolve, e.g. aliased id
-                resolvedSrc = normalizePath$3(resolveFrom(id, path$o.dirname(importer)));
-            }
-            catch {
-                // this is best-effort only so swallow errors
+        // lazily initialize idPkgDir
+        if (idPkgDir == null) {
+            idPkgDir = resolvePackageData(id, importer, preserveSymlinks, packageCache)?.dir;
+            // if still null, it likely means that this id isn't a dep for importer.
+            // break to bail early
+            if (idPkgDir == null)
                 break;
-            }
+            idPkgDir = normalizePath$3(idPkgDir);
         }
         // match by src to correctly identify if id belongs to nested dependency
-        if (optimizedData.src === resolvedSrc) {
+        if (optimizedData.src.startsWith(idPkgDir)) {
             return depsOptimizer.getOptimizedDepId(optimizedData);
         }
     }
@@ -38470,8 +38461,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-53dc1ef4.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-3b7a7ba2.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-0eeee069.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-afdc0526.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40369,9 +40360,7 @@ function importAnalysisPlugin(config) {
             let s;
             const str = () => s || (s = new MagicString(source));
             const importedUrls = new Set();
-            const acceptedUrls = new Set();
             let isPartiallySelfAccepting = false;
-            const acceptedExports = new Set();
             const importedBindings = enablePartialAccept
                 ? new Map()
                 : null;
@@ -40471,11 +40460,13 @@ function importAnalysisPlugin(config) {
                 }
                 return [url, resolved.id];
             };
-            for (let index = 0; index < imports.length; index++) {
+            const orderedAcceptedUrls = new Array(imports.length);
+            const orderedAcceptedExports = new Array(imports.length);
+            await Promise.all(imports.map(async (importSpecifier, index) => {
                 const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, 
                 // #2083 User may use escape path,
                 // so use imports[index].n to get the unescaped string
-                n: specifier, a: assertIndex, } = imports[index];
+                n: specifier, a: assertIndex, } = importSpecifier;
                 const rawUrl = source.slice(start, end);
                 // check import.meta usage
                 if (rawUrl === 'import.meta') {
@@ -40486,18 +40477,24 @@ function importAnalysisPlugin(config) {
                         if (source.slice(endHot, endHot + 7) === '.accept') {
                             // further analyze accepted modules
                             if (source.slice(endHot, endHot + 14) === '.acceptExports') {
-                                lexAcceptedHmrExports(source, source.indexOf('(', endHot + 14) + 1, acceptedExports);
+                                const importAcceptedExports = (orderedAcceptedExports[index] =
+                                    new Set());
+                                lexAcceptedHmrExports(source, source.indexOf('(', endHot + 14) + 1, importAcceptedExports);
                                 isPartiallySelfAccepting = true;
                             }
-                            else if (lexAcceptedHmrDeps(source, source.indexOf('(', endHot + 7) + 1, acceptedUrls)) {
-                                isSelfAccepting = true;
+                            else {
+                                const importAcceptedUrls = (orderedAcceptedUrls[index] =
+                                    new Set());
+                                if (lexAcceptedHmrDeps(source, source.indexOf('(', endHot + 7) + 1, importAcceptedUrls)) {
+                                    isSelfAccepting = true;
+                                }
                             }
                         }
                     }
                     else if (prop === '.env') {
                         hasEnv = true;
                     }
-                    continue;
+                    return;
                 }
                 const isDynamicImport = dynamicIndex > -1;
                 // strip import assertions as we can process them ourselves
@@ -40509,25 +40506,25 @@ function importAnalysisPlugin(config) {
                 if (specifier) {
                     // skip external / data uri
                     if (isExternalUrl(specifier) || isDataUrl(specifier)) {
-                        continue;
+                        return;
                     }
                     // skip ssr external
                     if (ssr) {
                         if (config.legacy?.buildSsrCjsExternalHeuristics) {
                             if (cjsShouldExternalizeForSSR(specifier, server._ssrExternals)) {
-                                continue;
+                                return;
                             }
                         }
                         else if (shouldExternalizeForSSR(specifier, config)) {
-                            continue;
+                            return;
                         }
                         if (isBuiltin(specifier)) {
-                            continue;
+                            return;
                         }
                     }
                     // skip client
                     if (specifier === clientPublicPath) {
-                        continue;
+                        return;
                     }
                     // warn imports to non-asset /public files
                     if (specifier[0] === '/' &&
@@ -40582,7 +40579,7 @@ function importAnalysisPlugin(config) {
                             }
                             else if (needsInterop) {
                                 debug$a?.(`${url} needs interop`);
-                                interopNamedImports(str(), imports[index], url, index);
+                                interopNamedImports(str(), importSpecifier, url, index);
                                 rewriteDone = true;
                             }
                         }
@@ -40591,7 +40588,7 @@ function importAnalysisPlugin(config) {
                         // correctly throw the error message.
                         else if (url.includes(browserExternalId) &&
                             source.slice(expStart, start).includes('{')) {
-                            interopNamedImports(str(), imports[index], url, index);
+                            interopNamedImports(str(), importSpecifier, url, index);
                             rewriteDone = true;
                         }
                         if (!rewriteDone) {
@@ -40611,7 +40608,7 @@ function importAnalysisPlugin(config) {
                         importedUrls.add(hmrUrl);
                     }
                     if (enablePartialAccept && importedBindings) {
-                        extractImportedBindings(resolvedId, source, imports[index], importedBindings);
+                        extractImportedBindings(resolvedId, source, importSpecifier, importedBindings);
                     }
                     if (!isDynamicImport &&
                         isLocalImport &&
@@ -40657,7 +40654,9 @@ function importAnalysisPlugin(config) {
                         }
                     }
                 }
-            }
+            }));
+            const acceptedUrls = mergeAcceptedUrls(orderedAcceptedUrls);
+            const acceptedExports = mergeAcceptedUrls(orderedAcceptedExports);
             if (hasEnv) {
                 // inject import.meta.env
                 str().prepend(getEnv(ssr));
@@ -40724,6 +40723,16 @@ function importAnalysisPlugin(config) {
         },
     };
 }
+function mergeAcceptedUrls(orderedUrls) {
+    const acceptedUrls = new Set();
+    for (const urls of orderedUrls) {
+        if (!urls)
+            continue;
+        for (const url of urls)
+            acceptedUrls.add(url);
+    }
+    return acceptedUrls;
+}
 function interopNamedImports(str, importSpecifier, rewrittenUrl, importIndex) {
     const source = str.original;
     const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, } = importSpecifier;
@@ -41320,7 +41329,7 @@ function preAliasPlugin(config) {
                 id !== '@vite/client' &&
                 id !== '@vite/env') {
                 if (findPatterns.find((pattern) => matches(pattern, id))) {
-                    const optimizedId = await tryOptimizedResolve(depsOptimizer, id, importer);
+                    const optimizedId = await tryOptimizedResolve(depsOptimizer, id, importer, config.resolve.preserveSymlinks, config.packageCache);
                     if (optimizedId) {
                         return optimizedId; // aliased dep already optimized
                     }
@@ -42088,6 +42097,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
     return [
         isWatch ? ensureWatchPlugin() : null,
         isBuild ? metadataPlugin() : null,
+        watchPackageDataPlugin(config.packageCache),
         preAliasPlugin(config),
         alias$1({ entries: config.resolve.alias }),
         ...prePlugins,
@@ -45638,7 +45648,6 @@ async function resolveBuildPlugins(config) {
         pre: [
             completeSystemWrapPlugin(),
             ...(options.watch ? [ensureWatchPlugin()] : []),
-            watchPackageDataPlugin(config),
             ...(usePluginCommonjs ? [commonjs(options.commonjsOptions)] : []),
             dataURIPlugin(),
             ...(await asyncFlatten(Array.isArray(rollupOptionsPlugins)
@@ -45939,32 +45948,36 @@ const dynamicImportWarningIgnoreList = [
     `statically analyzed`,
 ];
 function onRollupWarning(warning, warn, config) {
-    if (warning.code === 'UNRESOLVED_IMPORT') {
-        const id = warning.id;
-        const exporter = warning.exporter;
-        // throw unless it's commonjs external...
-        if (!id || !/\?commonjs-external$/.test(id)) {
-            throw new Error(`[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
-                `This is most likely unintended because it can break your application at runtime.\n` +
-                `If you do want to externalize this module explicitly add it to\n` +
-                `\`build.rollupOptions.external\``);
-        }
-    }
-    if (warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
-        dynamicImportWarningIgnoreList.some((msg) => warning.message.includes(msg))) {
-        return;
-    }
-    if (!warningIgnoreList.includes(warning.code)) {
-        const userOnWarn = config.build.rollupOptions?.onwarn;
-        if (userOnWarn) {
-            userOnWarn(warning, warn);
+    function viteWarn(warning) {
+        if (warning.code === 'UNRESOLVED_IMPORT') {
+            const id = warning.id;
+            const exporter = warning.exporter;
+            // throw unless it's commonjs external...
+            if (!id || !/\?commonjs-external$/.test(id)) {
+                throw new Error(`[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
+                    `This is most likely unintended because it can break your application at runtime.\n` +
+                    `If you do want to externalize this module explicitly add it to\n` +
+                    `\`build.rollupOptions.external\``);
+            }
+        }
+        if (warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
+            dynamicImportWarningIgnoreList.some((msg) => warning.message.includes(msg))) {
+            return;
         }
-        else if (warning.code === 'PLUGIN_WARNING') {
-            config.logger.warn(`${picocolorsExports.bold(picocolorsExports.yellow(`[plugin:${warning.plugin}]`))} ${picocolorsExports.yellow(warning.message)}`);
+        if (!warningIgnoreList.includes(warning.code)) {
+            return;
         }
-        else {
-            warn(warning);
+        if (warning.code === 'PLUGIN_WARNING') {
+            config.logger.warn(`${picocolorsExports.bold(picocolorsExports.yellow(`[plugin:${warning.plugin}]`))} ${picocolorsExports.yellow(warning.message)}`);
         }
+        warn(warning);
+    }
+    const userOnWarn = config.build.rollupOptions?.onwarn;
+    if (userOnWarn) {
+        userOnWarn(warning, viteWarn);
+    }
+    else {
+        viteWarn(warning);
     }
 }
 async function cjsSsrResolveExternal(config, user) {
@@ -53170,6 +53183,10 @@ async function loadAndTransform(id, url, server, options, timestamp) {
     const file = cleanUrl(id);
     let code = null;
     let map = null;
+    // Ensure that the module is in the graph before it is loaded and the file is checked.
+    // This prevents errors from occurring during the load process and interrupting the watching process at its inception.
+    const mod = await moduleGraph.ensureEntryFromUrl(url, ssr);
+    ensureWatchedFile(watcher, mod.file, root);
     // load
     const loadStart = debugLoad ? performance$1.now() : 0;
     const loadResult = await pluginContainer.load(id, { ssr });
@@ -53234,9 +53251,6 @@ async function loadAndTransform(id, url, server, options, timestamp) {
         err.code = isPublicFile ? ERR_LOAD_PUBLIC_URL : ERR_LOAD_URL;
         throw err;
     }
-    // ensure module in graph after successful load
-    const mod = await moduleGraph.ensureEntryFromUrl(url, ssr);
-    ensureWatchedFile(watcher, mod.file, root);
     // transform
     const transformStart = debugTransform ? performance$1.now() : 0;
     const transformResult = await pluginContainer.transform(code, id, {
@@ -61846,32 +61860,36 @@ class ModuleGraph {
         if (mod) {
             return mod;
         }
-        const [url, resolvedId, meta] = await this._resolveUrl(rawUrl, ssr, resolved);
-        mod = this.idToModuleMap.get(resolvedId);
-        if (!mod) {
-            mod = new ModuleNode(url, setIsSelfAccepting);
-            if (meta)
-                mod.meta = meta;
-            this.urlToModuleMap.set(url, mod);
-            mod.id = resolvedId;
-            this.idToModuleMap.set(resolvedId, mod);
-            const file = (mod.file = cleanUrl(resolvedId));
-            let fileMappedModules = this.fileToModulesMap.get(file);
-            if (!fileMappedModules) {
-                fileMappedModules = new Set();
-                this.fileToModulesMap.set(file, fileMappedModules);
-            }
-            fileMappedModules.add(mod);
-        }
-        // multiple urls can map to the same module and id, make sure we register
-        // the url to the existing module in that case
-        else if (!this.urlToModuleMap.has(url)) {
-            this.urlToModuleMap.set(url, mod);
-        }
+        const modPromise = (async () => {
+            const [url, resolvedId, meta] = await this._resolveUrl(rawUrl, ssr, resolved);
+            mod = this.idToModuleMap.get(resolvedId);
+            if (!mod) {
+                mod = new ModuleNode(url, setIsSelfAccepting);
+                if (meta)
+                    mod.meta = meta;
+                this.urlToModuleMap.set(url, mod);
+                mod.id = resolvedId;
+                this.idToModuleMap.set(resolvedId, mod);
+                const file = (mod.file = cleanUrl(resolvedId));
+                let fileMappedModules = this.fileToModulesMap.get(file);
+                if (!fileMappedModules) {
+                    fileMappedModules = new Set();
+                    this.fileToModulesMap.set(file, fileMappedModules);
+                }
+                fileMappedModules.add(mod);
+            }
+            // multiple urls can map to the same module and id, make sure we register
+            // the url to the existing module in that case
+            else if (!this.urlToModuleMap.has(url)) {
+                this.urlToModuleMap.set(url, mod);
+            }
+            this._setUnresolvedUrlToModule(rawUrl, mod, ssr);
+            return mod;
+        })();
         // Also register the clean url to the module, so that we can short-circuit
         // resolving the same url twice
-        this._setUnresolvedUrlToModule(rawUrl, mod, ssr);
-        return mod;
+        this._setUnresolvedUrlToModule(rawUrl, modPromise, ssr);
+        return modPromise;
     }
     // some deps, like a css file referenced via @import, don't have its own
     // url because they are inlined into the main css import. But they still
@@ -61901,7 +61919,7 @@ class ModuleGraph {
     // the same module
     async resolveUrl(url, ssr) {
         url = removeImportQuery(removeTimestampQuery(url));
-        const mod = this._getUnresolvedUrlToModule(url, ssr);
+        const mod = await this._getUnresolvedUrlToModule(url, ssr);
         if (mod?.id) {
             return [mod.url, mod.id, mod.meta];
         }
@@ -63254,14 +63272,6 @@ async function _createServer(inlineConfig = {}, options) {
             process.stdin.on('end', exitProcess);
         }
     }
-    const { packageCache } = config;
-    const setPackageData = packageCache.set.bind(packageCache);
-    packageCache.set = (id, pkg) => {
-        if (id.endsWith('.json')) {
-            watcher.add(id);
-        }
-        return setPackageData(id, pkg);
-    };
     const onHMRUpdate = async (file, configOnly) => {
         if (serverConfig.hmr !== false) {
             try {
@@ -63282,9 +63292,6 @@ async function _createServer(inlineConfig = {}, options) {
     };
     watcher.on('change', async (file) => {
         file = normalizePath$3(file);
-        if (file.endsWith('/package.json')) {
-            return invalidatePackageData(packageCache, file);
-        }
         // invalidate module graph cache on file change
         moduleGraph.onFileChange(file);
         await onHMRUpdate(file, false);
@@ -63891,8 +63898,14 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     // resolve root
     const resolvedRoot = normalizePath$3(config.root ? path$o.resolve(config.root) : process.cwd());
     const clientAlias = [
-        { find: /^\/?@vite\/env/, replacement: ENV_ENTRY },
-        { find: /^\/?@vite\/client/, replacement: CLIENT_ENTRY },
+        {
+            find: /^\/?@vite\/env/,
+            replacement: path$o.posix.join(FS_PREFIX, normalizePath$3(ENV_ENTRY)),
+        },
+        {
+            find: /^\/?@vite\/client/,
+            replacement: path$o.posix.join(FS_PREFIX, normalizePath$3(CLIENT_ENTRY)),
+        },
     ];
     // resolve alias with internal client alias
     const resolvedAlias = normalizeAlias(mergeAlias(clientAlias, config.resolve?.alias || []));

package/dist/node/chunks/{dep-3b7a7ba2.js → dep-afdc0526.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { D as commonjsGlobal } from './dep-281af434.js';
+import { D as commonjsGlobal } from './dep-366ea021.js';
 import require$$0$1 from 'path';
 import require$$5 from 'crypto';
 import require$$0$2 from 'util';

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 { B as picocolorsExports, C as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-281af434.js';
+import { B as picocolorsExports, C as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-366ea021.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -23,7 +23,6 @@ import 'node:os';
 import 'node:child_process';
 import 'node:crypto';
 import 'node:dns';
-import 'resolve';
 import 'crypto';
 import 'node:buffer';
 import 'node:util';
@@ -729,7 +728,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-281af434.js').then(function (n) { return n.G; });
+    const { createServer } = await import('./chunks/dep-366ea021.js').then(function (n) { return n.G; });
     try {
         const server = await createServer({
             root,
@@ -807,7 +806,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-281af434.js').then(function (n) { return n.F; });
+    const { build } = await import('./chunks/dep-366ea021.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -835,7 +834,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-281af434.js').then(function (n) { return n.E; });
+    const { optimizeDeps } = await import('./chunks/dep-366ea021.js').then(function (n) { return n.E; });
     try {
         const config = await resolveConfig({
             root,
@@ -860,7 +859,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-281af434.js').then(function (n) { return n.H; });
+    const { preview } = await import('./chunks/dep-366ea021.js').then(function (n) { return n.H; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-281af434.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, l as loadConfigFromFile, z as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, A as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-281af434.js';
+import { i as isInNodeModules } from './chunks/dep-366ea021.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, l as loadConfigFromFile, z as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, A as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-366ea021.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -25,7 +25,6 @@ import 'node:os';
 import 'node:child_process';
 import 'node:crypto';
 import 'node:dns';
-import 'resolve';
 import 'crypto';
 import 'node:buffer';
 import 'node:util';

package/dist/node-cjs/publicUtils.cjs

@@ -3324,9 +3324,9 @@ function createDebugger(namespace, options = {}) {
         enabled = !!DEBUG?.includes(ns);
     }
     if (enabled) {
-        return (msg, ...args) => {
-            if (!filter || msg.includes(filter)) {
-                log(msg, ...args);
+        return (...args) => {
+            if (!filter || args.some((a) => a?.includes(filter))) {
+                log(...args);
             }
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.3.0-beta.2",
+  "version": "4.3.0-beta.3",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -68,7 +68,6 @@
   "dependencies": {
     "esbuild": "^0.17.5",
     "postcss": "^8.4.21",
-    "resolve": "^1.22.1",
     "rollup": "^3.20.2"
   },
   "optionalDependencies": {