@astrojs/cloudflare 6.3.0 → 6.5.0

package/dist/index.js

@@ -1,3 +1,4 @@
+import { createRedirectsFromAstroRoutes } from "@astrojs/underscore-redirects";
 import esbuild from "esbuild";
 import * as fs from "fs";
 import * as os from "os";
@@ -31,7 +32,8 @@ function createIntegration(args) {
           build: {
             client: new URL(`.${config.base}`, config.outDir),
             server: new URL(`.${SERVER_BUILD_FOLDER}`, config.outDir),
-            serverEntry: "_worker.mjs"
+            serverEntry: "_worker.mjs",
+            redirects: false
           }
         });
       },
@@ -66,7 +68,7 @@ function createIntegration(args) {
           vite.ssr.target = "webworker";
         }
       },
-      "astro:build:done": async ({ pages }) => {
+      "astro:build:done": async ({ pages, routes, dir }) => {
         var _a, _b;
         const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
         const entryUrl = new URL(_buildConfig.serverEntry, _config.outDir);
@@ -134,6 +136,18 @@ function createIntegration(args) {
               staticPathList.push(...redirects);
             }
           }
+          const redirectRoutes = routes.filter((r) => r.type === "redirect");
+          const trueRedirects = createRedirectsFromAstroRoutes({
+            config: _config,
+            routes: redirectRoutes,
+            dir
+          });
+          if (!trueRedirects.empty()) {
+            await fs.promises.appendFile(
+              new URL("./_redirects", _config.outDir),
+              trueRedirects.print()
+            );
+          }
           await fs.promises.writeFile(
             new URL("./_routes.json", _config.outDir),
             JSON.stringify(

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 { 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: any) => Promise<Response>;
     };
 };
 export {};

package/dist/server.advanced.js

@@ -18,7 +18,13 @@ 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
+      });
       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,8 @@
+import type { 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;
     } & Record<string, unknown>) => Promise<void | Response>;
 };

package/dist/server.directory.js

@@ -25,7 +25,9 @@ function createExports(manifest) {
       Reflect.set(request, Symbol.for("runtime"), {
         ...runtimeEnv,
         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.3.0",
+  "version": "6.5.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,11 +32,13 @@
     "runtime.d.ts"
   ],
   "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.5.0"
+    "astro": "^2.6.4"
   },
   "devDependencies": {
     "chai": "^4.3.6",
@@ -44,7 +46,7 @@
     "mocha": "^9.2.2",
     "slash": "^4.0.0",
     "wrangler": "^2.0.23",
-    "astro": "2.5.0",
+    "astro": "2.6.4",
     "astro-scripts": "0.0.14"
   },
   "scripts": {