astro 5.4.3 → 5.5.1

package/dist/assets/build/generate.js

@@ -170,6 +170,9 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env) {
         env.imageConfig
       )).data;
     } catch (e) {
+      if (AstroError.is(e)) {
+        throw e;
+      }
       const error = new AstroError(
         {
           ...AstroErrorData.CouldNotTransformImage,

package/dist/content/content-layer.js

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

package/dist/core/compile/compile.js

@@ -35,6 +35,7 @@ async function compile({
         cssPartialCompileResults,
         cssTransformErrors
       }),
+      experimentalScriptOrder: astroConfig.experimental.preserveScriptOrder ?? false,
       async resolvePath(specifier) {
         return resolvePath(specifier, filename);
       }

package/dist/core/config/schema.d.ts

@@ -72,6 +72,8 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         svg: false;
         serializeConfig: false;
         session: false;
+        headingIdCompat: false;
+        preserveScriptOrder: false;
     };
 };
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -296,7 +298,16 @@ export declare const AstroConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
     }>>;
     markdown: z.ZodDefault<z.ZodObject<{
-        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
+        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodDefault<z.ZodObject<{
+            type: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">]>>;
+            excludeLangs: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
+        }, "strip", z.ZodTypeAny, {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        }, {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        }>>, z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">]>>, z.ZodLiteral<false>]>>;
         shikiConfig: z.ZodDefault<z.ZodObject<{
             langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
             langAlias: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
@@ -328,7 +339,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         gfm: z.ZodDefault<z.ZodBoolean>;
         smartypants: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -344,7 +358,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         gfm: boolean;
         smartypants: boolean;
     }, {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -757,11 +774,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             mode?: "inline" | "sprite" | undefined;
         } | undefined>;
         serializeConfig: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        headingIdCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        preserveScriptOrder: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         clientPrerender: boolean;
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -775,6 +796,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{
         collections: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -849,7 +872,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         enabled: boolean;
     };
     markdown: {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -916,6 +942,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -1039,7 +1067,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
     } | undefined;
     markdown?: {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -1124,6 +1155,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;
@@ -1352,7 +1385,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled?: boolean | undefined;
     }>>;
     markdown: z.ZodDefault<z.ZodObject<{
-        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">, z.ZodLiteral<false>]>>;
+        syntaxHighlight: z.ZodDefault<z.ZodUnion<[z.ZodDefault<z.ZodObject<{
+            type: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">]>>;
+            excludeLangs: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
+        }, "strip", z.ZodTypeAny, {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        }, {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        }>>, z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"shiki">, z.ZodLiteral<"prism">]>>, z.ZodLiteral<false>]>>;
         shikiConfig: z.ZodDefault<z.ZodObject<{
             langs: z.ZodDefault<z.ZodEffects<z.ZodArray<z.ZodType<ShikiLang, z.ZodTypeDef, ShikiLang>, "many">, ShikiLang[], ShikiLang[]>>;
             langAlias: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
@@ -1384,7 +1426,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         gfm: z.ZodDefault<z.ZodBoolean>;
         smartypants: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -1400,7 +1445,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         gfm: boolean;
         smartypants: boolean;
     }, {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -1813,11 +1861,15 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             mode?: "inline" | "sprite" | undefined;
         } | undefined>;
         serializeConfig: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        headingIdCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        preserveScriptOrder: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strict", z.ZodTypeAny, {
         clientPrerender: boolean;
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -1831,6 +1883,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     }>>;
     legacy: z.ZodDefault<z.ZodObject<{
         collections: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -1987,7 +2041,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled: boolean;
     };
     markdown: {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -2054,6 +2111,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -2177,7 +2236,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled?: boolean | undefined;
     } | undefined;
     markdown?: {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -2262,6 +2324,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;
@@ -2333,7 +2397,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled: boolean;
     };
     markdown: {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -2400,6 +2467,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -2523,7 +2592,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled?: boolean | undefined;
     } | undefined;
     markdown?: {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -2608,6 +2680,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;
@@ -2679,7 +2753,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled: boolean;
     };
     markdown: {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -2746,6 +2823,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -2869,7 +2948,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled?: boolean | undefined;
     } | undefined;
     markdown?: {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -2954,6 +3036,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;
@@ -3025,7 +3109,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled: boolean;
     };
     markdown: {
-        syntaxHighlight: false | "shiki" | "prism";
+        syntaxHighlight: false | "shiki" | "prism" | {
+            type: "shiki" | "prism";
+            excludeLangs: string[];
+        };
         shikiConfig: {
             langs: ShikiLang[];
             theme: import("shiki").BundledTheme | ShikiTheme;
@@ -3092,6 +3179,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         contentIntellisense: boolean;
         responsiveImages: boolean;
         serializeConfig: boolean;
+        headingIdCompat: boolean;
+        preserveScriptOrder: boolean;
         svg?: {
             mode?: "inline" | "sprite" | undefined;
         } | undefined;
@@ -3215,7 +3304,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         enabled?: boolean | undefined;
     } | undefined;
     markdown?: {
-        syntaxHighlight?: false | "shiki" | "prism" | undefined;
+        syntaxHighlight?: false | "shiki" | "prism" | {
+            type?: "shiki" | "prism" | undefined;
+            excludeLangs?: string[] | undefined;
+        } | undefined;
         shikiConfig?: {
             langs?: ShikiLang[] | undefined;
             theme?: import("shiki").BundledTheme | ShikiTheme | undefined;
@@ -3300,6 +3392,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         serializeConfig?: boolean | undefined;
         session?: boolean | undefined;
+        headingIdCompat?: boolean | undefined;
+        preserveScriptOrder?: boolean | undefined;
     } | undefined;
     legacy?: {
         collections?: boolean | undefined;

package/dist/core/config/schema.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { markdownConfigDefaults } from "@astrojs/markdown-remark";
+import { markdownConfigDefaults, syntaxHighlightDefaults } from "@astrojs/markdown-remark";
 import { bundledThemes } from "shiki";
 import { z } from "zod";
 import { EnvSchema } from "../../env/schema.js";
@@ -58,9 +58,12 @@ const ASTRO_CONFIG_DEFAULTS = {
     responsiveImages: false,
     svg: false,
     serializeConfig: false,
-    session: false
+    session: false,
+    headingIdCompat: false,
+    preserveScriptOrder: false
   }
 };
+const highlighterTypesSchema = z.union([z.literal("shiki"), z.literal("prism")]).default(syntaxHighlightDefaults.type);
 const AstroConfigSchema = z.object({
   root: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.root).transform((val) => new URL(val)),
   srcDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.srcDir).transform((val) => new URL(val)),
@@ -176,7 +179,14 @@ const AstroConfigSchema = z.object({
     enabled: z.boolean().default(ASTRO_CONFIG_DEFAULTS.devToolbar.enabled)
   }).default(ASTRO_CONFIG_DEFAULTS.devToolbar),
   markdown: z.object({
-    syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).default(ASTRO_CONFIG_DEFAULTS.markdown.syntaxHighlight),
+    syntaxHighlight: z.union([
+      z.object({
+        type: highlighterTypesSchema,
+        excludeLangs: z.array(z.string()).optional().default(syntaxHighlightDefaults.excludeLangs)
+      }).default(syntaxHighlightDefaults),
+      highlighterTypesSchema,
+      z.literal(false)
+    ]).default(ASTRO_CONFIG_DEFAULTS.markdown.syntaxHighlight),
     shikiConfig: z.object({
       langs: z.custom().array().transform((langs) => {
         for (const lang of langs) {
@@ -377,7 +387,9 @@ const AstroConfigSchema = z.object({
       }
       return svgConfig;
     }),
-    serializeConfig: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.serializeConfig)
+    serializeConfig: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.serializeConfig),
+    headingIdCompat: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.headingIdCompat),
+    preserveScriptOrder: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.preserveScriptOrder)
   }).strict(
     `Invalid or outdated experimental feature.
 Check for incorrect spelling or outdated Astro version.

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.4.3";
+const ASTRO_VERSION = "5.5.1";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

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 = "5.4.3";
+  const currentVersion = "5.5.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/events/session.js

@@ -53,7 +53,9 @@ function createAnonymousConfigInfo(userConfig) {
     vite: userConfig.vite ? sanitizeConfigInfo(userConfig.vite, Object.keys(userConfig.vite)) : void 0
   };
   configInfo.build.format = measureStringLiteral(userConfig.build?.format);
-  configInfo.markdown.syntaxHighlight = measureStringLiteral(userConfig.markdown?.syntaxHighlight);
+  const syntaxHighlight = userConfig.markdown?.syntaxHighlight;
+  const syntaxHighlightType = typeof syntaxHighlight === "object" ? syntaxHighlight.type : syntaxHighlight;
+  configInfo.markdown.syntaxHighlight = measureStringLiteral(syntaxHighlightType);
   configInfo.output = measureStringLiteral(userConfig.output);
   configInfo.scopedStyleStrategy = measureStringLiteral(userConfig.scopedStyleStrategy);
   configInfo.trailingSlash = measureStringLiteral(userConfig.trailingSlash);

package/dist/transitions/router.js

@@ -76,6 +76,14 @@ function getFallback() {
 }
 function runScripts() {
   let wait = Promise.resolve();
+  let needsWaitForInlineModuleScript = false;
+  for (const script of document.getElementsByTagName("script")) {
+    script.dataset.astroExec === void 0 && script.getAttribute("type") === "module" && (needsWaitForInlineModuleScript = script.getAttribute("src") === null);
+  }
+  needsWaitForInlineModuleScript && document.body.insertAdjacentHTML(
+    "beforeend",
+    `<script type="module" src="data:application/javascript,"/>`
+  );
   for (const script of document.getElementsByTagName("script")) {
     if (script.dataset.astroExec === "") continue;
     const type = script.getAttribute("type");
@@ -421,6 +429,7 @@ if (inBrowser) {
   }
   for (const script of document.getElementsByTagName("script")) {
     detectScriptExecuted(script);
+    script.dataset.astroExec = "";
   }
 }
 async function prepareForClientOnlyComponents(newDocument, toLocation, signal) {

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

@@ -1,6 +1,6 @@
 import type { OutgoingHttpHeaders } from 'node:http';
 import type { RemotePattern } from '@astrojs/internal-helpers/remote';
-import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
+import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, SyntaxHighlightConfigType } from '@astrojs/markdown-remark';
 import type { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage } from 'unstorage';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
@@ -220,7 +220,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      * When redirects occur in production for GET requests, the redirect will be a 301 (permanent) redirect. For all other request methods, it will be a 308 (permanent, and preserve the request method) redirect.
      *
      * Trailing slashes on prerendered pages are handled by the hosting platform, and may not respect your chosen configuration.
-     * See your hosting platform's documentation for more information.
+     * See your hosting platform's documentation for more information. You cannot use Astro [redirects](#redirects) for this use case at this point.
      *
      * ```js
      * {
@@ -252,7 +252,8 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      *    '/news': {
      *      status: 302,
      *      destination: 'https://example.com/news'
-     *  	}
+     *  	},
+     *    // '/product1/', '/product1' // Note, this is not supported
      * 	}
      * })
      * ```
@@ -276,6 +277,8 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      *     },
      *   }
      * })
+     *
+     *
      * ```
      */
     redirects?: Record<string, RedirectConfig>;
