astro 6.0.0-beta.12 → 6.0.0-beta.13

package/README.md

@@ -15,7 +15,7 @@
 npm create astro@latest
 
 # Manual:
-npm install --save-dev astro
+npm install astro
 ```
 
 Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.

package/components/Code.astro

@@ -1,10 +1,18 @@
 ---
-import { type ThemePresets, createShikiHighlighter } from '@astrojs/markdown-remark';
+import {
+	type ThemePresets,
+	createShikiHighlighter,
+	globalShikiStyleCollector,
+	transformerStyleToClass,
+} from '@astrojs/markdown-remark';
 import type { ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
 import { bundledLanguages } from 'shiki/langs';
 import type { CodeLanguage } from '../dist/types/public/common.js';
 import type { HTMLAttributes } from '../types.js';
 
+// Code.astro always uses Shiki, so import the virtual CSS module
+import 'virtual:astro:shiki-styles.css';
+
 interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	/** The code to highlight. Required. */
 	code: string;
@@ -16,6 +24,14 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	 * @default "plaintext"
 	 */
 	lang?: CodeLanguage;
+	/**
+	 * Additional languages to load.
+	 * Useful if `code` embeds languages not included by the given `lang`
+	 * For example, TSX in Vue
+	 *
+	 * @default []
+	 */
+	embeddedLangs?: CodeLanguage[];
 	/**
 	 * A metastring to pass to the highlighter.
 	 * Allows passing information to transformers: https://shiki.style/guide/transformers#meta
@@ -72,6 +88,7 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 const {
 	code,
 	lang = 'plaintext',
+	embeddedLangs = [],
 	meta,
 	theme = 'github-dark',
 	themes = {},
@@ -101,16 +118,23 @@ const highlighter = await createShikiHighlighter({
 				? lang
 				: 'plaintext'
 			: (lang as any),
+		...embeddedLangs,
 	],
 	theme,
 	themes,
 });
 
+// Combine style-to-class transformer with user-provided transformers
+const allTransformers = [
+	globalShikiStyleCollector.register(transformerStyleToClass()),
+	...transformers,
+];
+
 const html = await highlighter.codeToHtml(code, typeof lang === 'string' ? lang : lang.name, {
 	defaultColor,
 	wrap,
 	inline,
-	transformers,
+	transformers: allTransformers,
 	meta,
 	attributes: rest as any,
 });

package/dist/assets/fonts/providers/index.d.ts

@@ -1,29 +1,32 @@
-import { type AdobeProviderOptions, type GoogleFamilyOptions, type GoogleiconsFamilyOptions } from 'unifont';
+import { type AdobeProviderOptions, type GoogleFamilyOptions, type GoogleiconsFamilyOptions, type NpmProviderOptions, type NpmFamilyOptions } from 'unifont';
 import type { FontProvider } from '../types.js';
 import { type LocalFamilyOptions } from './local.js';
-/** [Adobe](https://fonts.adobe.com/) */
+/** [Adobe](https://v6.docs.astro.build/en/reference/font-provider-reference/#adobe) */
 declare function adobe(config: AdobeProviderOptions): FontProvider;
-/** [Bunny](https://fonts.bunny.net/) */
+/** [Bunny](https://v6.docs.astro.build/en/reference/font-provider-reference/#bunny) */
 declare function bunny(): FontProvider;
-/** [Fontshare](https://www.fontshare.com/) */
+/** [Fontshare](https://v6.docs.astro.build/en/reference/font-provider-reference/#fontshare) */
 declare function fontshare(): FontProvider;
-/** [Fontsource](https://fontsource.org/) */
+/** [Fontsource](https://v6.docs.astro.build/en/reference/font-provider-reference/#fontsource) */
 declare function fontsource(): FontProvider;
-/** [Google](https://fonts.google.com/) */
+/** [Google](https://v6.docs.astro.build/en/reference/font-provider-reference/#google) */
 declare function google(): FontProvider<GoogleFamilyOptions | undefined>;
-/** [Google Icons](https://fonts.google.com/icons) */
+/** [Google Icons](https://v6.docs.astro.build/en/reference/font-provider-reference/#google-icons) */
 declare function googleicons(): FontProvider<GoogleiconsFamilyOptions | undefined>;
-/** A provider that handles local files. */
+/** [Local](https://v6.docs.astro.build/en/reference/font-provider-reference/#local) */
 declare function local(): FontProvider<LocalFamilyOptions>;
+/** [NPM](https://v6.docs.astro.build/en/reference/font-provider-reference/#npm) */
+declare function npm(options?: Omit<NpmProviderOptions, 'root' | 'readFile'>): FontProvider<NpmFamilyOptions | undefined>;
 /**
  * Astro exports a few built-in providers:
- * - [Adobe](https://fonts.adobe.com/)
- * - [Bunny](https://fonts.bunny.net/)
- * - [Fontshare](https://www.fontshare.com/)
- * - [Fontsource](https://fontsource.org/)
- * - [Google](https://fonts.google.com/)
- * - [Google Icons](https://fonts.google.com/icons)
- * - Local
+ * - [Adobe](https://v6.docs.astro.build/en/reference/font-provider-reference/#adobe)
+ * - [Bunny](https://v6.docs.astro.build/en/reference/font-provider-reference/#bunny)
+ * - [Fontshare](https://v6.docs.astro.build/en/reference/font-provider-reference/#fontshare)
+ * - [Fontsource](https://v6.docs.astro.build/en/reference/font-provider-reference/#fontsource)
+ * - [Google](https://v6.docs.astro.build/en/reference/font-provider-reference/#google)
+ * - [Google Icons](https://v6.docs.astro.build/en/reference/font-provider-reference/#google-icons)
+ * - [Local](https://v6.docs.astro.build/en/reference/font-provider-reference/#local)
+ * - [NPM](TODO:)
  */
 export declare const fontProviders: {
     adobe: typeof adobe;
@@ -33,5 +36,6 @@ export declare const fontProviders: {
     google: typeof google;
     googleicons: typeof googleicons;
     local: typeof local;
+    npm: typeof npm;
 };
 export {};

package/dist/assets/fonts/providers/index.js

@@ -3,6 +3,8 @@ import {
 } from "unifont";
 import { FontaceFontFileReader } from "../infra/fontace-font-file-reader.js";
 import { LocalFontProvider } from "./local.js";
+import { fileURLToPath } from "node:url";
+import { readFile } from "node:fs/promises";
 function adobe(config) {
   const provider = providers.adobe(config);
   let initializedProvider;
@@ -105,6 +107,25 @@ function local() {
     fontFileReader: new FontaceFontFileReader()
   });
 }
+function npm(options) {
+  let initializedProvider;
+  return {
+    name: providers.npm()._name,
+    async init(context) {
+      initializedProvider = await providers.npm({
+        ...options,
+        root: fileURLToPath(context.root),
+        readFile: (path) => readFile(path, "utf-8").catch(() => null)
+      })(context);
+    },
+    async resolveFont({ familyName, ...rest }) {
+      return await initializedProvider?.resolveFont(familyName, rest);
+    },
+    async listFonts() {
+      return await initializedProvider?.listFonts?.();
+    }
+  };
+}
 const fontProviders = {
   adobe,
   bunny,
@@ -112,7 +133,8 @@ const fontProviders = {
   fontsource,
   google,
   googleicons,
-  local
+  local,
+  npm
 };
 export {
   fontProviders

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.0.0-beta.12";
+  version = "6.0.0-beta.13";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -181,7 +181,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.12") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.13") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -189,8 +189,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-beta.12") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-beta.12");
+    if ("6.0.0-beta.13") {
+      await this.#store.metaStore().set("astro-version", "6.0.0-beta.13");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/entrypoints/virtual/dev.d.ts

@@ -1,2 +1,2 @@
-import type { BaseApp } from '../../base.js';
-export declare function createApp(): BaseApp;
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/entrypoints/virtual/dev.js

@@ -2,9 +2,9 @@ import { manifest } from "virtual:astro:manifest";
 import { DevApp } from "../../dev/app.js";
 import { createConsoleLogger } from "../../logging.js";
 let currentDevApp = null;
-function createApp() {
+const createApp = ({ streaming } = {}) => {
   const logger = createConsoleLogger(manifest.logLevel);
-  currentDevApp = new DevApp(manifest, true, logger);
+  currentDevApp = new DevApp(manifest, streaming, logger);
   if (import.meta.hot) {
     import.meta.hot.on("astro:routes-updated", async () => {
       if (!currentDevApp) return;
@@ -21,7 +21,7 @@ function createApp() {
     });
   }
   return currentDevApp;
-}
+};
 export {
   createApp
 };

package/dist/core/app/entrypoints/virtual/index.d.ts

@@ -1,2 +1,2 @@
-import type { BaseApp } from '../../base.js';
-export declare const createApp: () => BaseApp;
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/entrypoints/virtual/prod.d.ts

@@ -1,2 +1,2 @@
-import type { BaseApp } from '../../base.js';
-export declare function createApp(): BaseApp;
+import type { CreateApp } from '../../types.js';
+export declare const createApp: CreateApp;

package/dist/core/app/entrypoints/virtual/prod.js

@@ -1,8 +1,8 @@
 import { manifest } from "virtual:astro:manifest";
 import { App } from "../../app.js";
-function createApp() {
-  return new App(manifest);
-}
+const createApp = ({ streaming } = {}) => {
+  return new App(manifest, streaming);
+};
 export {
   createApp
 };

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

@@ -9,6 +9,7 @@ import type { LoggerLevel } from '../logger/core.js';
 import type { RoutingStrategies } from './common.js';
 import type { BaseSessionConfig, SessionDriverFactory } from '../session/types.js';
 import type { DevToolbarPlacement } from '../../types/public/toolbar.js';
+import type { BaseApp } from './base.js';
 type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -168,4 +169,7 @@ export type NodeAppHeadersJson = {
         value: string;
     }[];
 }[];
+export type CreateApp = (options?: {
+    streaming?: boolean;
+}) => BaseApp;
 export {};

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.0-beta.12";
+const ASTRO_VERSION = "6.0.0-beta.13";
 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/create-vite.js

@@ -49,6 +49,7 @@ import { vitePluginEnvironment } from "../vite-plugin-environment/index.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "./constants.js";
 import { vitePluginChromedevtools } from "../vite-plugin-chromedevtools/index.js";
 import { vitePluginAstroServerClient } from "../vite-plugin-overlay/index.js";
+import { vitePluginShikiStyles } from "../vite-plugin-shiki-styles/index.js";
 async function createVite(commandConfig, { settings, logger, mode, command, fs = nodeFs, sync, routesList }) {
   const astroPkgsConfig = await crawlFrameworkPkgs({
     root: fileURLToPath(settings.config.root),
@@ -90,7 +91,11 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     appType: "custom",
     plugins: [
       serializedManifestPlugin({ settings, command, sync }),
-      vitePluginRenderers({ settings }),
+      vitePluginRenderers({
+        settings,
+        routesList,
+        command: command === "dev" ? "serve" : "build"
+      }),
       vitePluginStaticPaths(),
       await astroPluginRoutes({ routesList, settings, logger, fsMod: fs, command }),
       astroVirtualManifestPlugin(),
@@ -130,7 +135,8 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
       vitePluginSessionDriver({ settings }),
       astroContainer(),
       astroHmrReloadPlugin(),
-      vitePluginChromedevtools({ settings })
+      vitePluginChromedevtools({ settings }),
+      vitePluginShikiStyles()
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -382,10 +382,12 @@ class RenderContext {
       },
       get csp() {
         if (!pipeline.manifest.csp) {
-          pipeline.logger.warn(
-            "csp",
-            `context.csp was used when rendering the route ${colors.green(this.routePattern)}, but CSP was not configured. For more information, see https://docs.astro.build/en/reference/experimental-flags/csp/`
-          );
+          if (pipeline.runtimeMode === "production") {
+            pipeline.logger.warn(
+              "csp",
+              `context.csp was used when rendering the route ${colors.green(this.routePattern)}, but CSP was not configured. For more information, see https://docs.astro.build/en/reference/experimental-flags/csp/`
+            );
+          }
           return void 0;
         }
         return {
@@ -601,10 +603,12 @@ class RenderContext {
       },
       get csp() {
         if (!pipeline.manifest.csp) {
-          pipeline.logger.warn(
-            "csp",
-            `Astro.csp was used when rendering the route ${colors.green(this.routePattern)}, but CSP was not configured. For more information, see https://docs.astro.build/en/reference/experimental-flags/csp/`
-          );
+          if (pipeline.runtimeMode === "production") {
+            pipeline.logger.warn(
+              "csp",
+              `Astro.csp was used when rendering the route ${colors.green(this.routePattern)}, but CSP was not configured. For more information, see https://docs.astro.build/en/reference/experimental-flags/csp/`
+            );
+          }
           return void 0;
         }
         return {

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

@@ -2,7 +2,7 @@ import { clsx } from "clsx";
 import { HTMLString, markHTMLString } from "../escape.js";
 import { isPromise } from "../util.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
-const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|muted|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
+const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|inert|loop|muted|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);
@@ -87,6 +87,9 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
   if (key === "download" && typeof value === "boolean") {
     return handleBooleanAttribute(key, value, shouldEscape, tagName);
   }
+  if (key === "hidden" && typeof value === "boolean") {
+    return handleBooleanAttribute(key, value, shouldEscape, tagName);
+  }
   return markHTMLString(` ${key}="${toAttributeString(value, shouldEscape)}"`);
 }
 function internalSpreadAttributes(values, shouldEscape = true, tagName) {

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

@@ -66,60 +66,98 @@ export type AdapterSupportWithMessage = {
 export type AdapterSupport = AdapterSupportsKind | AdapterSupportWithMessage;
 export interface AstroAdapterFeatures {
     /**
-     * Creates an edge function that will communicate with the Astro middleware
+     * Defines whether any on-demand rendering middleware code will be bundled when built. When enabled, this prevents
+     * middleware code from being bundled and imported by all pages during the build.
      */
     edgeMiddleware: boolean;
     /**
-     * Determine the type of build output the adapter is intended for. Defaults to `server`;
+     * Allows you to force a specific output shape for the build. This can be useful for adapters that only work with
+     * a specific output type. For example, your adapter might expect a static website so it can create host-specific
+     * files. Defaults to `server` if not specified.
      */
     buildOutput?: 'static' | 'server';
     /**
-     * If supported by the adapter and enabled, Astro won't add any `<meta http-equiv>` tags
-     * in the static pages, instead it will return a mapping in the
-     * `astro:build:generated` hook, so adapters can consume them and add them inside
-     * their hosting headers configuration file.
-     *
-     * Future features may decide to use this feature to create/add headers for static pages.
+     * Whether or not the adapter provides support for setting response headers for static pages. When this feature is
+     * enabled, Astro will return a map of the `Headers` emitted by the static pages. This map is available as `routeToHeaders`
+     * in the `astro:build:generated` hook and can be used to generate platform-specific output that controls HTTP headers,
+     * for example, to create a `_headers` file for platforms that support it.
      */
     staticHeaders?: boolean;
 }
 interface AdapterExplicitProperties {
     /**
-     * Determines how the adapter's entrypoint is handled during the build.
-     * - `'auto'`: The adapter defines its own entrypoint and provides either serverEntrypoint or rollupOptions.input
-     * - `'explicit'`: Uses the virtual module entrypoint with dynamic exports
-     * @default 'explicit'
-     * @deprecated This will be removed in a future major version and `'auto'` will become the default
+     * @deprecated `entrypointResolution: "explicit"` is deprecated. `entrypointResolution: "auto"` will become the default,
+     * and only, behavior in a future major version. See [how to migrate](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#deprecated-createexports-and-start-adapter-api).
+     *
+     * Specifies the method Astro will use to resolve the server entrypoint: `"auto"` (recommended)
+     * or `"explicit"` (default, but deprecated):
+     *
+     * - **`"auto"` (recommended):** You are responsible for providing a valid module as an entrypoint
+     * using either `serverEntrypoint` or, if you need further customization at the Vite level using `vite.build.rollupOptions.input`.
+     * - **`"explicit"` (deprecated)**: You must provide the exports required by the host in the server entrypoint
+     * using a `createExports()` function before passing them to `setAdapter()` as an [`exports`](#exports) list. This supports
+     * adapters built using the Astro 5 version of the Adapter API. By default, all adapters will receive this value to allow backwards
+     * compatibility. **However, no new adapters should be created with this value.** Existing adapters should override this default
+     * value with `"auto"` as soon as they are able to migrate to the new v6 API.
      */
     entrypointResolution?: 'explicit';
+    /**
+     * Defines the entrypoint for on-demand rendering.
+     */
     serverEntrypoint?: string | URL;
-    /** @deprecated This will be removed in a future major version, alongside `entrypointResolution: 'explicit'` */
+    /**
+     * @deprecated This will be removed in a future major version, alongside `entrypointResolution: 'explicit'`.
+     *
+     * Defines an array of named exports to use in conjunction with the `createExports()` function of your server entrypoint.
+     */
     exports?: string[];
-    /** @deprecated This will be removed in a future major version, alongside `entrypointResolution: 'explicit'` */
+    /**
+     * @deprecated This will be removed in a future major version, alongside `entrypointResolution: 'explicit'`.
+     *
+     * A JSON-serializable value that will be passed to the adapter's server entrypoint at runtime. This is useful to pass an object containing build-time configuration (e.g. paths, secrets) to your server runtime code.
+     */
     args?: any;
 }
 interface AdapterAutoProperties {
     /**
-     * Determines how the adapter's entrypoint is handled during the build.
-     * - `'auto'`: The adapter defines its own entrypoint and provides either serverEntrypoint or rollupOptions.input
-     * - `'explicit'`: Uses the virtual module entrypoint with dynamic exports
-     * @default 'explicit'
+     * Specifies the method Astro will use to resolve the server entrypoint: `"auto"` (recommended)
+     * or `"explicit"` (default, but deprecated):
+     *
+     * - **`"auto"` (recommended):** You are responsible for providing a valid module as an entrypoint
+     * using either `serverEntrypoint` or, if you need further customization at the Vite level using `vite.build.rollupOptions.input`.
+     * - **`"explicit"` (deprecated)**: You must provide the exports required by the host in the server entrypoint
+     * using a `createExports()` function before passing them to `setAdapter()` as an [`exports`](#exports) list. This supports
+     * adapters built using the Astro 5 version of the Adapter API. By default, all adapters will receive this value to allow backwards
+     * compatibility. **However, no new adapters should be created with this value.** Existing adapters should override this default
+     * value with `"auto"` as soon as they are able to migrate to the new v6 API.
      */
     entrypointResolution: 'auto';
+    /**
+     * Defines the entrypoint for on-demand rendering.
+     */
     serverEntrypoint?: string | URL;
 }
 export type AstroAdapter = {
+    /**
+     * Defines a unique name for your adapter. This will be used for logging.
+     */
     name: string;
+    /**
+     * Defines the path or ID of a module in the adapter's package that is responsible for starting up the built
+     * server when `astro preview` is run.
+     */
     previewEntrypoint?: string | URL;
+    /**
+     * An object that specifies which adapter features that change the build output are supported by the adapter.
+     */
     adapterFeatures?: AstroAdapterFeatures;
     /**
-     * List of features supported by an adapter.
-     *
-     * If the adapter is not able to handle certain configurations, Astro will throw an error.
+     * A map of Astro's built-in features supported by the adapter. This allows Astro to determine which features an
+     * adapter supports, so appropriate error messages can be provided.
      */
     supportedAstroFeatures: AstroAdapterFeatureMap;
     /**
-     * Configuration for Astro's client-side code.
+     * A configuration object for Astro's client-side code.
      */
     client?: AstroAdapterClientConfig;
 } & (AdapterExplicitProperties | AdapterAutoProperties);
@@ -160,27 +198,31 @@ export interface AstroPrerenderer {
 }
 export type AstroAdapterFeatureMap = {
     /**
-     * The adapter is able to serve static pages
+     * Defines whether the adapter is able to serve static pages.
      */
     staticOutput?: AdapterSupport;
     /**
-     * The adapter is able to serve pages that are static or rendered via server
+     * Defines whether the adapter is able to serve sites that include a mix of static and on-demand rendered pages.
      */
     hybridOutput?: AdapterSupport;
     /**
-     * The adapter is able to serve SSR pages
+     * Defines whether the adapter is able to serve on-demand rendered pages.
      */
     serverOutput?: AdapterSupport;
     /**
-     * The adapter is able to support i18n domains
+     * Defines whether the adapter is able to support i18n domains.
      */
     i18nDomains?: AdapterSupport;
     /**
-     * The adapter is able to support `getSecret` exported from `astro:env/server`
+     * Defines whether the adapter is able to support `getSecret()` exported from `astro:env/server`. When enabled, this feature
+     * allows your adapter to retrieve secrets configured by users in `env.schema`.
+     *
+     * The `astro/env/setup` module allows you to provide an implementation for `getSecret()`. In your server entrypoint, call
+     * `setGetEnv()` as soon as possible.
      */
     envGetSecret?: AdapterSupport;
     /**
-     * The adapter supports image transformation using the built-in Sharp image service
+     * Defines whether the adapter supports image transformation using the built-in Sharp image service.
      */
     sharpImageService?: AdapterSupport;
 };

package/dist/vite-plugin-markdown/index.js

@@ -98,12 +98,15 @@ function markdown({ settings, logger }) {
             `[${id}] Astro now supports MDX! Support for components in ".md" (or alternative extensions like ".markdown") files using the "setup" frontmatter is no longer enabled by default. Migrate this file to MDX.`
           );
         }
+        const usesShiki = settings.config.markdown.syntaxHighlight === "shiki" || settings.config.markdown.syntaxHighlight === void 0;
+        const hasCodeBlocks = renderResult.metadata.hasCodeBlocks ?? false;
         const code = `
-				import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
+			import { unescapeHTML, spreadAttributes, createComponent, render, renderComponent, maybeRenderHead } from ${JSON.stringify(
           astroServerRuntimeModulePath
         )};
-				import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
-				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
+			import { AstroError, AstroErrorData } from ${JSON.stringify(astroErrorModulePath)};
+			${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
+			${usesShiki && hasCodeBlocks ? `import 'virtual:astro:shiki-styles.css';` : ""}
 
 				${// Only include the code relevant to `astro:assets` if there's images in the file
         localImagePaths.length > 0 || remoteImagePaths.length > 0 ? getMarkdownCodeForImages(localImagePaths, remoteImagePaths, html) : `const html = () => ${JSON.stringify(html)};`}

package/dist/vite-plugin-renderers/index.d.ts

@@ -1,8 +1,10 @@
-import type { Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../types/astro.js';
+import type { ConfigEnv, Plugin as VitePlugin } from 'vite';
+import type { AstroSettings, RoutesList } from '../types/astro.js';
 export declare const ASTRO_RENDERERS_MODULE_ID = "virtual:astro:renderers";
 interface PluginOptions {
     settings: AstroSettings;
+    routesList: RoutesList;
+    command: ConfigEnv['command'];
 }
 export default function vitePluginRenderers(options: PluginOptions): VitePlugin;
 export {};

package/dist/vite-plugin-renderers/index.js

@@ -1,5 +1,11 @@
+import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
 const ASTRO_RENDERERS_MODULE_ID = "virtual:astro:renderers";
 const RESOLVED_ASTRO_RENDERERS_MODULE_ID = `\0${ASTRO_RENDERERS_MODULE_ID}`;
+function ssrBuildNeedsRenderers(routesList) {
+  return routesList.routes.some(
+    (route) => route.type === "page" && !route.prerender && route.origin !== "internal"
+  );
+}
 function vitePluginRenderers(options) {
   const renderers = options.settings.renderers;
   return {
@@ -18,6 +24,9 @@ function vitePluginRenderers(options) {
         id: new RegExp(`^${RESOLVED_ASTRO_RENDERERS_MODULE_ID}$`)
       },
       handler() {
+        if (options.command === "build" && this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr && renderers.length > 0 && !ssrBuildNeedsRenderers(options.routesList)) {
+          return { code: `export const renderers = [];` };
+        }
         if (renderers.length > 0) {
           const imports = [];
           const exports = [];

package/dist/vite-plugin-shiki-styles/index.d.ts

@@ -0,0 +1,9 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that provides a virtual CSS module containing all Shiki syntax highlighting styles.
+ *
+ * This plugin collects styles from the style-to-class transformer used by both Code.astro
+ * and Markdown processing, and bundles them into a single CSS file. The .css extension
+ * ensures Vite processes this through its CSS pipeline (minification, hashing, etc.).
+ */
+export declare function vitePluginShikiStyles(): Plugin;

package/dist/vite-plugin-shiki-styles/index.js

@@ -0,0 +1,44 @@
+import { globalShikiStyleCollector } from "@astrojs/markdown-remark";
+const VIRTUAL_SHIKI_STYLES_ID = "virtual:astro:shiki-styles.css";
+const RESOLVED_VIRTUAL_SHIKI_STYLES_ID = "\0virtual:astro:shiki-styles.css";
+function vitePluginShikiStyles() {
+  return {
+    name: "astro:shiki-styles",
+    buildStart() {
+      globalShikiStyleCollector.clear();
+    },
+    resolveId: {
+      filter: {
+        id: new RegExp(`^${VIRTUAL_SHIKI_STYLES_ID}$`)
+      },
+      handler(id) {
+        if (id === VIRTUAL_SHIKI_STYLES_ID) {
+          return RESOLVED_VIRTUAL_SHIKI_STYLES_ID;
+        }
+      }
+    },
+    load: {
+      filter: {
+        id: new RegExp(`^${RESOLVED_VIRTUAL_SHIKI_STYLES_ID}$`)
+      },
+      handler(id) {
+        if (id === RESOLVED_VIRTUAL_SHIKI_STYLES_ID) {
+          const css = globalShikiStyleCollector.collectCSS();
+          return css || "/* Shiki styles will be generated during build */";
+        }
+      }
+    },
+    // Handle HMR invalidation when markdown/astro files change
+    handleHotUpdate({ file, server }) {
+      if (file.endsWith(".md") || file.endsWith(".mdx") || file.endsWith(".astro")) {
+        const module = server.moduleGraph.getModuleById(RESOLVED_VIRTUAL_SHIKI_STYLES_ID);
+        if (module) {
+          server.moduleGraph.invalidateModule(module);
+        }
+      }
+    }
+  };
+}
+export {
+  vitePluginShikiStyles
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.0-beta.12",
+  "version": "6.0.0-beta.13",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -144,7 +144,7 @@
     "tinyglobby": "^0.2.15",
     "tsconfck": "^3.1.6",
     "ultrahtml": "^1.6.0",
-    "unifont": "~0.7.3",
+    "unifont": "~0.7.4",
     "unist-util-visit": "^5.1.0",
     "unstorage": "^1.17.4",
     "vfile": "^6.0.3",
@@ -154,7 +154,7 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.8.0-beta.1",
-    "@astrojs/markdown-remark": "7.0.0-beta.6",
+    "@astrojs/markdown-remark": "7.0.0-beta.7",
     "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {

package/types/content.d.ts

@@ -33,7 +33,6 @@ declare module 'astro:content' {
 	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type CollectionKey = any;
 	/** Run `astro dev` or `astro sync` to generate high fidelity types */
-	// biome-ignore lint/correctness/noUnusedVariables: stub generic type to match generated type
 	export type CollectionEntry<C> = any;
 	/** Run `astro dev` or `astro sync` to generate high fidelity types */
 	export type ContentCollectionKey = any;