@astrojs/cloudflare 12.0.1 → 12.2.0

package/dist/entrypoints/middleware.js

@@ -1,20 +1,9 @@
-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) => {
+export const onRequest = (context, next) => {
+    if (context.isPrerendered) {
         // @ts-expect-error
-        if (ctx.locals.runtime === undefined) {
-            // @ts-expect-error
-            ctx.locals.runtime = {
-                env: process.env,
-            };
-        }
-        return next();
-    },
-    [When.StaticBuild]: (_, next) => next(),
+        context.locals.runtime ??= {
+            env: process.env,
+        };
+    }
+    return next();
 };
-export const onRequest = middlewares[whenAmI];

package/dist/entrypoints/server.js

@@ -34,6 +34,7 @@ export function createExports(manifest) {
                     passThroughOnException: () => {
                         throw new Error('`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.');
                     },
+                    props: {},
                 },
             },
         };

package/dist/index.js

@@ -3,9 +3,8 @@ 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 { defaultServerConditions } from 'vite';
+import { defaultClientConditions } from 'vite';
 import { getPlatformProxy } from 'wrangler';
 import { cloudflareModuleLoader, } from './utils/cloudflare-module-loader.js';
 import { createGetEnv } from './utils/env.js';
@@ -27,7 +26,9 @@ function setProcessEnv(config, env) {
 }
 export default function createIntegration(args) {
     let _config;
+    let finalBuildOutput;
     const cloudflareModulePlugin = cloudflareModuleLoader(args?.cloudflareModules ?? true);
+    let _routes;
     return {
         name: '@astrojs/cloudflare',
         hooks: {
@@ -56,21 +57,30 @@ export default function createIntegration(args) {
                             },
                         ],
                     },
-                    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));
+                if (args?.platformProxy?.configPath) {
+                    addWatchFile(new URL(args.platformProxy.configPath, config.root));
+                }
+                else {
+                    addWatchFile(new URL('./wrangler.toml', config.root));
+                    addWatchFile(new URL('./wrangler.json', config.root));
+                    addWatchFile(new URL('./wrangler.jsonc', config.root));
+                }
                 addMiddleware({
                     entrypoint: '@astrojs/cloudflare/entrypoints/middleware.js',
                     order: 'pre',
                 });
             },
+            'astro:routes:resolved': ({ routes }) => {
+                _routes = routes;
+            },
             'astro:config:done': ({ setAdapter, config, buildOutput, logger }) => {
                 if (buildOutput === 'static') {
                     logger.warn('[@astrojs/cloudflare] This adapter is intended to be used with server rendered pages, which this project does not contain any of. As such, this adapter is unnecessary.');
                 }
                 _config = config;
+                finalBuildOutput = buildOutput;
                 setAdapter({
                     name: '@astrojs/cloudflare',
                     serverEntrypoint: '@astrojs/cloudflare/entrypoints/server.js',
@@ -84,8 +94,11 @@ export default function createIntegration(args) {
                         hybridOutput: 'stable',
                         staticOutput: 'unsupported',
                         i18nDomains: 'experimental',
-                        sharpImageService: 'limited',
-                        envGetSecret: 'experimental',
+                        sharpImageService: {
+                            support: 'limited',
+                            message: 'Cloudflare does not support sharp. You can use the `compile` image service to compile images at build time. It will not work for any on-demand rendered images.',
+                        },
+                        envGetSecret: 'stable',
                     },
                 });
             },
@@ -135,7 +148,7 @@ export default function createIntegration(args) {
                     // (previously supported in esbuild instead: https://github.com/withastro/astro/pull/7092)
                     vite.ssr ||= {};
                     vite.ssr.resolve ||= {};
-                    vite.ssr.resolve.conditions ||= [...defaultServerConditions];
+                    vite.ssr.resolve.conditions ||= [...defaultClientConditions];
                     vite.ssr.resolve.conditions.push('workerd', 'worker');
                     vite.ssr.target = 'webworker';
                     vite.ssr.noExternal = true;
@@ -164,7 +177,7 @@ export default function createIntegration(args) {
                     };
                 }
             },
