withastro · delucis · Jun 29, 2022 · Jun 25, 2022 · Jun 25, 2022 · Jun 26, 2022
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/astro.config.mjs b/packages/astro/e2e/fixtures/preact-compat-component/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import preact from '@astrojs/preact';
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [preact({ compat: true })],
+});
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/package.json b/packages/astro/e2e/fixtures/preact-compat-component/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@e2e/preact-component",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/preact": "workspace:*",
+    "astro": "workspace:*",
+    "preact": "^10.7.3"
+  }
+}
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/components/Counter.css b/packages/astro/e2e/fixtures/preact-compat-component/src/components/Counter.css
@@ -0,0 +1,11 @@
+.counter {
+	display: grid;
+	font-size: 2em;
+	grid-template-columns: repeat(3, minmax(0, 1fr));
+	margin-top: 2em;
+	place-items: center;
+}
+
+.counter-message {
+	text-align: center;
+}
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/components/Counter.jsx b/packages/astro/e2e/fixtures/preact-compat-component/src/components/Counter.jsx
@@ -0,0 +1,19 @@
+import { useState } from 'react';
+import './Counter.css';
+
+export default function Counter({ children, count: initialCount, id }) {
+	const [count, setCount] = useState(initialCount);
+	const add = () => setCount((i) => i + 1);
+	const subtract = () => setCount((i) => i - 1);
+
+	return (
+		<>
+			<div id={id} className="counter">
+				<button className="decrement" onClick={subtract}>-</button>
+				<pre>{count}</pre>
+				<button className="increment" onClick={add}>+</button>
+			</div>
+			<div className="counter-message">{children}</div>
+		</>
+	);
+}
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/components/JSXComponent.jsx b/packages/astro/e2e/fixtures/preact-compat-component/src/components/JSXComponent.jsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export default function({ id }) {
+	return <div id={id}>Framework client:only component</div>
+}
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/components/Layout.astro b/packages/astro/e2e/fixtures/preact-compat-component/src/components/Layout.astro
@@ -0,0 +1,4 @@
+<html>
+	<head><title>Preact compat component</title></head>
+	<body><slot></slot></body>
+</html>
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/pages/index.astro b/packages/astro/e2e/fixtures/preact-compat-component/src/pages/index.astro
@@ -0,0 +1,37 @@
+---
+import Counter from '../components/Counter.jsx';
+import PreactCompatComponent from '../components/JSXComponent.jsx';
+
+const someProps = {
+	count: 0,
+};
+---
+
+<html>
+	<head>
+		<!-- Head Stuff -->
+	</head>
+	<body>
+		<Counter id="server-only" {...someProps}>
+			<h1>Hello, server!</h1>
+		</Counter>
+
+		<Counter id="client-idle" {...someProps} client:idle>
+			<h1>Hello, client:idle!</h1>
+		</Counter>
+
+		<Counter id="client-load" {...someProps} client:load>
+			<h1>Hello, client:load!</h1>
+		</Counter>
+
+		<Counter id="client-visible" {...someProps} client:visible>
+			<h1>Hello, client:visible!</h1>
+		</Counter>
+
+		<Counter id="client-media" {...someProps} client:media="(max-width: 50em)">
+			<h1>Hello, client:media!</h1>
+		</Counter>
+
+		<PreactCompatComponent id="client-only" client:only="preact" />
+	</body>
+</html>
diff --git a/packages/astro/e2e/fixtures/preact-compat-component/src/pages/markdown.md b/packages/astro/e2e/fixtures/preact-compat-component/src/pages/markdown.md
@@ -0,0 +1,32 @@
+---
+layout: ../components/Layout.astro
+setup: |
+  import Counter from '../components/Counter.jsx';
+  import PreactComponent from '../components/JSXComponent.jsx';
+
+  const someProps = {
+    count: 0,
+  };
+---
+
+<Counter id="server-only" {...someProps}>
+	# Hello, server!
+</Counter>
+
+<Counter id="client-idle" {...someProps} client:idle>
+	# Hello, client:idle!
+</Counter>
+
+<Counter id="client-load" {...someProps} client:load>
+	# Hello, client:load!
+</Counter>
+
+<Counter id="client-visible" {...someProps} client:visible>
+	# Hello, client:visible!
+</Counter>
+
+<Counter id="client-media" {...someProps} client:media="(max-width: 50em)">
+	# Hello, client:media!
+</Counter>
+
+<PreactComponent id="client-only" client:only="preact" />
diff --git a/packages/astro/e2e/preact-compat-component.test.js b/packages/astro/e2e/preact-compat-component.test.js
@@ -0,0 +1,19 @@
+import { prepareTestFactory } from './shared-component-tests.js';
+
+const { test, createTests } = prepareTestFactory({ root: './fixtures/preact-compat-component/' });
+
+test.describe('preact/compat components in Astro files', () => {
+	createTests({
+		pageUrl: '/',
+		pageSourceFilePath: './src/pages/index.astro',
+		componentFilePath: './src/components/JSXComponent.jsx',
+	});
+});
+
+test.describe('preact/compat components in Markdown files', () => {
+	createTests({
+		pageUrl: '/markdown/',
+		pageSourceFilePath: './src/pages/markdown.md',
+		componentFilePath: './src/components/JSXComponent.jsx',
+	});
+});
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.17.12",
+    "babel-plugin-module-resolver": "^4.1.0",
     "preact-render-to-string": "^5.2.0"
   },
   "devDependencies": {

diff --git a/packages/integrations/preact/src/index.ts b/packages/integrations/preact/src/index.ts
@@ -1,6 +1,6 @@
-import { AstroIntegration } from 'astro';
+import { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
 
-function getRenderer() {
+function getRenderer(): AstroRenderer {
 	return {
 		name: '@astrojs/preact',
 		clientEntrypoint: '@astrojs/preact/client.js',
@@ -18,8 +18,36 @@ function getRenderer() {
 	};
 }
 
-function getViteConfiguration() {
+function getCompatRenderer(): AstroRenderer {
 	return {
+		name: '@astrojs/preact',
+		clientEntrypoint: '@astrojs/preact/client.js',
+		serverEntrypoint: '@astrojs/preact/server.js',
+		jsxImportSource: 'react',
+		jsxTransformOptions: async () => {
+			const {
+				default: { default: jsx },
+				// @ts-expect-error types not found
+			} = await import('@babel/plugin-transform-react-jsx');
+			return {
+				plugins: [
+					jsx({}, { runtime: 'automatic', importSource: 'preact/compat' }),
+					['babel-plugin-module-resolver', {
+						alias: {
+							'react': 'preact/compat',
+							'react-dom/test-utils': 'preact/test-utils',
+							'react-dom': 'preact/compat',
+        			'react/jsx-runtime': 'preact/jsx-runtime'
+						}
+					}],
+				],
+			};
+		},
+	};
+}
+
+function getViteConfiguration(compat?: boolean): ViteUserConfig {
+	const viteConfig: ViteUserConfig = {
 		optimizeDeps: {
 			include: [
 				'@astrojs/preact/client.js',
@@ -33,16 +61,36 @@ function getViteConfiguration() {
 			external: ['preact-render-to-string'],
 		},
 	};
+
+	if (compat) {
+    viteConfig.optimizeDeps!.include!.push(
+			'preact/compat',
+			'preact/test-utils',
+			'preact/compat/jsx-runtime',
+		);
+    viteConfig.resolve = {
+      alias: [
+				{ find: 'react', replacement: 'preact/compat' },
+        { find: 'react-dom/test-utils', replacement: 'preact/test-utils' },
+        { find: 'react-dom', replacement: 'preact/compat' },
+        { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' }
+      ],
+      dedupe: ['preact/compat'],
+    };
+  }
+
+	return viteConfig
 }
 
-export default function (): AstroIntegration {
+export default function ({ compat }: { compat?: boolean } = {}): AstroIntegration {
 	return {
 		name: '@astrojs/preact',
 		hooks: {
 			'astro:config:setup': ({ addRenderer, updateConfig }) => {
+				if (compat) addRenderer(getCompatRenderer());
 				addRenderer(getRenderer());
 				updateConfig({
-					vite: getViteConfiguration(),
+					vite: getViteConfiguration(compat),
 				});
 			},
 		},