@astrojs/cloudflare 6.8.0 → 7.0.0-beta.1

package/README.md

@@ -73,10 +73,12 @@ It's then possible to update the preview script in your `package.json` to `"prev
 
 ## Access to the Cloudflare runtime
 
-You can access all the Cloudflare bindings and environment variables from Astro components and API routes through `Astro.locals`.
+You can access all the Cloudflare bindings and environment variables from Astro components and API routes through the adapter API.
 
 ```js
-const env = Astro.locals.runtime.env;
+import { getRuntime } from '@astrojs/cloudflare/runtime';
+
+getRuntime(Astro.request);
 ```
 
 Depending on your adapter mode (advanced = worker, directory = pages), the runtime object will look a little different due to differences in the Cloudflare API.

package/dist/index.js

@@ -9,11 +9,31 @@ function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.directory.js",
-    exports: ["onRequest", "manifest"]
+    exports: ["onRequest", "manifest"],
+    supportedAstroFeatures: {
+      hybridOutput: "stable",
+      staticOutput: "unsupported",
+      serverOutput: "stable",
+      assets: {
+        supportKind: "unsupported",
+        isSharpCompatible: false,
+        isSquooshCompatible: false
+      }
+    }
   } : {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.advanced.js",
-    exports: ["default"]
+    exports: ["default"],
+    supportedAstroFeatures: {
+      hybridOutput: "stable",
+      staticOutput: "unsupported",
+      serverOutput: "stable",
+      assets: {
+        supportKind: "stable",
+        isSharpCompatible: false,
+        isSquooshCompatible: false
+      }
+    }
   };
 }
 const SHIM = `globalThis.process = {
@@ -25,7 +45,7 @@ const potentialFunctionRouteTypes = ["endpoint", "page"];
 function createIntegration(args) {
   let _config;
   let _buildConfig;
-  const isModeDirectory = (args == null ? void 0 : args.mode) === "directory";
+  const isModeDirectory = args?.mode === "directory";
   let _entryPoints = /* @__PURE__ */ new Map();
   return {
     name: "@astrojs/cloudflare",
@@ -79,7 +99,6 @@ function createIntegration(args) {
         _entryPoints = entryPoints;
       },
       "astro:build:done": async ({ pages, routes, dir }) => {
-        var _a, _b, _c, _d;
         const functionsUrl = new URL("functions/", _config.root);
         if (isModeDirectory) {
           await fs.promises.mkdir(functionsUrl, { recursive: true });
@@ -98,7 +117,7 @@ function createIntegration(args) {
             allowOverwrite: true,
             format: "esm",
             bundle: true,
-            minify: ((_b = (_a = _config.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.minify) !== false,
+            minify: _config.vite?.build?.minify !== false,
             banner: {
               js: SHIM
             },
@@ -144,7 +163,7 @@ function createIntegration(args) {
             allowOverwrite: true,
             format: "esm",
             bundle: true,
-            minify: ((_d = (_c = _config.vite) == null ? void 0 : _c.build) == null ? void 0 : _d.minify) !== false,
+            minify: _config.vite?.build?.minify !== false,
             banner: {
               js: SHIM
             },

package/dist/runtime.d.ts

@@ -22,14 +22,4 @@ export type PagesRuntime<T = unknown, U = unknown> = {
     };
     cf?: IncomingRequestCfProperties;
 };
-/**
- * @deprecated since version 6.8.0
- * The `getRuntime` utility has been deprecated and should be updated to the new [`Astro.locals`](https://docs.astro.build/en/guides/middleware/#locals) API.
- * ```diff
- * - import { getRuntime } from '@astrojs/cloudflare/runtime';
- * - getRuntime(Astro.request);
- *
- * + const runtime = Astro.locals.runtime;
- * ```
- */
 export declare function getRuntime<T = unknown, U = unknown>(request: Request): WorkerRuntime<T> | PagesRuntime<T, U>;

package/dist/server.advanced.js

@@ -28,17 +28,7 @@ function createExports(manifest) {
           context.waitUntil(promise);
         }
       });
-      const locals = {
-        runtime: {
-          waitUntil: (promise) => {
-            context.waitUntil(promise);
-          },
-          env,
-          cf: request.cf,
-          caches
-        }
-      };
-      let response = await app.render(request, routeData, locals);
+      let response = await app.render(request, routeData);
       if (app.setCookieHeaders) {
         for (const setCookieHeader of app.setCookieHeaders(response)) {
           response.headers.append("Set-Cookie", setCookieHeader);

package/dist/server.directory.d.ts

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

package/dist/server.directory.js

@@ -5,13 +5,17 @@ if (!isNode) {
 }
 function createExports(manifest) {
   const app = new App(manifest);
-  const onRequest = async (context) => {
-    const request = context.request;
-    const { next, env } = context;
-    process.env = env;
+  const onRequest = async ({
+    request,
+    next,
+    ...runtimeEnv
+  }) => {
+    process.env = runtimeEnv.env;
     const { pathname } = new URL(request.url);
     if (manifest.assets.has(pathname)) {
-      return env.ASSETS.fetch(request);
+      return runtimeEnv.env.ASSETS.fetch(
+        request
+      );
     }
     let routeData = app.match(request, { matchNotFound: true });
     if (routeData) {
@@ -21,26 +25,16 @@ function createExports(manifest) {
         request.headers.get("cf-connecting-ip")
       );
       Reflect.set(request, Symbol.for("runtime"), {
-        ...context,
+        ...runtimeEnv,
         waitUntil: (promise) => {
-          context.waitUntil(promise);
+          runtimeEnv.waitUntil(promise);
         },
         name: "cloudflare",
         next,
         caches,
         cf: request.cf
       });
-      const locals = {
-        runtime: {
-          waitUntil: (promise) => {
-            context.waitUntil(promise);
-          },
-          env: context.env,
-          cf: request.cf,
-          caches
-        }
-      };
-      let response = await app.render(request, routeData, locals);
+      let response = await app.render(request, routeData);
       if (app.setCookieHeaders) {
         for (const setCookieHeader of app.setCookieHeaders(response)) {
           response.headers.append("Set-Cookie", setCookieHeader);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.8.0",
+  "version": "7.0.0-beta.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,20 +32,20 @@
     "runtime.d.ts"
   ],
   "dependencies": {
-    "@astrojs/underscore-redirects": "^0.2.0",
     "@cloudflare/workers-types": "^4.20230518.0",
-    "esbuild": "^0.17.19",
-    "tiny-glob": "^0.2.9"
+    "esbuild": "^0.18.16",
+    "tiny-glob": "^0.2.9",
+    "@astrojs/underscore-redirects": "0.3.0-beta.0"
   },
   "peerDependencies": {
-    "astro": "^2.10.6"
+    "astro": "^3.0.0-beta.1"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
     "wrangler": "^2.0.23",
-    "astro": "2.10.6",
+    "astro": "3.0.0-beta.1",
     "astro-scripts": "0.0.14"
   },
   "scripts": {