astro 4.4.0 → 4.4.2

package/dist/@types/astro.d.ts

@@ -1374,7 +1374,7 @@ export interface AstroUserConfig {
              * URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
              * Localized folders are used for every language, including the default.
              */
-            prefixDefaultLocale: boolean;
+            prefixDefaultLocale?: boolean;
             /**
              * @docs
              * @name i18n.routing.redirectToDefaultLocale
@@ -1402,7 +1402,7 @@ export interface AstroUserConfig {
              * })
              *```
              * */
-            redirectToDefaultLocale: boolean;
+            redirectToDefaultLocale?: boolean;
             /**
              * @name i18n.routing.strategy
              * @type {"pathname"}
@@ -1412,47 +1412,47 @@ export interface AstroUserConfig {
              *
              * - `"pathname": The strategy is applied to the pathname of the URLs
              */
-            strategy: 'pathname';
-            /**
-             * @name i18n.domains
-             * @type {Record<string, string> }
-             * @default '{}'
-             * @version 4.3.0
-             * @description
-             *
-             * Configures the URL pattern of one or more supported languages to use a custom domain (or sub-domain).
-             *
-             * When a locale is mapped to a domain, a `/[locale]/` path prefix will not be used.
-             * However, localized folders within `src/pages/` are still required, including for your configured `defaultLocale`.
-             *
-             * Any other locale not configured will default to a localized path-based URL according to your `prefixDefaultLocale` strategy (e.g. `https://example.com/[locale]/blog`).
-             *
-             * ```js
-             * //astro.config.mjs
-             * export default defineConfig({
-             * 	 site: "https://example.com",
-             * 	 output: "server", // required, with no prerendered pages
-             *   adapter: node({
-             *     mode: 'standalone',
-             *   }),
-             * 	 i18n: {
-             *     defaultLocale: "en",
-             *     locales: ["en", "fr", "pt-br", "es"],
-             *     prefixDefaultLocale: false,
-             *     domains: {
-             *       fr: "https://fr.example.com",
-             *       es: "https://example.es"
-             *     }
-             *   },
-             * })
-             * ```
-             *
-             * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
-             *
-             * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains) for more details, including the limitations of this feature.
-             */
-            domains?: Record<string, string>;
+            strategy?: 'pathname';
         };
+        /**
+         * @name i18n.domains
+         * @type {Record<string, string> }
+         * @default '{}'
+         * @version 4.3.0
+         * @description
+         *
+         * Configures the URL pattern of one or more supported languages to use a custom domain (or sub-domain).
+         *
+         * When a locale is mapped to a domain, a `/[locale]/` path prefix will not be used.
+         * However, localized folders within `src/pages/` are still required, including for your configured `defaultLocale`.
+         *
+         * Any other locale not configured will default to a localized path-based URL according to your `prefixDefaultLocale` strategy (e.g. `https://example.com/[locale]/blog`).
+         *
+         * ```js
+         * //astro.config.mjs
+         * export default defineConfig({
+         * 	 site: "https://example.com",
+         * 	 output: "server", // required, with no prerendered pages
+         *   adapter: node({
+         *     mode: 'standalone',
+         *   }),
+         * 	 i18n: {
+         *     defaultLocale: "en",
+         *     locales: ["en", "fr", "pt-br", "es"],
+         *     prefixDefaultLocale: false,
+         *     domains: {
+         *       fr: "https://fr.example.com",
+         *       es: "https://example.es"
+         *     }
+         *   },
+         * })
+         * ```
+         *
+         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
+         *
+         * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains) for more details, including the limitations of this feature.
+         */
+        domains?: Record<string, string>;
     };
     /** ⚠️ WARNING: SUBJECT TO CHANGE */
     db?: Config.Database;

package/dist/assets/build/generate.d.ts

@@ -1,6 +1,6 @@
 import type PQueue from 'p-queue';
 import type { AstroConfig } from '../../@types/astro.js';
-import type { BuildPipeline } from '../../core/build/buildPipeline.js';
+import type { BuildPipeline } from '../../core/build/pipeline.js';
 import type { Logger } from '../../core/logger/core.js';
 import type { MapValue } from '../../type-utils.js';
 import type { AssetsGlobalStaticImagesList } from '../types.js';

