vite 2.5.5 → 2.5.9

package/dist/node/chunks/{dep-07ec9cdd.js → dep-05fcddd5.js}

@@ -3145,7 +3145,7 @@ if (typeof process === 'undefined' || process.type === 'renderer' || process.bro
 	src$3.exports = node$2.exports;
 }
 
-var debug$d = src$3.exports;
+var debug$e = src$3.exports;
 
 const DEFAULT_MAIN_FIELDS = [
     'module',
@@ -4103,7 +4103,7 @@ function nestedResolveFrom(id, basedir) {
 const filter$1 = process.env.VITE_DEBUG_FILTER;
 const DEBUG$1 = process.env.DEBUG;
 function createDebugger(namespace, options = {}) {
-    const log = debug$d(namespace);
+    const log = debug$e(namespace);
     const { onlyWhenFocused } = options;
     const focus = typeof onlyWhenFocused === 'string' ? onlyWhenFocused : namespace;
     return (msg, ...args) => {
@@ -34157,7 +34157,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-8a1f5a00.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-58243dfd.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -34949,7 +34949,7 @@ function buildImportAnalysisPlugin(config) {
                                             const cssFiles = chunkToEmittedCssFileMap.get(chunk);
                                             if (cssFiles && cssFiles.size > 0) {
                                                 cssFiles.forEach((file) => {
-                                                    deps.add(config.base + file);
+                                                    deps.add(file);
                                                 });
                                                 hasRemovedPureCssChunk = true;
                                             }
@@ -35101,7 +35101,7 @@ const assetAttrsConfig = {
 };
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-a247570d.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-499befab.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -35602,48 +35602,66 @@ var stripJsonComments = (jsonString, options = {}) => {
 	return result + (insideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
 };
 
-const debug$c = createDebugger('vite:esbuild');
+const debug$d = createDebugger('vite:esbuild');
 async function transformWithEsbuild(code, filename, options, inMap) {
     var _a, _b, _c;
-    // if the id ends with a valid ext, use it (e.g. vue blocks)
-    // otherwise, cleanup the query before checking the ext
-    const ext = path__default.extname(/\.\w+$/.test(filename) ? filename : cleanUrl(filename));
-    let loader = ext.slice(1);
-    if (loader === 'cjs' || loader === 'mjs') {
-        loader = 'js';
-    }
-    // these fields would affect the compilation result
-    // https://esbuild.github.io/content-types/#tsconfig-json
-    const meaningfulFields = [
-        'jsxFactory',
-        'jsxFragmentFactory',
-        'useDefineForClassFields',
-        'importsNotUsedAsValues'
-    ];
-    const compilerOptionsForFile = {};
-    if (loader === 'ts' || loader === 'tsx') {
-        const loadedTsconfig = await loadTsconfigJsonForFile(filename);
-        const loadedCompilerOptions = (_a = loadedTsconfig.compilerOptions) !== null && _a !== void 0 ? _a : {};
-        for (const field of meaningfulFields) {
-            if (field in loadedCompilerOptions) {
-                // @ts-ignore TypeScript can't tell they are of the same type
-                compilerOptionsForFile[field] = loadedCompilerOptions[field];
-            }
+    let loader = options === null || options === void 0 ? void 0 : options.loader;
+    if (!loader) {
+        // if the id ends with a valid ext, use it (e.g. vue blocks)
+        // otherwise, cleanup the query before checking the ext
+        const ext = path__default
+            .extname(/\.\w+$/.test(filename) ? filename : cleanUrl(filename))
+            .slice(1);
+        if (ext === 'cjs' || ext === 'mjs') {
+            loader = 'js';
         }
-        // align with TypeScript 4.3
-        // https://github.com/microsoft/TypeScript/pull/42663
-        if (((_b = loadedCompilerOptions.target) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'esnext') {
-            compilerOptionsForFile.useDefineForClassFields =
-                (_c = loadedCompilerOptions.useDefineForClassFields) !== null && _c !== void 0 ? _c : true;
+        else {
+            loader = ext;
+        }
+    }
+    let tsconfigRaw = options === null || options === void 0 ? void 0 : options.tsconfigRaw;
+    // if options provide tsconfigraw in string, it takes highest precedence
+    if (typeof tsconfigRaw !== 'string') {
+        // these fields would affect the compilation result
+        // https://esbuild.github.io/content-types/#tsconfig-json
+        const meaningfulFields = [
+            'jsxFactory',
+            'jsxFragmentFactory',
+            'useDefineForClassFields',
+            'importsNotUsedAsValues'
+        ];
+        const compilerOptionsForFile = {};
+        if (loader === 'ts' || loader === 'tsx') {
+            const loadedTsconfig = await loadTsconfigJsonForFile(filename);
+            const loadedCompilerOptions = (_a = loadedTsconfig.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            for (const field of meaningfulFields) {
+                if (field in loadedCompilerOptions) {
+                    // @ts-ignore TypeScript can't tell they are of the same type
+                    compilerOptionsForFile[field] = loadedCompilerOptions[field];
+                }
+            }
+            // align with TypeScript 4.3
+            // https://github.com/microsoft/TypeScript/pull/42663
+            if (((_b = loadedCompilerOptions.target) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'esnext') {
+                compilerOptionsForFile.useDefineForClassFields =
+                    (_c = loadedCompilerOptions.useDefineForClassFields) !== null && _c !== void 0 ? _c : true;
+            }
         }
+        tsconfigRaw = {
+            ...tsconfigRaw,
+            compilerOptions: {
+                ...compilerOptionsForFile,
+                ...tsconfigRaw === null || tsconfigRaw === void 0 ? void 0 : tsconfigRaw.compilerOptions
+            }
+        };
     }
     const resolvedOptions = {
-        loader: loader,
         sourcemap: true,
         // ensure source file name contains full query
         sourcefile: filename,
-        tsconfigRaw: { compilerOptions: compilerOptionsForFile },
-        ...options
+        ...options,
+        loader,
+        tsconfigRaw
     };
     delete resolvedOptions.include;
     delete resolvedOptions.exclude;
@@ -35669,7 +35687,7 @@ async function transformWithEsbuild(code, filename, options, inMap) {
         }
     }
     catch (e) {
-        debug$c(`esbuild error with options used: `, resolvedOptions);
+        debug$d(`esbuild error with options used: `, resolvedOptions);
         // patch error information
         if (e.errors) {
             e.frame = '';
@@ -43306,7 +43324,7 @@ function resolve$1(pkg, entry='.', options={}) {
 // https://github.com/defunctzombie/package-browser-field-spec#ignore-a-module
 const browserExternalId = '__vite-browser-external';
 const isDebug$5 = process.env.DEBUG;
-const debug$b = createDebugger('vite:resolve-details', {
+const debug$c = createDebugger('vite:resolve-details', {
     onlyWhenFocused: true
 });
 function resolvePlugin(baseOptions) {
@@ -43342,7 +43360,7 @@ function resolvePlugin(baseOptions) {
             if (asSrc && id.startsWith(FS_PREFIX)) {
                 const fsPath = fsPathFromId(id);
                 res = tryFsResolve(fsPath, options);
-                isDebug$5 && debug$b(`[@fs] ${source.cyan(id)} -> ${source.dim(res)}`);
+                isDebug$5 && debug$c(`[@fs] ${source.cyan(id)} -> ${source.dim(res)}`);
                 // 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 res || fsPath;
@@ -43352,7 +43370,7 @@ function resolvePlugin(baseOptions) {
             if (asSrc && id.startsWith('/')) {
                 const fsPath = path__default.resolve(root, id.slice(1));
                 if ((res = tryFsResolve(fsPath, options))) {
-                    isDebug$5 && debug$b(`[url] ${source.cyan(id)} -> ${source.dim(res)}`);
+                    isDebug$5 && debug$c(`[url] ${source.cyan(id)} -> ${source.dim(res)}`);
                     return res;
                 }
             }
@@ -43377,7 +43395,7 @@ function resolvePlugin(baseOptions) {
                     return res;
                 }
                 if ((res = tryFsResolve(fsPath, options))) {
-                    isDebug$5 && debug$b(`[relative] ${source.cyan(id)} -> ${source.dim(res)}`);
+                    isDebug$5 && debug$c(`[relative] ${source.cyan(id)} -> ${source.dim(res)}`);
                     const pkg = importer != null && idToPkgMap.get(importer);
                     if (pkg) {
                         idToPkgMap.set(res, pkg);
@@ -43391,7 +43409,7 @@ function resolvePlugin(baseOptions) {
             }
             // absolute fs paths
             if (path__default.isAbsolute(id) && (res = tryFsResolve(id, options))) {
-                isDebug$5 && debug$b(`[fs] ${source.cyan(id)} -> ${source.dim(res)}`);
+                isDebug$5 && debug$c(`[fs] ${source.cyan(id)} -> ${source.dim(res)}`);
                 return res;
             }
             // external
@@ -43440,7 +43458,7 @@ function resolvePlugin(baseOptions) {
                     }
                     else {
                         if (!asSrc) {
-                            debug$b(`externalized node built-in "${id}" to empty module. ` +
+                            debug$c(`externalized node built-in "${id}" to empty module. ` +
                                 `(imported by: ${source.white.dim(importer)})`);
                         }
                         return isProduction
@@ -43449,7 +43467,7 @@ function resolvePlugin(baseOptions) {
                     }
                 }
             }
-            isDebug$5 && debug$b(`[fallthrough] ${source.dim(id)}`);
+            isDebug$5 && debug$c(`[fallthrough] ${source.dim(id)}`);
         },
         load(id) {
             if (id.startsWith(browserExternalId)) {
@@ -43656,7 +43674,7 @@ function resolvePackageData(id, basedir) {
         return loadPackageData(pkgPath, cacheKey);
     }
     catch (e) {
-        isDebug$5 && debug$b(`${source.red(`[failed loading package.json]`)} ${id}`);
+        isDebug$5 && debug$c(`${source.red(`[failed loading package.json]`)} ${id}`);
     }
 }
 function loadPackageData(pkgPath, cacheKey = pkgPath) {
@@ -43771,7 +43789,7 @@ function resolvePackageEntry(id, { dir, data, setResolvedCache, getResolvedCache
         const resolvedEntryPoint = tryFsResolve(entryPoint, options);
         if (resolvedEntryPoint) {
             isDebug$5 &&
-                debug$b(`[package entry] ${source.cyan(id)} -> ${source.dim(resolvedEntryPoint)}`);
+                debug$c(`[package entry] ${source.cyan(id)} -> ${source.dim(resolvedEntryPoint)}`);
             setResolvedCache('.', resolvedEntryPoint, targetWeb);
             return resolvedEntryPoint;
         }
@@ -43838,7 +43856,7 @@ function resolveDeepImport(id, { webResolvedImports, setResolvedCache, getResolv
         targetWeb);
         if (resolved) {
             isDebug$5 &&
-                debug$b(`[node/deep-import] ${source.cyan(id)} -> ${source.dim(resolved)}`);
+                debug$c(`[node/deep-import] ${source.cyan(id)} -> ${source.dim(resolved)}`);
             setResolvedCache(id, resolved, targetWeb);
             return resolved;
         }
@@ -43854,7 +43872,7 @@ function tryResolveBrowserMapping(id, importer, options, isFilePath) {
             const fsPath = path__default.join(pkg.dir, browserMappedPath);
             if ((res = tryFsResolve(fsPath, options))) {
                 isDebug$5 &&
-                    debug$b(`[browser mapped] ${source.cyan(id)} -> ${source.dim(res)}`);
+                    debug$c(`[browser mapped] ${source.cyan(id)} -> ${source.dim(res)}`);
                 idToPkgMap.set(res, pkg);
                 return {
                     id: res,
@@ -43890,6 +43908,7 @@ function equalWithoutSuffix(path, key, suffix) {
     return key.endsWith(suffix) && key.slice(0, -suffix.length) === path;
 }
 
+const debug$b = createDebugger('vite:ssr-external');
 /**
  * Heuristics for determining whether a dependency should be externalized for
  * server-side rendering.
@@ -43933,7 +43952,7 @@ function resolveSSRExternal(config, knownImports, ssrExternals = new Set(), seen
         }
         catch (e) {
             // resolve failed, assume include
-            config.logger.warn(`Bundling package for SSR due to resolve failure. ${e.message}`);
+            debug$b(`Failed to resolve entries for package "${id}"\n`, e);
             continue;
         }
         if (!entry) {
@@ -50372,17 +50391,6 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                 map: ctx._getCombinedSourcemap()
             };
         },
-        watchChange(id, event = 'update') {
-            const ctx = new Context();
-            if (watchFiles.has(id)) {
-                for (const plugin of plugins) {
-                    if (!plugin.watchChange)
-                        continue;
-                    ctx._activePlugin = plugin;
-                    plugin.watchChange.call(ctx, id, { event });
-                }
-            }
-        },
         async close() {
             if (closed)
                 return;
@@ -50995,7 +51003,6 @@ async function doBuild(inlineConfig = {}) {
         config.logger.error(msg, { error: e });
     };
     try {
-        const pkgName = libOptions && getPkgName(config.root);
         const buildOutputOptions = (output = {}) => {
             return {
                 dir: outDir,
@@ -51006,7 +51013,7 @@ async function doBuild(inlineConfig = {}) {
                 entryFileNames: ssr
                     ? `[name].js`
                     : libOptions
-                        ? resolveLibFilename(libOptions, output.format || 'es', pkgName)
+                        ? resolveLibFilename(libOptions, output.format || 'es', config.root)
                         : path__default.posix.join(options.assetsDir, `[name].[hash].js`),
                 chunkFileNames: libOptions
                     ? `[name].js`
@@ -51121,9 +51128,7 @@ function prepareOutDir(outDir, emptyOutDir, config) {
 }
 function getPkgName(root) {
     const { name } = JSON.parse(lookupFile(root, ['package.json']) || `{}`);
-    if (!name)
-        throw new Error('no name found in package.json');
-    return name.startsWith('@') ? name.split('/')[1] : name;
+    return (name === null || name === void 0 ? void 0 : name.startsWith('@')) ? name.split('/')[1] : name;
 }
 function createMoveToVendorChunkFn(config) {
     const cache = new Map();
@@ -51157,10 +51162,14 @@ function staticImportedByEntry(id, getModuleInfo, cache, importStack = []) {
     cache.set(id, someImporterIs);
     return someImporterIs;
 }
-function resolveLibFilename(libOptions, format, pkgName) {
-    return typeof libOptions.fileName === 'function'
-        ? libOptions.fileName(format)
-        : `${libOptions.fileName || pkgName}.${format}.js`;
+function resolveLibFilename(libOptions, format, root) {
+    if (typeof libOptions.fileName === 'function') {
+        return libOptions.fileName(format);
+    }
+    const name = libOptions.fileName || getPkgName(root);
+    if (!name)
+        throw new Error('Name in package.json is required if option "build.lib.fileName" is not provided.');
+    return `${name}.${format}.js`;
 }
 function resolveBuildOutputs(outputs, libOptions, logger) {
     if (libOptions) {
@@ -57646,7 +57655,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-ebe44577.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-fcb82982.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -63895,6 +63904,157 @@ function proxyMiddleware(httpServer, config) {
     };
 }
 
+var lib = {exports: {}};
+
+(function (module, exports) {
+
+var url = require$$0__default$7;
+
+module.exports = function historyApiFallback(options) {
+  options = options || {};
+  var logger = getLogger(options);
+
+  return function(req, res, next) {
+    var headers = req.headers;
+    if (req.method !== 'GET') {
+      logger(
+        'Not rewriting',
+        req.method,
+        req.url,
+        'because the method is not GET.'
+      );
+      return next();
+    } else if (!headers || typeof headers.accept !== 'string') {
+      logger(
+        'Not rewriting',
+        req.method,
+        req.url,
+        'because the client did not send an HTTP accept header.'
+      );
+      return next();
+    } else if (headers.accept.indexOf('application/json') === 0) {
+      logger(
+        'Not rewriting',
+        req.method,
+        req.url,
+        'because the client prefers JSON.'
+      );
+      return next();
+    } else if (!acceptsHtml(headers.accept, options)) {
+      logger(
+        'Not rewriting',
+        req.method,
+        req.url,
+        'because the client does not accept HTML.'
+      );
+      return next();
+    }
+
+    var parsedUrl = url.parse(req.url);
+    var rewriteTarget;
+    options.rewrites = options.rewrites || [];
+    for (var i = 0; i < options.rewrites.length; i++) {
+      var rewrite = options.rewrites[i];
+      var match = parsedUrl.pathname.match(rewrite.from);
+      if (match !== null) {
+        rewriteTarget = evaluateRewriteRule(parsedUrl, match, rewrite.to, req);
+
+        if(rewriteTarget.charAt(0) !== '/') {
+          logger(
+            'We recommend using an absolute path for the rewrite target.',
+            'Received a non-absolute rewrite target',
+            rewriteTarget,
+            'for URL',
+            req.url
+          );
+        }
+
+        logger('Rewriting', req.method, req.url, 'to', rewriteTarget);
+        req.url = rewriteTarget;
+        return next();
+      }
+    }
+
+    var pathname = parsedUrl.pathname;
+    if (pathname.lastIndexOf('.') > pathname.lastIndexOf('/') &&
+        options.disableDotRule !== true) {
+      logger(
+        'Not rewriting',
+        req.method,
+        req.url,
+        'because the path includes a dot (.) character.'
+      );
+      return next();
+    }
+
+    rewriteTarget = options.index || '/index.html';
+    logger('Rewriting', req.method, req.url, 'to', rewriteTarget);
+    req.url = rewriteTarget;
+    next();
+  };
+};
+
+function evaluateRewriteRule(parsedUrl, match, rule, req) {
+  if (typeof rule === 'string') {
+    return rule;
+  } else if (typeof rule !== 'function') {
+    throw new Error('Rewrite rule can only be of type string or function.');
+  }
+
+  return rule({
+    parsedUrl: parsedUrl,
+    match: match,
+    request: req
+  });
+}
+
+function acceptsHtml(header, options) {
+  options.htmlAcceptHeaders = options.htmlAcceptHeaders || ['text/html', '*/*'];
+  for (var i = 0; i < options.htmlAcceptHeaders.length; i++) {
+    if (header.indexOf(options.htmlAcceptHeaders[i]) !== -1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function getLogger(options) {
+  if (options && options.logger) {
+    return options.logger;
+  } else if (options && options.verbose) {
+    return console.log.bind(console);
+  }
+  return function(){};
+}
+}(lib));
+
+var history = lib.exports;
+
+function spaFallbackMiddleware(root) {
+    const historySpaFallbackMiddleware = history({
+        logger: createDebugger('vite:spa-fallback'),
+        // support /dir/ without explicit index.html
+        rewrites: [
+            {
+                from: /\/$/,
+                to({ parsedUrl }) {
+                    const rewritten = parsedUrl.pathname + 'index.html';
+                    if (fs__default.existsSync(path__default.join(root, rewritten))) {
+                        return rewritten;
+                    }
+                    else {
+                        return `/index.html`;
+                    }
+                }
+            }
+        ]
+    });
+    // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
+    return function viteSpaFallbackMiddleware(req, res, next) {
+        return historySpaFallbackMiddleware(req, res, next);
+    };
+}
+
 /*!
  * etag
  * Copyright(c) 2014-2016 Douglas Christopher Wilson
@@ -64348,6 +64508,7 @@ async function ssrTransform(code, inMap, url) {
     });
     let uid = 0;
     const deps = new Set();
+    const dynamicDeps = new Set();
     const idToImportMap = new Map();
     const declaredConst = new Set();
     function defineImport(node, source) {
@@ -64486,6 +64647,9 @@ async function ssrTransform(code, inMap, url) {
         },
         onDynamicImport(node) {
             s.overwrite(node.start, node.start + 6, ssrDynamicImportKey);
+            if (node.type === 'ImportExpression' && node.source.type === 'Literal') {
+                dynamicDeps.add(node.source.value);
+            }
         }
     });
     let map = s.generateMap({ hires: true });
@@ -64506,7 +64670,8 @@ async function ssrTransform(code, inMap, url) {
     return {
         code: s.toString(),
         map,
-        deps: [...deps]
+        deps: [...deps],
+        dynamicDeps: [...dynamicDeps]
     };
 }
 /**
@@ -65505,132 +65670,6 @@ function indexHtmlMiddleware(server) {
     };
 }
 
-var lib = {exports: {}};
-
-(function (module, exports) {
-
-var url = require$$0__default$7;
-
-module.exports = function historyApiFallback(options) {
-  options = options || {};
-  var logger = getLogger(options);
-
-  return function(req, res, next) {
-    var headers = req.headers;
-    if (req.method !== 'GET') {
-      logger(
-        'Not rewriting',
-        req.method,
-        req.url,
-        'because the method is not GET.'
-      );
-      return next();
-    } else if (!headers || typeof headers.accept !== 'string') {
-      logger(
-        'Not rewriting',
-        req.method,
-        req.url,
-        'because the client did not send an HTTP accept header.'
-      );
-      return next();
-    } else if (headers.accept.indexOf('application/json') === 0) {
-      logger(
-        'Not rewriting',
-        req.method,
-        req.url,
-        'because the client prefers JSON.'
-      );
-      return next();
-    } else if (!acceptsHtml(headers.accept, options)) {
-      logger(
-        'Not rewriting',
-        req.method,
-        req.url,
-        'because the client does not accept HTML.'
-      );
-      return next();
-    }
-
-    var parsedUrl = url.parse(req.url);
-    var rewriteTarget;
-    options.rewrites = options.rewrites || [];
-    for (var i = 0; i < options.rewrites.length; i++) {
-      var rewrite = options.rewrites[i];
-      var match = parsedUrl.pathname.match(rewrite.from);
-      if (match !== null) {
-        rewriteTarget = evaluateRewriteRule(parsedUrl, match, rewrite.to, req);
-
-        if(rewriteTarget.charAt(0) !== '/') {
-          logger(
-            'We recommend using an absolute path for the rewrite target.',
-            'Received a non-absolute rewrite target',
-            rewriteTarget,
-            'for URL',
-            req.url
-          );
-        }
-
-        logger('Rewriting', req.method, req.url, 'to', rewriteTarget);
-        req.url = rewriteTarget;
-        return next();
-      }
-    }
-
-    var pathname = parsedUrl.pathname;
-    if (pathname.lastIndexOf('.') > pathname.lastIndexOf('/') &&
-        options.disableDotRule !== true) {
-      logger(
-        'Not rewriting',
-        req.method,
-        req.url,
-        'because the path includes a dot (.) character.'
-      );
-      return next();
-    }
-
-    rewriteTarget = options.index || '/index.html';
-    logger('Rewriting', req.method, req.url, 'to', rewriteTarget);
-    req.url = rewriteTarget;
-    next();
-  };
-};
-
-function evaluateRewriteRule(parsedUrl, match, rule, req) {
-  if (typeof rule === 'string') {
-    return rule;
-  } else if (typeof rule !== 'function') {
-    throw new Error('Rewrite rule can only be of type string or function.');
-  }
-
-  return rule({
-    parsedUrl: parsedUrl,
-    match: match,
-    request: req
-  });
-}
-
-function acceptsHtml(header, options) {
-  options.htmlAcceptHeaders = options.htmlAcceptHeaders || ['text/html', '*/*'];
-  for (var i = 0; i < options.htmlAcceptHeaders.length; i++) {
-    if (header.indexOf(options.htmlAcceptHeaders[i]) !== -1) {
-      return true;
-    }
-  }
-  return false;
-}
-
-function getLogger(options) {
-  if (options && options.logger) {
-    return options.logger;
-  } else if (options && options.verbose) {
-    return console.log.bind(console);
-  }
-  return function(){};
-}
-}(lib));
-
-var history = lib.exports;
-
 const logTime = createDebugger('vite:time');
 function timeMiddleware(root) {
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
@@ -71465,7 +71504,7 @@ function esbuildDepPlugin(qualified, exportsData, config, ssr) {
                             namespace: 'browser-external'
                         };
                     }
-                    if (isExternalUrl(resolved)) {
+                    if (isExternalUrl(resolved) || (ssr && isBuiltin(id))) {
                         return {
                             path: resolved,
                             external: true
@@ -75428,24 +75467,7 @@ async function createServer(inlineConfig = {}) {
     middlewares.use(serveStaticMiddleware(root, config));
     // spa fallback
     if (!middlewareMode || middlewareMode === 'html') {
-        middlewares.use(history({
-            logger: createDebugger('vite:spa-fallback'),
-            // support /dir/ without explicit index.html
-            rewrites: [
-                {
-                    from: /\/$/,
-                    to({ parsedUrl }) {
-                        const rewritten = parsedUrl.pathname + 'index.html';
-                        if (fs__default.existsSync(path__default.join(root, rewritten))) {
-                            return rewritten;
-                        }
-                        else {
-                            return `/index.html`;
-                        }
-                    }
-                }
-            ]
-        }));
+        middlewares.use(spaFallbackMiddleware(root));
     }
     // run post config hooks
     // This is applied before the html middleware so that user middleware can
@@ -75857,6 +75879,7 @@ function importAnalysisPlugin(config) {
                     this.error(`Failed to resolve import "${url}" from "${path__default.relative(process.cwd(), importer)}". Does the file exist?`, pos);
                 }
                 const isRelative = url.startsWith('.');
+                const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
                 // normalize all imports into resolved URLs
                 // e.g. `import 'foo'` -> `import '/@fs/.../node_modules/foo/index.js`
                 if (resolved.id.startsWith(root + '/')) {
@@ -75884,10 +75907,11 @@ function importAnalysisPlugin(config) {
                 if (!ssr) {
                     // mark non-js/css imports with `?import`
                     url = markExplicitImport(url);
-                    // for relative js/css imports, inherit importer's version query
+                    // for relative js/css imports, or self-module virtual imports
+                    // (e.g. vue blocks), inherit importer's version query
                     // do not do this for unknown type imports, otherwise the appended
                     // query can break 3rd party plugin's extension checks.
-                    if (isRelative && !/[\?&]import=?\b/.test(url)) {
+                    if ((isRelative || isSelfImport) && !/[\?&]import=?\b/.test(url)) {
                         const versionMatch = importer.match(DEP_VERSION_RE);
                         if (versionMatch) {
                             url = injectQuery(url, versionMatch[1]);
@@ -76755,7 +76779,18 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     configEnv.mode = mode;
     // resolve plugins
     const rawUserPlugins = (config.plugins || []).flat().filter((p) => {
-        return p && (!p.apply || p.apply === command);
+        if (!p) {
+            return false;
+        }
+        else if (!p.apply) {
+            return true;
+        }
+        else if (typeof p.apply === 'function') {
+            return p.apply({ ...config, mode }, configEnv);
+        }
+        else {
+            return p.apply === command;
+        }
     });
     const [prePlugins, normalPlugins, postPlugins] = sortUserPlugins(rawUserPlugins);
     // run config hooks
@@ -77346,5 +77381,6 @@ exports.send = send$1;
 exports.sirv = sirv;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
+exports.transformWithEsbuild = transformWithEsbuild;
 exports.vary = vary$1;
-//# sourceMappingURL=dep-07ec9cdd.js.map
+//# sourceMappingURL=dep-05fcddd5.js.map