From 00bad1e6d3409e7750df2b669d5b8f10b7d3e3d2 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 24 Feb 2021 07:36:10 +0100
Subject: [PATCH] fixes #2396: @converse/headless wrongly depends on
 `CustomElement` from the view layer

---
 CHANGES.md                    | 4 ++++
 src/converse.js               | 5 ++++-
 src/headless/converse-core.js | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1c00e0576..27d2380e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.0.5 (Unreleased)
+
+- #2396: @converse/headless wrongly depends on `CustomElement` from the view layer
+
 ## 7.0.4 (2020-12-09)
 
 Bugfix: Set protocol after discovering connection methods
diff --git a/src/converse.js b/src/converse.js
index d058f8535..c6f63606a 100644
--- a/src/converse.js
+++ b/src/converse.js
@@ -36,7 +36,10 @@ import "./components/converse.js";
 
 import "../sass/converse.scss";
 
-import { converse } from "@converse/headless/converse-core";
+import { _converse, converse } from "@converse/headless/converse-core";
+import { CustomElement } from 'components/element';
+
+_converse.CustomElement = CustomElement;
 
 const WHITELISTED_PLUGINS = [
     'converse-autocomplete',
diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js
index 333400af1..c43e7d241 100644
--- a/src/headless/converse-core.js
+++ b/src/headless/converse-core.js
@@ -17,7 +17,6 @@ import stanza_utils from "@converse/headless/utils/stanza";
 import u from '@converse/headless/utils/core';
 import { Collection } from "@converse/skeletor/src/collection";
 import { Connection, MockConnection } from '@converse/headless/connection.js';
-import { CustomElement } from '../components/element';
 import { Events } from '@converse/skeletor/src/events.js';
 import { Model } from '@converse/skeletor/src/model.js';
 import { Router } from '@converse/skeletor/src/router.js';
@@ -1644,7 +1643,6 @@ Object.assign(converse, {
         $pres,
         'utils': u,
         Collection,
-        CustomElement,
         Model,
         Promise,
         Strophe,