3 files changed, 14 insertions, 1 deletions
diff --git a/packages/integrations/lit/server-shim.js b/packages/integrations/lit/server-shim.js
index 0c1fde383..e4d123c37 100644
--- a/packages/integrations/lit/server-shim.js
+++ b/packages/integrations/lit/server-shim.js
@@ -5,3 +5,9 @@ window.global = window;
 document.getElementsByTagName = () => [];
 // See https://github.com/lit/lit/issues/2393
 document.currentScript = null;
+
+const ceDefine = customElements.define;
+customElements.define = function(tagName, Ctr) {
+	Ctr[Symbol.for('tagName')] = tagName;
+	return ceDefine.call(this, tagName, Ctr);
+}
diff --git a/packages/integrations/lit/server.js b/packages/integrations/lit/server.js
index 05f0d1f9d..df284dbeb 100644
--- a/packages/integrations/lit/server.js
+++ b/packages/integrations/lit/server.js
@@ -9,6 +9,8 @@ function isCustomElementTag(name) {
 function getCustomElementConstructor(name) {
 	if (typeof customElements !== 'undefined' && isCustomElementTag(name)) {
 		return customElements.get(name) || null;
+	} else if(typeof name === 'function') {
+		return name;
 	}
 	return null;
 }
@@ -24,7 +26,11 @@ async function check(Component, _props, _children) {
 	return !!(await isLitElement(Component));
 }
 
-function* render(tagName, attrs, children) {
+function* render(Component, attrs, children) {
+	let tagName = Component;
+	if(typeof tagName !== 'string') {
+		tagName = Component[Symbol.for('tagName')];
+	}
 	const instance = new LitElementRenderer(tagName);
 
 	// LitElementRenderer creates a new element instance, so copy over.
diff --git a/packages/integrations/lit/src/index.ts b/packages/integrations/lit/src/index.ts
index 8eca44492..bebb58ac3 100644
--- a/packages/integrations/lit/src/index.ts
+++ b/packages/integrations/lit/src/index.ts
@@ -18,6 +18,7 @@ function getViteConfiguration() {
 				'@lit-labs/ssr/lib/install-global-dom-shim.js',
 				'@lit-labs/ssr/lib/render-lit-html.js',
 				'@lit-labs/ssr/lib/lit-element-renderer.js',
+				'@astrojs/lit/server.js'
 			],
 		},
 	};