astro 5.15.4 → 6.0.0-alpha.0

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

@@ -1704,14 +1704,14 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
              * @name i18n.routing.redirectToDefaultLocale
              * @kind h4
              * @type {boolean}
-             * @default `true`
+             * @default `false`
              * @version 4.2.0
              * @description
              *
              * Configures whether or not the home URL (`/`) generated by `src/pages/index.astro`
              * will redirect to `/[defaultLocale]` when `prefixDefaultLocale: true` is set.
              *
-             * Set `redirectToDefaultLocale: false` to disable this automatic redirection at the root of your site:
+             * Set `redirectToDefaultLocale: true` to enable this automatic redirection at the root of your site:
              * ```js
              * // astro.config.mjs
              * export default defineConfig({
@@ -1720,7 +1720,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
              * 		locales: ["en", "fr"],
              *     routing: {
              *       prefixDefaultLocale: true,
-             *       redirectToDefaultLocale: false
+             *       redirectToDefaultLocale: true
              *     }
              *   }
              * })
@@ -1921,48 +1921,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
      * These flags allow you to opt in to some deprecated or otherwise outdated behavior of Astro
      * in the latest version, so that you can continue to upgrade and take advantage of new Astro releases.
      */
-    legacy?: {
-        /**
-         *
-         * @name legacy.collections
-         * @type {boolean}
-         * @default `false`
-         * @version 5.0.0
-         * @description
-         * Enable legacy behavior for content collections.
-         *
-         * ```js
-         * // astro.config.mjs
-         * import { defineConfig } from 'astro/config';
-         * export default defineConfig({
-         *   legacy: {
-         *     collections: true
-         *   }
-         * });
-         * ```
-         *
-         * If enabled, `data` and `content` collections (only) are handled using the legacy content collections implementation. Collections with a `loader` (only) will continue to use the Content Layer API instead. Both kinds of collections may exist in the same project, each using their respective implementations.
-         *
-         *  The following limitations continue to exist:
-         *
-         * - Any legacy (`type: 'content'` or `type: 'data'`) collections must continue to be located in the `src/content/` directory.
-         * - These legacy collections will not be transformed to implicitly use the `glob()` loader, and will instead be handled by legacy code.
-         * - Collections using the Content Layer API (with a `loader` defined) are forbidden in `src/content/`, but may exist anywhere else in your project.
-         *
-         * When you are ready to remove this flag and migrate to the new Content Layer API for your legacy collections, you must define a collection for any directories in `src/content/` that you want to continue to use as a collection. It is sufficient to declare an empty collection, and Astro will implicitly generate an appropriate definition for your legacy collections:
-         *
-         * ```js
-         * // src/content.config.ts
-         * import { defineCollection, z } from 'astro:content';
-         *
-         * const blog = defineCollection({ })
-         *
-         * export const collections = { blog };
-         * ```
-         *
-         */
-        collections?: boolean;
-    };
+    legacy?: Record<string, never>;
     /**
      *
      * @kind heading
@@ -2059,19 +2018,6 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
          * see the [Fonts RFC](https://github.com/withastro/roadmap/pull/1039).
          */
         fonts?: FontFamily[];
-        /**
-         * @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.csp
          * @type {boolean | object}
@@ -2310,75 +2256,6 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
              */
             directives?: CspDirective[];
         };
-        /**
-         * @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;
-        /**
-         * @name experimental.liveContentCollections
-         * @type {boolean}
-         * @default `false`
-         * @version 5.10
-         * @description
-         * Enables the use of live content collections.
-         *
-         */
-        liveContentCollections?: boolean;
-        /**
-         * @name experimental.staticImportMetaEnv
-         * @type {boolean}
-         * @default `false`
-         * @version 5.13
-         * @description
-         *
-         * Disables replacement of `import.meta.env` values with `process.env` calls and their coercion
-         *
-         * Currently, non-public `import.meta.env` environment variables are replaced by a reference to `process.env`. Additionally, Astro may also convert the value type of your environment variables used through `import.meta.env`, which can prevent access to some values such as the strings `"true"` (which is converted to a boolean value), and `"1"` (which is converted to a number).
-         *
-         * The `experimental.staticImportMetaEnv` flag simplifies Astro's default behavior, making it easier to understand and use. Astro will no longer replace any `import.meta.env` environment variables with a `process.env` call, nor will it coerce values.
-         *
-         * This flag aligns `import.meta.env`'s behavior in Astro with [Vite](https://vite.dev/guide/env-and-mode.html#env-variables).
-         *
-         * See the [experimental static `import.meta.env` docs](https://docs.astro.build/en/reference/experimental-flags/static-import-meta-env/) for more information.
-         */
-        staticImportMetaEnv?: boolean;
         /**
          * @name experimental.chromeDevtoolsWorkspace
          * @type {boolean}

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

@@ -1,19 +1,33 @@
 import type { z } from 'zod';
 import type { ActionAccept, ActionClient, ActionReturnType } from '../../actions/runtime/server.js';
-import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from '../../core/constants.js';
 import type { AstroCookies } from '../../core/cookies/cookies.js';
 import type { CspDirective, CspHash } from '../../core/csp/config.js';
 import type { AstroSession } from '../../core/session.js';
 import type { AstroComponentFactory } from '../../runtime/server/index.js';
 import type { Params, RewritePayload } from './common.js';
 import type { ValidRedirectStatus } from './config.js';
-import type { AstroInstance, MarkdownInstance, MDXInstance } from './content.js';
 /**
  * Astro global available in all contexts in .astro files
  *
  * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
-export interface AstroGlobal<Props extends Record<string, any> = Record<string, any>, Self = AstroComponentFactory, Params extends Record<string, string | undefined> = Record<string, string | undefined>> extends AstroGlobalPartial, AstroSharedContext<Props, Params> {
+export interface AstroGlobal<Props extends Record<string, any> = Record<string, any>, Self = AstroComponentFactory, Params extends Record<string, string | undefined> = Record<string, string | undefined>> extends AstroSharedContext<Props, Params> {
+    /**
+     * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
+     */
+    site: URL | undefined;
+    /**
+     * Returns a string with the current version of Astro.
+     *
+     * Useful for using `<meta name="generator" content={Astro.generator} />` or crediting Astro in a site footer.
+     *
+     * [HTML Specification for `generator`](https://html.spec.whatwg.org/multipage/semantics.html#meta-generator)
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrogenerator)
+     */
+    generator: string;
     /**
      * A full URL object of the request URL.
      * Equivalent to: `new URL(Astro.request.url)`
@@ -195,42 +209,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
         render(slotName: string, args?: any[]): Promise<string>;
     };
 }
-/** Union type of supported markdown file extensions */
-type MarkdownFileExtension = (typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS)[number];
-export interface AstroGlobalPartial {
-    /**
-     * Fetch local files into your static site setup
-     *
-     * Example usage:
-     * ```typescript
-     * const posts = await Astro.glob('../pages/post/*.md');
-     * ```
-     *
-     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroglob)
-     * @deprecated Astro.glob is deprecated and will be removed in the next major version of Astro. Use `import.meta.glob` instead: https://vitejs.dev/guide/features.html#glob-import
-     */
-    glob(globStr: `${any}.astro`): Promise<AstroInstance[]>;
-    glob<T extends Record<string, any>>(globStr: `${any}${MarkdownFileExtension}`): Promise<MarkdownInstance<T>[]>;
-    glob<T extends Record<string, any>>(globStr: `${any}.mdx`): Promise<MDXInstance<T>[]>;
-    glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
-    /**
-     * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
-     *
-     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
-     */
-    site: URL | undefined;
-    /**
-     * Returns a string with the current version of Astro.
-     *
-     * Useful for using `<meta name="generator" content={Astro.generator} />` or crediting Astro in a site footer.
-     *
-     * [HTML Specification for `generator`](https://html.spec.whatwg.org/multipage/semantics.html#meta-generator)
-     *
-     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrogenerator)
-     */
-    generator: string;
-}
-export interface AstroSharedContext<Props extends Record<string, any> = Record<string, any>, RouteParams extends Record<string, string | undefined> = Record<string, string | undefined>> {
+interface AstroSharedContext<Props extends Record<string, any> = Record<string, any>, RouteParams extends Record<string, string | undefined> = Record<string, string | undefined>> {
     /**
      * The address (usually IP address) of the user.
      *

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

@@ -184,11 +184,6 @@ export interface BaseIntegrationHooks {
     }) => void | Promise<void>;
     'astro:build:ssr': (options: {
         manifest: SerializedSSRManifest;
-        /**
-         * This maps a {@link RouteData} to an {@link URL}, this URL represents
-         * the physical file you should import.
-         */
-        entryPoints: Map<IntegrationRouteData, URL>;
         /**
          * File path of the emitted middleware
          */
@@ -215,8 +210,6 @@ export interface BaseIntegrationHooks {
             pathname: string;
         }[];
         dir: URL;
-        /** @deprecated Use the `assets` map and the new `astro:routes:resolved` hook */
-        routes: IntegrationRouteData[];
         assets: Map<string, URL[]>;
         logger: AstroIntegrationLogger;
     }) => void | Promise<void>;
@@ -237,16 +230,6 @@ export interface AstroIntegration {
         [K in keyof Astro.IntegrationHooks]?: Astro.IntegrationHooks[K];
     } & Partial<Record<string, unknown>>;
 }
-/**
- * A smaller version of the {@link RouteData} that is used in the integrations.
- * @deprecated Use {@link IntegrationResolvedRoute}
- */
-export type IntegrationRouteData = Omit<RouteData, 'isIndex' | 'fallbackRoutes' | 'redirectRoute' | 'origin'> & {
-    /**
-     * {@link RouteData.redirectRoute}
-     */
-    redirectRoute?: IntegrationRouteData;
-};
 export type RouteToHeaders = Map<string, HeaderPayload>;
 export type HeaderPayload = {
     headers: Headers;

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

@@ -4,7 +4,7 @@ import type { AstroCookies } from '../../core/cookies/cookies.js';
 import type { AstroComponentInstance, ServerIslandComponent } from '../../runtime/server/index.js';
 import type { Params } from './common.js';
 import type { AstroConfig, RedirectConfig } from './config.js';
-import type { AstroGlobal, AstroGlobalPartial } from './context.js';
+import type { AstroGlobal } from './context.js';
 import type { AstroRenderer } from './integrations.js';
 export type { SSRActions, SSRManifest, SSRManifestCSP } from '../../core/app/types.js';
 export interface NamedSSRLoadedRendererValue extends SSRLoadedRendererValue {
@@ -202,7 +202,7 @@ export interface SSRResult {
     links: Set<SSRElement>;
     componentMetadata: Map<string, SSRComponentMetadata>;
     inlinedScripts: Map<string, string>;
-    createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
+    createAstro(props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     params: Params;
     resolve: (s: string) => Promise<string>;
     response: AstroGlobal['response'];

package/dist/virtual-modules/live-config.d.ts

@@ -3,8 +3,6 @@ export { defineLiveCollection } from '../content/config.js';
 export declare const getCollection: () => never;
 export declare const render: () => never;
 export declare const getEntry: () => never;
-export declare const getEntryBySlug: () => never;
-export declare const getDataEntryById: () => never;
 export declare const getEntries: () => never;
 export declare const reference: () => never;
 export declare const getLiveCollection: () => never;

package/dist/virtual-modules/live-config.js

@@ -14,8 +14,6 @@ function createErrorFunction(message) {
 const getCollection = createErrorFunction("getCollection");
 const render = createErrorFunction("render");
 const getEntry = createErrorFunction("getEntry");
-const getEntryBySlug = createErrorFunction("getEntryBySlug");
-const getDataEntryById = createErrorFunction("getDataEntryById");
 const getEntries = createErrorFunction("getEntries");
 const reference = createErrorFunction("reference");
 const getLiveCollection = createErrorFunction("getLiveCollection");
@@ -25,10 +23,8 @@ export {
   defineCollection,
   defineLiveCollection,
   getCollection,
-  getDataEntryById,
   getEntries,
   getEntry,
-  getEntryBySlug,
   getLiveCollection,
   getLiveEntry,
   reference,

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

@@ -46,7 +46,6 @@ 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.15.4",
+  "version": "6.0.0-alpha.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -77,14 +77,14 @@
     "./virtual-modules/*": "./dist/virtual-modules/*"
   },
   "bin": {
-    "astro": "astro.js"
+    "astro": "./bin/astro.mjs"
   },
   "files": [
     "components/*.{astro,css,ts}",
     "tsconfigs",
     "dist",
     "types",
-    "astro.js",
+    "bin",
     "env.d.ts",
     "client.d.ts",
     "jsx-runtime.d.ts",
@@ -94,11 +94,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.12.2",
+    "@astrojs/compiler": "0.0.0-render-script-20251003120459",
     "@capsizecss/unpack": "^3.0.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.2.0",
-    "acorn": "^8.15.0",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
     "boxen": "8.0.1",
@@ -115,13 +114,11 @@
     "dset": "^3.1.4",
     "es-module-lexer": "^1.7.0",
     "esbuild": "^0.25.0",
-    "estree-walker": "^3.0.3",
     "flattie": "^1.1.1",
     "fontace": "~0.3.0",
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
-    "import-meta-resolve": "^4.2.0",
     "js-yaml": "^4.1.0",
     "magic-string": "^0.30.18",
     "magicast": "^0.3.5",
@@ -145,7 +142,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.17.0",
     "vfile": "^6.0.3",
-    "vite": "^6.4.1",
+    "vite": "^7.1.7",
     "vitefu": "^1.1.1",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
@@ -154,7 +151,7 @@
     "zod-to-json-schema": "^3.24.6",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.7.4",
-    "@astrojs/markdown-remark": "6.3.8",
+    "@astrojs/markdown-remark": "7.0.0-alpha.0",
     "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
@@ -194,11 +191,11 @@
     "undici": "^6.21.3",
     "unified": "^11.0.5",
     "vitest": "^3.2.4",
-    "@astrojs/check": "0.9.5",
+    "@astrojs/check": "0.9.6-alpha.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0",
+    "node": "^20.19.5 || >=22.12.0",
     "npm": ">=9.6.5",
     "pnpm": ">=7.1.0"
   },

package/templates/content/module.mjs

@@ -1,11 +1,9 @@
 // astro-head-inject
 import {
-	createCollectionToGlobResultMap,
+	createDeprecatedFunction,
 	createGetCollection,
-	createGetDataEntryById,
 	createGetEntries,
 	createGetEntry,
-	createGetEntryBySlug,
 	createGetLiveCollection,
 	createGetLiveEntry,
 	createReference,
@@ -20,76 +18,17 @@ export { z } from 'astro/zod';
 
 /* @@LIVE_CONTENT_CONFIG@@ */
 
-const contentDir = '@@CONTENT_DIR@@';
-
-const contentEntryGlob = '@@CONTENT_ENTRY_GLOB_PATH@@';
-const contentCollectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: contentEntryGlob,
-	contentDir,
-});
-
-const dataEntryGlob = '@@DATA_ENTRY_GLOB_PATH@@';
-const dataCollectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: dataEntryGlob,
-	contentDir,
-});
-const collectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: { ...contentEntryGlob, ...dataEntryGlob },
-	contentDir,
-});
-
-let lookupMap = {};
-/* @@LOOKUP_MAP_ASSIGNMENT@@ */
-
-const collectionNames = new Set(Object.keys(lookupMap));
-
-function createGlobLookup(glob) {
-	return async (collection, lookupId) => {
-		const filePath = lookupMap[collection]?.entries[lookupId];
-
-		if (!filePath) return undefined;
-		return glob[collection][filePath];
-	};
-}
-
-const renderEntryGlob = '@@RENDER_ENTRY_GLOB_PATH@@';
-const collectionToRenderEntryMap = createCollectionToGlobResultMap({
-	globResult: renderEntryGlob,
-	contentDir,
-});
-
-const cacheEntriesByCollection = new Map();
 export const getCollection = createGetCollection({
-	contentCollectionToEntryMap,
-	dataCollectionToEntryMap,
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	cacheEntriesByCollection,
 	liveCollections,
 });
 
 export const getEntry = createGetEntry({
-	getEntryImport: createGlobLookup(collectionToEntryMap),
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	collectionNames,
 	liveCollections,
 });
 
-export const getEntryBySlug = createGetEntryBySlug({
-	getEntryImport: createGlobLookup(contentCollectionToEntryMap),
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	collectionNames,
-	getEntry,
-});
-
-export const getDataEntryById = createGetDataEntryById({
-	getEntryImport: createGlobLookup(dataCollectionToEntryMap),
-	collectionNames,
-	getEntry,
-});
-
 export const getEntries = createGetEntries(getEntry);
 
-export const reference = createReference({ lookupMap });
+export const reference = createReference();
 
 export const getLiveCollection = createGetLiveCollection({
 	liveCollections,
@@ -98,3 +37,9 @@ export const getLiveCollection = createGetLiveCollection({
 export const getLiveEntry = createGetLiveEntry({
 	liveCollections,
 });
+
+// TODO: remove in Astro 7
+export const getEntryBySlug = createDeprecatedFunction('getEntryBySlug');
+
+// TODO: remove in Astro 7
+export const getDataEntryById = createDeprecatedFunction('getDataEntryById');