astro 6.1.0 → 6.1.2

package/dist/cli/add/index.js

@@ -492,7 +492,7 @@ function createPrettyError(err) {
 Reason: ${err.message}
 
 You will need to add these integration(s) manually.
-Documentation: https://docs.astro.build/en/guides/integrations-guide/`;
+Documentation: https://docs.astro.build/en/guides/integrations/`;
   return err;
 }
 function addIntegration(mod, integration) {

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.1.0";
+  version = "6.1.2";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -192,7 +192,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.1.0") {
+    if (previousAstroVersion && previousAstroVersion !== "6.1.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -200,8 +200,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.1.0") {
-      this.#store.metaStore().set("astro-version", "6.1.0");
+    if ("6.1.2") {
+      this.#store.metaStore().set("astro-version", "6.1.2");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -67,6 +67,11 @@ async function createManifest(buildOpts, internals) {
   for (const file of clientStatics) {
     internals.staticFiles.add(file);
   }
+  for (const [, ssrAssets] of internals.ssrAssetsPerEnvironment) {
+    for (const asset of ssrAssets) {
+      internals.staticFiles.add(asset);
+    }
+  }
   const staticFiles = internals.staticFiles;
   const encodedKey = await encodeKey(await buildOpts.key);
   const manifest = await buildManifest(buildOpts, internals, Array.from(staticFiles), encodedKey);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.1.0";
+const ASTRO_VERSION = "6.1.2";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -37,7 +37,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.1.0";
+  const currentVersion = "6.1.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -29,7 +29,7 @@ export declare const UnknownCompilerError: {
 /**
  * @docs
  * @see
- * - [Official integrations](https://docs.astro.build/en/guides/integrations-guide/#official-integrations)
+ * - [Official integrations](https://docs.astro.build/en/guides/integrations/#official-integrations)
  * - [Astro.clientAddress](https://docs.astro.build/en/reference/api-reference/#clientaddress)
  * @description
  * The adapter you're using unfortunately does not support `Astro.clientAddress`.
@@ -128,7 +128,7 @@ export declare const MissingMediaQueryDirective: {
  * @message Unable to render `COMPONENT_NAME`. There are `RENDERER_COUNT` renderer(s) configured in your `astro.config.mjs` file, but none were able to server-side render `COMPONENT_NAME`.
  * @see
  * - [Frameworks components](https://docs.astro.build/en/guides/framework-components/)
- * - [UI Frameworks](https://docs.astro.build/en/guides/integrations-guide/#official-integrations)
+ * - [UI Frameworks](https://docs.astro.build/en/guides/integrations/#official-integrations)
  * @description
  * None of the installed integrations were able to render the component you imported. Make sure to install the appropriate integration for the type of component you are trying to include in your page.
  *

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

@@ -577,7 +577,7 @@ const InvalidContentEntryFrontmatterError = {
       `**${String(collection)} \u2192 ${String(
         entryId
       )}** frontmatter does not match collection schema.`,
-      error.message
+      ...error.issues.map((issue) => `  **${issue.path.join(".")}**: ${issue.message}`)
     ].join("\n");
   },
   hint: "See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas."
@@ -589,7 +589,7 @@ const InvalidContentEntryDataError = {
     return [
       `**${String(collection)} \u2192 ${String(entryId)}** data does not match collection schema.
 `,
-      `  **: ${error.message}`,
+      ...error.issues.map((issue) => `  **${issue.path.join(".")}**: ${issue.message}`),
       ""
     ].join("\n");
   },
@@ -631,7 +631,7 @@ const ContentEntryDataError = {
     return [
       `**${String(collection)} \u2192 ${String(entryId)}** data does not match collection schema.
 `,
-      `  **: ${error.message}`,
+      ...error.issues.map((issue) => `  **${issue.path.join(".")}**: ${issue.message}`),
       ""
     ].join("\n");
   },

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.1.0"}`
+        `v${"6.1.2"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/index.d.ts

@@ -37,6 +37,13 @@ export type CreateContext = {
  * Creates a context to be passed to Astro middleware `onRequest` function.
  */
 declare function createContext({ request, params, userDefinedLocales, defaultLocale, locals, clientAddress, }: CreateContext): APIContext;
+/**
+ * Checks whether the passed `value` is serializable.
+ *
+ * A serializable value contains plain values. For example, `Proxy`, `Set`, `Map`, functions, etc.
+ * are not accepted because they can't be serialized.
+ */
+export declare function isLocalsSerializable(value: unknown): boolean;
 /**
  * It attempts to serialize `value` and return it as a string.
  *

package/dist/core/middleware/index.js

@@ -82,20 +82,24 @@ function createContext({
   });
 }
 function isLocalsSerializable(value) {
-  let type = typeof value;
-  let plainObject = true;
-  if (type === "object" && isPlainObject(value)) {
-    for (const [, nestedValue] of Object.entries(value)) {
-      if (!isLocalsSerializable(nestedValue)) {
-        plainObject = false;
-        break;
-      }
+  const stack = [value];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    const type = typeof current;
+    if (current === null || type === "string" || type === "number" || type === "boolean") {
+      continue;
     }
-  } else {
-    plainObject = false;
+    if (Array.isArray(current)) {
+      stack.push(...current);
+      continue;
+    }
+    if (type === "object" && isPlainObject(current)) {
+      stack.push(...Object.values(current));
+      continue;
+    }
+    return false;
   }
-  let result = value === null || type === "string" || type === "number" || type === "boolean" || Array.isArray(value) || plainObject;
-  return result;
+  return true;
 }
 function isPlainObject(value) {
   if (typeof value !== "object" || value === null) return false;
@@ -118,6 +122,7 @@ import { defineMiddleware } from "./defineMiddleware.js";
 export {
   createContext,
   defineMiddleware,
+  isLocalsSerializable,
   sequence,
   trySerializeLocals
 };

package/dist/core/preview/static-preview-server.js

@@ -1,6 +1,6 @@
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
-import { preview } from "vite";
+import { mergeConfig, preview } from "vite";
 import * as msg from "../messages/runtime.js";
 import { getResolvedHostForHttpServer } from "./util.js";
 import { vitePluginAstroPreview } from "./vite-plugin-astro-preview.js";
@@ -10,7 +10,7 @@ async function createStaticPreviewServer(settings, logger) {
   const startServerTime = performance.now();
   let previewServer;
   try {
-    previewServer = await preview({
+    const astroPreviewConfig = {
       configFile: false,
       base: settings.config.base,
       appType: "mpa",
@@ -22,11 +22,18 @@ async function createStaticPreviewServer(settings, logger) {
         host: settings.config.server.host,
         port: settings.config.server.port,
         headers: settings.config.server.headers,
-        open: settings.config.server.open,
-        allowedHosts: settings.config.server.allowedHosts
+        open: settings.config.server.open
       },
       plugins: [vitePluginAstroPreview(settings)]
-    });
+    };
+    const { plugins: _plugins, ...userViteConfig } = settings.config.vite ?? {};
+    const mergedViteConfig = mergeConfig(userViteConfig, astroPreviewConfig);
+    const { allowedHosts } = settings.config.server;
+    if (typeof allowedHosts === "boolean" || Array.isArray(allowedHosts) && allowedHosts.length > 0) {
+      mergedViteConfig.preview ??= {};
+      mergedViteConfig.preview.allowedHosts = allowedHosts;
+    }
+    previewServer = await preview(mergedViteConfig);
   } catch (err) {
     if (err instanceof Error) {
       logger.error(null, err.stack || err.message);

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

@@ -451,7 +451,9 @@ const a11y = [
       }
       const elementRoles = role.split(WHITESPACE_REGEX);
       for (const elementRole of elementRoles) {
-        const { requiredProps } = roles.get(elementRole);
+        const roleData = roles.get(normalizeAriaRole(elementRole));
+        if (!roleData) continue;
+        const { requiredProps } = roleData;
         const required_role_props = Object.keys(requiredProps);
         const missingProps = required_role_props.filter((prop) => !element.hasAttribute(prop));
         if (missingProps.length > 0) {
@@ -477,7 +479,9 @@ const a11y = [
       if (!role) return false;
       const elementRoles = role.split(WHITESPACE_REGEX);
       for (const elementRole of elementRoles) {
-        const { props } = roles.get(elementRole);
+        const roleData = roles.get(normalizeAriaRole(elementRole));
+        if (!roleData) continue;
+        const { props } = roleData;
         const attributes = getAttributeObject(element);
         const unsupportedAttributes = aria.keys().filter((attribute) => !(attribute in props));
         const invalidAttributes = Object.keys(attributes).filter(
@@ -546,6 +550,12 @@ function menuitem_implicit_role(attributes) {
   if (!type) return;
   return menuitem_type_to_implicit_role.get(type);
 }
+const ariaQueryRoleAliases = {
+  image: "img"
+};
+function normalizeAriaRole(role) {
+  return ariaQueryRoleAliases[role] ?? role;
+}
 function getRole(element) {
   if (element.hasAttribute("role")) {
     return element.getAttribute("role");

package/dist/transitions/swap-functions.js

@@ -116,6 +116,12 @@ const persistedHeadElement = (el, newDoc) => {
     const href = el.getAttribute("href");
     return newDoc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
   }
+  if (import.meta.env.DEV && el.tagName === "STYLE") {
+    const viteDevId = el.getAttribute("data-vite-dev-id");
+    if (viteDevId) {
+      return newDoc.head.querySelector(`style[data-vite-dev-id="${viteDevId}"]`);
+    }
+  }
   if (el.tagName === "STYLE" && el.textContent) {
     const styles = newDoc.head.querySelectorAll("style");
     for (const s of styles) {

package/dist/types/public/config.d.ts

@@ -312,7 +312,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
      *
      * Extend Astro with custom integrations. Integrations are your one-stop-shop for adding framework support (like Solid.js), new features (like sitemaps), and new libraries (like Partytown).
      *
-     * Read our [Integrations Guide](https://docs.astro.build/en/guides/integrations-guide/) for help getting started with Astro Integrations.
+     * Read our [Integrations Guide](https://docs.astro.build/en/guides/integrations/) for help getting started with Astro Integrations.
      *
      * ```js
      * import react from '@astrojs/react';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -218,7 +218,12 @@
     "test:e2e:chrome": "playwright test",
     "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
     "test:types": "tsc --project test/types/tsconfig.json",
-    "test:unit": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
-    "test:integration": "astro-scripts test \"test/*.test.js\""
+    "typecheck:tests": "tsc --project tsconfig.test.json",
+    "test:unit": "pnpm run test:unit:js && pnpm run test:unit:ts",
+    "test:unit:js": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
+    "test:unit:ts": "astro-scripts test \"test/units/**/*.test.ts\" --strip-types --teardown ./test/units/teardown.js",
+    "test:integration": "pnpm run test:integration:js && pnpm run test:integration:ts",
+    "test:integration:js": "astro-scripts test \"test/*.test.js\"",
+    "test:integration:ts": "astro-scripts test \"test/*.test.ts\" --strip-types"
   }
 }