20 files changed, 17 insertions, 15 deletions
diff --git a/packages/renderers/preact/client.js b/packages/renderers/renderer-preact/client.js
index 2b8d4bd49..2b8d4bd49 100644
--- a/packages/renderers/preact/client.js
+++ b/packages/renderers/renderer-preact/client.js
diff --git a/packages/renderers/react/index.js b/packages/renderers/renderer-preact/index.js
index fdc9e29d5..07ebe50e7 100644
--- a/packages/renderers/react/index.js
+++ b/packages/renderers/renderer-preact/index.js
@@ -1,5 +1,5 @@
 export default {
-  name: '@astro-renderer/react',
+  name: '@astrojs/renderer-preact',
   client: './client',
   server: './server',
 };
diff --git a/packages/renderers/preact/package.json b/packages/renderers/renderer-preact/package.json
index 063a28b50..c6bb915e9 100644
--- a/packages/renderers/preact/package.json
+++ b/packages/renderers/renderer-preact/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@astro-renderer/preact",
+  "name": "@astrojs/renderer-preact",
   "version": "0.0.1",
   "type": "module",
   "exports": {
diff --git a/packages/renderers/preact/server.js b/packages/renderers/renderer-preact/server.js
index e8ece01ba..a14b710b1 100644
--- a/packages/renderers/preact/server.js
+++ b/packages/renderers/renderer-preact/server.js
@@ -2,15 +2,16 @@ import { h } from 'preact';
 import { renderToString } from 'preact-render-to-string';
 import StaticHtml from './static-html.js';
 
-function check(Component, props) {
+function check(Component, props, children) {
   try {
-    return Boolean(renderToString(h(Component, props)));
+    const { html } = renderToStaticMarkup(Component, props, children)
+    return Boolean(html)
   } catch (e) {}
   return false;
 }
 
 function renderToStaticMarkup(Component, props, children) {
-  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })));
+  const html = renderToString(h(Component, { ...props, children: h(StaticHtml, { value: children }), innerHTML: children }));
   return { html };
 }
 
diff --git a/packages/renderers/preact/static-html.js b/packages/renderers/renderer-preact/static-html.js
index 5a31a68af..5a31a68af 100644
--- a/packages/renderers/preact/static-html.js
+++ b/packages/renderers/renderer-preact/static-html.js
diff --git a/packages/renderers/react/client.js b/packages/renderers/renderer-react/client.js
index b699a76d0..b699a76d0 100644
--- a/packages/renderers/react/client.js
+++ b/packages/renderers/renderer-react/client.js
diff --git a/packages/renderers/preact/index.js b/packages/renderers/renderer-react/index.js
index cfd4ae8c6..af8e516b8 100644
--- a/packages/renderers/preact/index.js
+++ b/packages/renderers/renderer-react/index.js
@@ -1,5 +1,5 @@
 export default {
-  name: '@astro-renderer/preact',
+  name: '@astrojs/renderer-react',
   client: './client',
   server: './server',
 };
