@astrojs/cloudflare 12.0.0-beta.1 → 12.0.1

package/dist/entrypoints/image-service.js

@@ -26,7 +26,9 @@ 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(import.meta.env.BASE_URL, '/cdn-cgi/image', resizingParams.join(','), imageSource);
+        const imageEndpoint = joinPaths(
+        // @ts-expect-error Can't recognise import.meta.env
+        import.meta.env.BASE_URL, '/cdn-cgi/image', resizingParams.join(','), imageSource);
         return imageEndpoint;
     },
 };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import type { AstroIntegration } from 'astro';
+import { type GetPlatformProxyOptions } from 'wrangler';
 export type { Runtime } from './entrypoints/server.js';
 export type Options = {
     /** Options for handling images. */
@@ -30,17 +31,9 @@ export type Options = {
     /**
      * Proxy configuration for the platform.
      */
-    platformProxy?: {
+    platformProxy?: GetPlatformProxyOptions & {
         /** Toggle the proxy. Default `undefined`, which equals to `true`. */
         enabled?: boolean;
-        /** Path to the configuration file. Default `wrangler.toml`. */
-        configPath?: string;
-        /** Enable experimental support for JSON configuration. Default `false`. */
-        experimentalJsonConfig?: boolean;
-        /** Configuration persistence settings. Default '.wrangler/state/v3' */
-        persist?: boolean | {
-            path: string;
-        };
     };
     /**
      * Allow bundling cloudflare worker specific file types as importable modules. Defaults to true.

package/dist/index.js

@@ -5,6 +5,7 @@ import { appendForwardSlash, prependForwardSlash, removeLeadingForwardSlash, } f
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
 import astroWhen from '@inox-tools/astro-when';
 import { AstroError } from 'astro/errors';
+import { defaultServerConditions } from 'vite';
 import { getPlatformProxy } from 'wrangler';
 import { cloudflareModuleLoader, } from './utils/cloudflare-module-loader.js';
 import { createGetEnv } from './utils/env.js';
@@ -24,13 +25,6 @@ function setProcessEnv(config, env) {
         }
     }
 }
-function createPlatformProxy(platformProxy) {
-    return getPlatformProxy({
-        configPath: platformProxy?.configPath,
-        experimentalJsonConfig: platformProxy?.experimentalJsonConfig ?? false,
-        persist: platformProxy?.persist ?? true,
-    });
-}
 export default function createIntegration(args) {
     let _config;
     const cloudflareModulePlugin = cloudflareModuleLoader(args?.cloudflareModules ?? true);
@@ -97,7 +91,7 @@ export default function createIntegration(args) {
             },
             'astro:server:setup': async ({ server }) => {
                 if ((args?.platformProxy?.enabled ?? true) === true) {
-                    const platformProxy = await createPlatformProxy(args?.platformProxy);
+                    const platformProxy = await getPlatformProxy(args?.platformProxy);
                     setProcessEnv(_config, platformProxy.env);
                     const clientLocalsSymbol = Symbol.for('astro.locals');
                     server.middlewares.use(async function middleware(req, res, next) {
@@ -137,11 +131,12 @@ export default function createIntegration(args) {
                             vite.resolve.alias[alias.find] = alias.replacement;
                         }
                     }
-                    vite.resolve.conditions ||= [];
-                    // We need those conditions, previous these conditions where applied at the esbuild step which we removed
-                    // https://github.com/withastro/astro/pull/7092
-                    vite.resolve.conditions.push('workerd', 'worker');
+                    // Support `workerd` and `worker` conditions for the ssr environment
+                    // (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.push('workerd', 'worker');
                     vite.ssr.target = 'webworker';
                     vite.ssr.noExternal = true;
                     if (typeof _config.vite.ssr?.external === 'undefined')
@@ -168,18 +163,6 @@ export default function createIntegration(args) {
                         ...vite.define,
                     };
                 }
-                // we thought that vite config inside `if (target === 'server')` would not apply for client
-                // but it seems like the same `vite` reference is used for both
-                // so we need to reset the previous conflicting setting
-                // in the future we should look into a more robust solution
-                if (target === 'client') {
-                    vite.resolve ||= {};
-                    vite.resolve.conditions ||= [];
-                    vite.resolve.conditions = vite.resolve.conditions.filter((c) => c !== 'workerd' && c !== 'worker');
-                    vite.build ||= {};
-                    vite.build.rollupOptions ||= {};
-                    vite.build.rollupOptions.output ||= {};
-                }
             },
             'astro:build:done': async ({ pages, routes, dir, logger }) => {
                 await cloudflareModulePlugin.afterBuildCompleted(_config);

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

@@ -12,6 +12,10 @@ export declare function setImageConfig(service: string, config: AstroConfig['ima
         hostname?: string | undefined;
         pathname?: string | undefined;
     }[];
+    experimentalLayout?: "fixed" | "none" | "responsive" | "full-width" | undefined;
+    experimentalObjectFit?: string | undefined;
+    experimentalObjectPosition?: string | undefined;
+    experimentalBreakpoints?: number[] | undefined;
 } | {
     service: import("astro").ImageServiceConfig<Record<string, any>>;
     endpoint: {
@@ -24,4 +28,8 @@ export declare function setImageConfig(service: string, config: AstroConfig['ima
         hostname?: string | undefined;
         pathname?: string | undefined;
     }[];
+    experimentalLayout?: "fixed" | "none" | "responsive" | "full-width" | undefined;
+    experimentalObjectFit?: string | undefined;
+    experimentalObjectPosition?: string | undefined;
+    experimentalBreakpoints?: number[] | undefined;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.0.0-beta.1",
+  "version": "12.0.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -31,26 +31,26 @@
   "dependencies": {
     "@astrojs/internal-helpers": "0.4.1",
     "@astrojs/underscore-redirects": "^0.4.0-alpha.0",
-    "@cloudflare/workers-types": "^4.20241022.0",
+    "@cloudflare/workers-types": "^4.20241112.0",
     "@inox-tools/astro-when": "^0.2.4",
     "esbuild": "^0.24.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.12",
-    "miniflare": "^3.20241022.0",
+    "magic-string": "^0.30.14",
+    "miniflare": "^3.20241106.1",
     "tiny-glob": "^0.2.9",
-    "wrangler": "^3.84.0"
+    "vite": "^6.0.2",
+    "wrangler": "^3.91.0"
   },
   "peerDependencies": {
-    "astro": "^5.0.0-alpha.8"
+    "astro": "^5.0.0"
   },
   "devDependencies": {
-    "astro": "^5.0.0-alpha.8",
+    "astro": "^5.0.0",
     "cheerio": "1.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "rollup": "^4.24.3",
+    "rollup": "^4.27.4",
     "strip-ansi": "^7.1.0",
-    "vite": "6.0.0-beta.2",
     "@astrojs/test-utils": "0.0.1",
     "astro-scripts": "0.0.14"
   },