@astrojs/cloudflare 6.6.0 → 6.6.2

package/README.md

@@ -66,7 +66,7 @@ export default defineConfig({
 In order for preview to work you must install `wrangler`
 
 ```sh
-$ pnpm install wrangler --save-dev
+pnpm install wrangler --save-dev
 ```
 
 It's then possible to update the preview script in your `package.json` to `"preview": "wrangler pages dev ./dist"`. This will allow you to run your entire application locally with [Wrangler](https://github.com/cloudflare/wrangler2), which supports secrets, environment variables, KV namespaces, Durable Objects and [all other supported Cloudflare bindings](https://developers.cloudflare.com/pages/platform/functions/#adding-bindings).

package/dist/index.js

@@ -1,10 +1,10 @@
 import { createRedirectsFromAstroRoutes } from "@astrojs/underscore-redirects";
 import esbuild from "esbuild";
-import * as fs from "fs";
-import * as os from "os";
-import { dirname } from "path";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "tiny-glob";
-import { fileURLToPath, pathToFileURL } from "url";
 function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
@@ -68,9 +68,13 @@ function createIntegration(args) {
           }
           vite.ssr ||= {};
           vite.ssr.target = "webworker";
+          vite.define = {
+            "process.env": "process.env",
+            ...vite.define
+          };
         }
       },
-      "astro:build:ssr": ({ manifest, entryPoints }) => {
+      "astro:build:ssr": ({ entryPoints }) => {
         _entryPoints = entryPoints;
       },
       "astro:build:done": async ({ pages, routes, dir }) => {
@@ -80,11 +84,11 @@ function createIntegration(args) {
           await fs.promises.mkdir(functionsUrl, { recursive: true });
         }
         if (isModeDirectory && _buildConfig.split) {
-          const entryPointsRouteData = [..._entryPoints.keys()];
           const entryPointsURL = [..._entryPoints.values()];
           const entryPaths = entryPointsURL.map((entry) => fileURLToPath(entry));
-          const outputDir = fileURLToPath(new URL(".astro", _buildConfig.server));
-          const { outputFiles } = await esbuild.build({
+          const outputUrl = new URL("$astro", _buildConfig.server);
+          const outputDir = fileURLToPath(outputUrl);
+          await esbuild.build({
             target: "es2020",
             platform: "browser",
             conditions: ["workerd", "worker", "browser"],
@@ -99,19 +103,31 @@ function createIntegration(args) {
             },
             logOverride: {
               "ignored-bare-import": "silent"
-            },
-            write: false
+            }
+          });
+          const outputFiles = await glob(`**/*`, {
+            cwd: outputDir,
+            filesOnly: true
           });
-          for (const [index, outputFile] of outputFiles.entries()) {
-            const fileName = entryPointsRouteData[index].component.replace("src/pages/", "").replace(".astro", ".js").replace(/(\[\.\.\.)(\w+)(\])/g, (_match, _p1, p2, _p3) => {
-              return `[[${p2}]]`;
+          for (const outputFile of outputFiles) {
+            const path = outputFile.split(sep);
+            const finalSegments = path.map(
+              (segment) => segment.replace(/(\_)(\w+)(\_)/g, (_, __, prop) => {
+                return `[${prop}]`;
+              }).replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => {
+                return `[[${prop}]]`;
+              })
+            );
+            finalSegments[finalSegments.length - 1] = finalSegments[finalSegments.length - 1].replace("entry.", "").replace(/(.*)\.(\w+)\.(\w+)$/g, (_, fileName, __, newExt) => {
+              return `${fileName}.${newExt}`;
             });
-            const fileUrl = new URL(fileName, functionsUrl);
-            const newFileDir = dirname(fileURLToPath(fileUrl));
-            if (!fs.existsSync(newFileDir)) {
-              fs.mkdirSync(newFileDir, { recursive: true });
-            }
-            await fs.promises.writeFile(fileUrl, outputFile.contents);
+            const finalDirPath = finalSegments.slice(0, -1).join(sep);
+            const finalPath = finalSegments.join(sep);
+            const newDirUrl = new URL(finalDirPath, functionsUrl);
+            await fs.promises.mkdir(newDirUrl, { recursive: true });
+            const oldFileUrl = new URL(`$astro/${outputFile}`, outputUrl);
+            const newFileUrl = new URL(finalPath, functionsUrl);
+            await fs.promises.rename(oldFileUrl, newFileUrl);
           }
         } else {
           const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
@@ -185,10 +201,12 @@ function createIntegration(args) {
               staticPathList.push(...redirects);
             }
           }
-          const redirectRoutes = routes.filter((r) => r.type === "redirect");
+          const redirectRoutes = routes.filter((r) => r.type === "redirect").map((r) => {
+            return [r, ""];
+          });
           const trueRedirects = createRedirectsFromAstroRoutes({
             config: _config,
-            routes: redirectRoutes,
+            routeToDynamicTargetMap: new Map(Array.from(redirectRoutes)),
             dir
           });
           if (!trueRedirects.empty()) {

package/dist/server.directory.d.ts

@@ -5,6 +5,6 @@ export declare function createExports(manifest: SSRManifest): {
         request: Request & CFRequest;
         next: (request: Request) => void;
         waitUntil: EventContext<unknown, any, unknown>['waitUntil'];
-    } & Record<string, unknown>) => Promise<void | Response>;
+    } & Record<string, unknown>) => Promise<import("@cloudflare/workers-types").Response | Response>;
     manifest: SSRManifest;
 };

package/dist/server.directory.js

@@ -13,7 +13,9 @@ function createExports(manifest) {
     process.env = runtimeEnv.env;
     const { pathname } = new URL(request.url);
     if (manifest.assets.has(pathname)) {
-      return next(request);
+      return runtimeEnv.env.ASSETS.fetch(
+        request
+      );
     }
     let routeData = app.match(request, { matchNotFound: true });
     if (routeData) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.6.0",
+  "version": "6.6.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,20 +32,20 @@
     "runtime.d.ts"
   ],
   "dependencies": {
-    "@astrojs/underscore-redirects": "^0.1.0",
+    "@astrojs/underscore-redirects": "^0.2.0",
     "@cloudflare/workers-types": "^4.20230518.0",
     "esbuild": "^0.17.19",
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.7.3"
+    "astro": "^2.8.4"
   },
   "devDependencies": {
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
     "wrangler": "^2.0.23",
-    "astro": "2.7.3",
+    "astro": "2.8.4",
     "astro-scripts": "0.0.14"
   },
   "scripts": {