@astrojs/cloudflare 8.1.0 → 9.0.1

package/dist/entrypoints/server.advanced.js

@@ -26,7 +26,7 @@ export function createExports(manifest) {
                 caches: caches,
             },
         };
-        const response = await app.render(request, routeData, locals);
+        const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {
                 response.headers.append('Set-Cookie', setCookieHeader);

package/dist/entrypoints/server.directory.js

@@ -28,7 +28,7 @@ export function createExports(manifest) {
                 caches: caches,
             },
         };
-        const response = await app.render(request, routeData, locals);
+        const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {
                 response.headers.append('Set-Cookie', setCookieHeader);

package/dist/index.js

@@ -417,21 +417,39 @@ export default function createIntegration(args) {
                             include: ['/*'],
                             exclude: deduplicatePatterns(staticPathList.concat(args?.routes?.exclude ?? [])),
                         };
-                    const includeStrategyLength = includeStrategy
-                        ? includeStrategy.include.length + includeStrategy.exclude.length
-                        : Infinity;
-                    const excludeStrategyLength = excludeStrategy
-                        ? excludeStrategy.include.length + excludeStrategy.exclude.length
-                        : Infinity;
-                    const winningStrategy = notFoundIsSSR
-                        ? excludeStrategy
-                        : includeStrategyLength <= excludeStrategyLength
-                            ? includeStrategy
-                            : excludeStrategy;
-                    await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
-                        version: 1,
-                        ...winningStrategy,
-                    }, null, 2));
+                    switch (args?.routes?.strategy) {
+                        case 'include':
+                            await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                version: 1,
+                                ...includeStrategy,
+                            }, null, 2));
+                            break;
+                        case 'exclude':
+                            await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                version: 1,
+                                ...excludeStrategy,
+                            }, null, 2));
+                            break;
+                        default:
+                            {
+                                const includeStrategyLength = includeStrategy
+                                    ? includeStrategy.include.length + includeStrategy.exclude.length
+                                    : Infinity;
+                                const excludeStrategyLength = excludeStrategy
+                                    ? excludeStrategy.include.length + excludeStrategy.exclude.length
+                                    : Infinity;
+                                const winningStrategy = notFoundIsSSR
+                                    ? excludeStrategy
+                                    : includeStrategyLength <= excludeStrategyLength
+                                        ? includeStrategy
+                                        : excludeStrategy;
+                                await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                    version: 1,
+                                    ...winningStrategy,
+                                }, null, 2));
+                            }
+                            break;
+                    }
                 }
             },
         },

package/dist/utils/deduplicatePatterns.js

@@ -9,15 +9,17 @@ export function deduplicatePatterns(patterns) {
     const openPatterns = [];
     // A value in the set may only occur once; it is unique in the set's collection.
     // ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
-    return [...new Set(patterns)]
+    const uniquePatterns = [...new Set(patterns)];
+    for (const pattern of uniquePatterns) {
+        if (pattern.endsWith('*')) {
+            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '[^*\n]*$')}`));
+        }
+    }
+    return uniquePatterns
         .sort((a, b) => a.length - b.length)
         .filter((pattern) => {
-        if (openPatterns.some((p) => p.test(pattern))) {
+        if (openPatterns.some((p) => p.test(pattern)))
             return false;
-        }
-        if (pattern.endsWith('*')) {
-            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '.*')}`));
-        }
         return true;
     });
 }

package/dist/utils/local-runtime.js

@@ -1,4 +1,4 @@
-import { mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import assert from 'node:assert';
 import { fileURLToPath } from 'url';
 import TOML from '@iarna/toml';
@@ -111,7 +111,9 @@ class LocalRuntime {
         const CF_ENDPOINT = 'https://workers.cloudflare.com/cf.json';
         if (!this.cfObject) {
             this.cfObject = await fetch(CF_ENDPOINT).then((res) => res.json());
-            mkdirSync(this._astroConfig.cacheDir);
+            if (!existsSync(this._astroConfig.cacheDir)) {
+                mkdirSync(this._astroConfig.cacheDir);
+            }
             writeFileSync(fileURLToPath(new URL('cf.json', this._astroConfig.cacheDir)), JSON.stringify(this.cfObject), 'utf8');
         }
         return this.cfObject;

package/package.json

@@ -2,7 +2,7 @@
   "//comment": "test changeset-bot",
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "8.1.0",
+  "version": "9.0.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -40,26 +40,24 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^3.0.0 || ^4.0.0"
+    "astro": "^4.2.0"
   },
   "devDependencies": {
     "execa": "^8.0.1",
     "fast-glob": "^3.3.1",
     "@types/iarna__toml": "^2.0.2",
     "strip-ansi": "^7.1.0",
-    "astro": "^4.0.0",
-    "chai": "^4.3.10",
+    "astro": "^4.3.5",
     "cheerio": "1.0.0-rc.12",
-    "mocha": "^10.2.0",
     "wrangler": "^3.15.0",
-    "@astrojs/test-utils": "0.0.1"
+    "@astrojs/test-utils": "0.0.1",
+    "astro-scripts": "0.0.14"
   },
   "publishConfig": {
     "provenance": true
   },
   "scripts": {
     "build": "tsc",
-    "test": "mocha --exit --timeout 30000 test/",
-    "test:match": "mocha --exit --timeout 30000 -g"
+    "test": "astro-scripts test \"test/**/*.test.js\""
   }
 }