@astrojs/cloudflare 7.3.0 → 7.4.0

package/README.md

@@ -25,57 +25,57 @@ npm install @astrojs/cloudflare
 
 2. Add the following to your `astro.config.mjs` file:
 
-```js ins={3, 6-7}
-// astro.config.mjs
-import { defineConfig } from 'astro/config';
-import cloudflare from '@astrojs/cloudflare';
-
-export default defineConfig({
-  output: 'server',
-  adapter: cloudflare(),
-});
+```diff lang="js"
+  // astro.config.mjs
+  import { defineConfig } from 'astro/config';
++ import cloudflare from '@astrojs/cloudflare';
+
+  export default defineConfig({
++   output: 'server',
++   adapter: cloudflare(),
+  });
 ```
 
 ## Options
 
-### Mode
+### `mode`
 
 `mode: "advanced" | "directory"`
 
 default `"advanced"`
 
-Cloudflare Pages has 2 different modes for deploying functions, `advanced` mode which picks up the `_worker.js` in `dist`, or a directory mode where pages will compile the worker out of a functions folder in the project root. For most projects the adapter default of `advanced` will be sufficient; the `dist` folder will contain your compiled project.
+This configuration option defines how your Astro project is deployed to Cloudflare Pages.
 
-#### `mode:directory`
+- `advanced` mode picks up the `_worker.js` file in the `dist` folder
+- `directory` mode picks up the files in the `functions` folder, by default only one `[[path]].js` file is generated
 
-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.
+Switching to directory mode allows you to add additional files manually such as [Cloudflare Pages Plugins](https://developers.cloudflare.com/pages/platform/functions/plugins/), [Cloudflare Pages Middleware](https://developers.cloudflare.com/pages/platform/functions/middleware/) or custom functions using [Cloudflare Pages Functions Routing](https://developers.cloudflare.com/pages/platform/functions/routing/).
 
-```ts
+```js
 // astro.config.mjs
 export default defineConfig({
   adapter: cloudflare({ mode: 'directory' }),
 });
 ```
 
-In `directory` mode, the adapter will compile the client-side part of your app the same way as in `advanced` mode 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.
-
-To instead compile a separate bundle for each page, set the `functionPerPath` option in your Cloudflare adapter config. 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.
+To compile a separate bundle for each page, set the `functionPerRoute` option in your Cloudflare adapter config. This option requires some manual maintenance of the `functions` folder. Files emitted by Astro will overwrite existing files with identical names in the `functions` folder, 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.
 
-```diff
-import {defineConfig} from "astro/config";
-import cloudflare from '@astrojs/cloudflare';
+```diff lang="js"
+  // astro.config.mjs
+  import {defineConfig} from "astro/config";
+  import cloudflare from '@astrojs/cloudflare';
 