@@ -1048,7 +1051,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * @docs
          * @name image.domains
          * @type {string[]}
-         * @default `{domains: []}`
+         * @default `[]`
          * @version 2.10.10
          * @description
          * Defines a list of permitted image source domains for remote image optimization. No other remote images will be optimized by Astro.
@@ -1070,7 +1073,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * @docs
          * @name image.remotePatterns
          * @type {RemotePattern[]}
-         * @default `{remotePatterns: []}`
+         * @default `[]`
          * @version 2.10.10
          * @description
          * Defines a list of permitted image source URL patterns for remote image optimization.
@@ -1208,14 +1211,15 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         /**
          * @docs
          * @name markdown.syntaxHighlight
-         * @type {'shiki' | 'prism' | false}
-         * @default `shiki`
+         * @type {SyntaxHighlightConfig | SyntaxHighlightConfigType | false}
+         * @default `{ type: 'shiki', excludeLangs: ['math'] }`
          * @description
          * Which syntax highlighter to use for Markdown code blocks (\`\`\`), if any. This determines the CSS classes that Astro will apply to your Markdown code blocks.
+         *
          * - `shiki` - use the [Shiki](https://shiki.style) highlighter (`github-dark` theme configured by default)
          * - `prism` - use the [Prism](https://prismjs.com/) highlighter and [provide your own Prism stylesheet](/en/guides/syntax-highlighting/#add-a-prism-stylesheet)
          * - `false` - do not apply syntax highlighting.
-         *
+
          * ```js
          * {
          *   markdown: {
@@ -1224,8 +1228,52 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          *   }
          * }
          * ```
+         *
+         * For more control over syntax highlighting, you can instead specify a configuration object with the properties listed below.
          */
