Add workerd and worker to cloudflare adapter bundling (#7092)

withastro · May 16, 2023 · 2a1fa09 · 2a1fa09
1 parent d7007a1
commit 2a1fa09
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 277 deletions.
diff --git a/.changeset/rich-crews-fry.md b/.changeset/rich-crews-fry.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': minor
+---
+
+Add `worked` and `worker` import condition for worker bundling
diff --git a/packages/integrations/cloudflare/.gitignore b/packages/integrations/cloudflare/.gitignore
@@ -0,0 +1,2 @@
+# Astro cloudflare directory mode creates a function directory
+functions
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
@@ -98,6 +98,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 				await esbuild.build({
 					target: 'es2020',
 					platform: 'browser',
+					conditions: ["workerd", "worker", "browser"],
 					entryPoints: [entryPath],
 					outfile: buildPath,
 					allowOverwrite: true,

diff --git a/packages/integrations/cloudflare/test/fixtures/basics/functions/[[path]].js b/packages/integrations/cloudflare/test/fixtures/basics/functions/[[path]].js
diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/astro.config.mjs b/packages/integrations/cloudflare/test/fixtures/with-solid-js/astro.config.mjs
@@ -0,0 +1,9 @@
+import { defineConfig } from 'astro/config';
+import cloudflare from '@astrojs/cloudflare';
+import solidJs from "@astrojs/solid-js";
+
+export default defineConfig({
+	integrations: [solidJs()],
+	adapter: cloudflare(),
+	output: 'server',
+});
diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json b/packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@test/astro-cloudflare-with-solid-js",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/cloudflare": "workspace:*",
+    "@astrojs/solid-js": "workspace:*",
+    "solid-js": "*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/src/components/Component.tsx b/packages/integrations/cloudflare/test/fixtures/with-solid-js/src/components/Component.tsx
@@ -0,0 +1 @@
+export const Component = () => <div class="solid">Solid Content</div>
diff --git a/packages/integrations/cloudflare/test/fixtures/with-solid-js/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/with-solid-js/src/pages/index.astro
@@ -0,0 +1,13 @@
+---
+import {Component} from "../components/Component";
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+<h1>Testing</h1>
+<Component />
+</body>
+</html>
diff --git a/packages/integrations/cloudflare/test/with-solid-js.js b/packages/integrations/cloudflare/test/with-solid-js.js
@@ -0,0 +1,31 @@
+import {loadFixture, runCLI} from './test-utils.js';
+import { expect } from 'chai';
+import * as cheerio from "cheerio";
+
+describe('With SolidJS', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/with-solid-js/',
+		});
+		await fixture.build();
+	});
+
+	it('renders the solid component', async () => {
+		const { ready, stop } = runCLI('./fixtures/with-solid-js/', { silent: true });
+
+		try {
+			await ready;
+
+			let res = await fetch(`http://localhost:8787/`);
+			expect(res.status).to.equal(200);
+			let html = await res.text();
+			let $ = cheerio.load(html);
+			expect($('.solid').text()).to.equal('Solid Content');
+		} finally {
+			stop();
+		}
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Astro cloudflare directory mode creates a function directory
		functions
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const Component = () => <div class="solid">Solid Content</div>