astro 3.0.0-beta.0 → 3.0.0-beta.2

package/astro-jsx.d.ts

@@ -9,6 +9,8 @@
  * Adapted from React’s TypeScript definition from DefinitelyTyped.
  * @see https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react/index.d.ts
  */
+// BUG! Prettier 3.0 removes `declare`: https://github.com/prettier/prettier/issues/15207
+// prettier-ignore
 declare namespace astroHTML.JSX {
 	export type Child = Node | Node[] | string | number | boolean | null | undefined | unknown;
 	export type Children = Child | Child[];

package/components/ViewTransitions.astro

@@ -168,13 +168,18 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 			// Trigger the animations
 			document.documentElement.dataset.astroTransitionFallback = 'old';
-			doc.documentElement.dataset.astroTransitionFallback = 'new';
+			const fallbackSwap = () => {
+				removeEventListener('animationend', fallbackSwap);
+				clearTimeout(timeout);
+				swap();
+				document.documentElement.dataset.astroTransitionFallback = 'new';
+			};
 			// If there are any animations, want for the animationend event.
-			addEventListener('animationend', swap, { once: true });
+			addEventListener('animationend', fallbackSwap, { once: true });
 			// If there are no animations, go ahead and swap on next tick
 			// This is necessary because we do not know if there are animations.
 			// The setTimeout is a fallback in case there are none.
-			setTimeout(() => !isAnimating && swap());
+			let timeout = setTimeout(() => !isAnimating && fallbackSwap());
 		} else {
 			swap();
 		}

package/content-types.template.d.ts

@@ -44,7 +44,7 @@ declare module 'astro:content' {
 				import('astro/zod').ZodLiteral<'tiff'>,
 				import('astro/zod').ZodLiteral<'webp'>,
 				import('astro/zod').ZodLiteral<'gif'>,
-				import('astro/zod').ZodLiteral<'svg'>
+				import('astro/zod').ZodLiteral<'svg'>,
 			]
 		>;
 	}>;
