summaryrefslogtreecommitdiff
path: root/packages/renderers/renderer-solid
diff options
context:
space:
mode:
authorGravatar Nate Moore <natemoo-re@users.noreply.github.com> 2021-07-21 18:10:03 -0500
committerGravatar GitHub <noreply@github.com> 2021-07-21 18:10:03 -0500
commitbd18e14a2c05d473b9822ddaf9ebada48e2d75dd (patch)
tree6962207c8b3c553b3df675320f4e3a177e7516fc /packages/renderers/renderer-solid
parentba6b47eda7589b4794b52218457229bb04e7d139 (diff)
downloadastro-bd18e14a2c05d473b9822ddaf9ebada48e2d75dd.tar.gz
astro-bd18e14a2c05d473b9822ddaf9ebada48e2d75dd.tar.zst
astro-bd18e14a2c05d473b9822ddaf9ebada48e2d75dd.zip
Expose JSX compilation to renderers (#588)
* feat: add support for `jsxImportSource`, new JSX transform * Renderer: add Solid renderer (#667) * feat: add support for `jsxImportSource`, new JSX transform * WIP: solid renderer * [Renderer] Solid (#656) * feat: add support for `jsxImportSource`, new JSX transform * WIP: solid renderer * Solid renderer: fix SSR of children, hydration (top level) Caveat: cannot hydrate children/descendants of hydrated parents * Fix hydration of fragments * fix: SyntaxError in React/Preact renderers * fix: errors in React/Preact renderers * feat: update react external * chore: update examples * chore: delete old changelog * chore: update astro config Co-authored-by: Nate Moore <nate@skypack.dev> * Changing the preact to Solid (#669) * chore: use new client:visible syntax * fix: dev script issue * chore: cleanup SolidJS example * docs: update framework example docs * chore: cleanup framework-multiple example * fix: remove SolidJS false-positives from Preact renderer * chore: add changeset Co-authored-by: eyelidlessness <eyelidlessness@users.noreply.github.com> Co-authored-by: Abdullah Mzaien <s201540830@kfupm.edu.sa> * feat(create-astro): add Solid support * docs: add JSX options to renderer reference * chore: add changeset for P/React renderers * fix: move react/server.js to external * chore: remove brewfile * Revert "feat: add support for `jsxImportSource`, new JSX transform" This reverts commit 077c4bfc135c58a85d4ebfca6012e90403694d8d. * fix: remove `react-dom/server` from `external` * chore: remove unused dependency * feat: improve JSX error messages * Revert "Revert "feat: add support for `jsxImportSource`, new JSX transform"" This reverts commit f6c2896b9ec6430611fc0abae7d586c42aca87e5. * docs: update jsxImportSource * feat: improve error message * feat: improve error logging for JSX renderers * tests: add jsx-runtime tests * chore: update snowpack Co-authored-by: eyelidlessness <eyelidlessness@users.noreply.github.com> Co-authored-by: Abdullah Mzaien <s201540830@kfupm.edu.sa>
Diffstat (limited to 'packages/renderers/renderer-solid')
-rw-r--r--packages/renderers/renderer-solid/client.js17
-rw-r--r--packages/renderers/renderer-solid/index.js25
-rw-r--r--packages/renderers/renderer-solid/package.json18
-rw-r--r--packages/renderers/renderer-solid/server.js26
-rw-r--r--packages/renderers/renderer-solid/static-html.js12
5 files changed, 98 insertions, 0 deletions
diff --git a/packages/renderers/renderer-solid/client.js b/packages/renderers/renderer-solid/client.js
new file mode 100644
index 000000000..047de819d
--- /dev/null
+++ b/packages/renderers/renderer-solid/client.js
@@ -0,0 +1,17 @@
+import { createComponent } from 'solid-js/web';
+
+export default (element) => (Component, props) => {
+ // Solid `createComponent` just returns a DOM node with all reactivity
+ // already attached. There's no VDOM, so there's no real need to "mount".
+ // Likewise, `children` can just reuse the nearest `astro-fragment` node.
+ const component = createComponent(Component, {
+ ...props,
+ children: element.querySelector('astro-fragment'),
+ });
+
+ const children = Array.isArray(component)
+ ? component
+ : [ component ];
+
+ element.replaceChildren(...children);
+}
diff --git a/packages/renderers/renderer-solid/index.js b/packages/renderers/renderer-solid/index.js
new file mode 100644
index 000000000..5848f78a4
--- /dev/null
+++ b/packages/renderers/renderer-solid/index.js
@@ -0,0 +1,25 @@
+export default {
+ name: '@astrojs/renderer-solid',
+ client: './client',
+ server: './server',
+ knownEntrypoints: ['solid-js', 'solid-js/web'],
+ external: ['solid-js/web/dist/server.js', 'solid-js/dist/server.js', 'babel-preset-solid'],
+ jsxImportSource: 'solid-js',
+ jsxTransformOptions: async ({ isSSR }) => {
+ const [{ default: solid }] = await Promise.all([import('babel-preset-solid')]);
+ const options = {
+ presets: [
+ solid({}, { generate: isSSR ? 'ssr' : 'dom' }),
+ ]
+ }
+
+ if (isSSR) {
+ options.alias = {
+ 'solid-js/web': 'solid-js/web/dist/server.js',
+ 'solid-js': 'solid-js/dist/server.js',
+ };
+ }
+
+ return options;
+ }
+};
diff --git a/packages/renderers/renderer-solid/package.json b/packages/renderers/renderer-solid/package.json
new file mode 100644
index 000000000..ed92851e1
--- /dev/null
+++ b/packages/renderers/renderer-solid/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "@astrojs/renderer-solid",
+ "version": "0.0.1",
+ "type": "module",
+ "exports": {
+ ".": "./index.js",
+ "./client": "./client.js",
+ "./server": "./server.js",
+ "./package.json": "./package.json"
+ },
+ "dependencies": {
+ "babel-preset-solid": "^1.0.0",
+ "solid-js": "^1.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ }
+}
diff --git a/packages/renderers/renderer-solid/server.js b/packages/renderers/renderer-solid/server.js
new file mode 100644
index 000000000..8af4d8aab
--- /dev/null
+++ b/packages/renderers/renderer-solid/server.js
@@ -0,0 +1,26 @@
+import { createComponent } from 'solid-js';
+import { renderToStringAsync, ssr } from 'solid-js/web/dist/server.js';
+
+async function check(Component, props, children) {
+ if (typeof Component !== 'function') return false;
+
+ const { html } = await renderToStaticMarkup(Component, props, children);
+ return typeof html === 'string';
+}
+
+async function renderToStaticMarkup(Component, props, children) {
+ const html = await renderToStringAsync(() => (
+ () => createComponent(Component, {
+ ...props,
+ // In Solid SSR mode, `ssr` creates the expected structure for `children`.
+ // In Solid client mode, `ssr` is just a stub.
+ children: ssr([`<astro-fragment>${children}</astro-fragment>`]),
+ })
+ ));
+ return { html };
+}
+
+export default {
+ check,
+ renderToStaticMarkup,
+};
diff --git a/packages/renderers/renderer-solid/static-html.js b/packages/renderers/renderer-solid/static-html.js
new file mode 100644
index 000000000..953416c49
--- /dev/null
+++ b/packages/renderers/renderer-solid/static-html.js
@@ -0,0 +1,12 @@
+import { createComponent } from 'solid-js';
+
+/**
+ * Astro passes `children` as a string of HTML, so we need
+ * a wrapper `astro-fragment` to render that content as VNodes.
+ */
+const StaticHtml = ({ innerHTML }) => {
+ if (!innerHTML) return null;
+ return () => createComponent('astro-fragment', { innerHTML });
+};
+
+export default StaticHtml;