astro 2.9.7 → 3.0.0-beta.0

package/dist/content/types-generator.js

@@ -70,7 +70,7 @@ async function createContentTypesGenerator({
     return { typesGenerated: true };
   }
   async function handleEvent(event, opts) {
-    const logLevel = (opts == null ? void 0 : opts.logLevel) ?? "info";
+    const logLevel = opts?.logLevel ?? "info";
     if (event.name === "addDir" || event.name === "unlinkDir") {
       const collection2 = normalizePath(
         path.relative(fileURLToPath(contentPaths.contentDir), fileURLToPath(event.entry))
@@ -229,7 +229,7 @@ async function createContentTypesGenerator({
           fs
         });
         const entryMetadata = collectionInfo.entries[entryKey];
-        if ((entryMetadata == null ? void 0 : entryMetadata.slug) !== changedSlug) {
+        if (entryMetadata?.slug !== changedSlug) {
           collectionInfo.entries[entryKey].slug = changedSlug;
           return { shouldGenerateTypes: true };
         }
@@ -261,7 +261,7 @@ async function createContentTypesGenerator({
     );
   }
   async function runEvents(opts) {
-    const logLevel = (opts == null ? void 0 : opts.logLevel) ?? "info";
+    const logLevel = opts?.logLevel ?? "info";
     const eventResponses = [];
     for (const event of events) {
       const response = await handleEvent(event.type, event.opts);
@@ -325,9 +325,9 @@ async function writeContentFiles({
   let contentTypesStr = "";
   let dataTypesStr = "";
   for (const collectionKey of Object.keys(collectionEntryMap).sort()) {
-    const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[JSON.parse(collectionKey)];
+    const collectionConfig = contentConfig?.collections[JSON.parse(collectionKey)];
     const collection = collectionEntryMap[collectionKey];
-    if ((collectionConfig == null ? void 0 : collectionConfig.type) && collection.type !== "unknown" && collection.type !== collectionConfig.type) {
+    if (collectionConfig?.type && collection.type !== "unknown" && collection.type !== collectionConfig.type) {
       viteServer.ws.send({
         type: "error",
         err: new AstroError({
@@ -349,7 +349,7 @@ async function writeContentFiles({
     const resolvedType = collection.type === "unknown" ? (
       // Add empty / unknown collections to the data type map by default
       // This ensures `getCollection('empty-collection')` doesn't raise a type error
-      (collectionConfig == null ? void 0 : collectionConfig.type) ?? "data"
+      collectionConfig?.type ?? "data"
     ) : collection.type;
     switch (resolvedType) {
       case "content":
@@ -357,7 +357,7 @@ async function writeContentFiles({
 `;
         for (const entryKey of Object.keys(collection.entries).sort()) {
           const entryMetadata = collection.entries[entryKey];
-          const dataType = (collectionConfig == null ? void 0 : collectionConfig.schema) ? `InferEntrySchema<${collectionKey}>` : "any";
+          const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : "any";
           const renderType = `{ render(): Render[${JSON.stringify(
             path.extname(JSON.parse(entryKey))
           )}] }`;
@@ -378,7 +378,7 @@ async function writeContentFiles({
         dataTypesStr += `${collectionKey}: {
 `;
         for (const entryKey of Object.keys(collection.entries).sort()) {
-          const dataType = (collectionConfig == null ? void 0 : collectionConfig.schema) ? `InferEntrySchema<${collectionKey}>` : "any";
+          const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : "any";
           dataTypesStr += `${entryKey}: {
 	id: ${entryKey};
   collection: ${collectionKey};

package/dist/content/utils.js

@@ -8,7 +8,7 @@ import { z } from "zod";
 import { VALID_INPUT_FORMATS } from "../assets/consts.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { formatYAMLException, isYAMLException } from "../core/errors/utils.js";
-import { CONTENT_TYPES_FILE } from "./consts.js";
+import { CONTENT_FLAGS, CONTENT_TYPES_FILE } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { createImage } from "./runtime-assets.js";
 const collectionConfigParser = z.union([
@@ -78,9 +78,8 @@ async function getEntryData(entry, collectionConfig, pluginContext, config) {
     let formattedError;
     const parsed = await schema.safeParseAsync(entry.unvalidatedData, {
       errorMap(error, ctx) {
-        var _a, _b;
-        if (error.code === "custom" && ((_a = error.params) == null ? void 0 : _a.isHoistedAstroError)) {
-          formattedError = (_b = error.params) == null ? void 0 : _b.astroError;
+        if (error.code === "custom" && error.params?.isHoistedAstroError) {
+          formattedError = error.params?.astroError;
         }
         return errorMap(error, ctx);
       }

package/dist/content/vite-plugin-content-assets.js

@@ -42,12 +42,11 @@ function astroContentAssetPropagationPlugin({
       }
     },
     async transform(_, id, options) {
-      var _a;
       if (hasContentFlag(id, PROPAGATED_ASSET_FLAG)) {
         const basePath = id.split("?")[0];
         let stringifiedLinks, stringifiedStyles, stringifiedScripts;
-        if ((options == null ? void 0 : options.ssr) && devModuleLoader) {
-          if (!((_a = devModuleLoader.getModuleById(basePath)) == null ? void 0 : _a.ssrModule)) {
+        if (options?.ssr && devModuleLoader) {
+          if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
             await devModuleLoader.import(basePath);
           }
           const { stylesMap, urls } = await getStylesForURL(
@@ -101,7 +100,6 @@ function astroConfigBuildPlugin(options, internals) {
         };
       },
       "build:post": ({ ssrOutputs, clientOutputs, mutate }) => {
-        var _a, _b;
         const outputs = ssrOutputs.flatMap((o) => o.output);
         const prependBase = (src) => {
           if (options.settings.config.build.assetsPrefix) {
@@ -122,8 +120,8 @@ function astroConfigBuildPlugin(options, internals) {
                   const pageData = getPageDataByViteID(internals, pageViteID);
                   if (!pageData)
                     continue;
-                  const _entryCss = (_a = pageData.propagatedStyles) == null ? void 0 : _a.get(id);
-                  const _entryScripts = (_b = pageData.propagatedScripts) == null ? void 0 : _b.get(id);
+                  const _entryCss = pageData.propagatedStyles?.get(id);
+                  const _entryScripts = pageData.propagatedScripts?.get(id);
                   if (_entryCss) {
                     for (const value of _entryCss) {
                       if (value.type === "inline")

package/dist/content/vite-plugin-content-imports.js

@@ -224,7 +224,7 @@ async function getEntryModuleBaseInfo({
   const collection = getEntryCollectionName({ entry, contentDir });
   if (collection === void 0)
     throw new AstroError(AstroErrorData.UnknownContentCollectionError);
-  const collectionConfig = contentConfig == null ? void 0 : contentConfig.collections[collection];
+  const collectionConfig = contentConfig?.collections[collection];
   return {
     collectionConfig,
     entry,

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -99,14 +99,13 @@ async function getStringifiedLookupMap({
   for (const filePath of contentGlob) {
     promises.push(
       limit(async () => {
-        var _a, _b, _c, _d, _e;
         const entryType = getEntryType(filePath, contentPaths, contentEntryExts, dataEntryExts);
         if (entryType !== "content" && entryType !== "data")
           return;
         const collection = getEntryCollectionName({ contentDir, entry: pathToFileURL(filePath) });
         if (!collection)
           throw UnexpectedLookupMapError;
-        if (((_a = lookupMap[collection]) == null ? void 0 : _a.type) && lookupMap[collection].type !== entryType) {
+        if (lookupMap[collection]?.type && lookupMap[collection].type !== entryType) {
           throw new AstroError({
             ...AstroErrorData.MixedContentDataCollectionError,
             message: AstroErrorData.MixedContentDataCollectionError.message(collection)
@@ -129,7 +128,7 @@ async function getStringifiedLookupMap({
             fileUrl: pathToFileURL(filePath),
             contentEntryType
           });
-          if ((_c = (_b = lookupMap[collection]) == null ? void 0 : _b.entries) == null ? void 0 : _c[slug]) {
+          if (lookupMap[collection]?.entries?.[slug]) {
             throw new AstroError({
               ...AstroErrorData.DuplicateContentEntrySlugError,
               message: AstroErrorData.DuplicateContentEntrySlugError.message(collection, slug),
@@ -139,7 +138,7 @@ async function getStringifiedLookupMap({
           lookupMap[collection] = {
             type: "content",
             entries: {
-              ...(_d = lookupMap[collection]) == null ? void 0 : _d.entries,
+              ...lookupMap[collection]?.entries,
               [slug]: rootRelativePath(root, filePath)
             }
           };
@@ -148,7 +147,7 @@ async function getStringifiedLookupMap({
           lookupMap[collection] = {
             type: "data",
             entries: {
-              ...(_e = lookupMap[collection]) == null ? void 0 : _e.entries,
+              ...lookupMap[collection]?.entries,
               [id]: rootRelativePath(root, filePath)
             }
           };
@@ -168,7 +167,7 @@ function globWithUnderscoresIgnored(relContentDir, exts) {
   const contentDir = appendForwardSlash(relContentDir);
   return [
     `${contentDir}**/*${extGlob}`,
-    `!${contentDir}**/_*/**${extGlob}`,
+    `!${contentDir}**/_*/**/*${extGlob}`,
     `!${contentDir}**/_*${extGlob}`
   ];
 }

package/dist/core/app/index.js

@@ -4,7 +4,7 @@ import { consoleLogDestination } from "../logger/console.js";
 import { error } from "../logger/core.js";
 import { prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
-import { isResponse } from "../render/core";
+import { isResponse } from "../render/core.js";
 import {
   createEnvironment,
   createRenderContext,
@@ -229,7 +229,7 @@ class App {
     }
   }
   /**
-   * If is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
+   * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
    * This also handles pre-rendered /404 or /500 routes
    */
   async #renderError(request, { routeData, status, response: originalResponse }) {
@@ -272,8 +272,10 @@ class App {
       return newResponse;
     const { status, statusText, headers } = oldResponse;
     return new Response(newResponse.body, {
+      // If the original status was 200 (default), override it with the new status (probably 404 or 500)
+      // Otherwise, the user set a specific status while rendering and we should respect that one
       status: status === 200 ? newResponse.status : status,
-      statusText,
+      statusText: status === 200 ? newResponse.statusText : statusText,
       headers: new Headers(Array.from(headers))
     });
   }

package/dist/core/app/node.d.ts

@@ -3,6 +3,7 @@ import type { RouteData } from '../../@types/astro';
 import type { SSRManifest } from './types';
 import { IncomingMessage } from 'node:http';
 import { App, type MatchOptions } from './index.js';
+export { apply as applyPolyfills } from '../polyfill.js';
 declare class NodeIncomingMessage extends IncomingMessage {
     /**
      * The read-only body property of the Request interface contains a ReadableStream with the body contents that have been added to the request.
@@ -15,4 +16,3 @@ export declare class NodeApp extends App {
 }
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;
-export {};

package/dist/core/app/node.js

@@ -3,9 +3,9 @@ import { IncomingMessage } from "node:http";
 import { TLSSocket } from "node:tls";
 import { deserializeManifest } from "./common.js";
 import { App } from "./index.js";
+import { apply } from "../polyfill.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
 function createRequestFromNodeRequest(req, body) {
-  var _a;
   const protocol = req.socket instanceof TLSSocket || req.headers["x-forwarded-proto"] === "https" ? "https" : "http";
   const hostname = req.headers.host || req.headers[":authority"];
   const url = `${protocol}://${hostname}${req.url}`;
@@ -17,12 +17,16 @@ function createRequestFromNodeRequest(req, body) {
     headers: new Headers(entries),
     body: ["HEAD", "GET"].includes(method) ? null : body
   });
-  if ((_a = req.socket) == null ? void 0 : _a.remoteAddress) {
+  if (req.socket?.remoteAddress) {
     Reflect.set(request, clientAddressSymbol, req.socket.remoteAddress);
   }
   return request;
 }
 class NodeIncomingMessage extends IncomingMessage {
+  /**
+   * The read-only body property of the Request interface contains a ReadableStream with the body contents that have been added to the request.
+   */
+  body;
 }
 class NodeApp extends App {
   match(req, opts = {}) {
@@ -83,6 +87,7 @@ async function loadApp(rootFolder) {
 }
 export {
   NodeApp,
+  apply as applyPolyfills,
   loadApp,
   loadManifest
 };

package/dist/core/build/css-asset-name.js

@@ -3,9 +3,8 @@ import npath from "node:path";
 import { viteID } from "../util.js";
 import { getTopLevelPages } from "./graph.js";
 function shortHashedName(id, ctx) {
-  var _a;
   const parents = Array.from(getTopLevelPages(id, ctx));
-  const firstParentId = (_a = parents[0]) == null ? void 0 : _a[0].id;
+  const firstParentId = parents[0]?.[0].id;
   const firstParentName = firstParentId ? npath.parse(firstParentId).name : "index";
   const hash = crypto.createHash("sha256");
   for (const [page] of parents) {
@@ -21,10 +20,9 @@ function createSlugger(settings) {
   const map = /* @__PURE__ */ new Map();
   const sep = "-";
   return function(id, ctx) {
-    var _a;
     const parents = Array.from(getTopLevelPages(id, ctx));
     const allParentsKey = parents.map(([page]) => page.id).sort().join("-");
-    const firstParentId = ((_a = parents[0]) == null ? void 0 : _a[0].id) || indexPage;
+    const firstParentId = parents[0]?.[0].id || indexPage;
     let dir = firstParentId;
     let key = "";
     let i = 0;

package/dist/core/build/generate.js

@@ -60,11 +60,10 @@ async function getEntryForRedirectRoute(route, internals, outFolder) {
   return RedirectSinglePageBuiltModule;
 }
 function shouldSkipDraft(pageModule, settings) {
-  var _a;
   return (
     // Drafts are disabled
     !settings.config.markdown.drafts && // This is a draft post
-    "frontmatter" in pageModule && ((_a = pageModule.frontmatter) == null ? void 0 : _a.draft) === true
+    "frontmatter" in pageModule && pageModule.frontmatter?.draft === true
   );
 }
 function rootRelativeFacadeId(facadeId, settings) {
@@ -84,12 +83,11 @@ function chunkIsPage(settings, output, internals) {
   return false;
 }
 async function generatePages(opts, internals) {
-  var _a, _b;
   const timer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
   const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
   if (ssr && !hasPrerenderedPages(internals)) {
-    (_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _a.addStaticImage;
+    delete globalThis?.astroAsset?.addStaticImage;
     return;
   }
   const verb = ssr ? "prerendering" : "generating";
@@ -103,7 +101,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
         const ssrEntryPage = await import(ssrEntryURLPage.toString());
         if (opts.settings.config.build.split) {
           const manifest = ssrEntryPage.manifest;
-          const ssrEntry = manifest == null ? void 0 : manifest.pageModule;
+          const ssrEntry = manifest?.pageModule;
           if (ssrEntry) {
             await generatePage(opts, internals, pageData, ssrEntry, builtPaths, manifest);
           } else {
@@ -142,7 +140,7 @@ ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
       await generateImage(opts, imageData[1].options, imageData[1].path);
     }
-    (_b = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _b.addStaticImage;
+    delete globalThis?.astroAsset?.addStaticImage;
   }
   await runHookBuildGenerated({
     config: opts.settings.config,
@@ -167,7 +165,7 @@ async function generatePage(opts, internals, pageData, ssrEntry, builtPaths, man
   let timeStart = performance.now();
   const pageInfo = getPageDataByComponent(internals, pageData.route.component);
   const linkIds = [];
-  const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
+  const scripts = pageInfo?.hoistedScript ?? null;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const pageModulePromise = ssrEntry.page;
   const onRequest = ssrEntry.onRequest;
@@ -218,7 +216,6 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
       mod,
       route,
       routeCache: opts.routeCache,
-      isValidate: false,
       logging: opts.logging,
       ssr: isServerLikeOutput(opts.settings.config)
     }).catch((err) => {
@@ -255,18 +252,14 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
   return paths;
 }
 function getInvalidRouteSegmentError(e, route, staticPath) {
-  var _a, _b;
-  const invalidParam = (_a = e.message.match(/^Expected "([^"]+)"/)) == null ? void 0 : _a[1];
+  const invalidParam = e.message.match(/^Expected "([^"]+)"/)?.[1];
   const received = invalidParam ? staticPath.params[invalidParam] : void 0;
   let hint = "Learn about dynamic routes at https://docs.astro.build/en/core-concepts/routing/#dynamic-routes";
   if (invalidParam && typeof received === "string") {
-    const matchingSegment = (_b = route.segments.find(
-      (segment) => {
-        var _a2;
-        return ((_a2 = segment[0]) == null ? void 0 : _a2.content) === invalidParam;
-      }
-    )) == null ? void 0 : _b[0];
-    const mightBeMissingSpread = (matchingSegment == null ? void 0 : matchingSegment.dynamic) && !(matchingSegment == null ? void 0 : matchingSegment.spread);
+    const matchingSegment = route.segments.find(
+      (segment) => segment[0]?.content === invalidParam
+    )?.[0];
+    const mightBeMissingSpread = matchingSegment?.dynamic && !matchingSegment?.spread;
     if (mightBeMissingSpread) {
       hint = `If the param contains slashes, try using a rest parameter: **[...${invalidParam}]**. Learn more at https://docs.astro.build/en/core-concepts/routing/#dynamic-routes`;
     }

package/dist/core/build/graph.js

@@ -14,9 +14,9 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
     }
     yield [info, depth, order];
   }
-  if (until == null ? void 0 : until(id))
+  if (until?.(id))
     return;
-  const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
+  const importers = (info?.importers || []).concat(info?.dynamicImporters || []);
   for (const imp of importers) {
     if (seen.has(imp)) {
       continue;
@@ -25,8 +25,7 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
   }
 }
 function moduleIsTopLevelPage(info) {
-  var _a, _b;
-  return ((_a = info.importers[0]) == null ? void 0 : _a.includes(ASTRO_PAGE_RESOLVED_MODULE_ID)) || ((_b = info.dynamicImporters[0]) == null ? void 0 : _b.includes(ASTRO_PAGE_RESOLVED_MODULE_ID));
+  return info.importers[0]?.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || info.dynamicImporters[0]?.includes(ASTRO_PAGE_RESOLVED_MODULE_ID);
 }
 function* getTopLevelPages(id, ctx) {
   for (const res of walkParentInfos(id, ctx)) {

package/dist/core/build/index.js

@@ -37,8 +37,15 @@ async function build(inlineConfig, options) {
   await builder.run();
 }
 class AstroBuilder {
+  settings;
+  logging;
+  mode = "production";
+  origin;
+  routeCache;
+  manifest;
+  timer;
+  teardownCompiler;
   constructor(settings, options) {
-    this.mode = "production";
     if (options.mode) {
       this.mode = options.mode;
     }

package/dist/core/build/internal.js

@@ -143,8 +143,8 @@ function cssOrder(a, b) {
 }
 function mergeInlineCss(acc, current) {
   const lastAdded = acc.at(acc.length - 1);
-  const lastWasInline = (lastAdded == null ? void 0 : lastAdded.type) === "inline";
-  const currentIsInline = (current == null ? void 0 : current.type) === "inline";
+  const lastWasInline = lastAdded?.type === "inline";
+  const currentIsInline = current?.type === "inline";
   if (lastWasInline && currentIsInline) {
     const merged = { type: "inline", content: lastAdded.content + current.content };
     acc[acc.length - 1] = merged;

package/dist/core/build/plugin.js

@@ -25,12 +25,11 @@ function createPluginContainer(options, internals) {
     },
     // Hooks
     runBeforeHook(build, input) {
-      var _a;
       let plugins = build === "ssr" ? ssrPlugins : clientPlugins;
       let vitePlugins = [];
       let lastVitePlugins = [];
       for (const plugin of plugins) {
-        if ((_a = plugin.hooks) == null ? void 0 : _a["build:before"]) {
+        if (plugin.hooks?.["build:before"]) {
           let result = plugin.hooks["build:before"]({ build, input });
           if (result.vitePlugin) {
             vitePlugins.push(result.vitePlugin);
@@ -43,7 +42,6 @@ function createPluginContainer(options, internals) {
       };
     },
     async runPostHook(ssrReturn, clientReturn) {
-      var _a;
       const mutations = /* @__PURE__ */ new Map();
       const ssrOutputs = [];
       const clientOutputs = [];
@@ -65,7 +63,7 @@ function createPluginContainer(options, internals) {
         });
       };
       for (const plugin of allPlugins) {
-        const postHook = (_a = plugin.hooks) == null ? void 0 : _a["build:post"];
+        const postHook = plugin.hooks?.["build:post"];
         if (postHook) {
           await postHook({
             ssrOutputs,

package/dist/core/build/plugins/plugin-analyzer.js

@@ -11,10 +11,9 @@ function isPropagatedAsset(id) {
   }
 }
 async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
-  var _a, _b;
   if (!childInfo || !parentInfo.ast || !childExportNames)
     return "no";
-  if (childExportNames === "dynamic" || ((_a = parentInfo.dynamicallyImportedIds) == null ? void 0 : _a.includes(childInfo.id))) {
+  if (childExportNames === "dynamic" || parentInfo.dynamicallyImportedIds?.includes(childInfo.id)) {
     return "dynamic";
   }
   const imports = [];
@@ -64,7 +63,7 @@ async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
         if (node.declaration.type !== "VariableDeclaration")
           continue;
         for (const declarator of node.declaration.declarations) {
-          if (((_b = declarator.init) == null ? void 0 : _b.type) !== "Identifier")
+          if (declarator.init?.type !== "Identifier")
             continue;
           if (declarator.id.type !== "Identifier")
             continue;
@@ -95,7 +94,6 @@ function vitePluginAnalyzer(internals) {
     const pageScripts = /* @__PURE__ */ new Map();
     return {
       async scan(scripts, from) {
-        var _a;
         const hoistedScripts = /* @__PURE__ */ new Set();
         for (let i = 0; i < scripts.length; i++) {
           const hid = `${from.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
@@ -149,7 +147,7 @@ function vitePluginAnalyzer(internals) {
                     propagatedMapByImporter: /* @__PURE__ */ new Map()
                   });
                 }
-                (_a = pageScripts.get(parentInfo.id)) == null ? void 0 : _a.hoistedSet.add(hid);
+                pageScripts.get(parentInfo.id)?.hoistedSet.add(hid);
               }
             }
           }
@@ -191,12 +189,11 @@ function vitePluginAnalyzer(internals) {
   return {
     name: "@astro/rollup-plugin-astro-analyzer",
     async generateBundle() {
-      var _a;
       const hoistScanner = hoistedScriptScanner();
       const ids = this.getModuleIds();
       for (const id of ids) {
         const info = this.getModuleInfo(id);
-        if (!((_a = info == null ? void 0 : info.meta) == null ? void 0 : _a.astro))
+        if (!info?.meta?.astro)
           continue;
         const astro = info.meta.astro;
         const pageData = getPageDataByViteID(internals, id);
@@ -207,7 +204,7 @@ function vitePluginAnalyzer(internals) {
           const rid = c.resolvedPath ? decodeURI(c.resolvedPath) : c.specifier;
           if (internals.discoveredHydratedComponents.has(rid)) {
             const exportNames = internals.discoveredHydratedComponents.get(rid);
-            exportNames == null ? void 0 : exportNames.push(c.exportName);
+            exportNames?.push(c.exportName);
           } else {
             internals.discoveredHydratedComponents.set(rid, [c.exportName]);
           }
@@ -219,7 +216,7 @@ function vitePluginAnalyzer(internals) {
             const cid = c.resolvedPath ? decodeURI(c.resolvedPath) : c.specifier;
             if (internals.discoveredClientOnlyComponents.has(cid)) {
               const exportNames = internals.discoveredClientOnlyComponents.get(cid);
-              exportNames == null ? void 0 : exportNames.push(c.exportName);
+              exportNames?.push(c.exportName);
             } else {
               internals.discoveredClientOnlyComponents.set(cid, [c.exportName]);
             }

package/dist/core/build/plugins/plugin-component-entry.js

@@ -11,10 +11,9 @@ function vitePluginComponentEntry(internals) {
     }
   }
   function mergeComponentExportNames(components) {
-    var _a;
     for (const [componentId, exportNames] of components) {
       if (componentToExportNames.has(componentId)) {
-        (_a = componentToExportNames.get(componentId)) == null ? void 0 : _a.push(...exportNames);
+        componentToExportNames.get(componentId)?.push(...exportNames);
       } else {
         componentToExportNames.set(componentId, exportNames);
       }
@@ -24,8 +23,7 @@ function vitePluginComponentEntry(internals) {
     name: "@astro/plugin-component-entry",
     enforce: "pre",
     config(config) {
-      var _a, _b;
-      const rollupInput = (_b = (_a = config.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.input;
+      const rollupInput = config.build?.rollupOptions?.input;
       if (Array.isArray(rollupInput)) {
         config.build.rollupOptions.input = rollupInput.map((id) => {
           if (componentToExportNames.has(id)) {

package/dist/core/build/plugins/plugin-css.js

@@ -1,5 +1,6 @@
 import * as crypto from "node:crypto";
 import * as npath from "node:path";
+import {} from "vite";
 import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import * as assetName from "../css-asset-name.js";
@@ -39,7 +40,7 @@ function rollupPluginAstroBuildCSS(options) {
     name: "astro:rollup-plugin-build-css",
     outputOptions(outputOptions) {
       const assetFileNames = outputOptions.assetFileNames;
-      const namingIncludesHash = assetFileNames == null ? void 0 : assetFileNames.toString().includes("[hash]");
+      const namingIncludesHash = assetFileNames?.toString().includes("[hash]");
       const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
       extendManualChunks(outputOptions, {
         after(id, meta) {
@@ -145,12 +146,10 @@ function rollupPluginAstroBuildCSS(options) {
     name: "astro:rollup-plugin-inline-stylesheets",
     enforce: "post",
     async generateBundle(_outputOptions, bundle) {
-      var _a;
       const inlineConfig = settings.config.build.inlineStylesheets;
-      const { assetsInlineLimit = 4096 } = ((_a = settings.config.vite) == null ? void 0 : _a.build) ?? {};
+      const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
       Object.entries(bundle).forEach(([id, stylesheet]) => {
-        var _a2;
-        if (stylesheet.type !== "asset" || ((_a2 = stylesheet.name) == null ? void 0 : _a2.endsWith(".css")) !== true || typeof stylesheet.source !== "string")
+        if (stylesheet.type !== "asset" || stylesheet.name?.endsWith(".css") !== true || typeof stylesheet.source !== "string")
           return;
         const assetSize = new TextEncoder().encode(stylesheet.source).byteLength;
         const toBeInlined = inlineConfig === "always" ? true : inlineConfig === "never" ? false : assetSize <= assetsInlineLimit;
@@ -159,8 +158,7 @@ function rollupPluginAstroBuildCSS(options) {
         const sheet = toBeInlined ? { type: "inline", content: stylesheet.source } : { type: "external", src: stylesheet.fileName };
         const pages = Array.from(eachPageData(internals));
         pages.forEach((pageData) => {
-          var _a3;
-          const orderingInfo = (_a3 = pagesToCss[pageData.moduleSpecifier]) == null ? void 0 : _a3[stylesheet.fileName];
+          const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName];
           if (orderingInfo !== void 0)
             return pageData.styles.push({ ...orderingInfo, sheet });
           const propagatedPaths = pagesToPropagatedCss[pageData.moduleSpecifier];
@@ -196,9 +194,8 @@ function* getParentClientOnlys(id, ctx, internals) {
   }
 }
 function appendCSSToPage(pageData, meta, pagesToCss, depth, order) {
-  var _a;
   for (const importedCssImport of meta.importedCss) {
-    const cssInfo = (_a = pagesToCss[pageData.moduleSpecifier]) == null ? void 0 : _a[importedCssImport];
+    const cssInfo = pagesToCss[pageData.moduleSpecifier]?.[importedCssImport];
     if (cssInfo !== void 0) {
       if (depth < cssInfo.depth) {
         cssInfo.depth = depth;

package/dist/core/build/plugins/plugin-hoisted-scripts.js

@@ -28,10 +28,9 @@ function vitePluginHoistedScripts(settings, internals) {
       return void 0;
     },
     async generateBundle(_options, bundle) {
-      var _a, _b;
       let assetInlineLimit = 4096;
-      if (((_a = settings.config.vite) == null ? void 0 : _a.build) && settings.config.vite.build.assetsInlineLimit !== void 0) {
-        assetInlineLimit = (_b = settings.config.vite) == null ? void 0 : _b.build.assetsInlineLimit;
+      if (settings.config.vite?.build && settings.config.vite.build.assetsInlineLimit !== void 0) {
+        assetInlineLimit = settings.config.vite?.build.assetsInlineLimit;
       }
       const considerInlining = /* @__PURE__ */ new Map();
       const importedByOtherScripts = /* @__PURE__ */ new Set();

package/dist/core/build/plugins/plugin-internals.js

@@ -3,10 +3,9 @@ function vitePluginInternals(input, internals) {
   return {
     name: "@astro/plugin-build-internals",
     config(config, options) {
-      var _a;
       const extra = {};
       const noExternal = [], external = [];
-      if (options.command === "build" && ((_a = config.build) == null ? void 0 : _a.ssr)) {
+      if (options.command === "build" && config.build?.ssr) {
         noExternal.push("astro");
         external.push("shiki");
       }

package/dist/core/build/plugins/plugin-pages.js

@@ -1,6 +1,7 @@
 import { extname } from "node:path";
 import { routeIsRedirect } from "../../redirects/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
+import {} from "../internal.js";
 import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
 import { ASTRO_PAGE_EXTENSION_POST_PATTERN, getPathFromVirtualModulePageName } from "./util.js";
@@ -50,7 +51,10 @@ function vitePluginPages(opts, internals) {
             exports.push(`export { page }`);
             imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
             exports.push(`export { renderers };`);
-            if (!opts.settings.config.build.excludeMiddleware) {
+            if (
+              // TODO: remover in Astro 4.0
+              !opts.settings.config.build.excludeMiddleware || opts.settings.adapter?.adapterFeatures?.edgeMiddleware === true
+            ) {
               const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
               if (middlewareModule) {
                 imports.push(`import { onRequest } from "${middlewareModule.id}";`);