astro 6.3.3 → 6.3.5

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

@@ -2647,21 +2647,38 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
     experimental?: {
         /**
          * @name experimental.advancedRouting
-         * @type {boolean}
+         * @type {boolean | object}
          * @default `false`
          * @description
          * Enables `src/app.ts` as an advanced routing entrypoint, allowing you to
          * compose Astro's request pipeline with the Web Fetch standard or your own Hono middleware.
          *
+         * Pass `true` to enable with default settings, or an object to customize:
+         *
          * ```js
          * export default defineConfig({
          *   experimental: {
-         *     advancedRouting: true,
+         *     advancedRouting: {
+         *       fetchFile: 'fetch.ts',
+         *     },
          *   },
          * });
          * ```
          */
-        advancedRouting?: boolean;
+        advancedRouting?: boolean | {
+            /**
+             * @name experimental.advancedRouting.fetchFile
+             * @type {string | null}
+             * @default 'app'
+             * @description
+             *
+             * Customizes the file used as the advanced routing entrypoint inside `srcDir`.
+             * Defaults to `'app'`, meaning Astro looks for `src/app.ts`.
+             *
+             * If you already have a `src/app.ts` file in use for other purposes, define a different filename or set the value to `null` to disable the entrypoint.
+             */
+            fetchFile?: string | null;
+        };
         /**
          *
          * @name experimental.clientPrerender

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

@@ -126,7 +126,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
  *
  * [Astro reference](https://docs.astro.build/en/reference/api-reference/)
  */
-export interface APIContext<Props extends Record<string, any> = Record<string, any>, Params extends Record<string, string | undefined> = Record<string, string | undefined>> {
+export interface APIContext<Props extends Record<string, any> = Record<string, any>, Params extends Record<string, string | undefined> = Record<string, string | undefined>> extends App.Providers {
     /**
      * The site provided in the astro config, parsed as an instance of `URL`, without base.
      * `undefined` if the site is not provided in the config.

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

@@ -12,6 +12,25 @@ declare global {
          */
         interface SessionData {
         }
+        /**
+         * Declare custom context providers to get typed access on `Astro` and `ctx`.
+         * Libraries and users register providers via `state.provide(key, { create, finalize? })`,
+         * and the corresponding types are declared here using module augmentation.
+         *
+         * Built-in providers like `session` are already typed by Astro and don't
+         * need to be declared here.
+         *
+         * @example
+         * ```ts
+         * declare namespace App {
+         *   interface Providers {
+         *     oauth: import('./lib/oauth').OAuthSession;
+         *   }
+         * }
+         * ```
+         */
+        interface Providers {
+        }
     }
     namespace Astro {
         interface IntegrationHooks extends BaseIntegrationHooks {

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

@@ -9,6 +9,7 @@ export type { AstroIntegrationLogger } from '../../core/logger/core.js';
 export type { AstroSession } from '../../core/session/runtime.js';
 export type { ToolbarServerHelpers } from '../../runtime/client/dev-toolbar/helpers.js';
 export type { AstroEnvironmentNames } from '../../core/constants.js';
+export type { Fetchable } from '../../core/fetch/types.js';
 export type { SessionDriver, SessionDriverConfig } from '../../core/session/types.js';
 export type { CacheProvider, CacheProviderConfig, CacheProviderFactory, CacheOptions, InvalidateOptions, } from '../../core/cache/types.js';
 export type * from './common.js';

package/dist/vite-plugin-app/app.js

@@ -125,17 +125,6 @@ class AstroServerApp extends BaseApp {
     if (url.pathname.endsWith("/") && !shouldAppendForwardSlash(this.manifest.trailingSlash, this.manifest.buildFormat)) {
       url.pathname = url.pathname.slice(0, -1);
     }
-    let body = void 0;
-    if (!(incomingRequest.method === "GET" || incomingRequest.method === "HEAD")) {
-      let bytes = [];
-      await new Promise((resolve) => {
-        incomingRequest.on("data", (part) => {
-          bytes.push(part);
-        });
-        incomingRequest.on("end", resolve);
-      });
-      body = Buffer.concat(bytes);
-    }
     const self = this;
     await self.#loadFetchHandler();
     let handled = true;
@@ -155,6 +144,17 @@ class AstroServerApp extends BaseApp {
           handled = false;
           return;
         }
+        let body = void 0;
+        if (!(incomingRequest.method === "GET" || incomingRequest.method === "HEAD")) {
+          let bytes = [];
+          await new Promise((resolve) => {
+            incomingRequest.on("data", (part) => {
+              bytes.push(part);
+            });
+            incomingRequest.on("end", resolve);
+          });
+          body = Buffer.concat(bytes);
+        }
         const request = createRequest({
           url,
           headers: incomingRequest.headers,

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

@@ -107,17 +107,18 @@ function createVitePluginAstroServer({
               }
               try {
                 const pathname = decodeURI(new URL(request.url, "http://localhost").pathname);
-                const { routes } = await prerenderHandler.environment.runner.import("virtual:astro:routes");
-                const routesList = { routes: routes.map((r) => r.routeData) };
+                const { routes } = await prerenderHandler.environment.runner.import(
+                  "virtual:astro:routes"
+                );
+                const routesList = { routes: routes.map((route) => route.routeData) };
                 const matches = matchAllRoutes(pathname, routesList);
                 if (!matches.some((route) => route.prerender)) {
                   return next();
                 }
-                const handled = await new Promise((resolve) => {
-                  localStorage.run(request, () => {
-                    prerenderHandler.handler(request, response, { prerenderOnly: true }).then((result) => resolve(result)).catch(() => resolve(true));
-                  });
-                });
+                const handled = await localStorage.run(
+                  request,
+                  () => prerenderHandler.handler(request, response, { prerenderOnly: true })
+                );
                 if (!handled) {
                   return next();
                 }

package/dist/vite-plugin-hmr-reload/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 /**
  * The very last Vite plugin to reload the browser if any SSR-only module are updated
  * which will require a full page reload. This mimics the behaviour of Vite 5 where

package/dist/vite-plugin-hmr-reload/index.js

@@ -1,3 +1,4 @@
+import { isRunnableDevEnvironment } from "vite";
 import { VIRTUAL_PAGE_RESOLVED_MODULE_ID } from "../vite-plugin-pages/const.js";
 import { getDevCssModuleNameFromPageVirtualModuleName } from "../vite-plugin-css/util.js";
 import { isAstroServerEnvironment } from "../environments.js";
@@ -16,7 +17,7 @@ function hmrReload() {
     enforce: "post",
     hotUpdate: {
       order: "post",
-      handler({ modules, server, timestamp }) {
+      handler({ modules, server, timestamp, file }) {
         if (!isAstroServerEnvironment(this.environment)) return;
         let hasSsrOnlyModules = false;
         let hasSkippedStyleModules = false;
@@ -30,6 +31,12 @@ function hmrReload() {
           const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
           if (clientModule != null) continue;
           this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
+          if (isRunnableDevEnvironment(this.environment)) {
+            const runnerModule = this.environment.runner.evaluatedModules.getModuleById(mod.id);
+            if (runnerModule) {
+              this.environment.runner.evaluatedModules.invalidateModule(runnerModule);
+            }
+          }
           hasSsrOnlyModules = true;
         }
         for (const invalidatedModule of invalidatedModules) {
@@ -43,6 +50,13 @@ function hmrReload() {
         }
         if (hasSsrOnlyModules) {
           server.ws.send({ type: "full-reload" });
+          if (!isRunnableDevEnvironment(this.environment)) {
+            this.environment.hot.send({
+              type: "full-reload",
+              triggeredBy: file,
+              path: "*"
+            });
+          }
           return [];
         }
         if (hasSkippedStyleModules) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -164,9 +164,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
+    "@astrojs/telemetry": "3.3.2",
     "@astrojs/markdown-remark": "7.1.2",
-    "@astrojs/internal-helpers": "0.9.1",
-    "@astrojs/telemetry": "3.3.2"
+    "@astrojs/internal-helpers": "0.9.1"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -198,7 +198,7 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.58.0",
     "sass": "^1.98.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "undici": "^7.22.0",
     "unified": "^11.0.5",
     "vitest": "^4.1.0",
@@ -223,8 +223,8 @@
     "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:types",
-    "test:match": "astro-scripts test \"test/**/*.test.js\" --match",
-    "test:cli": "astro-scripts test \"test/**/cli.test.js\"",
+    "test:match": "astro-scripts test \"test/**/*.test.ts\" --match",
+    "test:cli": "astro-scripts test \"test/**/cli.test.ts\"",
     "test:e2e": "pnpm test:e2e:chrome && pnpm test:e2e:firefox",
     "test:e2e:match": "playwright test -g",
     "test:e2e:chrome": "playwright test",

package/templates/content/types.d.ts

@@ -134,6 +134,7 @@ declare module 'astro:content' {
 	type ExtractEntryFilterType<T> = ExtractLoaderTypes<T>['entryFilter'];
 	type ExtractCollectionFilterType<T> = ExtractLoaderTypes<T>['collectionFilter'];
 	type ExtractErrorType<T> = ExtractLoaderTypes<T>['error'];
+	type ExtractDataType<T> = ExtractLoaderTypes<T>['data'];
 
 	type LiveLoaderDataType<C extends keyof LiveContentConfig['collections']> =
 		LiveContentConfig['collections'][C]['schema'] extends undefined