@astrojs/cloudflare 12.5.4 → 12.6.0

package/dist/entrypoints/server.d.ts

@@ -1,4 +1,4 @@
-import type { CacheStorage as CLOUDFLARE_CACHESTORAGE, Request as CLOUDFLARE_REQUEST, ExecutionContext } from '@cloudflare/workers-types';
+import type { ExecutionContext, ExportedHandlerFetchHandler } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 type Env = {
     [key: string]: unknown;
@@ -7,21 +7,9 @@ type Env = {
     };
     ASTRO_STUDIO_APP_TOKEN?: string;
 };
-export interface Runtime<T extends object = object> {
-    runtime: {
-        env: Env & T;
-        cf: CLOUDFLARE_REQUEST['cf'];
-        caches: CLOUDFLARE_CACHESTORAGE;
-        ctx: ExecutionContext;
-    };
-}
-declare global {
-    var __ASTRO_SESSION_BINDING_NAME: string;
-    var __env__: Partial<Env>;
-}
 export declare function createExports(manifest: SSRManifest): {
     default: {
-        fetch: (request: Request & CLOUDFLARE_REQUEST, env: Env, context: ExecutionContext) => Promise<Response>;
+        fetch: (request: Parameters<ExportedHandlerFetchHandler>[0], env: Env, context: ExecutionContext) => Promise<Response>;
     };
 };
 export {};

package/dist/entrypoints/server.js

@@ -1,61 +1,9 @@
-import { env as globalEnv } from "cloudflare:workers";
 import { App } from "astro/app";
-import { setGetEnv } from "astro/env/setup";
-import { createGetEnv } from "../utils/env.js";
-setGetEnv(createGetEnv(globalEnv));
+import { handle } from "../utils/handler.js";
 function createExports(manifest) {
   const app = new App(manifest);
   const fetch = async (request, env, context) => {
-    const { pathname } = new URL(request.url);
-    const bindingName = globalThis.__ASTRO_SESSION_BINDING_NAME;
-    globalThis.__env__ ??= {};
-    globalThis.__env__[bindingName] = env[bindingName];
-    if (manifest.assets.has(pathname)) {
-      return env.ASSETS.fetch(request.url.replace(/\.html$/, ""));
-    }
-    const routeData = app.match(request);
-    if (!routeData) {
-      const asset = await env.ASSETS.fetch(
-        request.url.replace(/index.html$/, "").replace(/\.html$/, "")
-      );
-      if (asset.status !== 404) {
-        return asset;
-      }
-    }
-    Reflect.set(
-      request,
-      Symbol.for("astro.clientAddress"),
-      request.headers.get("cf-connecting-ip")
-    );
-    process.env.ASTRO_STUDIO_APP_TOKEN ??= (() => {
-      if (typeof env.ASTRO_STUDIO_APP_TOKEN === "string") {
-        return env.ASTRO_STUDIO_APP_TOKEN;
-      }
-    })();
-    const locals = {
-      runtime: {
-        env,
-        cf: request.cf,
-        caches,
-        ctx: {
-          waitUntil: (promise) => context.waitUntil(promise),
-          // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions
-          passThroughOnException: () => {
-            throw new Error(
-              "`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions."
-            );
-          },
-          props: {}
-        }
-      }
-    };
-    const response = await app.render(request, { routeData, locals });
-    if (app.setCookieHeaders) {
-      for (const setCookieHeader of app.setCookieHeaders(response)) {
-        response.headers.append("Set-Cookie", setCookieHeader);
-      }
-    }
-    return response;
+    return await handle(manifest, app, request, env, context);
   };
   return { default: { fetch } };
 }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { AstroIntegration } from 'astro';
 import { type GetPlatformProxyOptions } from 'wrangler';
 import { type ImageService } from './utils/image-config.js';
