vite 2.6.13 → 2.7.0-beta.0

package/dist/node/chunks/{dep-85dbaaa7.js → dep-f2dce443.js}

@@ -1,29 +1,29 @@
 'use strict';
 
-var fs$r = require('fs');
 var path$t = require('path');
-var require$$0$b = require('events');
+var fs$r = require('fs');
+var qs = require('querystring');
+var require$$0$4 = require('tty');
 var require$$0$6 = require('util');
-var require$$0$a = require('stream');
+var require$$3 = require('net');
+var require$$0$b = require('events');
+var require$$0$8 = require('url');
+var require$$1$2 = require('http');
+var require$$0$c = require('buffer');
+var require$$0$9 = require('zlib');
 var require$$0$5 = require('os');
+var resolve$4 = require('resolve');
+var require$$0$7 = require('module');
 var perf_hooks = require('perf_hooks');
-var require$$0$8 = require('url');
+var readline = require('readline');
 var require$$1 = require('crypto');
-var require$$0$7 = require('module');
+var require$$0$a = require('stream');
 var esbuild = require('esbuild');
 var require$$1$1 = require('worker_threads');
 var require$$5 = require('assert');
-var require$$1$4 = require('child_process');
-var readline = require('readline');
-var require$$0$9 = require('zlib');
-var resolve$4 = require('resolve');
-var qs = require('querystring');
-var require$$0$4 = require('tty');
-var require$$3 = require('net');
-var require$$1$2 = require('http');
-var require$$0$c = require('buffer');
 var require$$1$3 = require('https');
 var require$$4 = require('tls');
+var require$$1$4 = require('child_process');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -39,29 +39,29 @@ function _interopNamespace(e) {
 	return n;
 }
 
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path$t);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs$r);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs$r);
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path$t);
-var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$b);
-var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
-var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
-var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
-var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1);
-var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
-var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
-var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
-var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
-var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
-var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
-var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve$4);
 var qs__namespace = /*#__PURE__*/_interopNamespace(qs);
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
+var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
+var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$b);
+var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$c);
+var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
+var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
+var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve$4);
+var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
+var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
+var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1);
+var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
+var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
 var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
+var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -3887,6 +3887,9 @@ function isBuiltin(id) {
     id = deepMatch ? deepMatch[1] || deepMatch[2] : id;
     return builtinModules_1.includes(id);
 }
+function moduleListContains(moduleList, id) {
+    return moduleList === null || moduleList === void 0 ? void 0 : moduleList.some((m) => m === id || id.startsWith(m + '/'));
+}
 const bareImportRE = /^[\w@](?!.*:\/\/)/;
 const deepImportRE = /^([^@][^/]*)\/|^(@[^/]+\/[^/]+)\//;
 let isRunningWithYarnPnp;
@@ -4303,12 +4306,17 @@ function toUpperCaseDriveLetter(pathName) {
 }
 const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
 const singlelineCommentsRE = /\/\/.*/g;
+const usingDynamicImport = typeof jest === 'undefined';
 /**
  * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
  *
+ * As a temporary workaround for Jest's lack of stable ESM support, we fallback to require
+ * if we're in a Jest environment.
+ * See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077
+ *
  * @param file File path to import.
  */