-        syntaxHighlight?: 'shiki' | 'prism' | false;
+        syntaxHighlight?: {
+            /**
+             * @docs
+             * @name markdown.syntaxHighlight.type
+             * @kind h4
+             * @type {'shiki' | 'prism'}
+             * @default `'shiki'`
+             * @version 5.5.0
+             * @description
+             *
+             * The default CSS classes to apply to Markdown code blocks.
+             * (If no other syntax highlighting configuration is needed, you can instead set `markdown.syntaxHighlight` directly to `shiki`, `prism`, or `false`.)
+             *
+             */
+            type?: SyntaxHighlightConfigType;
+            /**
+             * @docs
+             * @name markdown.syntaxHighlight.excludeLangs
+             * @kind h4
+             * @type {string[]}
+             * @default `['math']`
+             * @version 5.5.0
+             * @description
+             *
+             * An array of languages to exclude from the default syntax highlighting specified in `markdown.syntaxHighlight.type`.
+             * This can be useful when using tools that create diagrams from Markdown code blocks, such as Mermaid.js and D2.
+             *
+             * ```js title="astro.config.mjs"
+             * import { defineConfig } from 'astro/config';
+             *
+             * export default defineConfig({
+             *   markdown: {
+             *     syntaxHighlight: {
+             *       type: 'shiki',
+             *       excludeLangs: ['mermaid', 'math'],
+             *     },
+             *   },
+             * });
+             * ```
+             *
+             * */
+            excludeLangs?: string[];
+        } | SyntaxHighlightConfigType | false;
         /**
          * @docs
          * @name markdown.remarkPlugins
@@ -1320,7 +1368,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      * @name i18n
      * @type {object}
      * @version 3.5.0
-     * @type {object}
      * @description
      *
      * Configures i18n routing and allows you to specify some customization options.
@@ -1388,12 +1435,39 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         /**
          * @docs
          * @name i18n.routing
-         * @type {Routing}
+         * @type {object | "manual"}
+         * @default `object`
          * @version 3.7.0
          * @description
          *
          * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language.
          *
+         * ```js
+         * export default defineConfig({
+         * 	i18n: {
+         * 		defaultLocale: "en",
+         * 		locales: ["en", "fr"],
+         * 		routing: {
+         * 			prefixDefaultLocale: false,
+         * 			redirectToDefaultLocale: true,
+         * 			fallbackType: "redirect",
+         * 		}
+         * 	}
+         * })
+         * ```
+         *
+         * Since 4.6.0, this option can also be set to `manual`. When this routing strategy is enabled, Astro will **disable** its i18n middleware and no other `routing` options (e.g. `prefixDefaultLocale`) may be configured. You will be responsible for writing your own routing logic, or executing Astro's i18n middleware manually alongside your own.
+         *
+         * ```js
+         * export default defineConfig({
+         * 	i18n: {
+         * 		defaultLocale: "en",
+         * 		locales: ["en", "fr"],
+         * 		routing: "manual"
+         * 	}
+         * })
+         * ```
+         *
          */
         routing?: {
             /**
@@ -1490,46 +1564,12 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
              * ```
              */
             fallbackType?: 'redirect' | 'rewrite';
-            /**
-             * @name i18n.routing.strategy
-             * @type {"pathname"}
-             * @default `"pathname"`
-             * @version 3.7.0
-             * @description
-             *
-             * - `"pathname": The strategy is applied to the pathname of the URLs
-             */
-            strategy?: 'pathname';
-        }
+        } | 'manual';
         /**
-         *
          * @docs
-         * @name i18n.routing.manual
-         * @kind h4
-         * @type {string}
-         * @version 4.6.0
-         * @description
-         * When this option is enabled, Astro will **disable** its i18n middleware so that you can implement your own custom logic. No other `routing` options (e.g. `prefixDefaultLocale`) may be configured with `routing: "manual"`.
-         *
-         * You will be responsible for writing your own routing logic, or executing Astro's i18n middleware manually alongside your own.
-         *
-         * ```js
-         * export default defineConfig({
-         * 	i18n: {
-         * 		defaultLocale: "en",
-         * 		locales: ["en", "fr", "pt-br", "es"],
-         * 		routing: {
-         * 			prefixDefaultLocale: true,
-         * 		}
-         * 	}
-         * })
-         * ```
-         */
-         | 'manual';
-        /**
          * @name i18n.domains
          * @type {Record<string, string> }
-         * @default '{}'
+         * @default `{}`
          * @version 4.3.0
          * @description
          *
@@ -1545,9 +1585,9 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * export default defineConfig({
          * 	 site: "https://example.com",
          * 	 output: "server", // required, with no prerendered pages
-         *   adapter: node({
-         *     mode: 'standalone',
-         *   }),
+         * 	 adapter: node({
+         * 	   mode: 'standalone',
+         * 	 }),
          * 	 i18n: {
          *     defaultLocale: "en",
          *     locales: ["en", "fr", "pt-br", "es"],
@@ -1560,7 +1600,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * })
          * ```
          *
-         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/reference/api-reference/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/reference/api-reference/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
+         * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/reference/modules/astro-i18n/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/reference/modules/astro-i18n/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
          *
          * See the [Internationalization Guide](https://docs.astro.build/en/guides/internationalization/#domains) for more details, including the limitations of this feature.
          */
