@astrojs/cloudflare 10.3.0 → 10.4.1

package/dist/entrypoints/server.d.ts

@@ -1,6 +1,7 @@
 import type { CacheStorage as CLOUDFLARE_CACHESTORAGE, Request as CLOUDFLARE_REQUEST, ExecutionContext } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 type Env = {
+    [key: string]: unknown;
     ASSETS: {
         fetch: (req: Request | string) => Promise<Response>;
     };

package/dist/entrypoints/server.js

@@ -1,4 +1,5 @@
 import { App } from 'astro/app';
+import { createGetEnv } from '../utils/env.js';
 export function createExports(manifest) {
     const app = new App(manifest);
     const fetch = async (request, env, context) => {
@@ -32,6 +33,12 @@ export function createExports(manifest) {
                 },
             },
         };
+        // Won't throw if the virtual module is not available because it's not supported in
+        // the users's astro version or if astro:env is not enabled in the project
+        const setupModule = 'astro/env/setup';
+        await import(/* @vite-ignore */ setupModule)
+            .then((mod) => mod.setGetEnv(createGetEnv(env)))
+            .catch(() => { });
         const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {

package/dist/index.js

@@ -8,6 +8,7 @@ import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { getPlatformProxy } from 'wrangler';
 import { cloudflareModuleLoader, } from './utils/cloudflare-module-loader.js';
+import { createGetEnv } from './utils/env.js';
 import { createRoutesFile, getParts } from './utils/generate-routes-json.js';
 import { setImageConfig } from './utils/image-config.js';
 import { mutateDynamicPageImportsInPlace, mutatePageMapInPlace } from './utils/index.js';
@@ -107,6 +108,7 @@ export default function createIntegration(args) {
                             isSharpCompatible: false,
                             isSquooshCompatible: false,
                         },
+                        envGetSecret: 'experimental',
                     },
                 });
             },
@@ -117,6 +119,15 @@ export default function createIntegration(args) {
                         experimentalJsonConfig: args.platformProxy.experimentalJsonConfig ?? false,
                         persist: args.platformProxy.persist ?? true,
                     });
+                    const getEnv = createGetEnv(platformProxy.env);
+                    if (_config.experimental.env?.schema) {
+                        for (const key of Object.keys(_config.experimental.env.schema)) {
+                            const value = getEnv(key);
+                            if (value !== undefined) {
+                                process.env[key] = value;
+                            }
+                        }
+                    }
                     const clientLocalsSymbol = Symbol.for('astro.locals');
                     server.middlewares.use(async function middleware(req, res, next) {
                         Reflect.set(req, clientLocalsSymbol, {

package/dist/utils/env.d.ts

@@ -0,0 +1,2 @@
+import type { GetEnv } from 'astro/env/setup';
+export declare const createGetEnv: (env: Record<string, unknown>) => GetEnv;

package/dist/utils/env.js

@@ -0,0 +1,11 @@
+export const createGetEnv = (env) => (key) => {
+    const v = env[key];
+    if (typeof v === 'undefined' || typeof v === 'string') {
+        return v;
+    }
+    if (typeof v === 'boolean' || typeof v === 'number') {
+        // let astro:env handle the validation and transformation
+        return v.toString();
+    }
+    return undefined;
+};

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

@@ -3,9 +3,9 @@ export declare function setImageConfig(service: string, config: AstroConfig['ima
     service: import("astro").ImageServiceConfig<Record<string, any>>;
     domains: string[];
     remotePatterns: {
+        port?: string | undefined;
         protocol?: string | undefined;
         hostname?: string | undefined;
-        port?: string | undefined;
         pathname?: string | undefined;
     }[];
     endpoint?: string | undefined;

package/dist/utils/non-server-chunk-detector.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'vite';
+import type { PluginOption } from 'vite';
 /**
  * A Vite bundle analyzer that identifies chunks that are not used for server rendering.
  *
@@ -8,7 +8,7 @@ import type { Plugin } from 'vite';
  */
 export declare class NonServerChunkDetector {
     private nonServerChunks?;
-    getPlugin(): Plugin;
+    getPlugin(): PluginOption;
     private processBundle;
     getNonServerChunks(): string[];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "10.3.0",
+  "version": "10.4.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -42,13 +42,13 @@
     "astro": "^4.2.0"
   },
   "devDependencies": {
-    "astro": "^4.5.8",
+    "astro": "^4.10.1",
     "cheerio": "1.0.0-rc.12",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "rollup": "^4.14.0",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.2.6",
+    "vite": "^5.2.13",
     "@astrojs/test-utils": "0.0.1",
     "astro-scripts": "0.0.14"
   },