-export default defineConfig({
-     adapter: cloudflare({
-        mode: 'directory',
-+       functionPerRoute: true
+  export default defineConfig({
+    adapter: cloudflare({
+      mode: 'directory',
++     functionPerRoute: true
     })
-})
+  })
 ```
 
-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.
+This adapter doesn't support the [`edgeMiddleware`](https://docs.astro.build/en/reference/adapter-reference/#edgemiddleware) option.
 
-### routes.strategy
+### `routes.strategy`
 
 `routes.strategy: "auto" | "include" | "exclude"`
 
@@ -129,7 +129,7 @@ There are three options available:
   }
   ```
 
-### routes.include
+### `routes.include`
 
 `routes.include: string[]`
 
@@ -137,7 +137,7 @@ default `[]`
 
 If you want to use the automatic `_routes.json` generation, but want to include additional routes (e.g. when having custom functions in the `functions` folder), you can use the `routes.include` option to add additional routes to the `include` array.
 
-### routes.exclude
+### `routes.exclude`
 
 `routes.exclude: string[]`
 
@@ -147,41 +147,85 @@ If you want to use the automatic `_routes.json` generation, but want to exclude
 
 The following example automatically generates `_routes.json` while including and excluding additional routes. Note that that is only necessary if you have custom functions in the `functions` folder that are not handled by Astro.
 
-```diff
+```diff lang="js"
+  // astro.config.mjs
+  export default defineConfig({
+    adapter: cloudflare({
+      mode: 'directory',
++     routes: {
++       strategy: 'include',
++       include: ['/users/*'], // handled by custom function: functions/users/[id].js
++       exclude: ['/users/faq'], // handled by static page: pages/users/faq.astro
++     },
+    }),
+  });
+```
+
+### `wasmModuleImports`
+
+`wasmModuleImports: boolean`
+
+default: `false`
+
+Whether or not to import `.wasm` files [directly as ES modules](https://github.com/WebAssembly/esm-integration/tree/main/proposals/esm-integration) using the `.wasm?module` import syntax.
+
+Add `wasmModuleImports: true` to `astro.config.mjs` to enable this functionality in both the Cloudflare build and the Astro dev server. Read more about [using Wasm modules](#use-wasm-modules)
+
+```diff lang="js"
 // astro.config.mjs
+import {defineConfig} from "astro/config";
+import cloudflare from '@astrojs/cloudflare';
+
 export default defineConfig({
     adapter: cloudflare({
-        mode: 'directory',
-+       routes: {
-+           strategy: 'include',
-+           include: ['/users/*'], // handled by custom function: functions/users/[id].js
-+           exclude: ['/users/faq'], // handled by static page: pages/users/faq.astro
-+       },
++      wasmModuleImports: true
     }),
-});
+    output: 'server'
+})
 ```
 
-## Enabling Preview
+### `runtime`
 
-In order for preview to work you must install `wrangler`
+`runtime: "off" | "local"`
 
-```sh
-pnpm install wrangler --save-dev
-```
+default `"off"`
+
+Determines whether and how the Cloudflare Runtime is added to `astro dev`.
+
+The Cloudflare Runtime includes [Cloudflare bindings](https://developers.cloudflare.com/pages/platform/functions/bindings), [environment variables](https://developers.cloudflare.com/pages/platform/functions/bindings/#environment-variables), and the [cf object](https://developers.cloudflare.com/workers/runtime-apis/request/#incomingrequestcfproperties). Read more about [accessing the Cloudflare Runtime](#cloudflare-runtime).
+
+- `local`: uses bindings mocking and locally static placeholders
+- `off`: no access to the Cloudflare runtime using `astro dev`. You can alternatively use [Preview with Wrangler](#preview-with-wrangler)
+
+```diff lang="js"
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+import cloudflare from '@astrojs/cloudflare';
 
-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).
+export default defineConfig({
+  output: 'server',
+  adapter: cloudflare({
++   runtime: 'local',
+  }),
+});
+```
 
-## Access to the Cloudflare runtime
+## Cloudflare runtime
 
-You can access all the Cloudflare bindings and environment variables from Astro components and API routes through `Astro.locals`.
+Gives you access to [environment variables](https://developers.cloudflare.com/pages/platform/functions/bindings/#environment-variables).
 
-If you're inside an `.astro` file, you access the runtime using the `Astro.locals` global:
+You can access the runtime from Astro components through `Astro.locals` inside any .astro` file.
 
 ```astro
-const env = Astro.locals.runtime.env;
+---
+// src/pages/index.astro
+const runtime = Astro.locals.runtime;
+---
+
+<pre>{JSON.stringify(runtime.env)}</pre>
 ```
 
-From an endpoint:
+You can access the runtime from API endpoints through `context.locals`:
 
 ```js
 // src/pages/api/someFile.js
@@ -192,21 +236,24 @@ export function GET(context) {
 }
 ```
 
-Depending on your adapter mode (advanced = worker, directory = pages), the runtime object will look a little different due to differences in the Cloudflare API.
+### Typing
 
-If you're using the `advanced` runtime, you can type the `runtime` object as following:
+If you have configured `mode: advanced`, you can type the `runtime` object using `AdvancedRuntime`:
 
 ```ts
 // src/env.d.ts
 /// <reference types="astro/client" />
-import type { AdvancedRuntime } from '@astrojs/cloudflare';
 
+type KVNamespace = import('@cloudflare/workers-types/experimental').KVNamespace;
 type ENV = {
   SERVER_URL: string;
+  KV_BINDING: KVNamespace;
 };
 
+type Runtime = import('@astrojs/cloudflare').AdvancedRuntime<ENV>;
+
 declare namespace App {
-  interface Locals extends AdvancedRuntime<ENV> {
+  interface Locals extends Runtime {
     user: {
       name: string;
       surname: string;
@@ -215,19 +262,22 @@ declare namespace App {
 }
 ```
 
-If you're using the `directory` runtime, you can type the `runtime` object as following:
+If you have configured `mode: directory`, you can type the `runtime` object using `DirectoryRuntime`:
 
 ```ts
 // src/env.d.ts
 /// <reference types="astro/client" />
-import type { DirectoryRuntime } from '@astrojs/cloudflare';
 
+type KVNamespace = import('@cloudflare/workers-types/experimental').KVNamespace;
 type ENV = {
   SERVER_URL: string;
+  KV_BINDING: KVNamespace;
 };
 
+type Runtime = import('@astrojs/cloudflare').DirectoryRuntime<ENV>;
+
 declare namespace App {
-  interface Locals extends DirectoryRuntime<ENV> {
+  interface Locals extends Runtime {
     user: {
       name: string;
       surname: string;
@@ -236,75 +286,30 @@ declare namespace App {
 }
 ```
 