@@ -2003,6 +2043,60 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          * These two virtual modules contain a serializable subset of the Astro configuration.
          */
         serializeConfig?: boolean;
+        /**
+         * @name experimental.headingIdCompat
+         * @type {boolean}
+         * @default `false`
+         * @version 5.5.x
+         * @description
+         *
+         * Enables full compatibility of Markdown headings IDs with common platforms such as GitHub and npm.
+         *
+         * When enabled, IDs for headings ending with non-alphanumeric characters, e.g. `<Picture />`, will
+         * include a trailing `-`, matching standard behavior in other Markdown tooling.
+         */
+        headingIdCompat?: boolean;
+        /**
+         * @name experimental.preserveScriptOrder
+         * @type {boolean}
+         * @default `false`
+         * @version 5.5
+         * @description
+         *
+         * When enabled, `<script>` and `<style>` tags are rendered in the same order as they are defined.
+         *
+         * ## Example
+         *
+         * Consider the following component:
+         *
+         * ```html
+         * <p>I am a component</p>
+         * <style>
+         *   body {
+         *     background: red;
+         *   }
+         * </style>
+         * <style>
+         *   body {
+         *     background: yellow;
+         *   }
+         * </style>
+         * ```
+         *
+         * By default, it will generate a CSS style where `red` will be applied:
+         *
+         * ```css
+         * body {background:#ff0} body {background:red}
+         * ```
+         *
+         * When this new option is set to `true`, the generated CSS style will apply `yellow`:
+         *
+         * ```css
+         * body {background:red} body {background:#ff0}
+         * ```
+         *
+         */
+        preserveScriptOrder?: boolean;
     };
 }
 /**

package/dist/vite-plugin-astro-server/plugin.js

@@ -67,7 +67,7 @@ function createVitePluginAstroServer({
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, null));
       viteServer.watcher.on("change", rebuildManifest);
       function handleUnhandledRejection(rejection) {
-        const error = new AstroError({
+        const error = AstroError.is(rejection) ? rejection : new AstroError({
           ...AstroErrorData.UnhandledRejection,
           message: AstroErrorData.UnhandledRejection.message(rejection?.stack || rejection)
         });

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

@@ -46,6 +46,7 @@ function markdown({ settings, logger }) {
         if (!processor) {
           processor = createMarkdownProcessor({
             image: settings.config.image,
+            experimentalHeadingIdCompat: settings.config.experimental.headingIdCompat,
             ...settings.config.markdown
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.4.3",
+  "version": "5.5.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -103,15 +103,15 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.10.4",
+    "@astrojs/compiler": "^2.11.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
     "@types/cookie": "^0.6.0",
-    "acorn": "^8.14.0",
+    "acorn": "^8.14.1",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
     "boxen": "8.0.1",
-    "ci-info": "^4.1.0",
+    "ci-info": "^4.2.0",
     "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.7.2",
@@ -150,7 +150,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
-    "vite": "^6.2.0",
+    "vite": "^6.2.1",
     "vitefu": "^1.0.6",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
@@ -159,7 +159,7 @@
     "zod-to-json-schema": "^3.24.3",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/markdown-remark": "6.2.1",
+    "@astrojs/markdown-remark": "6.3.0",
     "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
@@ -167,7 +167,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.50.1",
+    "@playwright/test": "^1.51.0",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -195,11 +195,11 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.34.9",
+    "rollup": "^4.35.0",
     "sass": "^1.85.1",
     "undici": "^7.4.0",
     "unified": "^11.0.5",
-    "vitest": "^3.0.7",
+    "vitest": "^3.0.8",
     "astro-scripts": "0.0.14"
   },
   "engines": {