astro 4.5.4 → 4.5.6

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

@@ -2478,6 +2478,10 @@ export type SSRComponentMetadata = {
     containsHead: boolean;
 };
 export interface SSRResult {
+    /**
+     * Whether the page has failed with a non-recoverable error, or the client disconnected.
+     */
+    cancelled: boolean;
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;

package/dist/cli/install-package.d.ts

@@ -1,6 +1,7 @@
 import { type Logger } from '../core/logger/core.js';
 type GetPackageOptions = {
     skipAsk?: boolean;
+    optional?: boolean;
     cwd?: string;
 };
 export declare function getPackage<T>(packageName: string, logger: Logger, options: GetPackageOptions, otherDeps?: string[]): Promise<T | undefined>;

package/dist/cli/install-package.js

@@ -24,6 +24,8 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     const packageImport = await import(packageName);
     return packageImport;
   } catch (e) {
+    if (options.optional)
+      return void 0;
     logger.info(
       "SKIP_FORMAT",
       `To continue, Astro requires the following dependency to be installed: ${bold(packageName)}.`

package/dist/content/types-generator.js

@@ -360,7 +360,7 @@ async function writeContentFiles({
 };
 `;
           if (settings.config.experimental.contentCollectionJsonSchema && collectionConfig?.schema) {
-            let zodSchemaForJson = collectionConfig.schema;
+            let zodSchemaForJson = typeof collectionConfig.schema === "function" ? collectionConfig.schema({ image: () => z.string() }) : collectionConfig.schema;
             if (zodSchemaForJson instanceof z.ZodObject) {
               zodSchemaForJson = zodSchemaForJson.extend({
                 $schema: z.string().optional()
@@ -382,7 +382,7 @@ async function writeContentFiles({
             } catch (err) {
               logger.warn(
                 "content",
-                `An error was encountered while creating the JSON schema. Proceeding without it. Error: ${err}`
+                `An error was encountered while creating the JSON schema for the ${entryKey} entry in ${collectionKey} collection. Proceeding without it. Error: ${err}`
               );
             }
           }

package/dist/core/build/index.js

@@ -89,8 +89,8 @@ class AstroBuilder {
       { settings: this.settings, logger: this.logger, mode: "build", command: "build" }
     );
     await runHookConfigDone({ settings: this.settings, logger });
-    const { syncInternal } = await import("../sync/index.js");
-    const syncRet = await syncInternal(this.settings, { logger, fs });
+    const { syncContentCollections } = await import("../sync/index.js");
+    const syncRet = await syncContentCollections(this.settings, { logger, fs });
     if (syncRet !== 0) {
       return process.exit(syncRet);
     }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.5.4";
+const ASTRO_VERSION = "4.5.6";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.5.4";
+  const currentVersion = "4.5.6";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/dev/utils.js

@@ -141,11 +141,11 @@ function getDocsForError(err) {
     return errorName.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
   }
 }
+const linkRegex = /\[([^[]+)\]\((.*)\)/g;
+const boldRegex = /\*\*(.+)\*\*/g;
+const urlRegex = / ((?:https?|ftp):\/\/[-\w+&@#\\/%?=~|!:,.;]*[-\w+&@#\\/%=~|])/gi;
+const codeRegex = /`([^`]+)`/g;
 function renderErrorMarkdown(markdown, target) {
-  const linkRegex = /\[([^[]+)\]\((.*)\)/g;
-  const boldRegex = /\*\*(.+)\*\*/g;
-  const urlRegex = / ((?:https?|ftp):\/\/[-\w+&@#\\/%?=~|!:,.;]*[-\w+&@#\\/%=~|])/gi;
-  const codeRegex = /`([^`]+)`/g;
   if (target === "html") {
     return escape(markdown).replace(linkRegex, `<a href="$2" target="_blank">$1</a>`).replace(boldRegex, "<b>$1</b>").replace(urlRegex, ' <a href="$1" target="_blank">$1</a>').replace(codeRegex, "<code>$1</code>");
   } else {

package/dist/core/errors/errors-data.d.ts

@@ -697,6 +697,28 @@ export declare const MiddlewareNotAResponse: {
     title: string;
     message: string;
 };
+/**
+ * @docs
+ * @description
+ * Thrown when an endpoint does not return anything or returns an object that is not a `Response` object.
+ *
+ * An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`. For example:
+ * ```ts
+ * import type { APIContext } from 'astro';
+ *
+ * export async function GET({ request, url, cookies }: APIContext): Promise<Response> {
+ *     return Response.json({
+ *         success: true,
+ *         result: 'Data from Astro Endpoint!'
+ *     })
+ * }
+ * ```
+ */
+export declare const EndpointDidNotReturnAResponse: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @description

package/dist/core/errors/errors-data.js

@@ -250,6 +250,11 @@ const MiddlewareNotAResponse = {
   title: "The middleware returned something that is not a `Response` object.",
   message: "Any data returned from middleware must be a valid `Response` object."
 };
+const EndpointDidNotReturnAResponse = {
+  name: "EndpointDidNotReturnAResponse",
+  title: "The endpoint did not return a `Response`.",
+  message: "An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`."
+};
 const LocalsNotAnObject = {
   name: "LocalsNotAnObject",
   title: "Value assigned to `locals` is not accepted.",
@@ -501,6 +506,7 @@ export {
   CouldNotTransformImage,
   DataCollectionEntryParseError,
   DuplicateContentEntrySlugError,
+  EndpointDidNotReturnAResponse,
   ExpectedImage,
   ExpectedImageOptions,
   FailedToFetchRemoteImageDimensions,

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.5.4";
+  const version = "4.5.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.5.4"}`
+        `v${"4.5.6"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -74,24 +74,38 @@ class RenderContext {
       serverLike
     });
     const apiContext = this.createAPIContext(props);
-    const { type } = routeData;
-    const lastNext = type === "endpoint" ? () => renderEndpoint(componentInstance, apiContext, serverLike, logger) : type === "redirect" ? () => renderRedirect(this) : type === "page" ? async () => {
-      const result = await this.createResult(componentInstance);
-      const response2 = await renderPage(
-        result,
-        componentInstance?.default,
-        props,
-        {},
-        streaming,
-        routeData
-      );
-      response2.headers.set(ROUTE_TYPE_HEADER, "page");
-      if (routeData.route === "/404" || routeData.route === "/500") {
-        response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+    const lastNext = async () => {
+      switch (routeData.type) {
+        case "endpoint":
+          return renderEndpoint(componentInstance, apiContext, serverLike, logger);
+        case "redirect":
+          return renderRedirect(this);
+        case "page": {
+          const result = await this.createResult(componentInstance);
+          let response2;
+          try {
+            response2 = await renderPage(
+              result,
+              componentInstance?.default,
+              props,
+              {},
+              streaming,
+              routeData
+            );
+          } catch (e) {
+            result.cancelled = true;
+            throw e;
+          }
+          response2.headers.set(ROUTE_TYPE_HEADER, "page");
+          if (routeData.route === "/404" || routeData.route === "/500") {
+            response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+          }
+          return response2;
+        }
+        case "fallback": {
+          return new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } });
+        }
       }
-      return response2;
-    } : type === "fallback" ? () => new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } }) : () => {
-      throw new Error("Unknown type of route: " + type);
     };
     const response = await callMiddleware(middleware, apiContext, lastNext);
     if (response.headers.get(ROUTE_TYPE_HEADER)) {
@@ -159,6 +173,7 @@ class RenderContext {
       }
     };
     const result = {
+      cancelled: false,
       clientDirectives,
       inlinedScripts,
       componentMetadata,

package/dist/core/routing/manifest/create.js

@@ -240,7 +240,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
         const pattern = getPattern(segments, settings.config, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
         const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
-        const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
+        const route = joinSegments(segments);
         routes.push({
           route,
           isIndex: item.isIndex,
@@ -295,7 +295,7 @@ function createInjectedRoutes({ settings, cwd }) {
     const generate = getRouteGenerator(segments, trailingSlash);
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
-    const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
+    const route = joinSegments(segments);
     routes[priority].push({
       type,
       // For backwards compatibility, an injected route is never considered an index route.
@@ -330,7 +330,7 @@ function createRedirectRoutes({ settings }, routeMap, logger) {
     const generate = getRouteGenerator(segments, trailingSlash);
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
-    const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
+    const route = joinSegments(segments);
     let destination;
     if (typeof to === "string") {
       destination = to;
@@ -577,6 +577,12 @@ function computeRoutePriority(config) {
   }
   return "legacy";
 }
+function joinSegments(segments) {
+  const arr = segments.map((segment) => {
+    return segment.map((rp) => rp.dynamic ? `[${rp.content}]` : rp.content).join("");
+  });
+  return `/${arr.join("/")}`.toLowerCase();
+}
 export {
   createRouteManifest
 };

package/dist/core/sync/index.js

@@ -3,6 +3,7 @@ import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { dim } from "kleur/colors";
 import { createServer } from "vite";
+import { getPackage } from "../../cli/install-package.js";
 import { createContentTypesGenerator } from "../../content/index.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
 import { telemetry } from "../../events/index.js";
@@ -29,8 +30,23 @@ async function sync(inlineConfig, options) {
     logger,
     command: "build"
   });
+  const timerStart = performance.now();
+  const dbPackage = await getPackage(
+    "@astrojs/db",
+    logger,
+    {
+      optional: true,
+      cwd: inlineConfig.root
+    },
+    []
+  );
   try {
-    return await syncInternal(settings, { ...options, logger });
+    await dbPackage?.typegen?.(astroConfig);
+    const exitCode = await syncContentCollections(settings, { ...options, logger });
+    if (exitCode !== 0)
+      return exitCode;
+    logger.info(null, `Types generated ${dim(getTimeStat(timerStart, performance.now()))}`);
+    return 0;
   } catch (err) {
     const error = createSafeError(err);
     logger.error(
@@ -40,8 +56,7 @@ async function sync(inlineConfig, options) {
     return 1;
   }
 }
-async function syncInternal(settings, { logger, fs }) {
-  const timerStart = performance.now();
+async function syncContentCollections(settings, { logger, fs }) {
   const tempViteServer = await createServer(
     await createVite(
       {
@@ -96,11 +111,10 @@ async function syncInternal(settings, { logger, fs }) {
   } finally {
     await tempViteServer.close();
   }
-  logger.info(null, `Types generated ${dim(getTimeStat(timerStart, performance.now()))}`);
   await setUpEnvTs({ settings, logger, fs: fs ?? fsMod });
   return 0;
 }
 export {
   sync as default,
-  syncInternal
+  syncContentCollections
 };

package/dist/runtime/client/dev-toolbar/apps/audit/index.js

@@ -11,6 +11,7 @@ try {
   customElements.define("astro-dev-toolbar-audit-list-item", DevToolbarAuditListItem);
 } catch (e) {
 }
+let showState = false;
 var audit_default = {
   id: "astro:audit",
   name: "Audit",
@@ -33,13 +34,19 @@ var audit_default = {
         if ("requestIdleCallback" in window) {
           window.requestIdleCallback(
             async () => {
-              lint();
+              lint().then(() => {
+                if (showState)
+                  createAuditsUI();
+              });
             },
             { timeout: 300 }
           );
         } else {
-          setTimeout(() => {
-            lint();
+          setTimeout(async () => {
+            lint().then(() => {
+              if (showState)
+                createAuditsUI();
+            });
           }, 150);
         }
       }, 250);
@@ -59,7 +66,10 @@ var audit_default = {
     });
     eventTarget.addEventListener("app-toggled", (event) => {
       if (event.detail.state === true) {
+        showState = true;
         createAuditsUI();
+      } else {
+        showState = false;
       }
     });
     closeOnOutsideClick(eventTarget, () => {

package/dist/runtime/client/dev-toolbar/apps/audit/ui/audit-list-item.js

@@ -68,6 +68,7 @@ class DevToolbarAuditListItem extends HTMLElement {
 				border: none;
 				z-index: 1000000000;
 				flex-direction: column;
+				line-height: 1.25rem;
 			}
 
 			:host([active])>button#astro-overlay-card {
@@ -104,6 +105,12 @@ class DevToolbarAuditListItem extends HTMLElement {
 				color: rgba(191, 193, 201, 1);
 			}
 
+			.extended-info code {
+				padding: 1px 3px;
+				border-radius: 3px;
+				background: #1F2433;
+			}
+
 			.reset-button {
 				text-align: left;
 				border: none;

package/dist/runtime/client/dev-toolbar/apps/audit/ui/audit-ui.js

@@ -109,18 +109,24 @@ function buildAuditCard(rule, highlightElement, auditedElement, audits) {
   extendedInfo.append(document.createElement("hr"));
   const message = document.createElement("p");
   message.classList.add("audit-message");
-  message.innerHTML = rule.message;
+  message.innerHTML = simpleRenderMarkdown(rule.message);
   extendedInfo.appendChild(message);
   const description = rule.description;
   if (description) {
     const descriptionElement = document.createElement("p");
     descriptionElement.classList.add("audit-description");
-    descriptionElement.innerHTML = description;
+    descriptionElement.innerHTML = simpleRenderMarkdown(description);
     extendedInfo.appendChild(descriptionElement);
   }
   card.shadowRoot.appendChild(extendedInfo);
   return card;
 }
+const linkRegex = /\[([^[]+)\]\((.*)\)/g;
+const boldRegex = /\*\*(.+)\*\*/g;
+const codeRegex = /`([^`]+)`/g;
+function simpleRenderMarkdown(markdown) {
+  return escapeHTML(markdown).replace(linkRegex, `<a href="$2" target="_blank">$1</a>`).replace(boldRegex, "<b>$1</b>").replace(codeRegex, "<code>$1</code>");
+}
 export {
   createAuditUI
 };

package/dist/runtime/server/endpoint.js

@@ -1,5 +1,7 @@
 import { bold } from "kleur/colors";
 import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from "../../core/constants.js";
+import { EndpointDidNotReturnAResponse } from "../../core/errors/errors-data.js";
+import { AstroError } from "../../core/errors/errors.js";
 async function renderEndpoint(mod, context, ssr, logger) {
   const { request, url } = context;
   const method = request.method.toUpperCase();
@@ -30,6 +32,9 @@ Found handlers: ${Object.keys(mod).map((exp) => JSON.stringify(exp)).join(", ")}
     return new Response(null, { status: 500 });
   }
   const response = await handler.call(mod, context);
+  if (!response || response instanceof Response === false) {
+    throw new AstroError(EndpointDidNotReturnAResponse);
+  }
   if (REROUTABLE_STATUS_CODES.includes(response.status)) {
     response.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
   }

package/dist/runtime/server/render/astro/render.js

@@ -80,6 +80,9 @@ async function renderToReadableStream(result, componentFactory, props, children,
           setTimeout(() => controller.error(e), 0);
         }
       })();
+    },
+    cancel() {
+      result.cancelled = true;
     }
   });
 }
@@ -127,11 +130,10 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
   }
   let error = null;
   let next = promiseWithResolvers();
-  let cancelled = false;
   const buffer = [];
   const iterator = {
     async next() {
-      if (cancelled)
+      if (result.cancelled)
         return { done: true, value: void 0 };
       await next.promise;
       if (error) {
@@ -157,7 +159,7 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       return returnValue;
     },
     async return() {
-      cancelled = true;
+      result.cancelled = true;
       return { done: true, value: void 0 };
     }
   };

package/dist/runtime/server/render/component.js

@@ -345,19 +345,27 @@ function renderAstroComponent(result, displayName, Component, props, slots = {})
 }
 async function renderComponent(result, displayName, Component, props, slots = {}) {
   if (isPromise(Component)) {
-    Component = await Component;
+    Component = await Component.catch(handleCancellation);
   }
   if (isFragmentComponent(Component)) {
-    return await renderFragmentComponent(result, slots);
+    return await renderFragmentComponent(result, slots).catch(handleCancellation);
   }
   props = normalizeProps(props);
   if (isHTMLComponent(Component)) {
-    return await renderHTMLComponent(result, Component, props, slots);
+    return await renderHTMLComponent(result, Component, props, slots).catch(handleCancellation);
   }
   if (isAstroComponentFactory(Component)) {
     return renderAstroComponent(result, displayName, Component, props, slots);
   }
-  return await renderFrameworkComponent(result, displayName, Component, props, slots);
+  return await renderFrameworkComponent(result, displayName, Component, props, slots).catch(
+    handleCancellation
+  );
+  function handleCancellation(e) {
+    if (result.cancelled)
+      return { render() {
+      } };
+    throw e;
+  }
 }
 function normalizeProps(props) {
   if (props["class:list"] !== void 0) {

package/dist/transitions/router.js

@@ -405,7 +405,7 @@ function onPopState(ev) {
   transition(direction, originalLocation, new URL(location.href), {}, state);
 }
 const onScrollEnd = () => {
-  if (scrollX !== history.state.scrollX || scrollY !== history.state.scrollY) {
+  if (history.state && (scrollX !== history.state.scrollX || scrollY !== history.state.scrollY)) {
     updateScrollPosition({ scrollX, scrollY });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.4",
+  "version": "4.5.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -162,8 +162,8 @@
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4",
     "@astrojs/internal-helpers": "0.3.0",
-    "@astrojs/markdown-remark": "4.3.0",
-    "@astrojs/telemetry": "3.0.4"
+    "@astrojs/telemetry": "3.0.4",
+    "@astrojs/markdown-remark": "4.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.32.6"