-export type { Runtime } from './entrypoints/server.js';
+export type { Runtime } from './utils/handler.js';
 export type Options = {
     /** Options for handling images. */
     imageService?: ImageService;
@@ -70,5 +70,25 @@ export type Options = {
      *
      */
     sessionKVBindingName?: string;
+    /**
+     * This configuration option allows you to specify a custom entryPoint for your Cloudflare Worker.
+     * The entry point is the file that will be executed when your Worker is invoked.
+     * By default, this is set to `@astrojs/cloudflare/entrypoints/server.js` and `['default']`.
+     * @docs https://docs.astro.build/en/guides/integrations-guide/cloudflare/#workerEntryPoint
+     */
+    workerEntryPoint?: {
+        /**
+         * The path to the entry file. This should be a relative path from the root of your Astro project.
+         * @example`'src/worker.ts'`
+         * @docs https://docs.astro.build/en/guides/integrations-guide/cloudflare/#workerentrypointpath
+         */
+        path: string | URL;
+        /**
+         * Additional named exports to use for the entry file. Astro always includes the default export (`['default']`). If you need to have other top level named exports use this option.
+         * @example ['MyDurableObject', 'namedExport']
+         * @docs https://docs.astro.build/en/guides/integrations-guide/cloudflare/#workerentrypointnamedexports
+         */
+        namedExports?: string[];
+    };
 };
 export default function createIntegration(args?: Options): AstroIntegration;

package/dist/index.js

@@ -1,13 +1,14 @@
 import { createReadStream } from "node:fs";
 import { appendFile, stat } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import {
   appendForwardSlash,
   prependForwardSlash,
   removeLeadingForwardSlash
 } from "@astrojs/internal-helpers/path";
-import { createRedirectsFromAstroRoutes } from "@astrojs/underscore-redirects";
+import { createRedirectsFromAstroRoutes, printAsRedirects } from "@astrojs/underscore-redirects";
 import { AstroError } from "astro/errors";
 import { defaultClientConditions } from "vite";
 import { getPlatformProxy } from "wrangler";
@@ -129,10 +130,19 @@ function createIntegration(args) {
         }
         _config = config;
         finalBuildOutput = buildOutput;
+        let customWorkerEntryPoint;
+        if (args?.workerEntryPoint && typeof args.workerEntryPoint.path === "string") {
+          const require2 = createRequire(config.root);
+          try {
+            customWorkerEntryPoint = pathToFileURL(require2.resolve(args.workerEntryPoint.path));
+          } catch {
+            customWorkerEntryPoint = new URL(args.workerEntryPoint.path, config.root);
+          }
+        }
         setAdapter({
           name: "@astrojs/cloudflare",
-          serverEntrypoint: "@astrojs/cloudflare/entrypoints/server.js",
-          exports: ["default"],
+          serverEntrypoint: customWorkerEntryPoint ?? "@astrojs/cloudflare/entrypoints/server.js",
+          exports: args?.workerEntryPoint?.namedExports ? ["default", ...args.workerEntryPoint.namedExports] : ["default"],
           adapterFeatures: {
             edgeMiddleware: false,
             buildOutput: "server"
@@ -156,6 +166,9 @@ function createIntegration(args) {
       "astro:server:setup": async ({ server }) => {
         if ((args?.platformProxy?.enabled ?? true) === true) {
           const platformProxy = await getPlatformProxy(args?.platformProxy);
+          server.httpServer?.on("close", async () => {
+            await platformProxy.dispose();
+          });
           setProcessEnv(_config, platformProxy.env);
           const clientLocalsSymbol = Symbol.for("astro.locals");
           server.middlewares.use(async function middleware(req, _res, next) {
@@ -277,7 +290,10 @@ function createIntegration(args) {
         });
         if (!trueRedirects.empty()) {
           try {
-            await appendFile(new URL("./_redirects", _config.outDir), trueRedirects.print());
+            await appendFile(
+              new URL("./_redirects", _config.outDir),
+              printAsRedirects(trueRedirects)
+            );
           } catch (_error) {
             logger.error("Failed to write _redirects file");
           }

package/dist/utils/handler.d.ts

@@ -0,0 +1,24 @@
+import type { CacheStorage as CloudflareCacheStorage, ExecutionContext, ExportedHandlerFetchHandler } from '@cloudflare/workers-types';
+import type { SSRManifest } from 'astro';
+import type { App } from 'astro/app';
+type Env = {
+    [key: string]: unknown;
+    ASSETS: {
+        fetch: (req: Request | string) => Promise<Response>;
+    };
+    ASTRO_STUDIO_APP_TOKEN?: string;
+};
+export interface Runtime<T extends object = object> {
+    runtime: {
+        env: Env & T;
+        cf: Parameters<ExportedHandlerFetchHandler>[0]['cf'];
+        caches: CloudflareCacheStorage;
+        ctx: ExecutionContext;
+    };
+}
+declare global {
+    var __ASTRO_SESSION_BINDING_NAME: string;
+    var __env__: Partial<Env>;
+}
+export declare function handle(manifest: SSRManifest, app: App, request: Parameters<ExportedHandlerFetchHandler>[0], env: Env, context: ExecutionContext): Promise<Response>;
+export {};

package/dist/utils/handler.js

@@ -0,0 +1,64 @@
+import { env as globalEnv } from "cloudflare:workers";
+import { setGetEnv } from "astro/env/setup";
+import { createGetEnv } from "../utils/env.js";
+setGetEnv(createGetEnv(globalEnv));
+async function handle(manifest, app, request, env, context) {
+  const { pathname } = new URL(request.url);
+  const bindingName = globalThis.__ASTRO_SESSION_BINDING_NAME;
+  globalThis.__env__ ??= {};
+  globalThis.__env__[bindingName] = env[bindingName];
+  if (manifest.assets.has(pathname)) {
+    return env.ASSETS.fetch(request.url.replace(/\.html$/, ""));
+  }
+  const routeData = app.match(request);
+  if (!routeData) {
+    const asset = await env.ASSETS.fetch(
+      request.url.replace(/index.html$/, "").replace(/\.html$/, "")
+    );
+    if (asset.status !== 404) {
+      return asset;
+    }
+  }
+  Reflect.set(request, Symbol.for("astro.clientAddress"), request.headers.get("cf-connecting-ip"));
+  process.env.ASTRO_STUDIO_APP_TOKEN ??= (() => {
+    if (typeof env.ASTRO_STUDIO_APP_TOKEN === "string") {
+      return env.ASTRO_STUDIO_APP_TOKEN;
+    }
+  })();
+  const locals = {
+    runtime: {
+      env,
+      cf: request.cf,
+      caches,
+      ctx: {
+        waitUntil: (promise) => context.waitUntil(promise),
+        // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions
+        passThroughOnException: () => {
+          throw new Error(
+            "`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions."
+          );
+        },
+        props: {}
+      }
+    }
+  };
+  const response = await app.render(
+    request,
+    {
+      routeData,
+      locals,
+      prerenderedErrorPageFetch: async (url) => {
+        return env.ASSETS.fetch(url.replace(/\.html$/, ""));
+      }
+    }
+  );
+  if (app.setCookieHeaders) {
+    for (const setCookieHeader of app.setCookieHeaders(response)) {
+      response.headers.append("Set-Cookie", setCookieHeader);
+    }
+  }
+  return response;
+}
+export {
+  handle
+};

package/dist/utils/image-config.d.ts

@@ -2,7 +2,7 @@ import type { AstroConfig, AstroIntegrationLogger, HookParameters } from 'astro'
 export type ImageService = 'passthrough' | 'cloudflare' | 'compile' | 'custom';
 export declare function setImageConfig(service: ImageService, config: AstroConfig['image'], command: HookParameters<'astro:config:setup'>['command'], logger: AstroIntegrationLogger): {
     service: import("astro").ImageServiceConfig<Record<string, any>>;
-    experimentalDefaultStyles: boolean;
+    responsiveStyles: boolean;
     endpoint: {
         route: string;
         entrypoint?: string | undefined;
@@ -14,16 +14,16 @@ export declare function setImageConfig(service: ImageService, config: AstroConfi
         hostname?: string | undefined;
         pathname?: string | undefined;
     }[];
-    experimentalLayout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
-    experimentalObjectFit?: string | undefined;
-    experimentalObjectPosition?: string | undefined;
-    experimentalBreakpoints?: number[] | undefined;
+    layout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
+    objectFit?: string | undefined;
+    objectPosition?: string | undefined;
+    breakpoints?: number[] | undefined;
 } | {
     service: import("astro").ImageServiceConfig<Record<string, any>>;
     endpoint: {
         entrypoint: string | undefined;
     };
-    experimentalDefaultStyles: boolean;
+    responsiveStyles: boolean;
     domains: string[];
     remotePatterns: {
         port?: string | undefined;
@@ -31,8 +31,8 @@ export declare function setImageConfig(service: ImageService, config: AstroConfi
         hostname?: string | undefined;
         pathname?: string | undefined;
     }[];
-    experimentalLayout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
-    experimentalObjectFit?: string | undefined;
-    experimentalObjectPosition?: string | undefined;
-    experimentalBreakpoints?: number[] | undefined;
+    layout?: "fixed" | "constrained" | "full-width" | "none" | undefined;
+    objectFit?: string | undefined;
+    objectPosition?: string | undefined;
+    breakpoints?: number[] | undefined;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.5.4",
+  "version": "12.6.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -23,6 +23,7 @@
     "./entrypoints/middleware.js": "./dist/entrypoints/middleware.js",
     "./image-service": "./dist/entrypoints/image-service.js",
     "./image-endpoint": "./dist/entrypoints/image-endpoint.js",
+    "./handler": "./dist/utils/handler.js",
     "./package.json": "./package.json"
   },
   "files": [
@@ -33,8 +34,8 @@
     "tinyglobby": "^0.2.13",
     "vite": "^6.3.5",
     "wrangler": "^4.14.1",
-    "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/underscore-redirects": "0.6.1"
+    "@astrojs/underscore-redirects": "1.0.0",
+    "@astrojs/internal-helpers": "0.6.1"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
@@ -44,13 +45,14 @@
     "devalue": "^5.1.1",
     "execa": "^8.0.1",
     "rollup": "^4.40.2",
-    "astro-scripts": "0.0.14",
-    "astro": "5.9.0"
+    "astro": "5.10.0",
+    "astro-scripts": "0.0.14"
   },
   "publishConfig": {
     "provenance": true
   },
   "scripts": {
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "test": "astro-scripts test \"test/**/*.test.js\""