-### Environment Variables
+## Platform
 
-See Cloudflare's documentation for [working with environment variables](https://developers.cloudflare.com/pages/platform/functions/bindings/#environment-variables).
+### Headers
 
-```js
-// pages/[id].json.js
-
-export function GET({ params }) {
-  // Access environment variables per request inside a function
-  const serverUrl = import.meta.env.SERVER_URL;
-  const result = await fetch(serverUrl + "/user/" + params.id);
-  return {
-    body: await result.text(),
-  };
-}
-```
-
-### `cloudflare.runtime`
-
-`runtime: "off" | "local" | "remote"`
-default `"off"`
-
-This optional flag enables the Astro dev server to populate environment variables and the Cloudflare Request Object, avoiding the need for Wrangler.
-
-- `local`: environment variables are available, but the request object is populated from a static placeholder value.
-- `remote`: environment variables and the live, fetched request object are available.
-- `off`: the Astro dev server will populate neither environment variables nor the request object. Use Wrangler to access Cloudflare bindings and environment variables.
-
-```js
-// astro.config.mjs
-import { defineConfig } from 'astro/config';
-import cloudflare from '@astrojs/cloudflare';
-
-export default defineConfig({
-  output: 'server',
-  adapter: cloudflare({
-    runtime: 'off' | 'local' | 'remote',
-  }),
-});
-```
+You can attach [custom headers](https://developers.cloudflare.com/pages/platform/headers/) to your responses by adding a `_headers` file in your Astro project's `public/` folder. This file will be copied to your build output directory.
 
-## Wasm module imports
+### Redirects
 
-`wasmModuleImports: boolean`
+You can declare [custom redirects](https://developers.cloudflare.com/pages/platform/redirects/) using Cloudflare Pages. This allows you to redirect requests to a different URL. You can add a `_redirects` file in your Astro project's `public/` folder. This file will be copied to your build output directory.
 
-default: `false`
+### Routes
 
-Whether or not to import `.wasm` files [directly as ES modules](https://github.com/WebAssembly/esm-integration/tree/main/proposals/esm-integration).
+You can define which routes are invoking functions and which are static assets, using [Cloudflare routing](https://developers.cloudflare.com/pages/platform/functions/routing/#functions-invocation-routes) via a `_routes.json` file. This file is automatically generated by Astro.
 
-Add `wasmModuleImports: true` to `astro.config.mjs` to enable in both the Cloudflare build and the Astro dev server.
+#### Custom `_routes.json`
 
-```diff
-// astro.config.mjs
-import {defineConfig} from "astro/config";
-import cloudflare from '@astrojs/cloudflare';
-
-export default defineConfig({
-    adapter: cloudflare({
-+       wasmModuleImports: true
-    }),
-	  output: 'server'
-})
-```
+By default, `@astrojs/cloudflare` will generate a `_routes.json` file with `include` and `exclude` rules based on your applications's dynamic and static routes.
+This will enable Cloudflare to serve files and process static redirects without a function invocation. Creating a custom `_routes.json` will override this automatic optimization. See [Cloudflare's documentation on creating a custom `routes.json`](https://developers.cloudflare.com/pages/platform/functions/routing/#create-a-_routesjson-file) for more details.
 
-Once enabled, you can import a web assembly module in Astro with a `.wasm?module` import.
+## Use Wasm modules
 
 The following is an example of importing a Wasm module that then responds to requests by adding the request's number parameters together.
 
-```javascript
+```js
 // pages/add/[a]/[b].js
 import mod from '../util/add.wasm?module';
 
@@ -320,17 +325,6 @@ export async function GET(context) {
 
 While this example is trivial, Wasm can be used to accelerate computationally intensive operations which do not involve significant I/O such as embedding an image processing library.
 
-## Headers, Redirects and function invocation routes
-
-Cloudflare has support for adding custom [headers](https://developers.cloudflare.com/pages/platform/headers/), configuring static [redirects](https://developers.cloudflare.com/pages/platform/redirects/) and defining which routes should [invoke functions](https://developers.cloudflare.com/pages/platform/functions/routing/#function-invocation-routes). Cloudflare looks for `_headers`, `_redirects`, and `_routes.json` files in your build output directory to configure these features. This means they should be placed in your Astro project’s `public/` directory.
-
-### Custom `_routes.json`
-
-By default, `@astrojs/cloudflare` will generate a `_routes.json` file with `include` and `exclude` rules based on your applications's dynamic and static routes.
-This will enable Cloudflare to serve files and process static redirects without a function invocation. Creating a custom `_routes.json` will override this automatic optimization and, if not configured manually, cause function invocations that will count against the request limits of your Cloudflare plan.
-
-See [Cloudflare's documentation](https://developers.cloudflare.com/pages/platform/functions/routing/#create-a-_routesjson-file) for more details.
-
 ## Node.js compatibility
 
 Astro's Cloudflare adapter allows you to use any Node.js runtime API supported by Cloudflare:
@@ -354,33 +348,43 @@ export const prerender = false;
 import { Buffer } from 'node:buffer';
 ```
 
-Additionally, you'll need to enable the Compatibility Flag in Cloudflare. The configuration for this flag may vary based on where you deploy your Astro site.
+Additionally, you'll need to enable the Compatibility Flag in Cloudflare. The configuration for this flag may vary based on where you deploy your Astro site. For detailed guidance, please refer to the [Cloudflare documentation on enabling Node.js compatibility](https://developers.cloudflare.com/workers/runtime-apis/nodejs).
 
-For detailed guidance, please refer to the [Cloudflare documentation](https://developers.cloudflare.com/workers/runtime-apis/nodejs).
+## Preview with Wrangler
 
-## Troubleshooting
+To use [`wrangler`](https://developers.cloudflare.com/workers/wrangler/) to run your application locally, update the preview script:
 
-For help, check out the `#support` channel on [Discord](https://astro.build/chat). Our friendly Support Squad members are here to help!
+```json
+//package.json
+"preview": "wrangler pages dev ./dist"
+```
 
-You can also check our [Astro Integration Documentation][astro-integration] for more on integrations.
+[`wrangler`](https://developers.cloudflare.com/workers/wrangler/) gives you access to [Cloudflare bindings](https://developers.cloudflare.com/pages/platform/functions/bindings), [environment variables](https://developers.cloudflare.com/pages/platform/functions/bindings/#environment-variables), and the [cf object](https://developers.cloudflare.com/workers/runtime-apis/request/#incomingrequestcfproperties). Getting hot reloading or the astro dev server to work with Wrangler might require custom setup. See [community examples](https://github.com/withastro/roadmap/discussions/590).
 
 ### Meaningful error messages
 
-Currently, errors during running your application in Wrangler are not very useful, due to the minification of your code. For better debugging, you can add `vite.build.minify = false` setting to your `astro.config.js`
+Currently, errors during running your application in Wrangler are not very useful, due to the minification of your code. For better debugging, you can add `vite.build.minify = false` setting to your `astro.config.mjs`.
 
-```js
-export default defineConfig({
-  adapter: cloudflare(),
-  output: 'server',
+```diff lang="js"
+  // astro.config.mjs
+  export default defineConfig({
+    adapter: cloudflare(),
+    output: 'server',
 
-  vite: {
-    build: {
-      minify: false,
-    },
-  },
-});
++   vite: {
++     build: {
++       minify: false,
++     },
++   },
+  });
 ```
 
+## 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.
+
 ## Contributing
 
 This package is maintained by Astro's Core team. You're welcome to submit an issue or PR!

package/dist/{server.advanced.js → entrypoints/server.advanced.js}

@@ -1,5 +1,5 @@
 import { App } from "astro/app";
-import { getProcessEnvProxy, isNode } from "./util.js";
+import { getProcessEnvProxy, isNode } from "../util.js";
 if (!isNode) {
   process.env = getProcessEnvProxy();
 }

package/dist/{server.directory.d.ts → entrypoints/server.directory.d.ts}

@@ -9,6 +9,6 @@ export interface DirectoryRuntime<T extends object = object> {
     };
 }
 export declare function createExports(manifest: SSRManifest): {
-    onRequest: (context: EventContext<unknown, string, unknown>) => Promise<import("@cloudflare/workers-types").Response | Response>;
+    onRequest: (context: EventContext<unknown, string, unknown>) => Promise<Response | import("@cloudflare/workers-types").Response>;
     manifest: SSRManifest;
 };

package/dist/{server.directory.js → entrypoints/server.directory.js}

@@ -1,5 +1,5 @@
 import { App } from "astro/app";
-import { getProcessEnvProxy, isNode } from "./util.js";
+import { getProcessEnvProxy, isNode } from "../util.js";
 if (!isNode) {
   process.env = getProcessEnvProxy();
 }

package/dist/getAdapter.d.ts

@@ -0,0 +1,5 @@
+import type { AstroAdapter } from 'astro';
+export declare function getAdapter({ isModeDirectory, functionPerRoute, }: {
+    isModeDirectory: boolean;
+    functionPerRoute: boolean;
+}): AstroAdapter;

package/dist/getAdapter.js

@@ -0,0 +1,36 @@
+function getAdapter({
+  isModeDirectory,
+  functionPerRoute
+}) {
+  const astroFeatures = {
+    hybridOutput: "stable",
+    staticOutput: "unsupported",
+    serverOutput: "stable",
+    assets: {
+      supportKind: "stable",
+      isSharpCompatible: false,
+      isSquooshCompatible: false
+    }
+  };
+  if (isModeDirectory) {
+    return {
+      name: "@astrojs/cloudflare",
+      serverEntrypoint: "@astrojs/cloudflare/entrypoints/server.directory.js",
+      exports: ["onRequest", "manifest"],
+      adapterFeatures: {
+        functionPerRoute,
+        edgeMiddleware: false
+      },
+      supportedAstroFeatures: astroFeatures
+    };
+  }
+  return {
+    name: "@astrojs/cloudflare",
+    serverEntrypoint: "@astrojs/cloudflare/entrypoints/server.advanced.js",
+    exports: ["default"],
+    supportedAstroFeatures: astroFeatures
+  };
+}
+export {
+  getAdapter
+};

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import type { AstroAdapter, AstroIntegration } from 'astro';
-export type { AdvancedRuntime } from './server.advanced.js';
-export type { DirectoryRuntime } from './server.directory.js';
+import type { AstroIntegration } from 'astro';
+export type { AdvancedRuntime } from './entrypoints/server.advanced.js';
+export type { DirectoryRuntime } from './entrypoints/server.directory.js';
 type Options = {
     mode?: 'directory' | 'advanced';
     functionPerRoute?: boolean;
@@ -25,8 +25,4 @@ type Options = {
     runtime?: 'off' | 'local' | 'remote';
     wasmModuleImports?: boolean;
 };
-export declare function getAdapter({ isModeDirectory, functionPerRoute, }: {
-    isModeDirectory: boolean;
-    functionPerRoute: boolean;
-}): AstroAdapter;
 export default function createIntegration(args?: Options): AstroIntegration;

package/dist/index.js

@@ -6,11 +6,16 @@ import { AstroError } from "astro/errors";
 import esbuild from "esbuild";
 import * as fs from "node:fs";
 import * as os from "node:os";
-import { basename, dirname, relative, sep } from "node:path";
+import { dirname, relative, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "tiny-glob";
-import { getEnvVars } from "./parser.js";
-import { wasmModuleLoader } from "./wasm-module-loader.js";
+import { getAdapter } from "./getAdapter.js";
+import { deduplicatePatterns } from "./utils/deduplicatePatterns.js";
+import { getCFObject } from "./utils/getCFObject.js";
+import { getEnvVars } from "./utils/parser.js";
+import { prependForwardSlash } from "./utils/prependForwardSlash.js";
+import { rewriteWasmImportPath } from "./utils/rewriteWasmImportPath.js";
+import { wasmModuleLoader } from "./utils/wasm-module-loader.js";
 class StorageFactory {
   storages = /* @__PURE__ */ new Map();
   storage(namespace) {
@@ -21,119 +26,11 @@ class StorageFactory {
     return storage;
   }
 }
-function getAdapter({
-  isModeDirectory,
-  functionPerRoute
-}) {
-  return isModeDirectory ? {
-    name: "@astrojs/cloudflare",
-    serverEntrypoint: "@astrojs/cloudflare/server.directory.js",
-    exports: ["onRequest", "manifest"],
-    adapterFeatures: {
-      functionPerRoute,
-      edgeMiddleware: false
-    },
-    supportedAstroFeatures: {
-      hybridOutput: "stable",
-      staticOutput: "unsupported",
-      serverOutput: "stable",
-      assets: {
-        supportKind: "stable",
-        isSharpCompatible: false,
-        isSquooshCompatible: false
-      }
-    }
-  } : {
-    name: "@astrojs/cloudflare",
-    serverEntrypoint: "@astrojs/cloudflare/server.advanced.js",
-    exports: ["default"],
-    supportedAstroFeatures: {
-      hybridOutput: "stable",
-      staticOutput: "unsupported",
-      serverOutput: "stable",
-      assets: {
-        supportKind: "stable",
-        isSharpCompatible: false,
-        isSquooshCompatible: false
-      }
-    }
-  };
-}
-async function getCFObject(runtimeMode) {
-  const CF_ENDPOINT = "https://workers.cloudflare.com/cf.json";
-  const CF_FALLBACK = {
-    asOrganization: "",
-    asn: 395747,
-    colo: "DFW",
-    city: "Austin",
-    region: "Texas",
-    regionCode: "TX",
-    metroCode: "635",
-    postalCode: "78701",
-    country: "US",
-    continent: "NA",
-    timezone: "America/Chicago",
-    latitude: "30.27130",
-    longitude: "-97.74260",
-    clientTcpRtt: 0,
-    httpProtocol: "HTTP/1.1",
-    requestPriority: "weight=192;exclusive=0",
-    tlsCipher: "AEAD-AES128-GCM-SHA256",
-    tlsVersion: "TLSv1.3",
-    tlsClientAuth: {
-      certPresented: "0",
-      certVerified: "NONE",
-      certRevoked: "0",
-      certIssuerDN: "",
-      certSubjectDN: "",
-      certIssuerDNRFC2253: "",
-      certSubjectDNRFC2253: "",
-      certIssuerDNLegacy: "",
-      certSubjectDNLegacy: "",
-      certSerial: "",
-      certIssuerSerial: "",
-      certSKI: "",
-      certIssuerSKI: "",
-      certFingerprintSHA1: "",
-      certFingerprintSHA256: "",
-      certNotBefore: "",
-      certNotAfter: ""
-    },
-    edgeRequestKeepAliveStatus: 0,
-    hostMetadata: void 0,
-    clientTrustScore: 99,
-    botManagement: {
-      corporateProxy: false,
-      verifiedBot: false,
-      ja3Hash: "25b4882c2bcb50cd6b469ff28c596742",
-      staticResource: false,
-      detectionIds: [],
-      score: 99
-    }
-  };
-  if (runtimeMode === "local") {
-    return CF_FALLBACK;
-  } else if (runtimeMode === "remote") {
-    try {
-      const res = await fetch(CF_ENDPOINT);
-      const cfText = await res.text();
-      const storedCf = JSON.parse(cfText);
-      return storedCf;
-    } catch (e) {
-      return CF_FALLBACK;
-    }
-  }
-}
-const SHIM = `globalThis.process = {
-	argv: [],
-	env: {},
-};`;
-const SERVER_BUILD_FOLDER = "/$server_build/";
-const potentialFunctionRouteTypes = ["endpoint", "page"];
 function createIntegration(args) {
   let _config;
   let _buildConfig;
   let _entryPoints = /* @__PURE__ */ new Map();
+  const SERVER_BUILD_FOLDER = "/$server_build/";
   const isModeDirectory = args?.mode === "directory";
   const functionPerRoute = args?.functionPerRoute ?? false;
   const runtimeMode = args?.runtime ?? "off";
@@ -163,12 +60,12 @@ function createIntegration(args) {
         setAdapter(getAdapter({ isModeDirectory, functionPerRoute }));
         _config = config;
         _buildConfig = config.build;
-        if (config.output === "static") {
+        if (_config.output === "static") {
           throw new AstroError(
             '[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.'
           );
         }
-        if (config.base === SERVER_BUILD_FOLDER) {
+        if (_config.base === SERVER_BUILD_FOLDER) {
           throw new AstroError(
             '[@astrojs/cloudflare] `base: "${SERVER_BUILD_FOLDER}"` is not allowed. Please change your `base` config to something else.'
           );
@@ -267,7 +164,7 @@ function createIntegration(args) {
               fileURLToPath(assetsUrl)
             );
             await esbuild.build({
-              target: "es2020",
+              target: "es2022",
               platform: "browser",
               conditions: ["workerd", "worker", "browser"],
               external: [
@@ -290,7 +187,10 @@ function createIntegration(args) {
               bundle: true,
               minify: _config.vite?.build?.minify !== false,
               banner: {
-                js: SHIM
+                js: `globalThis.process = {
+									argv: [],
+									env: {},
+								};`
               },
               logOverride: {
                 "ignored-bare-import": "silent"
@@ -328,7 +228,7 @@ function createIntegration(args) {
           const buildPath = fileURLToPath(entryUrl);
           const finalBuildUrl = pathToFileURL(buildPath.replace(/\.mjs$/, ".js"));
           await esbuild.build({
-            target: "es2020",
+            target: "es2022",
             platform: "browser",
             conditions: ["workerd", "worker", "browser"],
             external: [
@@ -350,7 +250,10 @@ function createIntegration(args) {
             bundle: true,
             minify: _config.vite?.build?.minify !== false,
             banner: {
-              js: SHIM
+              js: `globalThis.process = {
+								argv: [],
+								env: {},
+							};`
             },
             logOverride: {
               "ignored-bare-import": "silent"
@@ -386,6 +289,7 @@ function createIntegration(args) {
         }
         const routesExists = await fs.promises.stat(new URL("./_routes.json", _config.outDir)).then((stat) => stat.isFile()).catch(() => false);
         if (!routesExists) {
+          const potentialFunctionRouteTypes = ["endpoint", "page"];
           const functionEndpoints = routes.filter((route) => potentialFunctionRouteTypes.includes(route.type) && !route.prerender).map((route) => {
             const includePattern = "/" + route.segments.flat().map((segment) => segment.dynamic ? "*" : segment.content).join("/");
             const regexp = new RegExp(
@@ -398,7 +302,8 @@ function createIntegration(args) {
           });
           const staticPathList = (await glob(`${fileURLToPath(_buildConfig.client)}/**/*`, {
             cwd: fileURLToPath(_config.outDir),
-            filesOnly: true
+            filesOnly: true,
+            dot: true
           })).filter((file) => cloudflareSpecialFiles.indexOf(file) < 0).map((file) => `/${file.replace(/\\/g, "/")}`);
           for (let page of pages) {
             let pagePath = prependForwardSlash(page.pathname);
@@ -477,43 +382,6 @@ function createIntegration(args) {
     }
   };
 }
-function prependForwardSlash(path) {
-  return path[0] === "/" ? path : "/" + path;
-}
-function deduplicatePatterns(patterns) {
-  const openPatterns = [];
-  return [...new Set(patterns)].sort((a, b) => a.length - b.length).filter((pattern) => {
-    if (openPatterns.some((p) => p.test(pattern))) {
-      return false;
-    }
-    if (pattern.endsWith("*")) {
-      openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, ".*")}`));
-    }
-    return true;
-  });
-}
-function rewriteWasmImportPath({
-  relativePathToAssets
-}) {
-  return {
-    name: "wasm-loader",
-    setup(build) {
-      build.onResolve({ filter: /.*\.wasm.mjs$/ }, (args) => {
-        const updatedPath = [
-          relativePathToAssets.replaceAll("\\", "/"),
-          basename(args.path).replace(/\.mjs$/, "")
-        ].join("/");
-        return {
-          path: updatedPath,
-          // change the reference to the changed module
-          external: true
-          // mark it as external in the bundle
-        };
-      });
-    }
-  };
-}
 export {
-  createIntegration as default,
-  getAdapter
+  createIntegration as default
 };

package/dist/utils/deduplicatePatterns.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Remove duplicates and redundant patterns from an `include` or `exclude` list.
+ * Otherwise Cloudflare will throw an error on deployment. Plus, it saves more entries.
+ * E.g. `['/foo/*', '/foo/*', '/foo/bar'] => ['/foo/*']`
+ * @param patterns a list of `include` or `exclude` patterns
+ * @returns a deduplicated list of patterns
+ */
+export declare function deduplicatePatterns(patterns: string[]): string[];

package/dist/utils/deduplicatePatterns.js

@@ -0,0 +1,15 @@
+function deduplicatePatterns(patterns) {
+  const openPatterns = [];
+  return [...new Set(patterns)].sort((a, b) => a.length - b.length).filter((pattern) => {
+    if (openPatterns.some((p) => p.test(pattern))) {
+      return false;
+    }
+    if (pattern.endsWith("*")) {
+      openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, ".*")}`));
+    }
+    return true;
+  });
+}
+export {
+  deduplicatePatterns
+};

package/dist/utils/getCFObject.d.ts

@@ -0,0 +1,2 @@
+import type { IncomingRequestCfProperties } from '@cloudflare/workers-types/experimental';
+export declare function getCFObject(runtimeMode: string): Promise<IncomingRequestCfProperties | void>;

package/dist/utils/getCFObject.js

@@ -0,0 +1,68 @@
+async function getCFObject(runtimeMode) {
+  const CF_ENDPOINT = "https://workers.cloudflare.com/cf.json";
+  const CF_FALLBACK = {
+    asOrganization: "",
+    asn: 395747,
+    colo: "DFW",
+    city: "Austin",
+    region: "Texas",
+    regionCode: "TX",
+    metroCode: "635",
+    postalCode: "78701",
+    country: "US",
+    continent: "NA",
+    timezone: "America/Chicago",
+    latitude: "30.27130",
+    longitude: "-97.74260",
+    clientTcpRtt: 0,
+    httpProtocol: "HTTP/1.1",
+    requestPriority: "weight=192;exclusive=0",
+    tlsCipher: "AEAD-AES128-GCM-SHA256",
+    tlsVersion: "TLSv1.3",
+    tlsClientAuth: {
+      certPresented: "0",
+      certVerified: "NONE",
+      certRevoked: "0",
+      certIssuerDN: "",
+      certSubjectDN: "",
+      certIssuerDNRFC2253: "",
+      certSubjectDNRFC2253: "",
+      certIssuerDNLegacy: "",
+      certSubjectDNLegacy: "",
+      certSerial: "",
+      certIssuerSerial: "",
+      certSKI: "",
+      certIssuerSKI: "",
+      certFingerprintSHA1: "",
+      certFingerprintSHA256: "",
+      certNotBefore: "",
+      certNotAfter: ""
+    },
+    edgeRequestKeepAliveStatus: 0,
+    hostMetadata: void 0,
+    clientTrustScore: 99,
+    botManagement: {
+      corporateProxy: false,
+      verifiedBot: false,
+      ja3Hash: "25b4882c2bcb50cd6b469ff28c596742",
+      staticResource: false,
+      detectionIds: [],
+      score: 99
+    }
+  };
+  if (runtimeMode === "local") {
+    return CF_FALLBACK;
+  } else if (runtimeMode === "remote") {
+    try {
+      const res = await fetch(CF_ENDPOINT);
+      const cfText = await res.text();
+      const storedCf = JSON.parse(cfText);
+      return storedCf;
+    } catch (e) {
+      return CF_FALLBACK;
+    }
+  }
+}
+export {
+  getCFObject
+};

package/dist/utils/prependForwardSlash.d.ts

@@ -0,0 +1 @@
+export declare function prependForwardSlash(path: string): string;

package/dist/utils/prependForwardSlash.js

@@ -0,0 +1,6 @@
+function prependForwardSlash(path) {
+  return path[0] === "/" ? path : "/" + path;
+}
+export {
+  prependForwardSlash
+};

package/dist/utils/rewriteWasmImportPath.d.ts

@@ -0,0 +1,8 @@
+import esbuild from 'esbuild';
+/**
+ *
+ * @param relativePathToAssets - relative path from the final location for the current esbuild output bundle, to the assets directory.
+ */
+export declare function rewriteWasmImportPath({ relativePathToAssets, }: {
+    relativePathToAssets: string;
+}): esbuild.Plugin;

package/dist/utils/rewriteWasmImportPath.js

@@ -0,0 +1,25 @@
+import esbuild from "esbuild";
+import { basename } from "node:path";
+function rewriteWasmImportPath({
+  relativePathToAssets
+}) {
+  return {
+    name: "wasm-loader",
+    setup(build) {
+      build.onResolve({ filter: /.*\.wasm.mjs$/ }, (args) => {
+        const updatedPath = [
+          relativePathToAssets.replaceAll("\\", "/"),
+          basename(args.path).replace(/\.mjs$/, "")
+        ].join("/");
+        return {
+          path: updatedPath,
+          external: true
+          // mark it as external in the bundle
+        };
+      });
+    }
+  };
+}
+export {
+  rewriteWasmImportPath
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -19,17 +19,12 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
   "exports": {
     ".": "./dist/index.js",
-    "./runtime": {
-      "types": "./runtime.d.ts",
-      "default": "./dist/runtime.js"
-    },
-    "./server.advanced.js": "./dist/server.advanced.js",
-    "./server.directory.js": "./dist/server.directory.js",
+    "./entrypoints/server.advanced.js": "./dist/entrypoints/server.advanced.js",
+    "./entrypoints/server.directory.js": "./dist/entrypoints/server.directory.js",
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "runtime.d.ts"
+    "dist"
   ],
   "dependencies": {
     "@cloudflare/workers-types": "^4.20230821.0",
@@ -45,7 +40,7 @@
     "@astrojs/underscore-redirects": "0.3.0"
   },
   "peerDependencies": {
-    "astro": "^3.1.3"
+    "astro": "^3.2.1"
   },
   "devDependencies": {
     "@types/iarna__toml": "^2.0.2",
@@ -53,7 +48,7 @@
     "cheerio": "1.0.0-rc.12",
     "mocha": "^10.2.0",
     "wrangler": "^3.5.1",
-    "astro": "3.1.3",
+    "astro": "3.2.1",
     "astro-scripts": "0.0.14"
   },
   "scripts": {