@astrojs/cloudflare 11.0.4 → 12.0.0-beta.0

package/dist/entrypoints/image-service.js

@@ -26,9 +26,7 @@ const service = {
             // If it's not an imported image, nor is it allowed using the current domains or remote patterns, we'll just return the original URL
             return options.src;
         }
-        const imageEndpoint = joinPaths(
-        // @ts-expect-error - Property 'env' does not exist on type 'ImportMeta'.ts(2339)
-        import.meta.env.BASE_URL, '/cdn-cgi/image', resizingParams.join(','), imageSource);
+        const imageEndpoint = joinPaths(import.meta.env.BASE_URL, '/cdn-cgi/image', resizingParams.join(','), imageSource);
         return imageEndpoint;
     },
 };

package/dist/entrypoints/middleware.js

@@ -6,7 +6,9 @@ const middlewares = {
     [When.DevServer]: (_, next) => next(),
     [When.Server]: (_, next) => next(),
     [When.Prerender]: (ctx, next) => {
+        // @ts-expect-error
         if (ctx.locals.runtime === undefined) {
+            // @ts-expect-error
             ctx.locals.runtime = {
                 env: process.env,
             };

package/dist/index.js

@@ -15,8 +15,8 @@ function wrapWithSlashes(path) {
 }
 function setProcessEnv(config, env) {
     const getEnv = createGetEnv(env);
-    if (config.experimental.env?.schema) {
-        for (const key of Object.keys(config.experimental.env.schema)) {
+    if (config.env?.schema) {
+        for (const key of Object.keys(config.env.schema)) {
             const value = getEnv(key);
             if (value !== undefined) {
                 process.env[key] = value;
@@ -62,9 +62,9 @@ export default function createIntegration(args) {
                     order: 'pre',
                 });
             },
-            'astro:config:done': ({ setAdapter, config }) => {
-                if (config.output === 'static') {
-                    throw new AstroError('[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.');
+            '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;
                 setAdapter({
@@ -72,19 +72,15 @@ export default function createIntegration(args) {
                     serverEntrypoint: '@astrojs/cloudflare/entrypoints/server.js',
                     exports: ['default'],
                     adapterFeatures: {
-                        functionPerRoute: false,
                         edgeMiddleware: false,
+                        buildOutput: 'server',
                     },
                     supportedAstroFeatures: {
                         serverOutput: 'stable',
                         hybridOutput: 'stable',
                         staticOutput: 'unsupported',
                         i18nDomains: 'experimental',
-                        assets: {
-                            supportKind: 'stable',
-                            isSharpCompatible: false,
-                            isSquooshCompatible: false,
-                        },
+                        sharpImageService: 'limited',
                         envGetSecret: 'experimental',
                     },
                 });

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

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

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

@@ -6,6 +6,7 @@ import { prependForwardSlash, removeLeadingForwardSlash, removeTrailingForwardSl
 import glob from 'tiny-glob';
 // Copied from https://github.com/withastro/astro/blob/3776ecf0aa9e08a992d3ae76e90682fd04093721/packages/astro/src/core/routing/manifest/create.ts#L45-L70
 // We're not sure how to improve this regex yet
+// eslint-disable-next-line regexp/no-super-linear-backtracking
 const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
 const ROUTE_SPREAD = /^\.{3}.+$/;
 export function getParts(part) {

package/dist/utils/image-config.d.ts

@@ -1,6 +1,22 @@
-import type { AstroConfig, AstroIntegrationLogger } from 'astro';
-export declare function setImageConfig(service: string, config: AstroConfig['image'], command: 'dev' | 'build' | 'preview', logger: AstroIntegrationLogger): {
+import type { AstroConfig, AstroIntegrationLogger, HookParameters } from 'astro';
+export declare function setImageConfig(service: string, config: AstroConfig['image'], command: HookParameters<'astro:config:setup'>['command'], logger: AstroIntegrationLogger): {
     service: import("astro").ImageServiceConfig<Record<string, any>>;
+    endpoint: {
+        route: string;
+        entrypoint?: string | undefined;
+    };
+    domains: string[];
+    remotePatterns: {
+        port?: string | undefined;
+        protocol?: string | undefined;
+        hostname?: string | undefined;
+        pathname?: string | undefined;
+    }[];
+} | {
+    service: import("astro").ImageServiceConfig<Record<string, any>>;
+    endpoint: {
+        entrypoint: string | undefined;
+    };
     domains: string[];
     remotePatterns: {
         port?: string | undefined;
@@ -8,5 +24,4 @@ export declare function setImageConfig(service: string, config: AstroConfig['ima
         hostname?: string | undefined;
         pathname?: string | undefined;
     }[];
-    endpoint?: string | undefined;
 };

package/dist/utils/image-config.js

@@ -14,13 +14,14 @@ export function setImageConfig(service, config, command, logger) {
             return {
                 ...config,
                 service: sharpImageService(),
-                endpoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+                endpoint: {
+                    entrypoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+                },
             };
         case 'custom':
             return { ...config };
         default:
-            if (config.service.entrypoint === 'astro/assets/services/sharp' ||
-                config.service.entrypoint === 'astro/assets/services/squoosh') {
+            if (config.service.entrypoint === 'astro/assets/services/sharp') {
                 logger.warn(`The current configuration does not support image optimization. To allow your project to build with the original, unoptimized images, the image service has been automatically switched to the 'noop' option. See https://docs.astro.build/en/reference/configuration-reference/#imageservice`);
                 return { ...config, service: passthroughImageService() };
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "11.0.4",
+  "version": "12.0.0-beta.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -30,29 +30,29 @@
   ],
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/underscore-redirects": "^0.3.4",
-    "@cloudflare/workers-types": "^4.20240620.0",
-    "esbuild": "^0.22.0",
+    "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
+    "@cloudflare/workers-types": "^4.20240903.0",
+    "esbuild": "^0.23.1",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.10",
-    "miniflare": "^3.20240620.0",
+    "magic-string": "^0.30.11",
+    "miniflare": "^3.20240821.1",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.62.0",
-    "@inox-tools/astro-when": "^0.2.1"
+    "wrangler": "^3.75.0",
+    "@inox-tools/astro-when": "^0.2.2"
   },
   "peerDependencies": {
-    "astro": "^4.10.3"
+    "astro": "^5.0.0-alpha.8"
   },
   "devDependencies": {
-    "astro": "^4.11.3",
-    "cheerio": "1.0.0-rc.12",
+    "astro": "^5.0.0-alpha.8",
+    "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.18.0",
+    "rollup": "^4.21.2",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.3.2",
-    "astro-scripts": "0.0.14",
-    "@astrojs/test-utils": "0.0.1"
+    "vite": "^5.4.3",
+    "@astrojs/test-utils": "0.0.1",
+    "astro-scripts": "0.0.14"
   },
   "publishConfig": {
     "provenance": true