package/dist/assets/build/generate.js

@@ -11,8 +11,7 @@ import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage } from "./remote.js";
 async function prepareAssetsGenerationEnv(pipeline, totalCount) {
-  const config = pipeline.getConfig();
-  const logger = pipeline.getLogger();
+  const { config, logger } = pipeline;
   let useCache = true;
   const assetsCacheDir = new URL("assets/", config.cacheDir);
   const count = { total: totalCount, current: 1 };

package/dist/cli/add/babel.d.ts

@@ -11,7 +11,7 @@ export declare const visit: {
     node: (node: traverse.Node, opts: traverse.TraverseOptions<traverse.Node>, scope?: traverse.Scope | undefined, state?: any, path?: traverse.NodePath<traverse.Node> | undefined, skipKeys?: Record<string, boolean> | undefined) => void;
     clearNode: (node: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => void;
     removeProperties: (tree: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => traverse.Node;
-    hasType: (tree: traverse.Node, type: "CatchClause" | "ClassBody" | "Identifier" | "Program" | "SpreadElement" | "Super" | "SwitchCase" | "TemplateElement" | "VariableDeclarator" | "ArrayExpression" | "ArrowFunctionExpression" | "AssignmentExpression" | "AwaitExpression" | "BinaryExpression" | "CallExpression" | "ClassExpression" | "ConditionalExpression" | "FunctionExpression" | "ImportExpression" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "NewExpression" | "ObjectExpression" | "SequenceExpression" | "TaggedTemplateExpression" | "TemplateLiteral" | "ThisExpression" | "UnaryExpression" | "UpdateExpression" | "YieldExpression" | "ClassDeclaration" | "FunctionDeclaration" | "ImportDeclaration" | "ExportNamedDeclaration" | "ExportDefaultDeclaration" | "ExportAllDeclaration" | "ExpressionStatement" | "BlockStatement" | "StaticBlock" | "EmptyStatement" | "DebuggerStatement" | "WithStatement" | "ReturnStatement" | "LabeledStatement" | "BreakStatement" | "ContinueStatement" | "IfStatement" | "SwitchStatement" | "ThrowStatement" | "TryStatement" | "WhileStatement" | "DoWhileStatement" | "ForStatement" | "ForInStatement" | "ForOfStatement" | "VariableDeclaration" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayPattern" | "ArrayTypeAnnotation" | "AssignmentPattern" | "BigIntLiteral" | "BindExpression" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "ClassAccessorProperty" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportDefaultSpecifier" | "ExportNamespaceSpecifier" | "ExportSpecifier" | "File" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Import" | "ImportAttribute" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ImportSpecifier" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXAttribute" | "JSXClosingElement" | "JSXClosingFragment" | "JSXElement" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXIdentifier" | "JSXMemberExpression" | "JSXNamespacedName" | "JSXOpeningElement" | "JSXOpeningFragment" | "JSXSpreadAttribute" | "JSXSpreadChild" | "JSXText" | "MixedTypeAnnotation" | "ModuleExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectMethod" | "ObjectPattern" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestElement" | "RestProperty" | "SpreadProperty" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "ThisTypeAnnotation" | "TopicReference" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnionTypeAnnotation" | "V8IntrinsicIdentifier" | "Variance" | "VoidTypeAnnotation", denylistTypes?: string[] | undefined) => boolean;
+    hasType: (tree: traverse.Node, type: "File" | "CatchClause" | "ClassBody" | "Identifier" | "Program" | "SpreadElement" | "Super" | "SwitchCase" | "TemplateElement" | "VariableDeclarator" | "ArrayExpression" | "ArrowFunctionExpression" | "AssignmentExpression" | "AwaitExpression" | "BinaryExpression" | "CallExpression" | "ClassExpression" | "ConditionalExpression" | "FunctionExpression" | "ImportExpression" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "NewExpression" | "ObjectExpression" | "SequenceExpression" | "TaggedTemplateExpression" | "TemplateLiteral" | "ThisExpression" | "UnaryExpression" | "UpdateExpression" | "YieldExpression" | "ClassDeclaration" | "FunctionDeclaration" | "ImportDeclaration" | "ExportNamedDeclaration" | "ExportDefaultDeclaration" | "ExportAllDeclaration" | "ExpressionStatement" | "BlockStatement" | "StaticBlock" | "EmptyStatement" | "DebuggerStatement" | "WithStatement" | "ReturnStatement" | "LabeledStatement" | "BreakStatement" | "ContinueStatement" | "IfStatement" | "SwitchStatement" | "ThrowStatement" | "TryStatement" | "WhileStatement" | "DoWhileStatement" | "ForStatement" | "ForInStatement" | "ForOfStatement" | "VariableDeclaration" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayPattern" | "ArrayTypeAnnotation" | "AssignmentPattern" | "BigIntLiteral" | "BindExpression" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "ClassAccessorProperty" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportDefaultSpecifier" | "ExportNamespaceSpecifier" | "ExportSpecifier" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Import" | "ImportAttribute" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ImportSpecifier" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXAttribute" | "JSXClosingElement" | "JSXClosingFragment" | "JSXElement" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXIdentifier" | "JSXMemberExpression" | "JSXNamespacedName" | "JSXOpeningElement" | "JSXOpeningFragment" | "JSXSpreadAttribute" | "JSXSpreadChild" | "JSXText" | "MixedTypeAnnotation" | "ModuleExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectMethod" | "ObjectPattern" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestElement" | "RestProperty" | "SpreadProperty" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "ThisTypeAnnotation" | "TopicReference" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnionTypeAnnotation" | "V8IntrinsicIdentifier" | "Variance" | "VoidTypeAnnotation", denylistTypes?: string[] | undefined) => boolean;
     cache: typeof traverse.cache;
 };
 export { t };

package/dist/cli/add/index.js

@@ -79,10 +79,10 @@ async function getRegistry() {
 }
 async function add(names, { flags }) {
   ensureProcessNodeEnv("production");
+  applyPolyfill();
   const inlineConfig = flagsToAstroInlineConfig(flags);
   const { userConfig } = await resolveConfig(inlineConfig, "add");
   telemetry.record(eventCliSession("add", userConfig));
-  applyPolyfill();
   if (flags.help || names.length === 0) {
     printHelp({
       commandName: "astro add",

package/dist/cli/db/index.js

@@ -1,7 +1,9 @@
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { getPackage } from "../install-package.js";
 import { resolveConfig } from "../../core/config/config.js";
+import { apply as applyPolyfill } from "../../core/polyfill.js";
 async function db({ flags }) {
+  applyPolyfill();
   const logger = createLoggerFromFlags(flags);
   const getPackageOpts = { skipAsk: flags.yes || flags.y, cwd: flags.root };
   const dbPackage = await getPackage("@astrojs/db", logger, getPackageOpts, []);

package/dist/cli/info/index.js

@@ -5,6 +5,7 @@ import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
+import { apply as applyPolyfill } from "../../core/polyfill.js";
 async function getInfoOutput({
   userConfig,
   print
@@ -29,6 +30,7 @@ async function getInfoOutput({
   return output.trim();
 }
 async function printInfo({ flags }) {
+  applyPolyfill();
   const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), "info");
   const output = await getInfoOutput({ userConfig, print: true });
   await copyToClipboard(output);

package/dist/cli/preferences/index.js

@@ -10,6 +10,7 @@ import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { flattie } from "flattie";
 import { formatWithOptions } from "node:util";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
+import { apply as applyPolyfill } from "../../core/polyfill.js";
 const PREFERENCES_SUBCOMMANDS = [
   "get",
   "set",
@@ -23,6 +24,7 @@ function isValidSubcommand(subcommand) {
   return PREFERENCES_SUBCOMMANDS.includes(subcommand);
 }
 async function preferences(subcommand, key, value, { flags }) {
+  applyPolyfill();
   if (!isValidSubcommand(subcommand) || flags?.help || flags?.h) {
     msg.printHelp({
       commandName: "astro preferences",

package/dist/content/types-generator.js

@@ -121,7 +121,7 @@ async function createContentTypesGenerator({
           }
           const collectionInfo2 = collectionEntryMap[collectionKey2];
           if (collectionInfo2.type === "content") {
-            viteServer.ws.send({
+            viteServer.hot.send({
               type: "error",
               err: new AstroError({
                 ...AstroErrorData.MixedContentDataCollectionError,
@@ -157,7 +157,7 @@ async function createContentTypesGenerator({
     }
     const collectionInfo = collectionEntryMap[collectionKey];
     if (collectionInfo.type === "data") {
-      viteServer.ws.send({
+      viteServer.hot.send({
         type: "error",
         err: new AstroError({
           ...AstroErrorData.MixedContentDataCollectionError,
@@ -280,7 +280,7 @@ async function writeContentFiles({
     const collectionConfig = contentConfig?.collections[JSON.parse(collectionKey)];
     const collection = collectionEntryMap[collectionKey];
     if (collectionConfig?.type && collection.type !== "unknown" && collection.type !== collectionConfig.type) {
-      viteServer.ws.send({
+      viteServer.hot.send({
         type: "error",
         err: new AstroError({
           ...AstroErrorData.ContentCollectionTypeMismatchError,
@@ -292,7 +292,7 @@ async function writeContentFiles({
           hint: collection.type === "data" ? "Try adding `type: 'data'` to your collection config." : void 0,
           location: {
             file: ""
-            /** required for error overlay `ws` messages */
+            /** required for error overlay `hot` messages */
           }
         })
       });

package/dist/core/app/index.js

@@ -1,9 +1,6 @@
-import { createI18nMiddleware, i18nPipelineHook } from "../../i18n/middleware.js";
-import { REROUTE_DIRECTIVE_HEADER } from "../../runtime/server/consts.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
 import { consoleLogDestination } from "../logger/console.js";
 import { AstroIntegrationLogger, Logger } from "../logger/core.js";
-import { sequence } from "../middleware/index.js";
 import {
   appendForwardSlash,
   collapseDuplicateSlashes,
@@ -12,28 +9,23 @@ import {
   removeTrailingForwardSlash
 } from "../path.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
-import { createEnvironment, createRenderContext } from "../render/index.js";
-import { RouteCache } from "../render/route-cache.js";
-import {
-  createAssetLink,
-  createModuleScriptElement,
-  createStylesheetElementSet
-} from "../render/ssr-element.js";
+import { createAssetLink } from "../render/ssr-element.js";
 import { matchRoute } from "../routing/match.js";
-import { SSRRoutePipeline } from "./ssrPipeline.js";
+import { AppPipeline } from "./pipeline.js";
 import { normalizeTheLocale } from "../../i18n/index.js";
+import { RenderContext } from "../render-context.js";
+import {
+  clientAddressSymbol,
+  clientLocalsSymbol,
+  responseSentSymbol,
+  REROUTABLE_STATUS_CODES,
+  REROUTE_DIRECTIVE_HEADER
+} from "../constants.js";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 import { deserializeManifest } from "./common.js";
-const localsSymbol = Symbol.for("astro.locals");
-const clientAddressSymbol = Symbol.for("astro.clientAddress");
-const responseSentSymbol = Symbol.for("astro.responseSent");
-const REROUTABLE_STATUS_CODES = /* @__PURE__ */ new Set([404, 500]);
 class App {
-  /**
-   * The current environment of the application
-   */
   #manifest;
   #manifestData;
-  #routeDataToRouteInfo;
   #logger = new Logger({
     dest: consoleLogDestination,
     level: "info"
@@ -47,9 +39,8 @@ class App {
     this.#manifestData = {
       routes: manifest.routes.map((route) => route.routeData)
     };
-    this.#routeDataToRouteInfo = new Map(manifest.routes.map((route) => [route.routeData, route]));
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
-    this.#pipeline = new SSRRoutePipeline(this.#createEnvironment(streaming));
+    this.#pipeline = this.#createPipeline(streaming);
     this.#adapterLogger = new AstroIntegrationLogger(
       this.#logger.options,
       this.#manifest.adapterName
@@ -59,19 +50,17 @@ class App {
     return this.#adapterLogger;
   }
   /**
-   * Creates an environment by reading the stored manifest
+   * Creates a pipeline by reading the stored manifest
    *
    * @param streaming
    * @private
    */
-  #createEnvironment(streaming = false) {
-    return createEnvironment({
-      adapterName: this.#manifest.adapterName,
+  #createPipeline(streaming = false) {
+    return AppPipeline.create({
       logger: this.#logger,
+      manifest: this.#manifest,
       mode: "production",
-      compressHTML: this.#manifest.compressHTML,
       renderers: this.#manifest.renderers,
-      clientDirectives: this.#manifest.clientDirectives,
       resolve: async (specifier) => {
         if (!(specifier in this.#manifest.entryModules)) {
           throw new Error(`Unable to resolve [${specifier}]`);
@@ -87,9 +76,7 @@ class App {
           }
         }
       },
-      routeCache: new RouteCache(this.#logger),
-      site: this.#manifest.site,
-      ssr: true,
+      serverLike: true,
       streaming
     });
   }
@@ -123,7 +110,7 @@ class App {
   #computePathnameFromDomain(request) {
     let pathname = void 0;
     const url = new URL(request.url);
-    if (this.#manifest.i18n && (this.#manifest.i18n.routing === "domains-prefix-always" || this.#manifest.i18n.routing === "domains-prefix-other-locales" || this.#manifest.i18n.routing === "domains-prefix-always-no-redirect")) {
+    if (this.#manifest.i18n && (this.#manifest.i18n.strategy === "domains-prefix-always" || this.#manifest.i18n.strategy === "domains-prefix-other-locales" || this.#manifest.i18n.strategy === "domains-prefix-always-no-redirect")) {
       let host = request.headers.get("X-Forwarded-Host");
       let protocol = request.headers.get("X-Forwarded-Proto");
       if (protocol) {
@@ -193,7 +180,11 @@ class App {
       }
     }
     if (locals) {
-      Reflect.set(request, localsSymbol, locals);
+      if (typeof locals !== "object") {
+        this.#logger.error(null, new AstroError(AstroErrorData.LocalsNotAnObject).stack);
+        return this.#renderError(request, { status: 500 });
+      }
+      Reflect.set(request, clientLocalsSymbol, locals);
     }
     if (clientAddress) {
       Reflect.set(request, clientAddressSymbol, clientAddress);
@@ -210,35 +201,22 @@ class App {
     const pathname = this.#getPathnameFromRequest(request);
     const defaultStatus = this.#getDefaultStatusCode(routeData, pathname);
     const mod = await this.#getModuleForRoute(routeData);
-    const pageModule = await mod.page();
-    const url = new URL(request.url);
-    const renderContext = await this.#createRenderContext(
-      url,
-      request,
-      routeData,
-      mod,
-      defaultStatus
-    );
     let response;
     try {
-      const i18nMiddleware = createI18nMiddleware(
-        this.#manifest.i18n,
-        this.#manifest.base,
-        this.#manifest.trailingSlash,
-        this.#manifest.buildFormat
-      );
-      if (i18nMiddleware) {
-        this.#pipeline.setMiddlewareFunction(sequence(i18nMiddleware, this.#manifest.middleware));
-        this.#pipeline.onBeforeRenderRoute(i18nPipelineHook);
-      } else {
-        this.#pipeline.setMiddlewareFunction(this.#manifest.middleware);
-      }
-      response = await this.#pipeline.renderRoute(renderContext, pageModule);
+      const renderContext = RenderContext.create({
+        pipeline: this.#pipeline,
+        locals,
+        pathname,
+        request,
+        routeData,
+        status: defaultStatus
+      });
+      response = await renderContext.render(await mod.page());
     } catch (err) {
       this.#logger.error(null, err.stack || err.message || String(err));
       return this.#renderError(request, { status: 500 });
     }
-    if (REROUTABLE_STATUS_CODES.has(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
+    if (REROUTABLE_STATUS_CODES.includes(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
       return this.#renderError(request, {
         response,
         status: response.status
@@ -279,61 +257,6 @@ class App {
    * @returns An iterator that yields key-value pairs as equal-sign-separated strings.
    */
   static getSetCookieFromResponse = getSetCookiesFromResponse;
-  /**
-   * Creates the render context of the current route
-   */
-  async #createRenderContext(url, request, routeData, page, status = 200) {
-    if (routeData.type === "endpoint") {
-      const pathname = "/" + this.removeBase(url.pathname);
-      const mod = await page.page();
-      const handler = mod;
-      return await createRenderContext({
-        request,
-        pathname,
-        route: routeData,
-        status,
-        env: this.#pipeline.env,
-        mod: handler,
-        locales: this.#manifest.i18n?.locales,
-        routing: this.#manifest.i18n?.routing,
-        defaultLocale: this.#manifest.i18n?.defaultLocale
-      });
-    } else {
-      const pathname = prependForwardSlash(this.removeBase(url.pathname));
-      const info = this.#routeDataToRouteInfo.get(routeData);
-      const links = /* @__PURE__ */ new Set();
-      const styles = createStylesheetElementSet(info.styles);
-      let scripts = /* @__PURE__ */ new Set();
-      for (const script of info.scripts) {
-        if ("stage" in script) {
-          if (script.stage === "head-inline") {
-            scripts.add({
-              props: {},
-              children: script.children
-            });
-          }
-        } else {
-          scripts.add(createModuleScriptElement(script));
-        }
-      }
-      const mod = await page.page();
-      return await createRenderContext({
-        request,
-        pathname,
-        componentMetadata: this.#manifest.componentMetadata,
-        scripts,
-        styles,
-        links,
-        route: routeData,
-        status,
-        mod,
-        env: this.#pipeline.env,
-        locales: this.#manifest.i18n?.locales,
-        routing: this.#manifest.i18n?.routing,
-        defaultLocale: this.#manifest.i18n?.defaultLocale
-      });
-    }
-  }
   /**
    * 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
@@ -355,21 +278,15 @@ class App {
       }
       const mod = await this.#getModuleForRoute(errorRouteData);
       try {
-        const newRenderContext = await this.#createRenderContext(
-          url,
+        const renderContext = RenderContext.create({
+          pipeline: this.#pipeline,
+          middleware: skipMiddleware ? (_, next) => next() : void 0,
+          pathname: this.#getPathnameFromRequest(request),
           request,
-          errorRouteData,
-          mod,
+          routeData: errorRouteData,
           status
-        );
-        const page = await mod.page();
-        if (skipMiddleware === false) {
-          this.#pipeline.setMiddlewareFunction(this.#manifest.middleware);
-        }
-        if (skipMiddleware) {
-          this.#pipeline.unsetMiddlewareFunction();
-        }
-        const response2 = await this.#pipeline.renderRoute(newRenderContext, page);
+        });
+        const response2 = await renderContext.render(await mod.page());
         return this.#mergeResponses(response2, originalResponse);
       } catch {
         if (skipMiddleware === false) {

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

@@ -0,0 +1,7 @@
+import type { RouteData, SSRResult } from '../../@types/astro.js';
+import { Pipeline } from '../base-pipeline.js';
+export declare class AppPipeline extends Pipeline {
+    static create({ logger, manifest, mode, renderers, resolve, serverLike, streaming, }: Pick<AppPipeline, 'logger' | 'manifest' | 'mode' | 'renderers' | 'resolve' | 'serverLike' | 'streaming'>): AppPipeline;
+    headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
+    componentMetadata(): void;
+}

package/dist/core/app/pipeline.js

@@ -0,0 +1,39 @@
+import { Pipeline } from "../base-pipeline.js";
+import { createModuleScriptElement, createStylesheetElementSet } from "../render/ssr-element.js";
+class AppPipeline extends Pipeline {
+  static create({
+    logger,
+    manifest,
+    mode,
+    renderers,
+    resolve,
+    serverLike,
+    streaming
+  }) {
+    return new AppPipeline(logger, manifest, mode, renderers, resolve, serverLike, streaming);
+  }
+  headElements(routeData) {
+    const routeInfo = this.manifest.routes.find((route) => route.routeData === routeData);
+    const links = /* @__PURE__ */ new Set();
+    const scripts = /* @__PURE__ */ new Set();
+    const styles = createStylesheetElementSet(routeInfo?.styles ?? []);
+    for (const script of routeInfo?.scripts ?? []) {
+      if ("stage" in script) {
+        if (script.stage === "head-inline") {
+          scripts.add({
+            props: {},
+            children: script.children
+          });
+        }
+      } else {
+        scripts.add(createModuleScriptElement(script));
+      }
+    }
+    return { links, styles, scripts };
+  }
+  componentMetadata() {
+  }
+}
+export {
+  AppPipeline
+};

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

@@ -1,6 +1,6 @@
 import type { Locales, MiddlewareHandler, RouteData, SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../@types/astro.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
-import type { RoutingStrategies } from '../config/schema.js';
+import type { RoutingStrategies } from '../../i18n/utils.js';
 export type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -50,7 +50,7 @@ export type SSRManifest = {
 };
 export type SSRManifestI18n = {
     fallback?: Record<string, string>;
-    routing: RoutingStrategies;
+    strategy: RoutingStrategies;
     locales: Locales;
     defaultLocale: string;
     domainLookupTable: Record<string, string>;

package/dist/core/base-pipeline.d.ts

@@ -0,0 +1,59 @@
+import type { MiddlewareHandler, RouteData, RuntimeMode, SSRLoadedRenderer, SSRManifest, SSRResult } from '../@types/astro.js';
+import type { Logger } from './logger/core.js';
+import { RouteCache } from './render/route-cache.js';
+/**
+ * The `Pipeline` represents the static parts of rendering that do not change between requests.
+ * These are mostly known when the server first starts up and do not change.
+ *
+ * Thus, a `Pipeline` is created once at process start and then used by every `RenderContext`.
+ */
+export declare abstract class Pipeline {
+    readonly logger: Logger;
+    readonly manifest: SSRManifest;
+    /**
+     * "development" or "production"
+     */
+    readonly mode: RuntimeMode;
+    readonly renderers: SSRLoadedRenderer[];
+    readonly resolve: (s: string) => Promise<string>;
+    /**
+     * Based on Astro config's `output` option, `true` if "server" or "hybrid".
+     */
+    readonly serverLike: boolean;
+    readonly streaming: boolean;
+    /**
+     * Used to provide better error messages for `Astro.clientAddress`
+     */
+    readonly adapterName: string;
+    readonly clientDirectives: Map<string, string>;
+    readonly compressHTML: boolean;
+    readonly i18n: import("./app/types.js").SSRManifestI18n | undefined;
+    readonly middleware: MiddlewareHandler;
+    readonly routeCache: RouteCache;
+    /**
+     * Used for `Astro.site`.
+     */
+    readonly site: string | undefined;
+    readonly internalMiddleware: MiddlewareHandler[];
+    constructor(logger: Logger, manifest: SSRManifest, 
+    /**
+     * "development" or "production"
+     */
+    mode: RuntimeMode, renderers: SSRLoadedRenderer[], resolve: (s: string) => Promise<string>, 
+    /**
+     * Based on Astro config's `output` option, `true` if "server" or "hybrid".
+     */
+    serverLike: boolean, streaming: boolean, 
+    /**
+     * Used to provide better error messages for `Astro.clientAddress`
+     */
+    adapterName?: string, clientDirectives?: Map<string, string>, compressHTML?: boolean, i18n?: import("./app/types.js").SSRManifestI18n | undefined, middleware?: MiddlewareHandler, routeCache?: RouteCache, 
+    /**
+     * Used for `Astro.site`.
+     */
+    site?: string | undefined);
+    abstract headElements(routeData: RouteData): Promise<HeadElements> | HeadElements;
+    abstract componentMetadata(routeData: RouteData): Promise<SSRResult['componentMetadata']> | void;
+}
+export interface HeadElements extends Pick<SSRResult, 'scripts' | 'styles' | 'links'> {
+}