@astrojs/cloudflare 6.0.0 → 6.1.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/cloudflare:build: cache hit, replaying output 8a1cfbea8c1338b8
-@astrojs/cloudflare:build: 
-@astrojs/cloudflare:build: > @astrojs/cloudflare@6.0.0 build /home/runner/work/astro/astro/packages/integrations/cloudflare
-@astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
-@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: cache hit, replaying output af3389b4b118897d
+@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: > @astrojs/cloudflare@6.1.1 build /home/runner/work/astro/astro/packages/integrations/cloudflare
+@astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
+@astrojs/cloudflare:build: 

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @astrojs/cloudflare
 
+## 6.1.1
+
+### Patch Changes
+
+- [#6046](https://github.com/withastro/astro/pull/6046) [`df3201165`](https://github.com/withastro/astro/commit/df320116528e00ab082396531b4deffbb0707b78) Thanks [@matthewp](https://github.com/matthewp)! - Cloudflare fix for building to directory mode
+
+- Updated dependencies [[`41e97158b`](https://github.com/withastro/astro/commit/41e97158ba90d23d346b6e3ff6c7c14b5ecbe903), [`e779c6242`](https://github.com/withastro/astro/commit/e779c6242418d1d4102e683ca5b851b764c89688)]:
+  - astro@2.0.4
+
+## 6.1.0
+
+### Minor Changes
+
+- [#5914](https://github.com/withastro/astro/pull/5914) [`088f5194c`](https://github.com/withastro/astro/commit/088f5194c55a6ec15b2eaf2cfb97f9ef45a24a33) Thanks [@AngusMorton](https://github.com/AngusMorton)! - Re-enable streaming in Cloudflare Pages.
+
+### Patch Changes
+
+- [#5993](https://github.com/withastro/astro/pull/5993) [`9855db676`](https://github.com/withastro/astro/commit/9855db676e61ad616c64382adeaa8c74de05f7e1) Thanks [@matthewp](https://github.com/matthewp)! - Support for prerendering in the Cloudflare integration
+
+  This fixes prerendering in the Cloudflare adapter. Now any prerendered routes are added to the `_routes.json` config so that the worker script is skipped for those routes.
+
+- Updated dependencies [[`b53e0717b`](https://github.com/withastro/astro/commit/b53e0717b7f6b042baaeec7f87999e99c76c031c), [`60b32d585`](https://github.com/withastro/astro/commit/60b32d58565d87e87573eb268408293fc28ec657), [`883e0cc29`](https://github.com/withastro/astro/commit/883e0cc29968d51ed6c7515be035a40b28bafdad), [`dabce6b8c`](https://github.com/withastro/astro/commit/dabce6b8c684f851c3535f8acead06cbef6dce2a), [`aedf23f85`](https://github.com/withastro/astro/commit/aedf23f8582e32a6b94b81ddba9b323831f2b22a)]:
+  - astro@2.0.2
+
 ## 6.0.0
 
 ### Major Changes

package/dist/index.js

@@ -2,7 +2,7 @@ import esbuild from "esbuild";
 import * as fs from "fs";
 import * as os from "os";
 import glob from "tiny-glob";
-import { fileURLToPath } from "url";
+import { fileURLToPath, pathToFileURL } from "url";
 function getAdapter(isModeDirectory) {
   return isModeDirectory ? {
     name: "@astrojs/cloudflare",
@@ -31,7 +31,7 @@ function createIntegration(args) {
           build: {
             client: new URL(`.${config.base}`, config.outDir),
             server: new URL(`.${SERVER_BUILD_FOLDER}`, config.outDir),
-            serverEntry: "_worker.js"
+            serverEntry: "_worker.mjs"
           }
         });
       },
@@ -66,8 +66,11 @@ function createIntegration(args) {
           vite.ssr.target = vite.ssr.target || "webworker";
         }
       },
-      "astro:build:done": async () => {
-        const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server)), entryUrl = new URL(_buildConfig.serverEntry, _config.outDir), buildPath = fileURLToPath(entryUrl);
+      "astro:build:done": async ({ pages }) => {
+        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",
@@ -81,6 +84,7 @@ function createIntegration(args) {
             js: SHIM
           }
         });
+        await fs.promises.rename(buildPath, finalBuildUrl);
         const serverUrl = new URL(_buildConfig.server);
         await fs.promises.rm(serverUrl, { recursive: true, force: true });
         const cloudflareSpecialFiles = ["_headers", "_redirects", "_routes.json"];
@@ -101,6 +105,9 @@ function createIntegration(args) {
             cwd: fileURLToPath(_config.outDir),
             filesOnly: true
           })).filter((file) => cloudflareSpecialFiles.indexOf(file) < 0).map((file) => `/${file}`);
+          for (let page of pages) {
+            staticPathList.push(prependForwardSlash(page.pathname));
+          }
           const redirectsExists = await fs.promises.stat(new URL("./_redirects", _config.outDir)).then((stat) => stat.isFile()).catch(() => false);
           if (redirectsExists) {
             const redirects = (await fs.promises.readFile(new URL("./_redirects", _config.outDir), "utf-8")).split(os.EOL).map((line) => {
@@ -134,12 +141,15 @@ function createIntegration(args) {
           const functionsUrl = new URL(`file://${process.cwd()}/functions/`);
           await fs.promises.mkdir(functionsUrl, { recursive: true });
           const directoryUrl = new URL("[[path]].js", functionsUrl);
-          await fs.promises.rename(entryUrl, directoryUrl);
+          await fs.promises.rename(finalBuildUrl, directoryUrl);
         }
       }
     }
   };
 }
+function prependForwardSlash(path) {
+  return path[0] === "/" ? path : "/" + path;
+}
 export {
   createIntegration as default,
   getAdapter

package/dist/server.advanced.js

@@ -1,8 +1,10 @@
 import { App } from "astro/app";
-import { getProcessEnvProxy } from "./util.js";
-process.env = getProcessEnvProxy();
+import { getProcessEnvProxy, isNode } from "./util.js";
+if (!isNode) {
+  process.env = getProcessEnvProxy();
+}
 function createExports(manifest) {
-  const app = new App(manifest, false);
+  const app = new App(manifest);
   const fetch = async (request, env, context) => {
     process.env = env;
     const { pathname } = new URL(request.url);

package/dist/server.directory.js

@@ -1,8 +1,10 @@
 import { App } from "astro/app";
-import { getProcessEnvProxy } from "./util.js";
-process.env = getProcessEnvProxy();
+import { getProcessEnvProxy, isNode } from "./util.js";
+if (!isNode) {
+  process.env = getProcessEnvProxy();
+}
 function createExports(manifest) {
-  const app = new App(manifest, false);
+  const app = new App(manifest);
   const onRequest = async ({
     request,
     next,

package/dist/util.d.ts

@@ -1 +1,2 @@
+export declare const isNode: boolean;
 export declare function getProcessEnvProxy(): {};

package/dist/util.js

@@ -1,3 +1,4 @@
+const isNode = typeof process === "object" && Object.prototype.toString.call(process) === "[object process]";
 function getProcessEnvProxy() {
   return new Proxy(
     {},
@@ -11,5 +12,6 @@ function getProcessEnvProxy() {
   );
 }
 export {
-  getProcessEnvProxy
+  getProcessEnvProxy,
+  isNode
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to cloudflare workers or cloudflare pages",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -32,10 +32,10 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.0.0"
+    "astro": "^2.0.4"
   },
   "devDependencies": {
-    "astro": "2.0.0",
+    "astro": "2.0.4",
     "astro-scripts": "0.0.10",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",

package/src/index.ts

@@ -3,7 +3,7 @@ import esbuild from 'esbuild';
 import * as fs from 'fs';
 import * as os from 'os';
 import glob from 'tiny-glob';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
 
 type Options = {
 	mode: 'directory' | 'advanced';
@@ -49,7 +49,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					build: {
 						client: new URL(`.${config.base}`, config.outDir),
 						server: new URL(`.${SERVER_BUILD_FOLDER}`, config.outDir),
-						serverEntry: '_worker.js',
+						serverEntry: '_worker.mjs',
 					},
 				});
 			},
@@ -88,10 +88,13 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					vite.ssr.target = vite.ssr.target || 'webworker';
 				}
 			},
-			'astro:build:done': async () => {
-				const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server)),
-					entryUrl = new URL(_buildConfig.serverEntry, _config.outDir),
-					buildPath = fileURLToPath(entryUrl);
+			'astro:build:done': async ({ pages }) => {
+				const entryPath = fileURLToPath(new URL(_buildConfig.serverEntry, _buildConfig.server));
+				const entryUrl = new URL(_buildConfig.serverEntry, _config.outDir);
+				const buildPath = fileURLToPath(entryUrl);
+				// A URL for the final build path after renaming
+				const finalBuildUrl = pathToFileURL(buildPath.replace(/\.mjs$/, '.js'));
+
 				await esbuild.build({
 					target: 'es2020',
 					platform: 'browser',
@@ -106,6 +109,9 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					},
 				});
 
+				// Rename to worker.js
+				await fs.promises.rename(buildPath, finalBuildUrl);
+
 				// throw the server folder in the bin
 				const serverUrl = new URL(_buildConfig.server);
 				await fs.promises.rm(serverUrl, { recursive: true, force: true });
@@ -143,6 +149,10 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						.filter((file: string) => cloudflareSpecialFiles.indexOf(file) < 0)
 						.map((file: string) => `/${file}`);
 
+					for (let page of pages) {
+						staticPathList.push(prependForwardSlash(page.pathname));
+					}
+
 					const redirectsExists = await fs.promises
 						.stat(new URL('./_redirects', _config.outDir))
 						.then((stat) => stat.isFile())
@@ -196,9 +206,13 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					const functionsUrl = new URL(`file://${process.cwd()}/functions/`);
 					await fs.promises.mkdir(functionsUrl, { recursive: true });
 					const directoryUrl = new URL('[[path]].js', functionsUrl);
-					await fs.promises.rename(entryUrl, directoryUrl);
+					await fs.promises.rename(finalBuildUrl, directoryUrl);
 				}
 			},
 		},
 	};
 }