-            'astro:build:done': async ({ pages, routes, dir, logger }) => {
+            'astro:build:done': async ({ pages, dir, logger, assets }) => {
                 await cloudflareModulePlugin.afterBuildCompleted(_config);
                 const PLATFORM_FILES = ['_headers', '_redirects', '_routes.json'];
                 if (_config.base !== '/') {
@@ -221,17 +234,16 @@ export default function createIntegration(args) {
                     routesExists = false;
                 }
                 if (!routesExists) {
-                    await createRoutesFile(_config, logger, routes, pages, redirects, args?.routes?.extend?.include, args?.routes?.extend?.exclude);
-                }
-                const redirectRoutes = [];
-                for (const route of routes) {
-                    if (route.type === 'redirect')
-                        redirectRoutes.push([route, '']);
+                    await createRoutesFile(_config, logger, _routes, pages, redirects, args?.routes?.extend?.include, args?.routes?.extend?.exclude);
                 }
                 const trueRedirects = createRedirectsFromAstroRoutes({
                     config: _config,
-                    routeToDynamicTargetMap: new Map(Array.from(redirectRoutes)),
+                    routeToDynamicTargetMap: new Map(Array.from(_routes
+                        .filter((route) => route.type === 'redirect')
+                        .map((route) => [route, '']))),
                     dir,
+                    buildOutput: finalBuildOutput,
+                    assets,
                 });
                 if (!trueRedirects.empty()) {
                     try {

package/dist/utils/generate-routes-json.d.ts

@@ -1,8 +1,8 @@
-import type { AstroConfig, AstroIntegrationLogger, IntegrationRouteData, RoutePart } from 'astro';
+import type { AstroConfig, AstroIntegrationLogger, IntegrationResolvedRoute, RoutePart } from 'astro';
 export declare function getParts(part: string): RoutePart[];
-export declare function createRoutesFile(_config: AstroConfig, logger: AstroIntegrationLogger, routes: IntegrationRouteData[], pages: {
+export declare function createRoutesFile(_config: AstroConfig, logger: AstroIntegrationLogger, routes: IntegrationResolvedRoute[], pages: {
     pathname: string;
-}[], redirects: IntegrationRouteData['segments'][], includeExtends: {
+}[], redirects: IntegrationResolvedRoute['segments'][], includeExtends: {
     pattern: string;
 }[] | undefined, excludeExtends: {
     pattern: string;

package/dist/utils/generate-routes-json.js

@@ -162,16 +162,16 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
     let hasPrerendered404 = false;
     for (const route of routes) {
         const convertedPath = segmentsToCfSyntax(route.segments, _config);
-        if (route.pathname === '/404' && route.prerender === true)
+        if (route.pathname === '/404' && route.isPrerendered === true)
             hasPrerendered404 = true;
         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (route.type) {
             case 'page':
-                if (route.prerender === false)
+                if (route.isPrerendered === false)
                     includePaths.push(convertedPath);
                 break;
             case 'endpoint':
-                if (route.prerender === false)
+                if (route.isPrerendered === false)
                     includePaths.push(convertedPath);
                 else
                     excludePaths.push(convertedPath);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.0.1",
+  "version": "12.2.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -29,29 +29,28 @@
     "dist"
   ],
   "dependencies": {
-    "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
-    "@cloudflare/workers-types": "^4.20241112.0",
-    "@inox-tools/astro-when": "^0.2.4",
+    "@astrojs/internal-helpers": "0.4.2",
+    "@astrojs/underscore-redirects": "^0.6.0",
+    "@cloudflare/workers-types": "^4.20241230.0",
     "esbuild": "^0.24.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.14",
-    "miniflare": "^3.20241106.1",
+    "magic-string": "^0.30.17",
+    "miniflare": "^3.20241218.0",
     "tiny-glob": "^0.2.9",
-    "vite": "^6.0.2",
-    "wrangler": "^3.91.0"
+    "vite": "^6.0.7",
+    "wrangler": "^3.99.0"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
   },
   "devDependencies": {
-    "astro": "^5.0.0",
+    "astro": "^5.1.3",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.27.4",
+    "rollup": "^4.29.1",
     "strip-ansi": "^7.1.0",
-    "@astrojs/test-utils": "0.0.1",
+    "@astrojs/test-utils": "0.0.2",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {