@astrojs/cloudflare 6.5.1 → 6.6.1

package/README.md

@@ -32,13 +32,12 @@ import cloudflare from '@astrojs/cloudflare';
 
 export default defineConfig({
   output: 'server',
-  adapter: cloudflare()
+  adapter: cloudflare(),
 });
 ```
 
 ## Options
 
-
 ### Mode
 
 `mode: "advanced" | "directory"`
@@ -49,14 +48,17 @@ Cloudflare Pages has 2 different modes for deploying functions, `advanced` mode
 
 For most projects the adapter default of `advanced` will be sufficient; the `dist` folder will contain your compiled project. Switching to directory mode allows you to use [pages plugins](https://developers.cloudflare.com/pages/platform/functions/plugins/) such as [Sentry](https://developers.cloudflare.com/pages/platform/functions/plugins/sentry/) or write custom code to enable logging.
 
-In directory mode the adapter will compile the client side part of your app the same way, but moves the worker script into a `functions` folder in the project root. The adapter will only ever place a `[[path]].js` in that folder, allowing you to add additional plugins and pages middleware which can be checked into version control. Cloudflare documentation contains more information about [writing custom functions](https://developers.cloudflare.com/pages/platform/functions/).
+In directory mode, the adapter will compile the client side part of your app the same way by default, but moves the worker script into a `functions` folder in the project root. In this case, the adapter will only ever place a `[[path]].js` in that folder, allowing you to add additional plugins and pages middleware which can be checked into version control.
+
+With the build configuration `split: true`, the adapter instead compiles a separate bundle for each page. This option requires some manual maintenance of the `functions` folder. Files emitted by Astro will overwrite existing `functions` files with identical names, so you must choose unique file names for each file you manually add. Additionally, the adapter will never empty the `functions` folder of outdated files, so you must clean up the folder manually when you remove pages.
+
+Note that this adapter does not support using [Cloudflare Pages Middleware](https://developers.cloudflare.com/pages/platform/functions/middleware/). Astro will bundle the [Astro middleware](https://docs.astro.build/en/guides/middleware/) into each page.
 
 ```ts
 // directory mode
 export default defineConfig({
-  adapter: cloudflare({ mode: "directory" }),
+  adapter: cloudflare({ mode: 'directory' }),
 });
-
 ```
 
 ## Enabling Preview
@@ -64,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).
@@ -74,7 +76,7 @@ It's then possible to update the preview script in your `package.json` to `"prev
 You can access all the Cloudflare bindings and environment variables from Astro components and API routes through the adapter API.
 
 ```js
-import { getRuntime } from "@astrojs/cloudflare/runtime";
+import { getRuntime } from '@astrojs/cloudflare/runtime';
 
 getRuntime(Astro.request);
 ```
@@ -108,7 +110,6 @@ By default, `@astrojs/cloudflare` will generate a `_routes.json` file that lists
 
 ## Troubleshooting
 