+
+function prependForwardSlash(path: string) {
+	return path[0] === '/' ? path : '/' + path;
+}

package/src/server.advanced.ts

@@ -1,8 +1,10 @@
 import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
-import { getProcessEnvProxy } from './util.js';
+import { getProcessEnvProxy, isNode } from './util.js';
 
-process.env = getProcessEnvProxy();
+if (!isNode) {
+	process.env = getProcessEnvProxy();
+}
 
 type Env = {
 	ASSETS: { fetch: (req: Request) => Promise<Response> };
@@ -10,7 +12,7 @@ type Env = {
 };
 
 export function createExports(manifest: SSRManifest) {
-	const app = new App(manifest, false);
+	const app = new App(manifest);
 
 	const fetch = async (request: Request, env: Env, context: any) => {
 		process.env = env as any;

package/src/server.directory.ts

@@ -1,11 +1,13 @@
 import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
-import { getProcessEnvProxy } from './util.js';
+import { getProcessEnvProxy, isNode } from './util.js';
 
-process.env = getProcessEnvProxy();
+if (!isNode) {
+	process.env = getProcessEnvProxy();
+}
 
 export function createExports(manifest: SSRManifest) {
-	const app = new App(manifest, false);
+	const app = new App(manifest);
 
 	const onRequest = async ({
 		request,

package/src/util.ts

@@ -1,3 +1,6 @@
+export const isNode =
+	typeof process === 'object' && Object.prototype.toString.call(process) === '[object process]';
+
 export function getProcessEnvProxy() {
 	return new Proxy(
 		{},

package/test/directory.test.js

@@ -0,0 +1,20 @@
+import { loadFixture, runCLI } from './test-utils.js';
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import cloudflare from '../dist/index.js';
+
+describe('mode: "directory"', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/basics/',
+			adapter: cloudflare({ mode: 'directory' }),
+		});
+	});
+
+	it('Builds', async () => {
+		await fixture.build();
+	});
+});

package/test/fixtures/prerender/astro.config.mjs

@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import cloudflare from '@astrojs/cloudflare';
+
+export default defineConfig({
+	adapter: cloudflare(),
+	output: 'server',
+});

package/test/fixtures/prerender/node_modules/.bin/astro

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/home/runner/work/astro/astro/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="$NODE_PATH:/home/runner/work/astro/astro/node_modules/.pnpm/node_modules"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../../../../../../../astro/astro.js" "$@"
+else
+  exec node  "$basedir/../../../../../../../astro/astro.js" "$@"
+fi

package/test/fixtures/prerender/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-cloudflare-prerender",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/cloudflare": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

package/test/fixtures/prerender/src/pages/index.astro

@@ -0,0 +1,8 @@
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+	<h1>Testing</h1>
+</body>
+</html>

package/test/fixtures/prerender/src/pages/one.astro

@@ -0,0 +1,11 @@
+---
+export const prerender = true;
+---
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+	<h1>Testing</h1>
+</body>
+</html>

package/test/prerender.test.js

@@ -0,0 +1,19 @@
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('Prerendering', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/prerender/',
+		});
+		await fixture.build();
+	});
+
+	it('includes prerendered routes in the routes.json config', async () => {
+		const routes = JSON.parse(await fixture.readFile('/_routes.json'));
+		expect(routes.exclude).to.include('/one/');
+	});
+});