@astrojs/cloudflare 9.0.1 → 9.1.0

package/dist/utils/deduplicatePatterns.js

@@ -12,7 +12,7 @@ export function deduplicatePatterns(patterns) {
     const uniquePatterns = [...new Set(patterns)];
     for (const pattern of uniquePatterns) {
         if (pattern.endsWith('*')) {
-            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '[^*\n]*$')}`));
+            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '(?=.{2,}).+[^*\n]$')}`));
         }
     }
     return uniquePatterns

package/dist/utils/local-runtime.d.ts

@@ -24,7 +24,14 @@ type BASE_RUNTIME = {
             name: string;
             env?: string;
         };
-    }>;
+    } | ({
+        type: 'service';
+    } & ({
+        address: string;
+        protocol?: 'http' | 'https';
+    } | {
+        service: string;
+    }))>;
 };
 export type RUNTIME = {
     mode: BASE_RUNTIME['mode'];

package/dist/utils/local-runtime.js

@@ -20,6 +20,7 @@ class LocalRuntime {
         const d1Bindings = [];
         const r2Bindings = [];
         const durableObjectBindings = {};
+        const serviceBindings = {};
         for (const bindingName in runtimeConfig.bindings) {
             const bindingData = runtimeConfig.bindings[bindingName];
             switch (bindingData.type) {
@@ -41,6 +42,22 @@ class LocalRuntime {
                         scriptName: bindingData.service?.name,
                     };
                     break;
+                case 'service':
+                    if ('address' in bindingData) {
+                        // Pages mode
+                        const isHttps = bindingData.protocol === 'https';
+                        const serviceBindingConfig = isHttps
+                            ? { address: bindingData.address, https: {} }
+                            : { address: bindingData.address, http: {} };
+                        serviceBindings[bindingName] = {
+                            external: serviceBindingConfig,
+                        };
+                    }
+                    else if ('service' in bindingData) {
+                        // Worker mode
+                        serviceBindings[bindingName] = bindingData.service;
+                    }
+                    break;
             }
         }
         this._miniflare = new Miniflare({
@@ -61,6 +78,7 @@ class LocalRuntime {
                     r2Buckets: r2Bindings,
                     kvNamespaces: kvBindings,
                     durableObjects: durableObjectBindings,
+                    serviceBindings: serviceBindings,
                 },
             ],
         });
@@ -183,6 +201,14 @@ export class LocalWorkersRuntime extends LocalRuntime {
                 };
             }
         }
+        if (_wranglerConfig?.services) {
+            for (const service of _wranglerConfig.services) {
+                runtimeConfigWithWrangler.bindings[service.binding] = {
+                    type: 'service',
+                    service: service.service,
+                };
+            }
+        }
         super(astroConfig, runtimeConfigWithWrangler, logger);
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "//comment": "test changeset-bot",
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",