summaryrefslogtreecommitdiff
path: root/packages/integrations/react
diff options
context:
space:
mode:
Diffstat (limited to 'packages/integrations/react')
-rw-r--r--packages/integrations/react/client-v17.js4
-rw-r--r--packages/integrations/react/client.js4
-rw-r--r--packages/integrations/react/server-v17.js6
-rw-r--r--packages/integrations/react/server.js6
-rw-r--r--packages/integrations/react/src/index.ts28
-rw-r--r--packages/integrations/react/static-html.js5
6 files changed, 43 insertions, 10 deletions
diff --git a/packages/integrations/react/client-v17.js b/packages/integrations/react/client-v17.js
index a6bc7d3bc..64284a0b0 100644
--- a/packages/integrations/react/client-v17.js
+++ b/packages/integrations/react/client-v17.js
@@ -7,7 +7,9 @@ export default (element) => (Component, props, children) =>
createElement(
Component,
{ ...props, suppressHydrationWarning: true },
- children != null ? createElement(StaticHtml, { value: children, suppressHydrationWarning: true }) : children
+ children != null
+ ? createElement(StaticHtml, { value: children, suppressHydrationWarning: true })
+ : children
),
element
);
diff --git a/packages/integrations/react/client.js b/packages/integrations/react/client.js
index 11d63cfcb..7eba8984c 100644
--- a/packages/integrations/react/client.js
+++ b/packages/integrations/react/client.js
@@ -8,6 +8,8 @@ export default (element) => (Component, props, children) =>
createElement(
Component,
{ ...props, suppressHydrationWarning: true },
- children != null ? createElement(StaticHtml, { value: children, suppressHydrationWarning: true }) : children
+ children != null
+ ? createElement(StaticHtml, { value: children, suppressHydrationWarning: true })
+ : children
)
);
diff --git a/packages/integrations/react/server-v17.js b/packages/integrations/react/server-v17.js
index 1c0c41286..b48d7b6f4 100644
--- a/packages/integrations/react/server-v17.js
+++ b/packages/integrations/react/server-v17.js
@@ -5,7 +5,11 @@ import StaticHtml from './static-html.js';
const reactTypeof = Symbol.for('react.element');
function errorIsComingFromPreactComponent(err) {
- return err.message && (err.message.startsWith("Cannot read property '__H'") || err.message.includes("(reading '__H')"));
+ return (
+ err.message &&
+ (err.message.startsWith("Cannot read property '__H'") ||
+ err.message.includes("(reading '__H')"))
+ );
}
function check(Component, props, children) {
diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js
index e102b57fe..6ae49e7bc 100644
--- a/packages/integrations/react/server.js
+++ b/packages/integrations/react/server.js
@@ -5,7 +5,11 @@ import StaticHtml from './static-html.js';
const reactTypeof = Symbol.for('react.element');
function errorIsComingFromPreactComponent(err) {
- return err.message && (err.message.startsWith("Cannot read property '__H'") || err.message.includes("(reading '__H')"));
+ return (
+ err.message &&
+ (err.message.startsWith("Cannot read property '__H'") ||
+ err.message.includes("(reading '__H')"))
+ );
}
function check(Component, props, children) {
diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts
index 25899a025..a283938c3 100644
--- a/packages/integrations/react/src/index.ts
+++ b/packages/integrations/react/src/index.ts
@@ -4,8 +4,12 @@ import { version as ReactVersion } from 'react-dom';
function getRenderer() {
return {
name: '@astrojs/react',
- clientEntrypoint: ReactVersion.startsWith('18.') ? '@astrojs/react/client.js' : '@astrojs/react/client-v17.js',
- serverEntrypoint: ReactVersion.startsWith('18.') ? '@astrojs/react/server.js' : '@astrojs/react/server-v17.js',
+ clientEntrypoint: ReactVersion.startsWith('18.')
+ ? '@astrojs/react/client.js'
+ : '@astrojs/react/client-v17.js',
+ serverEntrypoint: ReactVersion.startsWith('18.')
+ ? '@astrojs/react/server.js'
+ : '@astrojs/react/server-v17.js',
jsxImportSource: 'react',
jsxTransformOptions: async () => {
const {
@@ -34,14 +38,28 @@ function getRenderer() {
function getViteConfiguration() {
return {
optimizeDeps: {
- include: [ReactVersion.startsWith('18.') ? '@astrojs/react/client.js' : '@astrojs/react/client-v17.js', 'react', 'react/jsx-runtime', 'react/jsx-dev-runtime', 'react-dom'],
- exclude: [ReactVersion.startsWith('18.') ? '@astrojs/react/server.js' : '@astrojs/react/server-v17.js'],
+ include: [
+ ReactVersion.startsWith('18.')
+ ? '@astrojs/react/client.js'
+ : '@astrojs/react/client-v17.js',
+ 'react',
+ 'react/jsx-runtime',
+ 'react/jsx-dev-runtime',
+ 'react-dom',
+ ],
+ exclude: [
+ ReactVersion.startsWith('18.')
+ ? '@astrojs/react/server.js'
+ : '@astrojs/react/server-v17.js',
+ ],
},
resolve: {
dedupe: ['react', 'react-dom'],
},
ssr: {
- external: ReactVersion.startsWith('18.') ? ['react-dom/server', 'react-dom/client'] : ['react-dom/server.js', 'react-dom/client.js'],
+ external: ReactVersion.startsWith('18.')
+ ? ['react-dom/server', 'react-dom/client']
+ : ['react-dom/server.js', 'react-dom/client.js'],
},
};
}
diff --git a/packages/integrations/react/static-html.js b/packages/integrations/react/static-html.js
index 47130d786..ecd76ae9b 100644
--- a/packages/integrations/react/static-html.js
+++ b/packages/integrations/react/static-html.js
@@ -9,7 +9,10 @@ import { createElement as h } from 'react';
*/
const StaticHtml = ({ value }) => {
if (!value) return null;
- return h('astro-fragment', { suppressHydrationWarning: true, dangerouslySetInnerHTML: { __html: value } });
+ return h('astro-fragment', {
+ suppressHydrationWarning: true,
+ dangerouslySetInnerHTML: { __html: value },
+ });
};
/**