@astrojs/cloudflare 11.0.1 → 11.0.3

package/dist/entrypoints/image-endpoint.d.ts

@@ -1 +1,3 @@
-export {};
+import type { APIRoute } from 'astro';
+export declare const prerender = false;
+export declare const GET: APIRoute;

package/dist/entrypoints/image-endpoint.js

@@ -1,3 +1,11 @@
-export {};
-// NOTE: this file is empty on purpose
-// it allows use to offer `imageService: 'compile'`
+export const prerender = false;
+export const GET = (ctx) => {
+    const href = ctx.url.searchParams.get('href');
+    if (!href) {
+        return new Response("Missing 'href' query parameter", {
+            status: 400,
+            statusText: "Missing 'href' query parameter",
+        });
+    }
+    return fetch(new URL(href, ctx.url.origin));
+};

package/dist/entrypoints/middleware.d.ts

@@ -0,0 +1,2 @@
+import type { MiddlewareHandler } from 'astro';
+export declare const onRequest: MiddlewareHandler;

package/dist/entrypoints/middleware.js

@@ -0,0 +1,18 @@
+import { When, whenAmI } from '@it-astro:when';
+const middlewares = {
+    [When.Client]: () => {
+        throw new Error('Client should not run a middleware!');
+    },
+    [When.DevServer]: (_, next) => next(),
+    [When.Server]: (_, next) => next(),
+    [When.Prerender]: (ctx, next) => {
+        if (ctx.locals.runtime === undefined) {
+            ctx.locals.runtime = {
+                env: process.env,
+            };
+        }
+        return next();
+    },
+    [When.StaticBuild]: (_, next) => next(),
+};
+export const onRequest = middlewares[whenAmI];

package/dist/index.js

@@ -3,6 +3,7 @@ import { appendFile, rename, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import { appendForwardSlash, prependForwardSlash, removeLeadingForwardSlash, } from '@astrojs/internal-helpers/path';
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
+import astroWhen from '@inox-tools/astro-when';
 import { AstroError } from 'astro/errors';
 import { getPlatformProxy } from 'wrangler';
 import { cloudflareModuleLoader, } from './utils/cloudflare-module-loader.js';
@@ -36,7 +37,7 @@ export default function createIntegration(args) {
     return {
         name: '@astrojs/cloudflare',
         hooks: {
-            'astro:config:setup': ({ command, config, updateConfig, logger, addWatchFile }) => {
+            'astro:config:setup': ({ command, config, updateConfig, logger, addWatchFile, addMiddleware, }) => {
                 updateConfig({
                     build: {
                         client: new URL(`.${wrapWithSlashes(config.base)}`, config.outDir),
@@ -51,10 +52,15 @@ export default function createIntegration(args) {
                             cloudflareModulePlugin,
                         ],
                     },
+                    integrations: [astroWhen()],
                     image: setImageConfig(args?.imageService ?? 'compile', config.image, command, logger),
                 });
                 addWatchFile(new URL('./wrangler.toml', config.root));
                 addWatchFile(new URL('./wrangler.json', config.root));
+                addMiddleware({
+                    entrypoint: '@astrojs/cloudflare/entrypoints/middleware.js',
+                    order: 'pre',
+                });
             },
             'astro:config:done': ({ setAdapter, config }) => {
                 if (config.output === 'static') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -20,6 +20,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./entrypoints/server.js": "./dist/entrypoints/server.js",
+    "./entrypoints/middleware.js": "./dist/entrypoints/middleware.js",
     "./image-service": "./dist/entrypoints/image-service.js",
     "./image-endpoint": "./dist/entrypoints/image-endpoint.js",
     "./package.json": "./package.json"
@@ -28,27 +29,28 @@
     "dist"
   ],
   "dependencies": {
-    "@astrojs/internal-helpers": "0.3.0",
-    "@astrojs/underscore-redirects": "^0.3.3",
-    "@cloudflare/workers-types": "^4.20240320.1",
-    "esbuild": "^0.19.5",
+    "@astrojs/internal-helpers": "0.4.1",
+    "@astrojs/underscore-redirects": "^0.3.4",
+    "@cloudflare/workers-types": "^4.20240620.0",
+    "esbuild": "^0.22.0",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.10",
-    "miniflare": "^3.20240320.0",
+    "miniflare": "^3.20240620.0",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.39.0"
+    "wrangler": "^3.62.0",
+    "@inox-tools/astro-when": "^0.2.0"
   },
   "peerDependencies": {
     "astro": "^4.10.3"
   },
   "devDependencies": {
-    "astro": "^4.10.3",
+    "astro": "^4.11.3",
     "cheerio": "1.0.0-rc.12",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.14.0",
+    "rollup": "^4.18.0",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.2.13",
+    "vite": "^5.3.2",
     "@astrojs/test-utils": "0.0.1",
     "astro-scripts": "0.0.14"
   },