diff --git a/packages/renderers/react/package.json b/packages/renderers/renderer-react/package.json
index 7fb22d47a..91151b915 100644
--- a/packages/renderers/react/package.json
+++ b/packages/renderers/renderer-react/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@astro-renderer/react",
+  "name": "@astrojs/renderer-react",
   "version": "0.0.1",
   "type": "module",
   "exports": {
diff --git a/packages/renderers/react/server.js b/packages/renderers/renderer-react/server.js
index aa3abc7bb..3518f6447 100644
--- a/packages/renderers/react/server.js
+++ b/packages/renderers/renderer-react/server.js
@@ -2,15 +2,16 @@ import { createElement as h } from 'react';
 import { renderToStaticMarkup as renderToString } from 'react-dom/server.js';
 import StaticHtml from './static-html.js';
 
-function check(Component, props) {
+function check(Component, props, children) {
   try {
-    return Boolean(renderToString(h(Component, props)));
+    const { html } = renderToStaticMarkup(Component, props, children)
+    return Boolean(html)
   } catch (e) {}
   return false;
 }
 
 function renderToStaticMarkup(Component, props, children) {
-  const html = renderToString(h(Component, props, h(StaticHtml, { value: children })));
+  const html = renderToString(h(Component, { ...props, children: h(StaticHtml, { value: children }), innerHTML: children }));
   return { html };
 }
 
diff --git a/packages/renderers/react/static-html.js b/packages/renderers/renderer-react/static-html.js
index 1efc625d0..1efc625d0 100644
--- a/packages/renderers/react/static-html.js
+++ b/packages/renderers/renderer-react/static-html.js
diff --git a/packages/renderers/svelte/Wrapper.svelte b/packages/renderers/renderer-svelte/Wrapper.svelte
index 78d4a402b..78d4a402b 100644
--- a/packages/renderers/svelte/Wrapper.svelte
+++ b/packages/renderers/renderer-svelte/Wrapper.svelte
diff --git a/packages/renderers/svelte/client.js b/packages/renderers/renderer-svelte/client.js
index ec0047abf..ec0047abf 100644
--- a/packages/renderers/svelte/client.js
+++ b/packages/renderers/renderer-svelte/client.js
diff --git a/packages/renderers/svelte/index.js b/packages/renderers/renderer-svelte/index.js
index 7cef83a2b..ba3468594 100644
--- a/packages/renderers/svelte/index.js
+++ b/packages/renderers/renderer-svelte/index.js
@@ -1,5 +1,5 @@
 export default {
-  name: '@astro-renderer/svelte',
+  name: '@astrojs/renderer-svelte',
   snowpackPlugin: '@snowpack/plugin-svelte',
   snowpackPluginOptions: { compilerOptions: { hydratable: true } },
   client: './client',
diff --git a/packages/renderers/svelte/package.json b/packages/renderers/renderer-svelte/package.json
index 7ce4664fd..8442f51b5 100644
--- a/packages/renderers/svelte/package.json
+++ b/packages/renderers/renderer-svelte/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@astro-renderer/svelte",
+  "name": "@astrojs/renderer-svelte",
   "version": "0.0.1",
   "type": "module",
   "exports": {
diff --git a/packages/renderers/svelte/server.js b/packages/renderers/renderer-svelte/server.js
index 8b42a12a1..8b42a12a1 100644
--- a/packages/renderers/svelte/server.js
+++ b/packages/renderers/renderer-svelte/server.js
diff --git a/packages/renderers/vue/client.js b/packages/renderers/renderer-vue/client.js
index 296fb8555..296fb8555 100644
--- a/packages/renderers/vue/client.js
+++ b/packages/renderers/renderer-vue/client.js
diff --git a/packages/renderers/vue/index.js b/packages/renderers/renderer-vue/index.js
index 09fb8793e..016beec6b 100644
--- a/packages/renderers/vue/index.js
+++ b/packages/renderers/renderer-vue/index.js
@@ -1,5 +1,5 @@
 export default {
-  name: '@astro-renderer/vue',
+  name: '@astrojs/renderer-vue',
   snowpackPlugin: '@snowpack/plugin-vue',
   client: './client',
   server: './server',
diff --git a/packages/renderers/vue/package.json b/packages/renderers/renderer-vue/package.json
index e3d77dd62..a01084328 100644
--- a/packages/renderers/vue/package.json
+++ b/packages/renderers/renderer-vue/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@astro-renderer/vue",
+  "name": "@astrojs/renderer-vue",
   "version": "0.0.1",
   "type": "module",
   "exports": {
@@ -11,6 +11,6 @@
   "dependencies": {
     "vue": "^3.0.10",
     "@vue/server-renderer": "^3.0.10",
-    "@snowpack/plugin-vue": "^2.5.0"
+    "@snowpack/plugin-vue": "^2.6.0"
   }
 }
diff --git a/packages/renderers/vue/server.js b/packages/renderers/renderer-vue/server.js
index 3d3159634..3d3159634 100644
--- a/packages/renderers/vue/server.js
+++ b/packages/renderers/renderer-vue/server.js
diff --git a/packages/renderers/vue/static-html.js b/packages/renderers/renderer-vue/static-html.js
index e623f1049..e623f1049 100644
--- a/packages/renderers/vue/static-html.js
+++ b/packages/renderers/renderer-vue/static-html.js