@@ -87,7 +87,7 @@ declare module 'astro:content' {
 
 	export function getEntryBySlug<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		// Note that this has to accept a regular string too, for SSR
@@ -112,7 +112,7 @@ declare module 'astro:content' {
 
 	export function getEntry<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(entry: {
 		collection: C;
 		slug: E;
@@ -121,7 +121,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
-		E extends keyof DataEntryMap[C] | (string & {})
+		E extends keyof DataEntryMap[C] | (string & {}),
 	>(entry: {
 		collection: C;
 		id: E;
@@ -130,7 +130,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		slug: E
@@ -139,7 +139,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
-		E extends keyof DataEntryMap[C] | (string & {})
+		E extends keyof DataEntryMap[C] | (string & {}),
 	>(
 		collection: C,
 		id: E

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

@@ -15,7 +15,7 @@ import type { AstroConfigSchema } from '../core/config';
 import type { AstroTimer } from '../core/config/timer';
 import type { AstroCookies } from '../core/cookies';
 import type { LogOptions, LoggerLevel } from '../core/logger/core';
-import { AstroIntegrationLogger } from '../core/logger/core';
+import type { AstroIntegrationLogger } from '../core/logger/core';
 import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
 import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
@@ -508,12 +508,7 @@ export interface AstroUserConfig {
      *
      * When using this option, all of your static asset imports and URLs should add the base as a prefix. You can access this value via `import.meta.env.BASE_URL`.
      *
-     * By default, the value of `import.meta.env.BASE_URL` includes a trailing slash. If you have the [`trailingSlash`](https://docs.astro.build/en/reference/configuration-reference/#trailingslash) option set to `'never'`, you will need to add it manually in your static asset imports and URLs.
-     *
-     * ```astro
-     * <a href="/docs/about/">About</a>
-     * <img src=`${import.meta.env.BASE_URL}image.png`>
-     * ```
+     * The value of `import.meta.env.BASE_URL` respects your `trailingSlash` config and will include a trailing slash if you explicitly include one or if `trailingSlash: "always"` is set. If `trailingSlash: "never"` is set, `BASE_URL` will not include a trailing slash, even if `base` includes one.
      */
     base?: string;
     /**
@@ -544,19 +539,21 @@ export interface AstroUserConfig {
     /**
      * @docs
      * @name scopedStyleStrategy
-     * @type {('where' | 'class')}
+     * @type {('where' | 'class' | 'attribute')}
      * @default `'where'`
      * @version 2.4
      * @description
      *
      * Specify the strategy used for scoping styles within Astro components. Choose from:
-     *   - `'where'` - Use `:where` selectors, causing no specifity increase.
-     *   - `'class'` - Use class-based selectors, causing a +1 specifity increase.
+     *   - `'where'` 		- Use `:where` selectors, causing no specifity increase.
+     *   - `'class'` 		- Use class-based selectors, causing a +1 specifity increase.
+     *   - `'attribute'` 	- Use `data-` attributes, causing no specifity increase.
      *
      * Using `'class'` is helpful when you want to ensure that element selectors within an Astro component override global style defaults (e.g. from a global stylesheet).
      * Using `'where'` gives you more control over specifity, but requires that you use higher-specifity selectors, layers, and other tools to control which selectors are applied.
+     * Using `'attribute'` is useful in case there's manipulation of the class attributes, so the styling emitted by Astro doesn't go in conflict with the user's business logic.
      */
-    scopedStyleStrategy?: 'where' | 'class';
+    scopedStyleStrategy?: 'where' | 'class' | 'attribute';
     /**
      * @docs
      * @name adapter
@@ -1187,6 +1184,27 @@ export interface AstroUserConfig {
          * ```
          */
         viewTransitions?: boolean;
+        /**
+         * @docs
+         * @name experimental.optimizeHoistedScript
+         * @type {boolean}
+         * @default `false`
+         * @version 2.10.4
+         * @description
+         * Prevents unused components' scripts from being included in a page unexpectedly.
+         * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
+         * before publishing.
+         * Enable hoisted script analysis optimization by adding the experimental flag:
+         *
+         * ```js
+         * {
+         * 	experimental: {
+         *		optimizeHoistedScript: true,
+         * 	},
+         * }
+         * ```
+         */
+        optimizeHoistedScript?: boolean;
     };
     /** @deprecated - Use "integrations" instead. Run Astro to learn more about migrating. */
     renderers?: never;
@@ -1217,15 +1235,18 @@ export interface AstroUserConfig {
  * - "page-ssr": Injected into the frontmatter of every Astro page. Processed & resolved by Vite.
  */
 export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' | 'page-ssr';
-/**
- * Resolved Astro Config
- * Config with user settings along with all defaults filled in.
- */
 export interface InjectedRoute {
     pattern: string;
     entryPoint: string;
     prerender?: boolean;
 }
+export interface ResolvedInjectedRoute extends InjectedRoute {
+    resolvedEntryPoint?: URL;
+}
+/**
+ * Resolved Astro Config
+ * Config with user settings along with all defaults filled in.
+ */
 export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
     integrations: AstroIntegration[];
 }
@@ -1315,6 +1336,7 @@ export interface AstroSettings {
     config: AstroConfig;
     adapter: AstroAdapter | undefined;
     injectedRoutes: InjectedRoute[];
+    resolvedInjectedRoutes: ResolvedInjectedRoute[];
     pageExtensions: string[];
     contentEntryTypes: ContentEntryType[];
     dataEntryTypes: DataEntryType[];
@@ -1697,10 +1719,13 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
      */
     locals: App.Locals;
 }
-export interface EndpointOutput {
+export type EndpointOutput = {
     body: Body;
-    encoding?: BufferEncoding;
-}
+    encoding?: Exclude<BufferEncoding, 'binary'>;
+} | {
+    body: Uint8Array;
+    encoding: 'binary';
+};
 export type APIRoute<Props extends Record<string, any> = Record<string, any>> = (context: APIContext<Props>) => EndpointOutput | Response | Promise<EndpointOutput | Response>;
 export interface EndpointHandler {
     [method: string]: APIRoute | ((params: Params, request: Request) => EndpointOutput | Response);

package/dist/@types/astro.js

@@ -1 +0,0 @@
-import { AstroIntegrationLogger } from "../core/logger/core";

package/dist/assets/services/vendor/squoosh/impl.js

@@ -22,7 +22,7 @@ async function decodeBuffer(_buffer) {
   const firstChunk = buffer.slice(0, 16);
   const firstChunkString = Array.from(firstChunk).map((v) => String.fromCodePoint(v)).join("");
   if (firstChunkString.includes("GIF")) {
-    throw Error(`GIF images are not supported, please install the @astrojs/image/sharp plugin`);
+    throw Error(`GIF images are not supported, please use the Sharp image service`);
   }
   const key = Object.entries(supportedFormats).find(
     ([, { detectors }]) => detectors.some((detector) => detector.exec(firstChunkString))

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

@@ -10,7 +10,7 @@ export declare const visit: {
     node: (node: t.Node, opts: import("@babel/traverse").TraverseOptions<t.Node>, scope?: import("@babel/traverse").Scope | undefined, state?: any, path?: import("@babel/traverse").NodePath<t.Node> | undefined, skipKeys?: Record<string, boolean> | undefined) => void;
     clearNode: (node: t.Node, opts?: t.RemovePropertiesOptions | undefined) => void;
     removeProperties: (tree: t.Node, opts?: t.RemovePropertiesOptions | undefined) => t.Node;
-    hasType: (tree: t.Node, type: "JSXAttribute" | "JSXSpreadAttribute" | "JSXIdentifier" | "JSXNamespacedName" | "Identifier" | "JSXElement" | "JSXOpeningElement" | "JSXMemberExpression" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayExpression" | "ArrayPattern" | "ArrayTypeAnnotation" | "ArrowFunctionExpression" | "AssignmentExpression" | "AssignmentPattern" | "AwaitExpression" | "BigIntLiteral" | "BinaryExpression" | "BindExpression" | "BlockStatement" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "BreakStatement" | "CallExpression" | "CatchClause" | "ClassAccessorProperty" | "ClassBody" | "ClassDeclaration" | "ClassExpression" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "ConditionalExpression" | "ContinueStatement" | "DebuggerStatement" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "DoWhileStatement" | "EmptyStatement" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportAllDeclaration" | "ExportDefaultDeclaration" | "ExportDefaultSpecifier" | "ExportNamedDeclaration" | "ExportNamespaceSpecifier" | "ExportSpecifier" | "ExpressionStatement" | "File" | "ForInStatement" | "ForOfStatement" | "ForStatement" | "FunctionDeclaration" | "FunctionExpression" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "IfStatement" | "Import" | "ImportAttribute" | "ImportDeclaration" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ImportSpecifier" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXClosingElement" | "JSXClosingFragment" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXFragment" | "JSXOpeningFragment" | "JSXSpreadChild" | "JSXText" | "LabeledStatement" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "MixedTypeAnnotation" | "ModuleExpression" | "NewExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectExpression" | "ObjectMethod" | "ObjectPattern" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "Program" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestElement" | "RestProperty" | "ReturnStatement" | "SequenceExpression" | "SpreadElement" | "SpreadProperty" | "StaticBlock" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "Super" | "SwitchCase" | "SwitchStatement" | "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" | "TaggedTemplateExpression" | "TemplateElement" | "TemplateLiteral" | "ThisExpression" | "ThisTypeAnnotation" | "ThrowStatement" | "TopicReference" | "TryStatement" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnaryExpression" | "UnionTypeAnnotation" | "UpdateExpression" | "V8IntrinsicIdentifier" | "VariableDeclaration" | "VariableDeclarator" | "Variance" | "VoidTypeAnnotation" | "WhileStatement" | "WithStatement" | "YieldExpression", denylistTypes?: string[] | undefined) => boolean;
+    hasType: (tree: t.Node, type: "File" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayExpression" | "ArrayPattern" | "ArrayTypeAnnotation" | "ArrowFunctionExpression" | "AssignmentExpression" | "AssignmentPattern" | "AwaitExpression" | "BigIntLiteral" | "BinaryExpression" | "BindExpression" | "BlockStatement" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "BreakStatement" | "CallExpression" | "CatchClause" | "ClassAccessorProperty" | "ClassBody" | "ClassDeclaration" | "ClassExpression" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "ConditionalExpression" | "ContinueStatement" | "DebuggerStatement" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "DoWhileStatement" | "EmptyStatement" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportAllDeclaration" | "ExportDefaultDeclaration" | "ExportDefaultSpecifier" | "ExportNamedDeclaration" | "ExportNamespaceSpecifier" | "ExportSpecifier" | "ExpressionStatement" | "ForInStatement" | "ForOfStatement" | "ForStatement" | "FunctionDeclaration" | "FunctionExpression" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Identifier" | "IfStatement" | "Import" | "ImportAttribute" | "ImportDeclaration" | "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" | "LabeledStatement" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "MixedTypeAnnotation" | "ModuleExpression" | "NewExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectExpression" | "ObjectMethod" | "ObjectPattern" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "Program" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "RestElement" | "RestProperty" | "ReturnStatement" | "SequenceExpression" | "SpreadElement" | "SpreadProperty" | "StaticBlock" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "Super" | "SwitchCase" | "SwitchStatement" | "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" | "TaggedTemplateExpression" | "TemplateElement" | "TemplateLiteral" | "ThisExpression" | "ThisTypeAnnotation" | "ThrowStatement" | "TopicReference" | "TryStatement" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnaryExpression" | "UnionTypeAnnotation" | "UpdateExpression" | "V8IntrinsicIdentifier" | "VariableDeclaration" | "VariableDeclarator" | "Variance" | "VoidTypeAnnotation" | "WhileStatement" | "WithStatement" | "YieldExpression", denylistTypes?: string[] | undefined) => boolean;
     cache: typeof import("@babel/traverse").cache;
 };
 export { t };

package/dist/cli/add/index.js

@@ -184,11 +184,6 @@ async function add(names, { flags }) {
     configURL = new URL("./astro.config.mjs", root);
     await fs.writeFile(fileURLToPath(configURL), ASTRO_CONFIG_STUB, { encoding: "utf-8" });
   }
-  if (configURL?.pathname.endsWith("package.json")) {
-    throw new Error(
-      `Unable to use "astro add" with package.json configuration. Try migrating to \`astro.config.mjs\` and try again.`
-    );
-  }
   let ast = null;
   try {
     ast = await parseAstroConfig(configURL);

package/dist/cli/check/index.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { error, info } from "../../core/logger/core.js";
-import { createLoggingFromFlags } from "../flags.js";
+import { createLoggingFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { getPackage } from "../install-package.js";
 async function check(flags) {
   const logging = createLoggingFromFlags(flags);
@@ -20,6 +20,12 @@ async function check(flags) {
     );
     return;
   }
+  const { sync } = await import("../../core/sync/index.js");
+  const inlineConfig = flagsToAstroInlineConfig(flags);
+  const exitCode = await sync(inlineConfig);
+  if (exitCode !== 0) {
+    process.exit(exitCode);
+  }
   const { check: checker, parseArgsAsCheckConfig } = checkPackage;
   const config = parseArgsAsCheckConfig(process.argv);
   info(logging, "check", `Getting diagnostics for Astro files in ${path.resolve(config.root)}...`);

package/dist/content/types-generator.js

@@ -3,8 +3,8 @@ import { cyan } from "kleur/colors";
 import * as path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { normalizePath } from "vite";
-import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
 import { info, warn } from "../core/logger/core.js";
 import { isRelativePath } from "../core/path.js";
 import { CONTENT_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";

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

@@ -1,8 +1,8 @@
 import * as devalue from "devalue";
 import { extname } from "node:path";
 import { pathToFileURL } from "node:url";
-import { AstroErrorData } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
+import { AstroErrorData } from "../core/errors/index.js";
 import { escapeViteEnvReferences } from "../vite-plugin-utils/index.js";
 import { CONTENT_FLAG, DATA_FLAG } from "./consts.js";
 import {
@@ -277,6 +277,7 @@ function stringifyEntryData(data) {
       });
     } else {
       throw new AstroError({
+        name: "PluginContentImportsError",
         message: "Unexpected error processing content collection data."
       });
     }

package/dist/core/app/index.js

@@ -1,10 +1,12 @@
-import mime from "mime";
-import { attachToResponse, getSetCookiesFromResponse } from "../cookies/index.js";
+import { getSetCookiesFromResponse } from "../cookies/index.js";
 import { consoleLogDestination } from "../logger/console.js";
 import { error } from "../logger/core.js";
-import { prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import {
+  collapseDuplicateSlashes,
+  prependForwardSlash,
+  removeTrailingForwardSlash
+} from "../path.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
-import { isResponse } from "../render/core.js";
 import {
   createEnvironment,
   createRenderContext,
@@ -17,6 +19,7 @@ import {
   createStylesheetElementSet
 } from "../render/ssr-element.js";
 import { matchRoute } from "../routing/match.js";
+import { EndpointNotFoundError, SSRRoutePipeline } from "./ssrPipeline.js";
 import { deserializeManifest } from "./common.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
 const responseSentSymbol = Symbol.for("astro.responseSent");
@@ -25,16 +28,15 @@ class App {
   /**
    * The current environment of the application
    */
-  #env;
   #manifest;
   #manifestData;
   #routeDataToRouteInfo;
-  #encoder = new TextEncoder();
   #logging = {
     dest: consoleLogDestination,
     level: "info"
   };
   #baseWithoutTrailingSlash;
+  #pipeline;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
     this.#manifestData = {
@@ -42,7 +44,7 @@ class App {
     };
     this.#routeDataToRouteInfo = new Map(manifest.routes.map((route) => [route.routeData, route]));
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
-    this.#env = this.#createEnvironment(streaming);
+    this.#pipeline = new SSRRoutePipeline(this.#createEnvironment(streaming));
   }
   set setManifest(newManifest) {
     this.#manifest = newManifest;
@@ -57,7 +59,6 @@ class App {
     return createEnvironment({
       adapterName: this.#manifest.adapterName,
       logging: this.#logging,
-      markdown: this.#manifest.markdown,
       mode: "production",
       compressHTML: this.#manifest.compressHTML,
       renderers: this.#manifest.renderers,
@@ -98,18 +99,21 @@ class App {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname))
       return void 0;
-    let pathname = prependForwardSlash(this.removeBase(url.pathname));
-    let routeData = matchRoute(pathname, this.#manifestData);
+    const pathname = prependForwardSlash(this.removeBase(url.pathname));
+    const routeData = matchRoute(pathname, this.#manifestData);
     if (!routeData || routeData.prerender)
       return void 0;
     return routeData;
   }
   async render(request, routeData, locals) {
+    if (request.url !== collapseDuplicateSlashes(request.url)) {
+      request = new Request(collapseDuplicateSlashes(request.url), request);
+    }
     if (!routeData) {
       routeData = this.match(request);
     }
     if (!routeData) {
-      return this.#renderError(request, { routeData, status: 404 });
+      return this.#renderError(request, { status: 404 });
     }
     Reflect.set(request, clientLocalsSymbol, locals ?? {});
     const defaultStatus = this.#getDefaultStatusCode(routeData.route);
@@ -125,56 +129,29 @@ class App {
     );
     let response;
     try {
-      response = await tryRenderRoute(
-        routeData.type,
-        renderContext,
-        this.#env,
-        pageModule,
-        mod.onRequest
-      );
+      if (mod.onRequest) {
+        this.#pipeline.setMiddlewareFunction(mod.onRequest);
+      }
+      response = await this.#pipeline.renderRoute(renderContext, pageModule);
     } catch (err) {
-      error(this.#logging, "ssr", err.stack || err.message || String(err));
-      return this.#renderError(request, { routeData, status: 500 });
+      if (err instanceof EndpointNotFoundError) {
+        return this.#renderError(request, { status: 404, response: err.originalResponse });
+      } else {
+        error(this.#logging, "ssr", err.stack || err.message || String(err));
+        return this.#renderError(request, { status: 500 });
+      }
     }
-    if (isResponse(response, routeData.type)) {
+    if (SSRRoutePipeline.isResponse(response, routeData.type)) {
       if (STATUS_CODES.has(response.status)) {
         return this.#renderError(request, {
-          routeData,
           response,
           status: response.status
         });
       }
       Reflect.set(response, responseSentSymbol, true);
       return response;
-    } else {
-      if (response.type === "response") {
-        if (response.response.headers.get("X-Astro-Response") === "Not-Found") {
-          return this.#renderError(request, {
-            routeData,
-            response: response.response,
-            status: 404
-          });
-        }
-        return response.response;
-      } else {
-        const body = response.body;
-        const headers = new Headers();
-        const mimeType = mime.getType(url.pathname);
-        if (mimeType) {
-          headers.set("Content-Type", `${mimeType};charset=utf-8`);
-        } else {
-          headers.set("Content-Type", "text/plain;charset=utf-8");
-        }
-        const bytes = this.#encoder.encode(body);
-        headers.set("Content-Length", bytes.byteLength.toString());
-        const newResponse = new Response(bytes, {
-          status: 200,
-          headers
-        });
-        attachToResponse(newResponse, response.cookies);
-        return newResponse;
-      }
     }
+    return response;
   }
   setCookieHeaders(response) {
     return getSetCookiesFromResponse(response);
@@ -192,7 +169,7 @@ class App {
         pathname,
         route: routeData,
         status,
-        env: this.#env,
+        env: this.#pipeline.env,
         mod: handler
       });
     } else {
@@ -224,7 +201,7 @@ class App {
         route: routeData,
         status,
         mod,
-        env: this.#env
+        env: this.#pipeline.env
       });
     }
   }
@@ -232,7 +209,7 @@ class App {
    * 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 }) {
+  async #renderError(request, { status, response: originalResponse }) {
     const errorRouteData = matchRoute("/" + status, this.#manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
@@ -241,22 +218,19 @@ class App {
         const response2 = await fetch(statusURL.toString());
         return this.#mergeResponses(response2, originalResponse);
       }
-      const finalRouteData = routeData ?? errorRouteData;
       const mod = await this.#getModuleForRoute(errorRouteData);
       try {
         const newRenderContext = await this.#createRenderContext(
           url,
           request,
-          finalRouteData,
+          errorRouteData,
           mod,
           status
         );
         const page = await mod.page();
         const response2 = await tryRenderRoute(
-          "page",
-          // this is hardcoded to ensure proper behavior for missing endpoints
           newRenderContext,
-          this.#env,
+          this.#pipeline.env,
           page
         );
         return this.#mergeResponses(response2, originalResponse);

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

@@ -0,0 +1,14 @@
+import type { Environment } from '../render';
+import { Pipeline } from '../pipeline.js';
+/**
+ * Thrown when an endpoint contains a response with the header "X-Astro-Response" === 'Not-Found'
+ */
+export declare class EndpointNotFoundError extends Error {
+    originalResponse: Response;
+    constructor(originalResponse: Response);
+}
+export declare class SSRRoutePipeline extends Pipeline {
+    #private;
+    encoder: TextEncoder;
+    constructor(env: Environment);
+}

package/dist/core/app/ssrPipeline.js

@@ -0,0 +1,47 @@
+import mime from "mime";
+import { attachCookiesToResponse } from "../cookies/index.js";
+import { Pipeline } from "../pipeline.js";
+class EndpointNotFoundError extends Error {
+  originalResponse;
+  constructor(originalResponse) {
+    super();
+    this.originalResponse = originalResponse;
+  }
+}
+class SSRRoutePipeline extends Pipeline {
+  encoder = new TextEncoder();
+  constructor(env) {
+    super(env);
+    this.setEndpointHandler(this.#ssrEndpointHandler);
+  }
+  // This function is responsible for handling the result coming from an endpoint.
+  async #ssrEndpointHandler(request, response) {
+    if (response.type === "response") {
+      if (response.response.headers.get("X-Astro-Response") === "Not-Found") {
+        throw new EndpointNotFoundError(response.response);
+      }
+      return response.response;
+    } else {
+      const url = new URL(request.url);
+      const headers = new Headers();
+      const mimeType = mime.getType(url.pathname);
+      if (mimeType) {
+        headers.set("Content-Type", `${mimeType};charset=utf-8`);
+      } else {
+        headers.set("Content-Type", "text/plain;charset=utf-8");
+      }
+      const bytes = response.encoding !== "binary" ? this.encoder.encode(response.body) : response.body;
+      headers.set("Content-Length", bytes.byteLength.toString());
+      const newResponse = new Response(bytes, {
+        status: 200,
+        headers
+      });
+      attachCookiesToResponse(newResponse, response.cookies);
+      return newResponse;
+    }
+  }
+}
+export {
+  EndpointNotFoundError,
+  SSRRoutePipeline
+};

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

@@ -1,4 +1,3 @@
-import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import type { RouteData, SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
 import type { SinglePageBuiltModule } from '../build/types';
 export type ComponentPath = string;
@@ -33,7 +32,6 @@ export type SSRManifest = {
     base: string;
     compressHTML: boolean;
     assetsPrefix?: string;
-    markdown: MarkdownRenderingOptions;
     renderers: SSRLoadedRenderer[];
     /**
      * Map of directive name (e.g. `load`) to the directive script code

package/dist/core/build/generate.js

@@ -13,6 +13,7 @@ import {
 } from "../../core/build/internal.js";
 import {
   isRelativePath,
+  joinPaths,
   prependForwardSlash,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash
@@ -303,10 +304,10 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
     buildPathname = base;
   } else if (routeType === "endpoint") {
     const buildPathRelative = removeLeadingForwardSlash(pathname);
-    buildPathname = base + buildPathRelative;
+    buildPathname = joinPaths(base, buildPathRelative);
   } else {
     const buildPathRelative = removeTrailingForwardSlash(removeLeadingForwardSlash(pathname)) + ending;
-    buildPathname = base + buildPathRelative;
+    buildPathname = joinPaths(base, buildPathRelative);
   }
   const url = new URL(buildPathname, origin);
   return url;
@@ -355,7 +356,6 @@ async function generatePath(pathname, opts, gopts, manifest, onRequest) {
   const env = createEnvironment({
     adapterName: manifest.adapterName,
     logging,
-    markdown: manifest.markdown,
     mode: opts.mode,
     renderers: manifest.renderers,
     clientDirectives: manifest.clientDirectives,
@@ -390,7 +390,7 @@ async function generatePath(pathname, opts, gopts, manifest, onRequest) {
   let encoding;
   let response;
   try {
-    response = await tryRenderRoute(pageData.route.type, renderContext, env, mod, onRequest);
+    response = await tryRenderRoute(renderContext, env, mod, onRequest);
   } catch (err) {
     if (!AstroError.is(err) && !err.id && typeof err === "object") {
       err.id = pageData.component;
@@ -444,7 +444,6 @@ function createBuildManifest(settings, internals, renderers) {
     entryModules: Object.fromEntries(internals.entrySpecifierToBundleMap.entries()),
     routes: [],
     adapterName: "",
-    markdown: settings.config.markdown,
     clientDirectives: settings.clientDirectives,
     compressHTML: settings.config.compressHTML,
     renderers,