@astrojs/cloudflare 6.4.0 → 6.5.1

package/dist/runtime.d.ts

@@ -1,8 +1,13 @@
+import type { Cache, CacheStorage, IncomingRequestCfProperties } from '@cloudflare/workers-types';
 export type WorkerRuntime<T = unknown> = {
     name: 'cloudflare';
     env: T;
     waitUntil(promise: Promise<any>): void;
     passThroughOnException(): void;
+    caches?: CacheStorage & {
+        default: Cache;
+    };
+    cf?: IncomingRequestCfProperties;
 };
 export type PagesRuntime<T = unknown, U = unknown> = {
     name: 'cloudflare';
@@ -12,5 +17,9 @@ export type PagesRuntime<T = unknown, U = unknown> = {
     data: U;
     waitUntil(promise: Promise<any>): void;
     next(request: Request): void;
+    caches?: CacheStorage & {
+        default: Cache;
+    };
+    cf?: IncomingRequestCfProperties;
 };
 export declare function getRuntime<T = unknown, U = unknown>(request: Request): WorkerRuntime<T> | PagesRuntime<T, U>;

package/dist/server.advanced.d.ts

@@ -1,3 +1,4 @@
+import type { ExecutionContext, Request as CFRequest } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 type Env = {
     ASSETS: {
@@ -7,7 +8,7 @@ type Env = {
 };
 export declare function createExports(manifest: SSRManifest): {
     default: {
-        fetch: (request: Request, env: Env, context: any) => Promise<Response>;
+        fetch: (request: Request & CFRequest, env: Env, context: ExecutionContext) => Promise<Response>;
     };
 };
 export {};

package/dist/server.advanced.js

@@ -18,7 +18,16 @@ function createExports(manifest) {
         Symbol.for("astro.clientAddress"),
         request.headers.get("cf-connecting-ip")
       );
-      Reflect.set(request, Symbol.for("runtime"), { env, name: "cloudflare", ...context });
+      Reflect.set(request, Symbol.for("runtime"), {
+        env,
+        name: "cloudflare",
+        caches,
+        cf: request.cf,
+        ...context,
+        waitUntil: (promise) => {
+          context.waitUntil(promise);
+        }
+      });
       let response = await app.render(request, routeData);
       if (app.setCookieHeaders) {
         for (const setCookieHeader of app.setCookieHeaders(response)) {

package/dist/server.directory.d.ts

@@ -1,7 +1,9 @@
+import type { EventContext, Request as CFRequest } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 export declare function createExports(manifest: SSRManifest): {
     onRequest: ({ request, next, ...runtimeEnv }: {
-        request: Request;
+        request: Request & CFRequest;
         next: (request: Request) => void;
+        waitUntil: EventContext<unknown, any, unknown>['waitUntil'];
     } & Record<string, unknown>) => Promise<void | Response>;
 };

package/dist/server.directory.js

@@ -24,8 +24,13 @@ function createExports(manifest) {
       );
       Reflect.set(request, Symbol.for("runtime"), {
         ...runtimeEnv,
+        waitUntil: (promise) => {
+          runtimeEnv.waitUntil(promise);
+        },
         name: "cloudflare",
-        next
+        next,
+        caches,
+        cf: request.cf
       });
       let response = await app.render(request, routeData);
       if (app.setCookieHeaders) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.4.0",
+  "version": "6.5.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -33,11 +33,12 @@
   ],
   "dependencies": {
     "@astrojs/underscore-redirects": "^0.1.0",
+    "@cloudflare/workers-types": "^4.20230518.0",
     "esbuild": "^0.17.12",
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.6.0"
+    "astro": "^2.6.6"
   },
   "devDependencies": {
     "chai": "^4.3.6",
@@ -45,7 +46,7 @@
     "mocha": "^9.2.2",
     "slash": "^4.0.0",
     "wrangler": "^2.0.23",
-    "astro": "2.6.0",
+    "astro": "2.6.6",
     "astro-scripts": "0.0.14"
   },
   "scripts": {