astro 5.4.2 → 5.5.0

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/index.d.ts

@@ -1,9 +1,9 @@
 import type * as vite from 'vite';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
-import type { PluginCssMetadata as AstroPluginCssMetadata, PluginMetadata as AstroPluginMetadata } from './types.js';
+import type { PluginMetadata as AstroPluginMetadata } from './types.js';
 export { getAstroMetadata } from './metadata.js';
-export type { AstroPluginMetadata, AstroPluginCssMetadata };
+export type { AstroPluginMetadata };
 interface AstroPluginOptions {
     settings: AstroSettings;
     logger: Logger;

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

@@ -89,15 +89,9 @@ function astro({ settings, logger }) {
           result.dependencies?.forEach((dep) => this.addWatchFile(dep));
           return {
             code: result.code,
-            // This metadata is used by `cssScopeToPlugin` to remove this module from the bundle
-            // if the `filename` default export (the Astro component) is unused.
-            meta: result.isGlobal ? void 0 : {
-              astroCss: {
-                cssScopeTo: {
-                  [filename]: ["default"]
-                }
-              }
-            }
+            // `vite.cssScopeTo` is a Vite feature that allows this CSS to be treeshaken
+            // if the Astro component's default export is not used
+            meta: result.isGlobal ? void 0 : { vite: { cssScopeTo: [filename, "default"] } }
           };
         }
         case "script": {

package/dist/vite-plugin-astro/types.d.ts

@@ -15,26 +15,6 @@ export interface PluginMetadata {
         pageOptions: PageOptions;
     };
 }
-export interface PluginCssMetadata {
-    astroCss: {
-        /**
-         * For Astro CSS virtual modules, it can scope to the main Astro module's default export
-         * so that if those exports are treeshaken away, the CSS module will also be treeshaken.
-         *
-         * Example config if the CSS id is `/src/Foo.astro?astro&type=style&lang.css`:
-         * ```js
-         * cssScopeTo: {
-         *   '/src/Foo.astro': ['default']
-         * }
-         * ```
-         *
-         * The above is the only config we use today, but we're exposing as a `Record` to follow the
-         * upstream Vite implementation: https://github.com/vitejs/vite/pull/16058. When/If that lands,
-         * we can also remove our custom implementation.
-         */
-        cssScopeTo: Record<string, string[]>;
-    };
-}
 export interface CompileMetadata {
     /** Used for HMR to compare code changes */
     originalCode: string;

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.2",
+  "version": "5.5.0",
   "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",
@@ -137,8 +137,8 @@
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
     "p-queue": "^8.1.0",
+    "package-manager-detector": "^1.0.0",
     "picomatch": "^4.0.2",
-    "preferred-pm": "^4.1.1",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.7.1",
@@ -150,17 +150,16 @@
     "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",
-    "which-pm": "^3.0.1",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
     "yocto-spinner": "^0.2.1",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.6.0",
-    "@astrojs/markdown-remark": "6.2.0",
+    "@astrojs/markdown-remark": "6.3.0",
+    "@astrojs/internal-helpers": "0.6.1",
     "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
@@ -168,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",
@@ -196,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": {