astro 5.6.1 → 5.7.0

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

@@ -3,6 +3,7 @@ import type { RemotePattern } from '@astrojs/internal-helpers/remote';
 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 { AstroFontProvider, FontFamily } from '../../assets/fonts/types.js';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
 import type { AssetsPrefix } from '../../core/app/types.js';
 import type { AstroConfigType } from '../../core/config/schemas/index.js';
@@ -15,6 +16,7 @@ export type Locales = (string | {
     codes: [string, ...string[]];
     path: string;
 })[];
+export type { AstroFontProvider as FontProvider };
 type NormalizeLocales<T extends Locales> = {
     [K in keyof T]: T[K] extends string ? T[K] : T[K] extends {
         codes: Array<string>;
@@ -142,7 +144,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
  * Docs: https://docs.astro.build/reference/configuration-reference/
  *
  * Generics do not follow semver and may change at any time.
- */ export interface AstroUserConfig<TLocales extends Locales = never, TSession extends SessionDriverName = never> {
+ */ export interface AstroUserConfig<TLocales extends Locales = never, TSession extends SessionDriverName = never, TFontFamilies extends FontFamily[] = never> {
     /**
      * @docs
      * @kind heading
@@ -251,7 +253,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
      *    '/news': {
      *      status: 302,
      *      destination: 'https://example.com/news'
-     *  	},
+     *    },
      *    // '/product1/', '/product1' // Note, this is not supported
      * 	}
      * })
@@ -516,35 +518,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          */
         checkOrigin?: boolean;
     };
-    /**
-     * @docs
-     * @name session
-     * @type {SessionConfig}
-     * @version 5.3.0
-     * @description
-     *
-     * Configures experimental session support by specifying a storage `driver` as well as any associated `options`.
-     * You must enable the `experimental.session` flag to use this feature.
-     * Some adapters may provide a default session driver, but you can override it with your own configuration.
-     *
-     * You can specify [any driver from Unstorage](https://unstorage.unjs.io/drivers) or provide a custom config which will override your adapter's default.
-     *
-     * See [the experimental session guide](https://docs.astro.build/en/reference/experimental-flags/sessions/) for more information.
-     *
-     * ```js title="astro.config.mjs"
-     *   {
-     *     session: {
-     *       // Required: the name of the Unstorage driver
-     *       driver: 'redis',
-     *       // The required options depend on the driver
-     *       options: {
-     *         url: process.env.REDIS_URL,
-     *       },
-     *     }
-     *   }
-     * ```
-     */
-    session?: SessionConfig<TSession>;
     /**
      * @docs
      * @name vite
@@ -893,6 +866,146 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
     server?: ServerConfig | ((options: {
         command: 'dev' | 'preview';
     }) => ServerConfig);
+    /**
+     * @docs
+     * @kind heading
+     * @version 5.7.0
+     * @name Session Options
+     * @description
+     *
+     * Configures session storage for your Astro project. This is used to store session data in a persistent way, so that it can be accessed across different requests.
+     * Some adapters may provide a default session driver, but you can override it with your own configuration.
+     *
+     * See [the sessions guide](https://docs.astro.build/en/guides/sessions/) for more information.
+     *
+     * ```js title="astro.config.mjs"
+     *   {
+     *     session: {
+     *       // The name of the Unstorage driver
+     *       driver: 'redis',
+     *       // The required options depend on the driver
+     *       options: {
+     *         url: process.env.REDIS_URL,
+     *       },
+     *       ttl: 3600, // 1 hour
+     *     }
+     *   }
+     * ```
+     */
+    session?: SessionConfig<TSession>;
+    /**
+     * @docs
+     * @name session.driver
+     * @type {string | undefined}
+     * @version 5.7.0
+     * @description
+     *
+     * The Unstorage driver to use for session storage.  The [Node](https://docs.astro.build/en/guides/integrations-guide/node/#sessions),
+     * [Cloudflare](https://docs.astro.build/en/guides/integrations-guide/cloudflare/#sessions), and
+     * [Netlify](/en/guides/integrations-guide/netlify/#sessions) adapters automatically configure a default driver for you,
+     * but you can specify your own if you would prefer or if you are using an adapter that does not provide one.
+     *
+     * The value is the "Driver name" from the [Unstorage driver documentation](https://unstorage.unjs.io/drivers).
+     *
+     * ```js title="astro.config.mjs" ins={4}
+     * {
+     *   adapter: vercel(),
+     *   session: {
+     *     driver: "redis",
+     *   },
+     * }
+     * ```
+     * :::note
+     * Some drivers may need extra packages to be installed. Some drivers may also require environment variables or credentials to be set. See the [Unstorage documentation](https://unstorage.unjs.io/drivers) for more information.
+     * :::
+     *
+     */
+    /**
+     * @docs
+     * @name session.options
+     * @type {Record<string, unknown> | undefined}
+     * @version 5.7.0
+     * @default `{}`
+     * @description
+     *
+     * The driver-specific options to use for session storage. The options depend on the driver you are using. See the [Unstorage documentation](https://unstorage.unjs.io/drivers)
+     * for more information on the options available for each driver.
+     *
+     * ```js title="astro.config.mjs" ins={4-6}
+     * {
+     *    session: {
+     *      driver: "redis",
+     *      options: {
+     *        url: process.env.REDIS_URL
+     *      },
+     *    }
+     * }
+     * ```
+     */
+    /**
+     * @docs
+     * @name session.cookie
+     * @type {string | AstroCookieSetOptions | undefined}
+     * @version 5.7.0
+     * @default `{ name: "astro-session", sameSite: "lax", httpOnly: true, secure: true }`
+     * @description
+     *
+     * The session cookie configuration. If set to a string, it will be used as the cookie name.
+     * Alternatively, you can pass an object with additional options. These will be merged with the defaults.
+     *
+     * ```js title="astro.config.mjs" ins={3-4}
+     * {
+     *  session: {
+     *    // If set to a string, it will be used as the cookie name.
+     *    cookie: "my-session-cookie",
+     *  }
+     * }
+     *
+     * ```
+     *
+     * ```js title="astro.config.mjs" ins={4-8}
+     * {
+     *  session: {
+     *    // If set to an object, it will be used as the cookie options.
+     *    cookie: {
+     *      name: "my-session-cookie",
+     *      sameSite: "lax",
+     *      secure: true,
+     *    }
+     *  }
+     * }
+     * ```
+     */
+    /**
+     * @docs
+     * @name session.ttl
+     * @version 5.7.0
+     * @type {number | undefined}
+     * @default {Infinity}
+     * @description
+     *
+     * An optional default time-to-live expiration period for session values, in seconds.
+     *
+     * By default, session values persist until they are deleted or the session is destroyed, and do not automatically expire because a particular amount of time has passed.
+     * Set `session.ttl` to add a default expiration period for your session values. Passing a `ttl` option to [`session.set()`](https://docs.astro.build/en/reference/api-reference/#set) will override the global default
+     * for that individual entry.
+     *
+     * ```js title="astro.config.mjs" ins={3-4}
+     * {
+     *  session: {
+     *    // Set a default expiration period of 1 hour (3600 seconds)
+     *    ttl: 3600,
+     *  }
+     * }
+     * ```
+     * :::note
+     * Setting a value for `ttl` does not automatically delete the value from storage after the time limit has passed.
+     *
+     * Values from storage will only be deleted when there is an attempt to access them after the `ttl` period has expired. At this time, the session value will be undefined and only then will the value be deleted.
+     *
+     * Individual drivers may also support a `ttl` option that will automatically delete sessions after the specified time. See your chosen driver's documentation for more information.
+     * :::
+     */
     /**
      * @docs
      * @kind heading
@@ -1844,7 +1957,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
          *
          * ```js title=astro.config.mjs
          * {
-         *  	experimental: {
+         *    experimental: {
          * 			responsiveImages: true,
          * 		},
          * }
@@ -1950,77 +2063,22 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
         responsiveImages?: boolean;
         /**
          *
-         * @name experimental.session
-         * @type {boolean}
-         * @default `false`
-         * @version 5.0.0
-         * @description
-         *
-         * Enables support for sessions in Astro. Sessions are used to store user data across requests, such as user authentication state.
-         *
-         * When enabled you can access the `Astro.session` object to read and write data that persists across requests. You can configure the session driver using the [`session` option](#session), or use the default provided by your adapter.
-         *
-         * ```astro title=src/components/CartButton.astro
-         * ---
-         * export const prerender = false; // Not needed in 'server' mode
-         * const cart = await Astro.session.get('cart');
-         * ---
-         *
-         * <a href="/checkout">🛒 {cart?.length ?? 0} items</a>
-         *
-         * ```
-         *
-         * For more details, see [the experimental session guide](https://docs.astro.build/en/reference/experimental-flags/sessions/).
-         *
-         */
-        session?: boolean;
-        /**
-         *
-         * @name experimental.svg
-         * @type {boolean}
-         * @default `undefined`
-         * @version 5.x
+         * @name experimental.fonts
+         * @type {FontFamily[]}
+         * @version 5.7
          * @description
          *
-         * This feature allows you to import SVG files directly into your Astro project. By default, Astro will inline the SVG content into your HTML output.
-         *
-         * To enable this feature, set `experimental.svg` to `true` in your Astro config:
-         *
-         * ```js
-         * {
-         *   experimental: {
-         * 	   svg: true,
-         * 	 },
-         * }
-         * ```
-         *
-         * To use this feature, import an SVG file in your Astro project, passing any common SVG attributes to the imported component.
-         * Astro also provides a `size` attribute to set equal `height` and `width` properties:
+         * This experimental feature allows you to use fonts from your filesystem and various providers
+         * (eg. Google, Fontsource, Bunny...) through a unified, fully customizable and type-safe API.
          *
-         * ```astro
-         * ---
-         * import Logo from './path/to/svg/file.svg';
-         * ---
-         *
-         * <Logo size={24} />
-         * ```
+         * Web fonts can impact page performance at both load time and rendering time. This feature provides
+         * automatic [optimization](https://web.dev/learn/performance/optimize-web-fonts) by creating
+         * preload links and optimized fallbacks. This API includes opinionated defaults to keep your sites lightweight and performant (e.g. minimal font files downloaded) while allowing for extensive customization so you can opt in to greater control.
          *
          * For a complete overview, and to give feedback on this experimental API,
-         * see the [Feature RFC](https://github.com/withastro/roadmap/pull/1035).
-         */
-        svg?: boolean;
-        /**
-         * @name experimental.serializeConfig
-         * @type {boolean}
-         * @default `false`
-         * @version 5.x
-         * @description
-         *
-         * Enables the use of the experimental virtual modules `astro:config/server` and `astro:config/client`.
-         *
-         * These two virtual modules contain a serializable subset of the Astro configuration.
+         * see the [Fonts RFC](https://github.com/withastro/roadmap/pull/1039).
          */
-        serializeConfig?: boolean;
+        fonts?: [TFontFamilies] extends [never] ? FontFamily[] : TFontFamilies;
         /**
          * @name experimental.headingIdCompat
          * @type {boolean}
@@ -2133,4 +2191,3 @@ declare global {
         type Database = Record<string, any>;
     }
 }
-export {};

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

@@ -258,6 +258,7 @@ export interface SSRMetadata {
     renderedScripts: Set<string>;
     hasDirectives: Set<string>;
     hasRenderedHead: boolean;
+    hasRenderedServerIslandRuntime: boolean;
     headInTree: boolean;
     extraHead: string[];
     propagators: Set<AstroComponentInstance>;

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

@@ -163,7 +163,7 @@ function createDevelopmentManifest(settings) {
         onRequest: NOOP_MIDDLEWARE_FN
       };
     },
-    sessionConfig: settings.config.experimental.session ? settings.config.session : void 0
+    sessionConfig: settings.config.session
   };
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.6.1",
+  "version": "5.7.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -65,6 +65,7 @@
     "./assets/endpoint/*": "./dist/assets/endpoint/*.js",
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/noop": "./dist/assets/services/noop.js",
+    "./assets/fonts/providers/*": "./dist/assets/fonts/providers/entrypoints/*.js",
     "./loaders": "./dist/content/loaders/index.js",
     "./content/runtime": "./dist/content/runtime.js",
     "./content/runtime-assets": "./dist/content/runtime-assets.js",
@@ -104,6 +105,8 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.11.0",
+    "@capsizecss/metrics": "^3.5.0",
+    "@capsizecss/unpack": "^2.4.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
     "acorn": "^8.14.1",
@@ -146,10 +149,11 @@
     "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.5",
     "ultrahtml": "^1.6.0",
+    "unifont": "^0.1.7",
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
-    "vite": "^6.2.4",
+    "vite": "^6.2.6",
     "vitefu": "^1.0.6",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
@@ -157,9 +161,9 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
+    "@astrojs/internal-helpers": "0.6.1",
     "@astrojs/markdown-remark": "6.3.1",
-    "@astrojs/telemetry": "3.2.0",
-    "@astrojs/internal-helpers": "0.6.1"
+    "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -224,7 +228,7 @@
     "test:e2e:match": "playwright test -g",
     "test:e2e:chrome": "playwright test",
     "test:e2e:firefox": "playwright test --config playwright.firefox.config.js",
-    "test:types": "tsc --project tsconfig.tests.json",
+    "test:types": "tsc --project test/types/tsconfig.json",
     "test:unit": "astro-scripts test \"test/units/**/*.test.js\" --teardown ./test/units/teardown.js",
     "test:integration": "astro-scripts test \"test/*.test.js\""
   }

package/types/fonts.d.ts

@@ -0,0 +1,4 @@
+declare module 'astro:assets' {
+	/** @internal Run `astro dev` or `astro sync` to generate high fidelity types */
+	export type FontFamily = string;
+}