-
 For help, check out the `#support` channel on [Discord](https://astro.build/chat). Our friendly Support Squad members are here to help!
 
 You can also check our [Astro Integration Documentation][astro-integration] for more on integrations.
@@ -119,14 +120,14 @@ Currently, errors during running your application in Wrangler are not very usefu
 
 ```js
 export default defineConfig({
-	adapter: cloudflare(),
-	output: 'server',
+  adapter: cloudflare(),
+  output: 'server',
 
   vite: {
     build: {
-      minify: false
-    }
-  }
+      minify: false,
+    },
+  },
 });
 ```
 

package/dist/index.js

@@ -2,13 +2,14 @@ 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 glob from "tiny-glob";
 import { fileURLToPath, pathToFileURL } from "url";
 function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.directory.js",
-    exports: ["onRequest"]
+    exports: ["onRequest", "manifest"]
   } : {
     name: "@astrojs/cloudflare",
     serverEntrypoint: "@astrojs/cloudflare/server.advanced.js",
@@ -24,6 +25,7 @@ function createIntegration(args) {
   let _config;
   let _buildConfig;
   const isModeDirectory = (args == null ? void 0 : args.mode) === "directory";
+  let _entryPoints = /* @__PURE__ */ new Map();
   return {
     name: "@astrojs/cloudflare",
     hooks: {
@@ -68,30 +70,77 @@ function createIntegration(args) {
           vite.ssr.target = "webworker";
         }
       },
+      "astro:build:ssr": ({ entryPoints }) => {
+        _entryPoints = entryPoints;
+      },
       "astro:build:done": async ({ pages, routes, dir }) => {
-        var _a, _b;
-        const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
-        const entryUrl = new URL(_buildConfig.serverEntry, _config.outDir);
-        const buildPath = fileURLToPath(entryUrl);
-        const finalBuildUrl = pathToFileURL(buildPath.replace(/\.mjs$/, ".js"));
-        await esbuild.build({
-          target: "es2020",
-          platform: "browser",
-          conditions: ["workerd", "worker", "browser"],
-          entryPoints: [entryPath],
-          outfile: buildPath,
-          allowOverwrite: true,
-          format: "esm",
-          bundle: true,
-          minify: ((_b = (_a = _config.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.minify) !== false,
-          banner: {
-            js: SHIM
-          },
-          logOverride: {
-            "ignored-bare-import": "silent"
+        var _a, _b, _c, _d;
+        const functionsUrl = new URL("functions/", _config.root);
+        if (isModeDirectory) {
+          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({
+            target: "es2020",
+            platform: "browser",
+            conditions: ["workerd", "worker", "browser"],
+            entryPoints: entryPaths,
+            outdir: outputDir,
+            allowOverwrite: true,
+            format: "esm",
+            bundle: true,
+            minify: ((_b = (_a = _config.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.minify) !== false,
+            banner: {
+              js: SHIM
+            },
+            logOverride: {
+              "ignored-bare-import": "silent"
+            },
+            write: false
+          });
+          for (const [index, outputFile] of outputFiles.entries()) {
+            const fileName = entryPointsRouteData[index].component.replace("src/pages/", "").replace(".astro", ".js").replace(/(\[\.\.\.)(\w+)(\])/g, (_match, _p1, p2) => {
+              return `[[${p2}]]`;
+            });
+            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);
           }
-        });
-        await fs.promises.rename(buildPath, finalBuildUrl);
+        } else {
+          const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
+          const entryUrl = new URL(_buildConfig.serverEntry, _config.outDir);
+          const buildPath = fileURLToPath(entryUrl);
+          const finalBuildUrl = pathToFileURL(buildPath.replace(/\.mjs$/, ".js"));
+          await esbuild.build({
+            target: "es2020",
+            platform: "browser",
+            conditions: ["workerd", "worker", "browser"],
+            entryPoints: [entryPath],
+            outfile: buildPath,
+            allowOverwrite: true,
+            format: "esm",
+            bundle: true,
+            minify: ((_d = (_c = _config.vite) == null ? void 0 : _c.build) == null ? void 0 : _d.minify) !== false,
+            banner: {
+              js: SHIM
+            },
+            logOverride: {
+              "ignored-bare-import": "silent"
+            }
+          });
+          await fs.promises.rename(buildPath, finalBuildUrl);
+          if (isModeDirectory) {
+            const directoryUrl = new URL("[[path]].js", functionsUrl);
+            await fs.promises.rename(finalBuildUrl, directoryUrl);
+          }
+        }
         const serverUrl = new URL(_buildConfig.server);
         await fs.promises.rm(serverUrl, { recursive: true, force: true });
         const cloudflareSpecialFiles = ["_headers", "_redirects", "_routes.json"];
@@ -136,10 +185,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()) {
@@ -161,12 +212,6 @@ function createIntegration(args) {
             )
           );
         }
-        if (isModeDirectory) {
-          const functionsUrl = new URL("functions/", _config.root);
-          await fs.promises.mkdir(functionsUrl, { recursive: true });
-          const directoryUrl = new URL("[[path]].js", functionsUrl);
-          await fs.promises.rename(finalBuildUrl, directoryUrl);
-        }
       }
     }
   };

package/dist/server.directory.d.ts

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

package/dist/server.directory.js

@@ -45,7 +45,7 @@ function createExports(manifest) {
       statusText: "Not found"
     });
   };
-  return { onRequest };
+  return { onRequest, manifest };
 }
 export {
   createExports

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "6.5.1",
+  "version": "6.6.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,27 +32,27 @@
     "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.12",
+    "esbuild": "^0.17.19",
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.6.6"
+    "astro": "^2.8.2"
   },
   "devDependencies": {
-    "chai": "^4.3.6",
-    "cheerio": "^1.0.0-rc.11",
+    "chai": "^4.3.7",
+    "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
-    "slash": "^4.0.0",
     "wrangler": "^2.0.23",
-    "astro": "2.6.6",
+    "astro": "2.8.2",
     "astro-scripts": "0.0.14"
   },
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 30000 test/"
+    "test": "mocha --exit --timeout 30000 test/",
+    "test:match": "mocha --exit --timeout 30000 -g"
   }
 }