vite 2.7.0-beta.3 → 2.7.0-beta.4

package/dist/node/chunks/{dep-5243d0d3.js → dep-6cab8e8a.js}

@@ -10,7 +10,7 @@ var require$$0$a = require('events');
 var require$$0$7 = require('url');
 var require$$1$2 = require('http');
 var require$$0$9 = require('stream');
-var resolve$4 = require('resolve');
+var resolve$3 = require('resolve');
 var require$$0$6 = require('module');
 var perf_hooks = require('perf_hooks');
 var require$$1$3 = require('https');
@@ -50,7 +50,7 @@ var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
-var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve$4);
+var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve$3);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
 var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
@@ -3387,7 +3387,7 @@ function normalizePath$5(input) {
 /**
  * Attempts to resolve `input` URL relative to `base`.
  */
-function resolve$3(input, base) {
+function resolve$2(input, base) {
     if (!base)
         base = '';
     // Absolute URLs are very easy to resolve right.
@@ -3455,7 +3455,7 @@ function resolve$1$1(input, base) {
     // https://github.com/chromium/chromium/blob/da4adbb3/third_party/blink/renderer/devtools/front_end/sdk/SourceMap.js#L400-L401
     if (base && !base.endsWith('/'))
         base += '/';
-    return resolve$3(input, base);
+    return resolve$2(input, base);
 }
 
 /**
@@ -3958,6 +3958,7 @@ const externalRE = /^(https?:)?\/\//;
 const isExternalUrl = (url) => externalRE.test(url);
 const dataUrlRE = /^\s*data:/i;
 const isDataUrl = (url) => dataUrlRE.test(url);
+const virtualModuleRE = /virtual-module:.*/;
 const knownJsSrcRE = /\.((j|t)sx?|mjs|vue|marko|svelte|astro)($|\?)/;
 const isJSRequest = (url) => {
     url = cleanUrl(url);
@@ -4058,6 +4059,9 @@ function prettifyUrl(url, root) {
 function isObject$3(value) {
     return Object.prototype.toString.call(value) === '[object Object]';
 }
+function isDefined(value) {
+    return value != null;
+}
 function lookupFile(dir, formats, pathOnly = false) {
     for (const format of formats) {
         const fullPath = path__default.join(dir, format);
@@ -4343,9 +4347,8 @@ function createLogger(level = 'info', options = {}) {
     const loggedErrors = new WeakSet();
     const { prefix = '[vite]', allowClearScreen = true } = options;
     const thresh = LogLevels[level];
-    const clear = allowClearScreen && process.stdout.isTTY && !process.env.CI
-        ? clearScreen
-        : () => { };
+    const canClearScreen = allowClearScreen && process.stdout.isTTY && !process.env.CI;
+    const clear = canClearScreen ? clearScreen : () => { };
     function output(type, msg, options = {}) {
         if (thresh >= LogLevels[type]) {
             const method = type === 'info' ? 'log' : type;
@@ -4365,18 +4368,23 @@ function createLogger(level = 'info', options = {}) {
             if (options.error) {
                 loggedErrors.add(options.error);
             }
-            if (type === lastType && msg === lastMsg) {
-                sameCount++;
-                clear();
-                console[method](format(), source.yellow(`(x${sameCount + 1})`));
-            }
-            else {
-                sameCount = 0;
-                lastMsg = msg;
-                lastType = type;
-                if (options.clear) {
+            if (canClearScreen) {
+                if (type === lastType && msg === lastMsg) {
+                    sameCount++;
                     clear();
+                    console[method](format(), source.yellow(`(x${sameCount + 1})`));
+                }
+                else {
+                    sameCount = 0;
+                    lastMsg = msg;
+                    lastType = type;
+                    if (options.clear) {
+                        clear();
+                    }
+                    console[method](format());
                 }
+            }
+            else {
                 console[method](format());
             }
         }
@@ -19599,7 +19607,7 @@ const plugins = (config, file) => {
 
 var plugins_1 = plugins;
 
-const resolve$2 = path__default.resolve;
+const resolve$1 = path__default.resolve;
 
 const config$1 = dist$2;
 const yaml = yaml$1;
@@ -19738,7 +19746,7 @@ const rc = withTypeScriptLoader((ctx, path, options) => {
   /**
    * @type {String} `process.cwd()`
    */
-  path = path ? resolve$2(path) : process.cwd();
+  path = path ? resolve$1(path) : process.cwd();
 
   return config$1.lilconfig('postcss', options)
     .search(path)
@@ -19760,7 +19768,7 @@ rc.sync = withTypeScriptLoader((ctx, path, options) => {
   /**
    * @type {String} `process.cwd()`
    */
-  path = path ? resolve$2(path) : process.cwd();
+  path = path ? resolve$1(path) : process.cwd();
 
   const result = config$1.lilconfigSync('postcss', options).search(path);
 
@@ -20377,7 +20385,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-c1084913.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-9583e954.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21342,7 +21350,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-59a3bcf9.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-ef63fa34.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -27622,7 +27630,7 @@ function getRequireStringArg(node) {
 function hasDynamicModuleForPath(source, id, dynamicRequireModuleSet) {
   if (!/^(?:\.{0,2}[/\\]|[A-Za-z]:[/\\])/.test(source)) {
     try {
-      const resolvedPath = normalizePathSlashes(resolve$4.sync(source, { basedir: path$t.dirname(id) }));
+      const resolvedPath = normalizePathSlashes(resolve$3.sync(source, { basedir: path$t.dirname(id) }));
       if (dynamicRequireModuleSet.has(resolvedPath)) {
         return true;
       }
@@ -29877,7 +29885,7 @@ function toName(name, entry) {
  * @param {string[]} [options.conditions]
  * @param {boolean} [options.unsafe]
  */
-function resolve$1(pkg, entry='.', options={}) {
+function resolve(pkg, entry='.', options={}) {
 	let { name, exports } = pkg;
 
 	if (exports) {
@@ -30190,18 +30198,17 @@ function tryNodeResolve(id, importer, options, targetWeb, server, ssr) {
     else {
         basedir = root;
     }
-    const preserveSymlinks = !!(server === null || server === void 0 ? void 0 : server.config.resolve.preserveSymlinks);
     // nested node module, step-by-step resolve to the basedir of the nestedPath
     if (nestedRoot) {
-        basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks);
+        basedir = nestedResolveFrom(nestedRoot, basedir, options.preserveSymlinks);
     }
-    const pkg = resolvePackageData(pkgId, basedir, preserveSymlinks);
+    const pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks);
     if (!pkg) {
         return;
     }
     let resolved = deepMatch
-        ? resolveDeepImport('.' + id.slice(pkgId.length), pkg, options, targetWeb, preserveSymlinks)
-        : resolvePackageEntry(id, pkg, options, targetWeb, preserveSymlinks);
+        ? resolveDeepImport('.' + id.slice(pkgId.length), pkg, options, targetWeb, options.preserveSymlinks)
+        : resolvePackageEntry(id, pkg, options, targetWeb, options.preserveSymlinks);
     if (!resolved) {
         return;
     }
@@ -30442,7 +30449,7 @@ function resolveExports(pkg, key, options, targetWeb) {
     if (options.conditions) {
         conditions.push(...options.conditions);
     }
-    return resolve$1(pkg, key, {
+    return resolve(pkg, key, {
         browser: targetWeb,
         require: options.isRequire,
         conditions
@@ -30559,8 +30566,9 @@ function resolveSSRExternal(config, knownImports) {
         ssrExternals.add(id);
         seen.add(id);
     });
-    collectExternals(config.root, ssrExternals, seen);
-    for (const dep of knownImports) {
+    collectExternals(config.root, config.resolve.preserveSymlinks, ssrExternals, seen);
+    const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined);
+    for (const dep of importedDeps) {
         // Assume external if not yet seen
         // At this point, the project root and any linked packages have had their dependencies checked,
         // so we can safely mark any knownImports not yet seen as external. They are guaranteed to be
@@ -30578,7 +30586,7 @@ function resolveSSRExternal(config, knownImports) {
     return externals;
 }
 // do we need to do this ahead of time or could we do it lazily?
-function collectExternals(root, ssrExternals, seen) {
+function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
     var _a;
     const pkgContent = lookupFile(root, ['package.json']);
     if (!pkgContent) {
@@ -30591,6 +30599,7 @@ function collectExternals(root, ssrExternals, seen) {
     };
     const resolveOptions = {
         root,
+        preserveSymlinks,
         isProduction: false,
         isBuild: true
     };
@@ -30642,7 +30651,7 @@ function collectExternals(root, ssrExternals, seen) {
         // or are there others like SystemJS / AMD that we'd need to handle?
         // for now, we'll just leave this as is
         else if (/\.m?js$/.test(esmEntry)) {
-            if (pkg.type === "module" || esmEntry.endsWith('.mjs')) {
+            if (pkg.type === 'module' || esmEntry.endsWith('.mjs')) {
                 ssrExternals.add(id);
                 continue;
             }
@@ -30654,7 +30663,7 @@ function collectExternals(root, ssrExternals, seen) {
         }
     }
     for (const depRoot of depsToTrace) {
-        collectExternals(depRoot, ssrExternals, seen);
+        collectExternals(depRoot, preserveSymlinks, ssrExternals, seen);
     }
 }
 function shouldExternalizeForSSR(id, externals) {
@@ -30670,6 +30679,17 @@ function shouldExternalizeForSSR(id, externals) {
     });
     return should;
 }
+function getNpmPackageName(importPath) {
+    const parts = importPath.split('/');
+    if (parts[0].startsWith('@')) {
+        if (!parts[1])
+            return null;
+        return `${parts[0]}/${parts[1]}`;
+    }
+    else {
+        return parts[0];
+    }
+}
 
 function ssrManifestPlugin(config) {
     // module id => preload assets mapping
@@ -42247,7 +42267,7 @@ function errorMiddleware(server, allowNext = false) {
  * https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/rollup-plugin-container.js
  */
 let parser = Parser.extend(acornClassFields, acornStaticClassFeatures);
-async function createPluginContainer({ plugins, logger, root, build: { rollupOptions } }, watcher) {
+async function createPluginContainer({ plugins, logger, root, build: { rollupOptions } }, moduleGraph, watcher) {
     const isDebug = process.env.DEBUG;
     const seenResolves = {};
     const debugResolve = createDebugger('vite:resolve');
@@ -42258,7 +42278,6 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
         onlyWhenFocused: 'vite:plugin'
     });
     // ---------------------------------------------------------------------------
-    const MODULES = new Map();
     const watchFiles = new Set();
     // get rollup version
     const rollupPkgPath = path$t.resolve(require.resolve('rollup'), '../../package.json');
@@ -42273,6 +42292,36 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
         logger.warn(source.cyan(`[plugin:${plugin}] `) +
             source.yellow(`context method ${source.bold(`${method}()`)} is not supported in serve mode. This plugin is likely not vite-compatible.`));
     }
+    // throw when an unsupported ModuleInfo property is accessed,
+    // so that incompatible plugins fail in a non-cryptic way.
+    const ModuleInfoProxy = {
+        get(info, key) {
+            if (key in info) {
+                return info[key];
+            }
+            throw Error(`[vite] The "${key}" property of ModuleInfo is not supported.`);
+        }
+    };
+    // same default value of "moduleInfo.meta" as in Rollup
+    const EMPTY_OBJECT = Object.freeze({});
+    function getModuleInfo(id) {
+        const module = moduleGraph === null || moduleGraph === void 0 ? void 0 : moduleGraph.getModuleById(id);
+        if (!module) {
+            return null;
+        }
+        if (!module.info) {
+            module.info = new Proxy({ id, meta: module.meta || EMPTY_OBJECT }, ModuleInfoProxy);
+        }
+        return module.info;
+    }
+    function updateModuleInfo(id, { meta }) {
+        if (meta) {
+            const moduleInfo = getModuleInfo(id);
+            if (moduleInfo) {
+                moduleInfo.meta = { ...moduleInfo.meta, ...meta };
+            }
+        }
+    }
     // we should create a new context for each async hook pipeline so that the
     // active plugin in that pipeline can be tracked in a concurrency-safe manner.
     // using a class to make creating new contexts more efficient
@@ -42305,19 +42354,12 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
             return out;
         }
         getModuleInfo(id) {
-            let mod = MODULES.get(id);
-            if (mod)
-                return mod.info;
-            mod = {
-                /** @type {import('rollup').ModuleInfo} */
-                // @ts-ignore-next
-                info: {}
-            };
-            MODULES.set(id, mod);
-            return mod.info;
+            return getModuleInfo(id);
         }
         getModuleIds() {
-            return MODULES.keys();
+            return moduleGraph
+                ? moduleGraph.idToModuleMap.keys()
+                : Array.prototype[Symbol.iterator]();
         }
         addWatchFile(id) {
             watchFiles.add(id);
@@ -42483,6 +42525,7 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 ...options
             };
         })(),
+        getModuleInfo,
         async buildStart() {
             await Promise.all(plugins.map((plugin) => {
                 if (plugin.buildStart) {
@@ -42547,6 +42590,9 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 ctx._activePlugin = plugin;
                 const result = await plugin.load.call(ctx, id, { ssr });
                 if (result != null) {
+                    if (isObject$3(result)) {
+                        updateModuleInfo(id, result);
+                    }
                     return result;
                 }
             }
@@ -42576,9 +42622,13 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 isDebug &&
                     debugPluginTransform(timeFrom(start), plugin.name, prettifyUrl(id, root));
                 if (isObject$3(result)) {
-                    code = result.code || '';
-                    if (result.map)
-                        ctx.sourcemapChain.push(result.map);
+                    if (result.code !== undefined) {
+                        code = result.code;
+                        if (result.map) {
+                            ctx.sourcemapChain.push(result.map);
+                        }
+                    }
+                    updateModuleInfo(id, result);
                 }
                 else {
                     code = result;
@@ -42603,6 +42653,7 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
 
 const debug$b = createDebugger('vite:deps');
 const htmlTypesRE = /\.(html|vue|svelte|astro)$/;
+const setupRE = /<script\s+setup/;
 // A simple regex to detect import sources. This is only used on
 // <script lang="ts"> blocks in vue (setup only) or svelte files, since
 // seemingly unused imports are dropped by esbuild when transpiling TS which
@@ -42692,6 +42743,7 @@ const commentRE = /<!--(.|[\r\n])*?-->/;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
+const contextRE = /\bcontext\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im;
 function esbuildScanPlugin(config, container, depImports, missing, entries) {
     var _a, _b;
     const seen = new Map();
@@ -42718,6 +42770,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
     return {
         name: 'vite:dep-scan',
         setup(build) {
+            const moduleScripts = {};
             // external urls
             build.onResolve({ filter: externalRE }, ({ path }) => ({
                 path,
@@ -42728,6 +42781,12 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                 path,
                 external: true
             }));
+            build.onResolve({ filter: virtualModuleRE }, async ({ path, importer }) => {
+                return {
+                    path,
+                    namespace: 'html'
+                };
+            });
             // html types: extract script contents -----------------------------------
             build.onResolve({ filter: htmlTypesRE }, async ({ path, importer }) => {
                 return {
@@ -42735,6 +42794,9 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     namespace: 'html'
                 };
             });
+            build.onLoad({ filter: virtualModuleRE, namespace: 'html' }, async ({ path }) => {
+                return moduleScripts[path];
+            });
             // extract scripts inside HTML-like files and treat it as a js module
             build.onLoad({ filter: htmlTypesRE, namespace: 'html' }, async ({ path }) => {
                 let raw = fs__default.readFileSync(path, 'utf-8');
@@ -42748,10 +42810,9 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                 let match;
                 while ((match = regex.exec(raw))) {
                     const [, openTag, content] = match;
-                    const srcMatch = openTag.match(srcRE);
                     const typeMatch = openTag.match(typeRE);
-                    const langMatch = openTag.match(langRE);
                     const type = typeMatch && (typeMatch[1] || typeMatch[2] || typeMatch[3]);
+                    const langMatch = openTag.match(langRE);
                     const lang = langMatch && (langMatch[1] || langMatch[2] || langMatch[3]);
                     // skip type="application/ld+json" and other non-JS types
                     if (type &&
@@ -42763,12 +42824,30 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     if (lang === 'ts' || lang === 'tsx' || lang === 'jsx') {
                         loader = lang;
                     }
+                    const srcMatch = openTag.match(srcRE);
                     if (srcMatch) {
                         const src = srcMatch[1] || srcMatch[2] || srcMatch[3];
                         js += `import ${JSON.stringify(src)}\n`;
                     }
                     else if (content.trim()) {
-                        js += content + '\n';
+                        // There can be module scripts (`<script context="module">` in Svelte and `<script>` in Vue)
+                        // or local scripts (`<script>` in Svelte and `<script setup>` in Vue)
+                        // We need to handle these separately in case variable names are reused between them
+                        const contextMatch = openTag.match(contextRE);
+                        const context = contextMatch &&
+                            (contextMatch[1] || contextMatch[2] || contextMatch[3]);
+                        if ((path.endsWith('.vue') && setupRE.test(raw)) ||
+                            (path.endsWith('.svelte') && context !== 'module')) {
+                            const id = `virtual-module:${path}`;
+                            moduleScripts[id] = {
+                                loader,
+                                contents: content
+                            };
+                            js += `import '${id}';\n`;
+                        }
+                        else {
+                            js += content + '\n';
+                        }
                     }
                 }
                 // empty singleline & multiline comments to avoid matching comments
@@ -42777,7 +42856,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                     .replace(singlelineCommentsRE, '');
                 if (loader.startsWith('ts') &&
                     (path.endsWith('.svelte') ||
-                        (path.endsWith('.vue') && /<script\s+setup/.test(raw)))) {
+                        (path.endsWith('.vue') && setupRE.test(raw)))) {
                     // when using TS + (Vue + <script setup>) or Svelte, imports may seem
                     // unused to esbuild and dropped in the build output, which prevents
                     // esbuild from crawling further.
@@ -43043,7 +43122,8 @@ function loadFallbackPlugin() {
     };
 }
 
-function resolveBuildOptions(raw) {
+function resolveBuildOptions(root, raw) {
+    var _a;
     const resolved = {
         target: 'modules',
         polyfillModulePreload: true,
@@ -43078,6 +43158,30 @@ function resolveBuildOptions(raw) {
             ...raw === null || raw === void 0 ? void 0 : raw.dynamicImportVarsOptions
         }
     };
+    const resolve = (p) => p.startsWith('\0') ? p : path__default.resolve(root, p);
+    resolved.outDir = resolve(resolved.outDir);
+    let input;
+    if ((_a = raw === null || raw === void 0 ? void 0 : raw.rollupOptions) === null || _a === void 0 ? void 0 : _a.input) {
+        input = Array.isArray(raw.rollupOptions.input)
+            ? raw.rollupOptions.input.map(input => resolve(input))
+            : typeof raw.rollupOptions.input === 'object'
+                ? Object.assign(
+                // @ts-ignore
+                ...Object.keys(raw.rollupOptions.input).map(key => ({ [key]: resolve(raw.rollupOptions.input[key]) })))
+                : resolve(raw.rollupOptions.input);
+    }
+    else {
+        input = resolve((raw === null || raw === void 0 ? void 0 : raw.lib)
+            ? raw.lib.entry
+            : typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string'
+                ? raw.ssr
+                : 'index.html');
+    }
+    if (!!(raw === null || raw === void 0 ? void 0 : raw.ssr) && typeof input === 'string' && input.endsWith('.html')) {
+        throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
+            `Please specify a dedicated SSR entry.`);
+    }
+    resolved.rollupOptions.input = input;
     // handle special build targets
     if (resolved.target === 'modules') {
         // Support browserslist
@@ -43156,27 +43260,18 @@ async function build(inlineConfig = {}) {
     }
 }
 async function doBuild(inlineConfig = {}) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const config = await resolveConfig(inlineConfig, 'build', 'production');
     const options = config.build;
+    const input = options.rollupOptions.input;
+    const outDir = options.outDir;
     const ssr = !!options.ssr;
     const libOptions = options.lib;
     config.logger.info(source.cyan(`vite v${require('vite/package.json').version} ${source.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
-    const resolve = (p) => path__default.resolve(config.root, p);
-    const input = libOptions
-        ? resolve(libOptions.entry)
-        : typeof options.ssr === 'string'
-            ? resolve(options.ssr)
-            : ((_a = options.rollupOptions) === null || _a === void 0 ? void 0 : _a.input) || resolve('index.html');
-    if (ssr && typeof input === 'string' && input.endsWith('.html')) {
-        throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
-            `Please specify a dedicated SSR entry.`);
-    }
-    const outDir = resolve(options.outDir);
     // inject ssr arg to plugin load/transform hooks
     const plugins = (ssr ? config.plugins.map((p) => injectSsrFlagToHooks(p)) : config.plugins);
     // inject ssrExternal if present
-    const userExternal = (_b = options.rollupOptions) === null || _b === void 0 ? void 0 : _b.external;
+    const userExternal = (_a = options.rollupOptions) === null || _a === void 0 ? void 0 : _a.external;
     let external = userExternal;
     if (ssr) {
         // see if we have cached deps data available
@@ -43197,7 +43292,6 @@ async function doBuild(inlineConfig = {}) {
     }
     const rollup = require('rollup');
     const rollupOptions = {
-        input,
         context: 'globalThis',
         preserveEntrySignatures: ssr
             ? 'allow-extension'
@@ -43254,7 +43348,7 @@ async function doBuild(inlineConfig = {}) {
             };
         };
         // resolve lib mode outputs
-        const outputs = resolveBuildOutputs((_c = options.rollupOptions) === null || _c === void 0 ? void 0 : _c.output, libOptions, config.logger);
+        const outputs = resolveBuildOutputs((_b = options.rollupOptions) === null || _b === void 0 ? void 0 : _b.output, libOptions, config.logger);
         // watch file changes with rollup
         if (config.build.watch) {
             config.logger.info(source.cyanBright(`\nwatching for file changes...`));
@@ -43277,7 +43371,7 @@ async function doBuild(inlineConfig = {}) {
                         ignored: [
                             '**/node_modules/**',
                             '**/.git/**',
-                            ...(((_d = watcherOptions === null || watcherOptions === void 0 ? void 0 : watcherOptions.chokidar) === null || _d === void 0 ? void 0 : _d.ignored) || [])
+                            ...(((_c = watcherOptions === null || watcherOptions === void 0 ? void 0 : watcherOptions.chokidar) === null || _c === void 0 ? void 0 : _c.ignored) || [])
                         ],
                         ignoreInitial: true,
                         ignorePermissionErrors: true,
@@ -49231,7 +49325,7 @@ function readFileIfExists(value) {
  * https://github.com/webpack/webpack-dev-server/blob/master/LICENSE
  */
 async function createCertificate() {
-    const { generate } = await Promise.resolve().then(function () { return require('./dep-777faa4b.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-90234190.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -56542,6 +56636,10 @@ const isDebug$3 = !!process.env.DEBUG;
 const debug$4 = createDebugger('vite:sourcemap', {
     onlyWhenFocused: true
 });
+// Virtual modules should be prefixed with a null byte to avoid a
+// false positive "missing source" warning. We also check for certain
+// prefixes used for special handling in esbuildDepPlugin.
+const virtualSourceRE = /^(\0|dep:|browser-external:)/;
 async function injectSourcesContent(map, file, logger) {
     let sourceRoot;
     try {
@@ -56551,7 +56649,7 @@ async function injectSourcesContent(map, file, logger) {
     catch { }
     const missingSources = [];
     map.sourcesContent = await Promise.all(map.sources.map((sourcePath) => {
-        if (sourcePath) {
+        if (sourcePath && !virtualSourceRE.test(sourcePath)) {
             sourcePath = decodeURI(sourcePath);
             if (sourceRoot) {
                 sourcePath = path__default.resolve(sourceRoot, sourcePath);
@@ -57011,7 +57109,7 @@ function isFileServingAllowed(url, server) {
         return true;
     const cleanedUrl = cleanUrl(url);
     const file = ensureLeadingSlash(normalizePath$4(cleanedUrl));
-    if (server.config.server.fs.deny.some((i) => minimatch_1(file, i, _matchOptions)))
+    if (server.config.server.fs.deny.some((i) => micromatch_1.isMatch(file, i, _matchOptions)))
         return false;
     if (server.moduleGraph.safeModulesPath.has(file))
         return true;
@@ -57482,13 +57580,13 @@ function invalidateSSRModule(mod, seen) {
     mod.importers.forEach((importer) => invalidateSSRModule(importer, seen));
 }
 class ModuleGraph {
-    constructor(container) {
+    constructor(resolveId) {
+        this.resolveId = resolveId;
         this.urlToModuleMap = new Map();
         this.idToModuleMap = new Map();
         // a single file may corresponds to multiple modules with different queries
         this.fileToModulesMap = new Map();
         this.safeModulesPath = new Set();
-        this.container = container;
     }
     async getModuleByUrl(rawUrl) {
         const [url] = await this.resolveUrl(rawUrl);
@@ -57510,6 +57608,7 @@ class ModuleGraph {
         }
     }
     invalidateModule(mod, seen = new Set()) {
+        mod.info = undefined;
         mod.transformResult = null;
         mod.ssrTransformResult = null;
         invalidateSSRModule(mod, seen);
@@ -57558,10 +57657,12 @@ class ModuleGraph {
         return noLongerImported;
     }
     async ensureEntryFromUrl(rawUrl) {
-        const [url, resolvedId] = await this.resolveUrl(rawUrl);
+        const [url, resolvedId, meta] = await this.resolveUrl(rawUrl);
         let mod = this.urlToModuleMap.get(url);
         if (!mod) {
             mod = new ModuleNode(url);
+            if (meta)
+                mod.meta = meta;
             this.urlToModuleMap.set(url, mod);
             mod.id = resolvedId;
             this.idToModuleMap.set(resolvedId, mod);
@@ -57602,15 +57703,15 @@ class ModuleGraph {
     // 2. resolve its extension so that urls with or without extension all map to
     // the same module
     async resolveUrl(url) {
-        var _a;
         url = removeImportQuery(removeTimestampQuery(url));
-        const resolvedId = ((_a = (await this.container.resolveId(url))) === null || _a === void 0 ? void 0 : _a.id) || url;
+        const resolved = await this.resolveId(url);
+        const resolvedId = (resolved === null || resolved === void 0 ? void 0 : resolved.id) || url;
         const ext = path$t.extname(cleanUrl(resolvedId));
         const { pathname, search, hash } = require$$0$7.parse(url);
         if (ext && !pathname.endsWith(ext)) {
             url = pathname + ext + (search || '') + (hash || '');
         }
-        return [url, resolvedId];
+        return [url, resolvedId, resolved === null || resolved === void 0 ? void 0 : resolved.meta];
     }
 }
 
@@ -57624,7 +57725,8 @@ async function handleHMRUpdate(file, server) {
     const shortFile = getShortName(file, config.root);
     const isConfig = file === config.configFile;
     const isConfigDependency = config.configFileDependencies.some((name) => file === path__default.resolve(name));
-    const isEnv = config.inlineConfig.envFile !== false && file.endsWith('.env');
+    const isEnv = config.inlineConfig.envFile !== false &&
+        (file === '.env' || file.startsWith('.env.'));
     if (isConfig || isConfigDependency || isEnv) {
         // auto restart server
         debugHmr(`[config change] ${source.dim(shortFile)}`);
@@ -57732,7 +57834,8 @@ async function handleFileAddUnlink(file, server, isUnlink = false) {
         for (const i in server._globImporters) {
             const { module, importGlobs } = server._globImporters[i];
             for (const { base, pattern } of importGlobs) {
-                if (minimatch_1(file, pattern) || minimatch_1(path__default.relative(base, file), pattern)) {
+                if (micromatch_1.isMatch(file, pattern) ||
+                    micromatch_1.isMatch(path__default.relative(base, file), pattern)) {
                     modules.push(module);
                     // We use `onFileChange` to invalidate `module.file` so that subsequent `ssrLoadModule()`
                     // calls get fresh glob import results with(out) the newly added(/removed) `file`.
@@ -66849,6 +66952,58 @@ function rebindErrorStacktrace(e, stacktrace) {
     }
 }
 
+/**
+ * This plugin hooks into Node's module resolution algorithm at runtime,
+ * so that SSR builds can benefit from `resolve.dedupe` like they do
+ * in development.
+ */
+function ssrRequireHookPlugin(config) {
+    var _a;
+    if (config.command !== 'build' || !((_a = config.resolve.dedupe) === null || _a === void 0 ? void 0 : _a.length)) {
+        return null;
+    }
+    return {
+        name: 'vite:ssr-require-hook',
+        transform(code, id) {
+            const moduleInfo = this.getModuleInfo(id);
+            if (moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.isEntry) {
+                const s = new MagicString(code);
+                s.prepend(`;(${dedupeRequire.toString()})(${JSON.stringify(config.resolve.dedupe)});\n`);
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({
+                        source: id
+                    })
+                };
+            }
+        }
+    };
+}
+/** Respect the `resolve.dedupe` option in production SSR. */
+function dedupeRequire(dedupe) {
+    const Module = require('module');
+    const resolveFilename = Module._resolveFilename;
+    Module._resolveFilename = function (request, parent, isMain, options) {
+        if (request[0] !== '.' && request[0] !== '/') {
+            const parts = request.split('/');
+            const pkgName = parts[0][0] === '@' ? parts[0] + '/' + parts[1] : parts[0];
+            if (dedupe.includes(pkgName)) {
+                // Use this module as the parent.
+                parent = module;
+            }
+        }
+        return resolveFilename(request, parent, isMain, options);
+    };
+}
+function hookNodeResolve(getResolver) {
+    const Module = require('module');
+    const prevResolver = Module._resolveFilename;
+    Module._resolveFilename = getResolver(prevResolver);
+    return () => {
+        Module._resolveFilename = prevResolver;
+    };
+}
+
 const pendingModules = new Map();
 const pendingImports = new Map();
 async function ssrLoadModule(url, server, context = { global }, urlStack = []) {
@@ -66897,13 +67052,26 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     };
     urlStack = urlStack.concat(url);
     const isCircular = (url) => urlStack.includes(url);
+    const { isProduction, resolve: { dedupe }, root } = server.config;
+    const resolveOptions = {
+        conditions: ['node'],
+        dedupe,
+        // Prefer CommonJS modules.
+        extensions: ['.js', '.mjs', '.ts', '.jsx', '.tsx', '.json'],
+        isBuild: true,
+        isProduction,
+        // Disable "module" condition.
+        isRequire: true,
+        mainFields: ['main'],
+        root
+    };
     // Since dynamic imports can happen in parallel, we need to
     // account for multiple pending deps and duplicate imports.
     const pendingDeps = [];
     const ssrImport = async (dep) => {
         var _a, _b;
         if (dep[0] !== '.' && dep[0] !== '/') {
-            return nodeImport(dep, mod.file, server.config);
+            return nodeImport(dep, mod.file, resolveOptions);
         }
         dep = unwrapId$1(dep);
         if (!isCircular(dep) && !((_a = pendingImports.get(dep)) === null || _a === void 0 ? void 0 : _a.some(isCircular))) {
@@ -66963,20 +67131,40 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     return Object.freeze(ssrModule);
 }
 // In node@12+ we can use dynamic import to load CJS and ESM
-async function nodeImport(id, importer, config) {
+async function nodeImport(id, importer, resolveOptions) {
+    // Node's module resolution is hi-jacked so Vite can ensure the
+    // configured `resolve.dedupe` and `mode` options are respected.
+    const viteResolve = (id, importer) => {
+        const resolved = tryNodeResolve(id, importer, resolveOptions, false);
+        if (!resolved) {
+            const err = new Error(`Cannot find module '${id}' imported from '${importer}'`);
+            err.code = 'ERR_MODULE_NOT_FOUND';
+            throw err;
+        }
+        return resolved.id;
+    };
+    // When an ESM module imports an ESM dependency, this hook is *not* used.
+    const unhookNodeResolve = hookNodeResolve((nodeResolve) => (id, parent, isMain, options) => id[0] === '.' || isBuiltin(id)
+        ? nodeResolve(id, parent, isMain, options)
+        : viteResolve(id, parent.id));
     let url;
     // `resolve` doesn't handle `node:` builtins, so handle them directly
     if (id.startsWith('node:') || isBuiltin(id)) {
         url = id;
     }
     else {
-        url = resolve(id, importer, config.root, !!config.resolve.preserveSymlinks);
+        url = viteResolve(id, importer);
         if (usingDynamicImport) {
             url = require$$0$7.pathToFileURL(url).toString();
         }
     }
-    const mod = await dynamicImport(url);
-    return proxyESM(id, mod);
+    try {
+        const mod = await dynamicImport(url);
+        return proxyESM(id, mod);
+    }
+    finally {
+        unhookNodeResolve();
+    }
 }
 // rollup-style default import interop for cjs
 function proxyESM(id, mod) {
@@ -66987,26 +67175,13 @@ function proxyESM(id, mod) {
             : mod;
     return new Proxy(mod, {
         get(mod, prop) {
+            var _a;
             if (prop === 'default')
                 return defaultExport;
-            return mod[prop];
+            return (_a = mod[prop]) !== null && _a !== void 0 ? _a : defaultExport === null || defaultExport === void 0 ? void 0 : defaultExport[prop];
         }
     });
 }
-const resolveCache = new Map();
-function resolve(id, importer, root, preserveSymlinks) {
-    const key = id + importer + root;
-    const cached = resolveCache.get(key);
-    if (cached) {
-        return cached;
-    }
-    const resolveDir = importer && fs__default.existsSync(cleanUrl(importer))
-        ? path__default.dirname(importer)
-        : root;
-    const resolved = resolveFrom$3(id, resolveDir, preserveSymlinks, true);
-    resolveCache.set(key, resolved);
-    return resolved;
-}
 
 /**
  * The amount to wait for requests to register newly found dependencies before triggering
@@ -67158,9 +67333,8 @@ async function createServer(inlineConfig = {}) {
         disableGlobbing: true,
         ...watchOptions
     });
-    const plugins = config.plugins;
-    const container = await createPluginContainer(config, watcher);
-    const moduleGraph = new ModuleGraph(container);
+    const moduleGraph = new ModuleGraph((url) => container.resolveId(url));
+    const container = await createPluginContainer(config, moduleGraph, watcher);
     const closeHttpServer = createServerCloseFn(httpServer);
     // eslint-disable-next-line prefer-const
     let exitProcess;
@@ -67267,7 +67441,7 @@ async function createServer(inlineConfig = {}) {
     }
     // apply server configuration hooks from plugins
     const postHooks = [];
-    for (const plugin of plugins) {
+    for (const plugin of config.plugins) {
         if (plugin.configureServer) {
             postHooks.push(await plugin.configureServer(server));
         }
@@ -81154,6 +81328,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
             ssrConfig: config.ssr,
             asSrc: true
         }),
+        config.build.ssr ? ssrRequireHookPlugin(config) : null,
         htmlInlineScriptProxyPlugin(config),
         cssPlugin(config),
         config.esbuild !== false ? esbuildPlugin(config.esbuild) : null,
@@ -81444,7 +81619,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     }
     // resolve public base url
     const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger);
-    const resolvedBuildOptions = resolveBuildOptions(config.build);
+    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build);
     // resolve cache directory
     const pkgPath = lookupFile(resolvedRoot, [`package.json`], true /* pathOnly */);
     const cacheDir = config.cacheDir
@@ -81993,4 +82168,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-5243d0d3.js.map
+//# sourceMappingURL=dep-6cab8e8a.js.map