-const dynamicImport = new Function('file', 'return import(file)');
+const dynamicImport = usingDynamicImport ? new Function('file', 'return import(file)') : require;
 
 /* eslint no-console: 0 */
 const LogLevels = {
@@ -19940,7 +19948,7 @@ function cssPostPlugin(config) {
             outputToExtractedCSSMap = new Map();
             hasEmitted = false;
         },
-        async transform(css, id, ssr) {
+        async transform(css, id, options) {
             if (!isCSSRequest(id) || commonjsProxyRE.test(id)) {
                 return;
             }
@@ -19953,7 +19961,7 @@ function cssPostPlugin(config) {
                 }
                 else {
                     // server only
-                    if (ssr) {
+                    if (options === null || options === void 0 ? void 0 : options.ssr) {
                         return modulesCode || `export default ${JSON.stringify(css)}`;
                     }
                     if (inlined) {
@@ -20257,7 +20265,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-1a7759b6.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-e5df0dd2.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21222,7 +21230,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-93e144c8.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-e51889c1.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -21604,18 +21612,19 @@ function isEntirelyImport(code) {
 function toPublicPath(filename, config) {
     return isExternalUrl(filename) ? filename : config.base + filename;
 }
-const headInjectRE = /([ \t]*)<\/head>/;
-const headPrependInjectRE = /([ \t]*)<head[^>]*>/;
+const headInjectRE = /([ \t]*)<\/head>/i;
+const headPrependInjectRE = /([ \t]*)<head[^>]*>/i;
+const htmlInjectRE = /<\/html>/i;
+const htmlPrependInjectRE = /([ \t]*)<html[^>]*>/i;
+const bodyInjectRE = /([ \t]*)<\/body>/i;
+const bodyPrependInjectRE = /([ \t]*)<body[^>]*>/i;
 const doctypePrependInjectRE = /<!doctype html>/i;
 function injectToHead(html, tags, prepend = false) {
     if (prepend) {
-        // inject after head or doctype
+        // inject as the first element of head
         if (headPrependInjectRE.test(html)) {
             return html.replace(headPrependInjectRE, (match, p1) => `${match}\n${serializeTags(tags, incrementIndent(p1))}`);
         }
-        else if (doctypePrependInjectRE.test(html)) {
-            return html.replace(doctypePrependInjectRE, `$&\n${serializeTags(tags)}`);
-        }
     }
     else {
         // inject before head close
@@ -21623,30 +21632,48 @@ function injectToHead(html, tags, prepend = false) {
             // respect indentation of head tag
             return html.replace(headInjectRE, (match, p1) => `${serializeTags(tags, incrementIndent(p1))}${match}`);
         }
+        // try to inject before the body tag
+        if (bodyPrependInjectRE.test(html)) {
+            return html.replace(bodyPrependInjectRE, (match, p1) => `${serializeTags(tags, p1)}\n${match}`);
+        }
     }
-    // if no <head> tag is present, just prepend
-    return serializeTags(tags) + html;
+    // if no head tag is present, we prepend the tag for both prepend and append
+    return prependInjectFallback(html, tags);
 }
-const bodyInjectRE = /([ \t]*)<\/body>/;
-const bodyPrependInjectRE = /([ \t]*)<body[^>]*>/;
 function injectToBody(html, tags, prepend = false) {
     if (prepend) {
         // inject after body open
         if (bodyPrependInjectRE.test(html)) {
             return html.replace(bodyPrependInjectRE, (match, p1) => `${match}\n${serializeTags(tags, incrementIndent(p1))}`);
         }
-        // if no body, prepend
-        return serializeTags(tags) + html;
+        // if no there is no body tag, inject after head or fallback to prepend in html
+        if (headInjectRE.test(html)) {
+            return html.replace(headInjectRE, (match, p1) => `${match}\n${serializeTags(tags, p1)}`);
+        }
+        return prependInjectFallback(html, tags);
     }
     else {
         // inject before body close
         if (bodyInjectRE.test(html)) {
             return html.replace(bodyInjectRE, (match, p1) => `${serializeTags(tags, incrementIndent(p1))}${match}`);
         }
-        // if no body, append
+        // if no body tag is present, append to the html tag, or at the end of the file
+        if (htmlInjectRE.test(html)) {
+            return html.replace(htmlInjectRE, `${serializeTags(tags)}\n$&`);
+        }
         return html + `\n` + serializeTags(tags);
     }
 }
+function prependInjectFallback(html, tags) {
+    // prepend to the html tag, append after doctype, or the document start
+    if (htmlPrependInjectRE.test(html)) {
+        return html.replace(htmlPrependInjectRE, `$&\n${serializeTags(tags)}`);
+    }
+    if (doctypePrependInjectRE.test(html)) {
+        return html.replace(doctypePrependInjectRE, `$&\n${serializeTags(tags)}`);
+    }
+    return serializeTags(tags) + html;
+}
 const unaryTags = new Set(['link', 'meta', 'base']);
 function serializeTag({ tag, attrs, children }, indent = '') {
     if (unaryTags.has(tag)) {
@@ -29809,7 +29836,8 @@ function resolvePlugin(baseOptions) {
         configureServer(_server) {
             server = _server;
         },
-        resolveId(id, importer, resolveOpts, ssr) {
+        resolveId(id, importer, resolveOpts) {
+            const ssr = (resolveOpts === null || resolveOpts === void 0 ? void 0 : resolveOpts.ssr) === true;
             if (id.startsWith(browserExternalId)) {
                 return id;
             }
@@ -29965,14 +29993,27 @@ function tryFsResolve(fsPath, options, preserveSymlinks, tryIndex = true, target
         postfix = fsPath.slice(postfixIndex);
     }
     let res;
+    // if we fould postfix exist, we should first try resolving file with postfix. details see #4703.
+    if (postfix &&
+        (res = tryResolveFile(fsPath, '', options, false, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
+        return res;
+    }
     if ((res = tryResolveFile(file, postfix, options, false, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
         return res;
     }
     for (const ext of options.extensions || DEFAULT_EXTENSIONS) {
+        if (postfix &&
+            (res = tryResolveFile(fsPath + ext, '', options, false, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
+            return res;
+        }
         if ((res = tryResolveFile(file + ext, postfix, options, false, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
             return res;
         }
     }
+    if (postfix &&
+        (res = tryResolveFile(fsPath, '', options, tryIndex, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
+        return res;
+    }
     if ((res = tryResolveFile(file, postfix, options, tryIndex, targetWeb, preserveSymlinks, options.tryPrefix, options.skipPackageJson))) {
         return res;
     }
@@ -30386,9 +30427,6 @@ const debug$c = createDebugger('vite:ssr-external');
 /**
  * Heuristics for determining whether a dependency should be externalized for
  * server-side rendering.
- *
- * TODO right now externals are imported using require(), we probably need to
- * rework this when more libraries ship native ESM distributions for Node.
  */
 function resolveSSRExternal(config, knownImports, ssrExternals = new Set(), seen = new Set()) {
     var _a, _b, _c, _d;
@@ -30452,6 +30490,10 @@ function resolveSSRExternal(config, knownImports, ssrExternals = new Set(), seen
                 // entry is not js, cannot externalize
                 continue;
             }
+            if (pkg.type === "module" || entry.endsWith('.mjs')) {
+                ssrExternals.add(id);
+                continue;
+            }
             // check if the entry is cjs
             const content = fs__default.readFileSync(entry, 'utf-8');
             if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
@@ -42126,12 +42168,12 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
             });
         }
         async resolve(id, importer, options) {
-            let skips;
+            let skip;
             if ((options === null || options === void 0 ? void 0 : options.skipSelf) && this._activePlugin) {
-                skips = new Set(this._resolveSkips);
-                skips.add(this._activePlugin);
+                skip = new Set(this._resolveSkips);
+                skip.add(this._activePlugin);
             }
-            let out = await container.resolveId(id, importer, skips, this.ssr);
+            let out = await container.resolveId(id, importer, { skip, ssr: this.ssr });
             if (typeof out === 'string')
                 out = { id: out };
             return out;
@@ -42322,21 +42364,23 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 }
             }));
         },
-        async resolveId(rawId, importer = path$t.join(root, 'index.html'), skips, ssr) {
+        async resolveId(rawId, importer = path$t.join(root, 'index.html'), options) {
+            const skip = options === null || options === void 0 ? void 0 : options.skip;
+            const ssr = options === null || options === void 0 ? void 0 : options.ssr;
             const ctx = new Context();
             ctx.ssr = !!ssr;
-            ctx._resolveSkips = skips;
+            ctx._resolveSkips = skip;
             const resolveStart = isDebug ? perf_hooks.performance.now() : 0;
             let id = null;
             const partial = {};
             for (const plugin of plugins) {
                 if (!plugin.resolveId)
                     continue;
-                if (skips === null || skips === void 0 ? void 0 : skips.has(plugin))
+                if (skip === null || skip === void 0 ? void 0 : skip.has(plugin))
                     continue;
                 ctx._activePlugin = plugin;
                 const pluginResolveStart = isDebug ? perf_hooks.performance.now() : 0;
-                const result = await plugin.resolveId.call(ctx, rawId, importer, {}, ssr);
+                const result = await plugin.resolveId.call(ctx, rawId, importer, { ssr });
                 if (!result)
                     continue;
                 if (typeof result === 'string') {
@@ -42367,21 +42411,24 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 return null;
             }
         },
-        async load(id, ssr) {
+        async load(id, options) {
+            const ssr = options === null || options === void 0 ? void 0 : options.ssr;
             const ctx = new Context();
             ctx.ssr = !!ssr;
             for (const plugin of plugins) {
                 if (!plugin.load)
                     continue;
                 ctx._activePlugin = plugin;
-                const result = await plugin.load.call(ctx, id, ssr);
+                const result = await plugin.load.call(ctx, id, { ssr });
                 if (result != null) {
                     return result;
                 }
             }
             return null;
         },
-        async transform(code, id, inMap, ssr) {
+        async transform(code, id, options) {
+            const inMap = options === null || options === void 0 ? void 0 : options.inMap;
+            const ssr = options === null || options === void 0 ? void 0 : options.ssr;
             const ctx = new TransformContext(id, code, inMap);
             ctx.ssr = !!ssr;
             for (const plugin of plugins) {
@@ -42393,7 +42440,7 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 const start = isDebug ? perf_hooks.performance.now() : 0;
                 let result;
                 try {
-                    result = await plugin.transform.call(ctx, code, id, ssr);
+                    result = await plugin.transform.call(ctx, code, id, { ssr });
                 }
                 catch (e) {
                     ctx.error(e);
@@ -42643,7 +42690,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                 // avoid matching windows volume
                 filter: /^[\w@][^:]/
             }, async ({ path: id, importer }) => {
-                if (exclude === null || exclude === void 0 ? void 0 : exclude.some((e) => e === id || id.startsWith(e + '/'))) {
+                if (moduleListContains(exclude, id)) {
                     return externalUnlessEntry({ path: id });
                 }
                 if (depImports[id]) {
@@ -42788,7 +42835,7 @@ function shouldExternalizeDep(resolvedId, rawId) {
 function assetImportMetaUrlPlugin(config) {
     return {
         name: 'vite:asset-import-meta-url',
-        async transform(code, id, ssr) {
+        async transform(code, id, options) {
             if (code.includes('new URL') && code.includes(`import.meta.url`)) {
                 const importMetaUrlRE = /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\)/g;
                 const noCommentsCode = code
@@ -42798,7 +42845,7 @@ function assetImportMetaUrlPlugin(config) {
                 let match;
                 while ((match = importMetaUrlRE.exec(noCommentsCode))) {
                     const { 0: exp, 1: rawUrl, index } = match;
-                    if (ssr) {
+                    if (options === null || options === void 0 ? void 0 : options.ssr) {
                         this.error(`\`new URL(url, import.meta.url)\` is not supported in SSR.`, index);
                     }
                     if (!s)
@@ -42860,6 +42907,7 @@ function loadFallbackPlugin() {
         name: 'vite:load-fallback',
         async load(id) {
             try {
+                // if we don't add `await` here, we couldn't catch the error in readFile
                 return await fs$r.promises.readFile(cleanUrl(id), 'utf-8');
             }
             catch (e) {
@@ -43303,18 +43351,37 @@ function injectSsrFlagToHooks(p) {
     const { resolveId, load, transform } = p;
     return {
         ...p,
-        resolveId: wrapSsrHook(resolveId),
-        load: wrapSsrHook(load),
-        transform: wrapSsrHook(transform)
+        resolveId: wrapSsrResolveId(resolveId),
+        load: wrapSsrLoad(load),
+        transform: wrapSsrTransform(transform)
+    };
+}
+function wrapSsrResolveId(fn) {
+    if (!fn)
+        return;
+    return function (id, importer, options) {
+        return fn.call(this, id, importer, injectSsrFlag(options));
     };
 }
-function wrapSsrHook(fn) {
+function wrapSsrLoad(fn) {
     if (!fn)
         return;
-    return function (...args) {
-        return fn.call(this, ...args, true);
+    // Receiving options param to be future-proof if Rollup adds it
+    return function (id, ...args) {
+        return fn.call(this, id, injectSsrFlag(args[0]));
     };
 }
+function wrapSsrTransform(fn) {
+    if (!fn)
+        return;
+    // Receiving options param to be future-proof if Rollup adds it
+    return function (code, importer, ...args) {
+        return fn.call(this, code, importer, injectSsrFlag(args[0]));
+    };
+}
+function injectSsrFlag(options = {}) {
+    return { ...options, ssr: true };
+}
 
 var build$1 = {
 	__proto__: null,
@@ -49038,7 +49105,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-724b1c48.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-0619a44b.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -56629,25 +56696,18 @@ function serveRawFsMiddleware(server) {
         }
     };
 }
+const _matchOptions = { matchBase: true };
 function isFileServingAllowed(url, server) {
-    // explicitly disabled
-    if (server.config.server.fs.strict === false)
+    if (!server.config.server.fs.strict)
         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)))
+        return false;
     if (server.moduleGraph.safeModulesPath.has(file))
         return true;
     if (server.config.server.fs.allow.some((i) => file.startsWith(i + '/')))
         return true;
-    if (!server.config.server.fs.strict) {
-        if (isFileReadable(cleanedUrl)) {
-            server.config.logger.warnOnce(`Unrestricted file system access to "${url}"`);
-            server.config.logger.warnOnce(`For security concerns, accessing files outside of serving allow list will ` +
-                `be restricted by default in the future version of Vite. ` +
-                `Refer to https://vitejs.dev/config/#server-fs-allow for more details.`);
-        }
-        return true;
-    }
     return false;
 }
 function ensureServingAccess(url, server, res, next) {
@@ -56733,7 +56793,7 @@ async function doTransform(url, server, options) {
     let map = null;
     // load
     const loadStart = isDebug$2 ? perf_hooks.performance.now() : 0;
-    const loadResult = await pluginContainer.load(id, ssr);
+    const loadResult = await pluginContainer.load(id, { ssr });
     if (loadResult == null) {
         // if this is an html request and there is no load result, skip ahead to
         // SPA fallback.
@@ -56794,7 +56854,7 @@ async function doTransform(url, server, options) {
     ensureWatchedFile(watcher, mod.file, root);
     // transform
     const transformStart = isDebug$2 ? perf_hooks.performance.now() : 0;
-    const transformResult = await pluginContainer.transform(code, id, map, ssr);
+    const transformResult = await pluginContainer.transform(code, id, { inMap: map, ssr });
     if (transformResult == null ||
         (isObject$3(transformResult) && transformResult.code == null)) {
         // no transform applied, keep code as-is
@@ -62882,6 +62942,13 @@ function esbuildDepPlugin(qualified, exportsData, config, ssr) {
                 }
             }
             build.onResolve({ filter: /^[\w@][^:]/ }, async ({ path: id, importer, kind }) => {
+                var _a;
+                if (moduleListContains((_a = config.optimizeDeps) === null || _a === void 0 ? void 0 : _a.exclude, id)) {
+                    return {
+                        path: id,
+                        external: true
+                    };
+                }
                 // ensure esbuild uses our resolved entries
                 let entry;
                 // if this is an entry, return entry namespace resolve result
@@ -66495,7 +66562,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     const ssrImport = async (dep) => {
         var _a, _b;
         if (dep[0] !== '.' && dep[0] !== '/') {
-            return nodeRequire(dep, mod.file, server.config.root, !!server.config.resolve.preserveSymlinks);
+            return nodeImport(dep, mod.file, server.config);
         }
         dep = unwrapId$1(dep);
         if (!isCircular(dep) && !((_a = pendingImports.get(dep)) === null || _a === void 0 ? void 0 : _a.some(isCircular))) {
@@ -66552,10 +66619,25 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     }
     return Object.freeze(ssrModule);
 }
-function nodeRequire(id, importer, root, preserveSymlinks) {
-    const mod = require(resolve(id, importer, root, preserveSymlinks));
-    const defaultExport = mod.__esModule ? mod.default : mod;
-    // rollup-style default import interop for cjs
+// In node@12+ we can use dynamic import to load CJS and ESM
+async function nodeImport(id, importer, config) {
+    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);
+        if (usingDynamicImport) {
+            url = require$$0$8.pathToFileURL(url).toString();
+        }
+    }
+    const mod = await dynamicImport(url);
+    return proxyESM(id, mod);
+}
+// rollup-style default import interop for cjs
+function proxyESM(id, mod) {
+    const defaultExport = mod.__esModule ? mod.default : mod.default ? mod.default : mod;
     return new Proxy(mod, {
         get(mod, prop) {
             if (prop === 'default')
@@ -66615,8 +66697,11 @@ function createMissingImporterRegisterFn(server) {
         }
         finally {
             server._isRunningOptimizer = false;
-            pendingResolve && pendingResolve();
-            server._pendingReload = pendingResolve = null;
+            if (!handle) {
+                // No other rerun() pending so resolve and let pending requests proceed
+                pendingResolve && pendingResolve();
+                server._pendingReload = pendingResolve = null;
+            }
         }
         // Cached transform results have stale imports (resolved to
         // old locations) so they need to be invalidated before the page is
@@ -66632,10 +66717,15 @@ function createMissingImporterRegisterFn(server) {
             currentMissing[id] = resolved;
             if (handle)
                 clearTimeout(handle);
-            handle = setTimeout(() => rerun(ssr), debounceMs);
-            server._pendingReload = new Promise((r) => {
-                pendingResolve = r;
-            });
+            handle = setTimeout(() => {
+                handle = undefined;
+                rerun(ssr);
+            }, debounceMs);
+            if (!server._pendingReload) {
+                server._pendingReload = new Promise((r) => {
+                    pendingResolve = r;
+                });
+            }
         }
     };
 }
@@ -67007,9 +67097,10 @@ function resolvedAllowDir(root, dir) {
     return ensureLeadingSlash(normalizePath$4(path__default.resolve(root, dir)));
 }
 function resolveServerOptions(root, raw) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const server = raw || {};
     let allowDirs = (_a = server.fs) === null || _a === void 0 ? void 0 : _a.allow;
+    const deny = ((_b = server.fs) === null || _b === void 0 ? void 0 : _b.deny) || ['.env', '.env.*', '*.{crt,pem}'];
     if (!allowDirs) {
         allowDirs = [searchForWorkspaceRoot(root)];
     }
@@ -67020,9 +67111,9 @@ function resolveServerOptions(root, raw) {
         allowDirs.push(resolvedClientDir);
     }
     server.fs = {
-        // TODO: make strict by default
-        strict: (_b = server.fs) === null || _b === void 0 ? void 0 : _b.strict,
-        allow: allowDirs
+        strict: (_d = (_c = server.fs) === null || _c === void 0 ? void 0 : _c.strict) !== null && _d !== void 0 ? _d : true,
+        allow: allowDirs,
+        deny
     };
     return server;
 }
@@ -67224,7 +67315,8 @@ function importAnalysisPlugin(config) {
         configureServer(_server) {
             server = _server;
         },
-        async transform(source$1, importer, ssr) {
+        async transform(source$1, importer, options) {
+            const ssr = (options === null || options === void 0 ? void 0 : options.ssr) === true;
             const prettyImporter = prettifyUrl(importer, root);
             if (canSkip(importer)) {
                 isDebug && debug$2(source.dim(`[skipped] ${prettyImporter}`));
@@ -67273,12 +67365,26 @@ function importAnalysisPlugin(config) {
             const acceptedUrls = new Set();
             const toAbsoluteUrl = (url) => path__default.posix.resolve(path__default.posix.dirname(importerModule.url), url);
             const normalizeUrl = async (url, pos) => {
+                var _a;
                 if (base !== '/' && url.startsWith(base)) {
                     url = url.replace(base, '/');
                 }
-                const resolved = await this.resolve(url, importer);
+                let importerFile = importer;
+                if (moduleListContains((_a = config.optimizeDeps) === null || _a === void 0 ? void 0 : _a.exclude, url) &&
+                    server._optimizeDepsMetadata) {
+                    // if the dependency encountered in the optimized file was excluded from the optimization
+                    // the dependency needs to be resolved starting from the original source location of the optimized file
+                    // because starting from node_modules/.vite will not find the dependency if it was not hoisted
+                    // (that is, if it is under node_modules directory in the package source of the optimized file)
+                    for (const optimizedModule of Object.values(server._optimizeDepsMetadata.optimized)) {
+                        if (optimizedModule.file === importerModule.file) {
+                            importerFile = optimizedModule.src;
+                        }
+                    }
+                }
+                const resolved = await this.resolve(url, importerFile);
                 if (!resolved) {
-                    this.error(`Failed to resolve import "${url}" from "${path__default.relative(process.cwd(), importer)}". Does the file exist?`, pos);
+                    this.error(`Failed to resolve import "${url}" from "${path__default.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
                 }
                 const isRelative = url.startsWith('.');
                 const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
@@ -67853,8 +67959,8 @@ function preAliasPlugin() {
         configureServer(_server) {
             server = _server;
         },
-        resolveId(id, importer, _, ssr) {
-            if (!ssr && bareImportRE.test(id)) {
+        resolveId(id, importer, options) {
+            if (!(options === null || options === void 0 ? void 0 : options.ssr) && bareImportRE.test(id)) {
                 return tryOptimizedResolve(id, server, importer);
             }
         }
@@ -67905,7 +68011,8 @@ function definePlugin(config) {
         ')\\b', 'g');
     return {
         name: 'vite:define',
-        transform(code, id, ssr) {
+        transform(code, id, options) {
+            const ssr = (options === null || options === void 0 ? void 0 : options.ssr) === true;
             if (!ssr && !isBuild) {
                 // for dev we inject actual global defines in the vite client to
                 // avoid the transform cost.
@@ -68301,7 +68408,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
                             ]
                         }));
             }
-            return (_a = (await container.resolveId(id, importer, undefined, ssr))) === null || _a === void 0 ? void 0 : _a.id;
+            return (_a = (await container.resolveId(id, importer, { ssr }))) === null || _a === void 0 ? void 0 : _a.id;
         };
     };
     const { publicDir } = config;
@@ -92019,8 +92126,9 @@ var compression$1 = compression$2.exports;
  * @param serverOptions - what host and port to use
  * @experimental
  */
-async function preview(config, serverOptions) {
-    var _a, _b;
+async function preview(inlineConfig) {
+    var _a;
+    const config = await resolveConfig(inlineConfig, 'serve', 'production');
     const app = connect();
     const httpServer = await resolveHttpServer(config.server, app, await resolveHttpsConfig(config));
     // cors
@@ -92040,8 +92148,8 @@ async function preview(config, serverOptions) {
         single: true
     }));
     const options = config.server;
-    const hostname = resolveHostname((_a = serverOptions.host) !== null && _a !== void 0 ? _a : options.host);
-    const port = (_b = serverOptions.port) !== null && _b !== void 0 ? _b : 5000;
+    const hostname = resolveHostname(options.host);
+    const port = (_a = options.port) !== null && _a !== void 0 ? _a : 5000;
     const protocol = options.https ? 'https' : 'http';
     const logger = config.logger;
     const base = config.base;
@@ -92057,7 +92165,13 @@ async function preview(config, serverOptions) {
             ? path
             : `${protocol}://${hostname.name}:${serverPort}${path}`, true, logger);
     }
-    return httpServer;
+    return {
+        config,
+        httpServer,
+        printUrls() {
+            printHttpServerUrls(httpServer, config);
+        }
+    };
 }
 
 exports.build = build;
@@ -92086,4 +92200,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-85dbaaa7.js.map
+//# sourceMappingURL=dep-f2dce443.js.map