Import from `@converse/headless` instead of sub-files.

Also, update to latest Strophe make use of its types.

package-lock.json

@@ -2330,7 +2330,7 @@
       "version": "20.3.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.1.tgz",
       "integrity": "sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
@@ -2415,7 +2415,7 @@
       "version": "8.5.5",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz",
       "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -2899,9 +2899,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.7.tgz",
-      "integrity": "sha512-sI1Ly2cODlWStkINzqGrZ8K6n+MTSbAeQnAipGyL+KZCXuHaRlj2gyyy8B/9MvsFFqN7XHryQnB2QwhzvJXovg==",
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz",
+      "integrity": "sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==",
       "optional": true,
       "engines": {
         "node": ">=10.0.0"
@@ -9940,14 +9940,16 @@
       }
     },
     "node_modules/strophe.js": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.6.2.tgz",
-      "integrity": "sha512-aS4zkPACypSsmewr54IAVexn+m9RHrnxQEn/kr8eF8jK5lhv+nZTEEcKMaXBRyQ00lpOAEY9lYHbApXwqIjCpA==",
+      "version": "2.0.0",
+      "resolved": "git+ssh://git@github.com/strophe/strophejs.git#a1a9e418a49dee56e6c42a1b67be118e7cd3f5bc",
+      "integrity": "sha512-aZ4pzuca9Bb1jBTZHlk8qa/K9+Ey0whey8TIe9b+0DeRWhxd0YQBL2KlXz6g3sLFuy3TuITsfubMMsSpVBe1dg==",
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.3"
       },
       "optionalDependencies": {
-        "@xmldom/xmldom": "0.8.7",
+        "@types/ws": "^8.5.5",
+        "@xmldom/xmldom": "0.8.8",
         "ws": "^8.5.0"
       }
     },
@@ -11247,7 +11249,7 @@
         "pluggable.js": "3.0.1",
         "sizzle": "^2.3.5",
         "sprintf-js": "^1.1.2",
-        "strophe.js": "^1.6.2",
+        "strophe.js": "strophe/strophejs#a1a9e418a49dee56e6c42a1b67be118e7cd3f5bc",
         "urijs": "^1.19.10"
       },
       "devDependencies": {}

src/headless/index.js

@@ -20,6 +20,9 @@ import "./plugins/status/index.js";
 import "./plugins/vcard/index.js";      // XEP-0054 VCard-temp
 /* END: Removable components */
 
-import { converse } from "./core.js";
+import log from './log.js';
+import { converse, _converse, i18n, api } from "./core.js";
+
+export { api, converse, _converse, i18n, log };
 
 export default converse;

src/headless/package.json

@@ -42,7 +42,7 @@
     "pluggable.js": "3.0.1",
     "sizzle": "^2.3.5",
     "sprintf-js": "^1.1.2",
-    "strophe.js": "^1.6.2",
+    "strophe.js": "strophe/strophejs#a1a9e418a49dee56e6c42a1b67be118e7cd3f5bc",
     "urijs": "^1.19.10"
   },
   "devDependencies": {}

src/headless/plugins/muc/api.js

@@ -1,5 +1,5 @@
 import log from '../../log';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 import { _converse, api, converse } from '../../core.js';
 
 const { u } = converse.env;

src/headless/plugins/muc/message.js

@@ -1,4 +1,4 @@
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 import { _converse, api } from '../../core.js';
 
 /**

src/headless/plugins/muc/muc.js

@@ -6,7 +6,7 @@ import pick from 'lodash-es/pick';
 import sizzle from 'sizzle';
 import { Model } from '@converse/skeletor/src/model.js';
 import { ROOMSTATUS } from './constants.js';
-import { Strophe, $build, $iq, $msg, $pres } from 'strophe.js/src/strophe';
+import { Strophe, $build, $iq, $msg, $pres } from 'strophe.js';
 import { TimeoutError } from '../../shared/errors.js';
 import { _converse, api, converse } from '../../core.js';
 import { computeAffiliationsDelta, setAffiliations, getAffiliationList }  from './affiliations/utils.js';

src/headless/plugins/muc/occupants.js

@@ -2,7 +2,7 @@ import ChatRoomOccupant from './occupant.js';
 import { Collection } from '@converse/skeletor/src/collection.js';
 import { MUC_ROLE_WEIGHTS } from './constants.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { Strophe } from 'strophe.js/src/strophe.js';
+import { Strophe } from 'strophe.js';
 import { _converse, api, converse } from '../../core.js';
 import { getAffiliationList } from './affiliations/utils.js';
 import { getAutoFetchedAffiliationLists } from './utils.js';

src/headless/plugins/ping/api.js

@@ -1,5 +1,5 @@
 import log from '@converse/headless/log.js';
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { setLastStanzaDate } from './utils.js';
 
 const { Strophe, $iq, u } = converse.env;

src/headless/shared/actions.js

@@ -1,6 +1,6 @@
 import log from '../log';
-import { Strophe, $msg } from 'strophe.js/src/strophe';
-import { _converse, api, converse } from '@converse/headless/core';
+import { Strophe, $msg } from 'strophe.js';
+import { _converse, api, converse } from '@converse/headless';
 
 const u = converse.env.utils;
 

src/headless/shared/api/public.js

@@ -9,7 +9,7 @@ import u, { setUnloadEvent } from '../../utils/core.js';
 import { ANONYMOUS, CHAT_STATES, KEYCODES, VERSION_NAME } from '../constants.js';
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { Strophe, $build, $iq, $msg, $pres } from 'strophe.js/src/strophe';
+import { Strophe, $build, $iq, $msg, $pres } from 'strophe.js';
 import { TimeoutError } from '../errors.js';
 import { filesize } from 'filesize';
 import { html } from 'lit';

src/headless/shared/api/send.js

@@ -1,6 +1,6 @@
 import _converse from '../../shared/_converse.js';
 import log from '../../log.js';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 import { TimeoutError } from '../errors.js';
 import { toStanza } from '../../utils/stanza.js';
 

src/headless/shared/chat/utils.js

@@ -1,5 +1,5 @@
 import debounce from 'lodash-es/debounce.js';
-import { api, converse } from '@converse/headless/core.js';
+import { api, converse } from '@converse/headless';
 
 const { u } = converse.env;
 

src/headless/shared/connection/api.js

@@ -1,5 +1,5 @@
 import _converse from '@converse/headless/shared/_converse.js';
-import { Strophe } from 'strophe.js/src/strophe.js';
+import { Strophe } from 'strophe.js';
 
 /**
  * This grouping collects API functions related to the XMPP connection.

src/headless/shared/connection/feedback.js

@@ -1,6 +1,6 @@
 import _converse from '../_converse';
 import { Model } from '@converse/skeletor/src/model.js';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 
 export default Model.extend({
     defaults: {

src/headless/shared/connection/index.js

@@ -3,7 +3,7 @@ import log from "../../log.js";
 import sizzle from 'sizzle';
 import { ANONYMOUS, BOSH_WAIT, LOGOUT } from '../../shared/constants.js';
 import { CONNECTION_STATUS } from '../constants';
-import { Strophe } from 'strophe.js/src/core.js';
+import { Strophe } from 'strophe.js';
 import { _converse, api } from "../../core.js";
 import { clearSession, tearDown } from "../../utils/core.js";
 import { getOpenPromise } from '@converse/openpromise';

src/headless/shared/constants.js

@@ -1,4 +1,4 @@
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 
 export const BOSH_WAIT = 59;
 export const VERSION_NAME = "v10.1.5";

src/headless/shared/parsers.js

@@ -2,9 +2,9 @@ import URI from 'urijs';
 import dayjs from 'dayjs';
 import log from '@converse/headless/log';
 import sizzle from 'sizzle';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 import { URL_PARSE_OPTIONS } from '@converse/headless/shared/constants.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 import { decodeHTMLEntities } from '@converse/headless/utils/core.js';
 import { rejectMessage } from '@converse/headless/shared/actions';
 import {

src/headless/shared/settings/utils.js

@@ -1,4 +1,4 @@
-import { _converse } from '@converse/headless/core.js';
+import { _converse } from '@converse/headless';
 import assignIn from 'lodash-es/assignIn';
 import isEqual from "lodash-es/isEqual.js";
 import isObject from 'lodash-es/isObject';

src/headless/utils/arraybuffer.js

@@ -1,4 +1,4 @@
-import { converse } from '@converse/headless/core.js';
+import { converse } from '@converse/headless';
 
 const { u } = converse.env;
 

src/headless/utils/core.js

@@ -11,7 +11,7 @@ import last from "lodash-es/last";
 import log from '../log.js';
 import sizzle from "sizzle";
 import { Model } from '@converse/skeletor/src/model.js';
-import { Strophe } from 'strophe.js/src/strophe.js';
+import { Strophe } from 'strophe.js';
 import { getOpenPromise } from '@converse/openpromise';
 import { settings_api } from '../shared/settings/api.js';
 import { stx , toStanza } from './stanza.js';
@@ -554,7 +554,7 @@ export function waitUntil (func, max_wait=300, check_delay=3) {
     const max_wait_timeout = setTimeout(handler, max_wait);
 
     return promise;
-};
+}
 
 
 export function setUnloadEvent () {

src/headless/utils/init.js

@@ -7,7 +7,7 @@ import syncDriver from 'localforage-webextensionstorage-driver/sync';
 import { ANONYMOUS, CORE_PLUGINS, EXTERNAL, LOGIN, PREBIND } from '../shared/constants.js';
 import { Connection, MockConnection } from '../shared/connection/index.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 import { createStore, initStorage } from './storage.js';
 import { saveWindowState, isValidJID } from './core.js';
 

src/headless/utils/stanza.js

@@ -1,5 +1,5 @@
 import log from '../log.js';
-import { Strophe } from 'strophe.js/src/strophe';
+import { Strophe } from 'strophe.js';
 
 const PARSE_ERROR_NS = 'http://www.w3.org/1999/xhtml';
 

src/headless/utils/storage.js

@@ -1,5 +1,5 @@
 import Storage from '@converse/skeletor/src/storage.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 export function getDefaultStore () {
     if (_converse.config.get('trusted')) {

src/headless/utils/url.js

@@ -1,6 +1,6 @@
 import URI from 'urijs';
 import log from '@converse/headless/log';
-import { api, converse } from '@converse/headless/core';
+import { api, converse } from '@converse/headless';
 
 const { u } = converse.env;
 

src/i18n/index.js

@@ -5,8 +5,7 @@
  * @description This is the internationalization module
  */
 import Jed from 'jed';
-import log from '@converse/headless/log.js';
-import { _converse, api, converse, i18n } from '@converse/headless/core.js';
+import { _converse, api, converse, log, i18n } from '@converse/headless';
 
 const { dayjs } = converse.env;
 

src/index.js

@@ -4,12 +4,11 @@
  * @license Mozilla Public License (MPLv2)
  */
 
-import "@converse/headless";
 import "./i18n/index.js";
 import "shared/registry.js";
 import { CustomElement } from 'shared/components/element';
 import { VIEW_PLUGINS } from './shared/constants.js';
-import { _converse, converse } from "@converse/headless/core";
+import { _converse, converse } from "@converse/headless";
 
 import 'shared/styles/index.scss';
 

src/plugins/adhoc-views/adhoc-commands.js

@@ -1,9 +1,8 @@
 import 'shared/autocomplete/index.js';
-import log from '@converse/headless/log';
 import tplAdhoc from './templates/ad-hoc.js';
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
-import { api, converse } from '@converse/headless/core.js';
+import { api, converse, log } from '@converse/headless';
 import { getNameAndValue } from 'utils/html.js';
 
 const { Strophe, sizzle } = converse.env;

src/plugins/adhoc-views/index.js

@@ -5,7 +5,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import './adhoc-commands.js';
-import { api, converse } from "@converse/headless/core.js";
+import { api, converse } from "@converse/headless";
 
 
 converse.plugins.add('converse-adhoc-views', {

src/plugins/bookmark-views/components/bookmark-form.js

@@ -1,6 +1,6 @@
 import tplMUCBookmarkForm from './templates/form.js';
 import { CustomElement } from 'shared/components/element';
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 
 
 class MUCBookmarkForm extends CustomElement {

src/plugins/bookmark-views/components/bookmarks-list.js

@@ -3,7 +3,7 @@ import tplBookmarksList from './templates/list.js';
 import tplSpinner from "templates/spinner.js";
 import { CustomElement } from 'shared/components/element.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api } from '@converse/headless/core.js';
+import { _converse, api } from '@converse/headless';
 import { initStorage } from '@converse/headless/utils/storage.js';
 
 import '../styles/bookmarks.scss';

src/plugins/bookmark-views/components/templates/list.js

@@ -1,6 +1,6 @@
 import bookmark_item from './item.js';
 import { __ } from 'i18n';
-import { _converse } from '@converse/headless/core.js';
+import { _converse } from '@converse/headless';
 import { html } from "lit";
 
 const filterBookmark = (b, text) => b.get('name')?.includes(text) || b.get('jid')?.includes(text);

src/plugins/bookmark-views/index.js

@@ -8,7 +8,7 @@ import './modals/bookmark-form.js';
 import '@converse/headless/plugins/muc/index.js';
 import BookmarkForm from './components/bookmark-form.js';
 import BookmarksView from './components/bookmarks-list.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { bookmarkableChatRoomView } from './mixins.js';
 import { getHeadingButtons, removeBookmarkViaEvent, addBookmarkViaEvent } from './utils.js';
 

src/plugins/bookmark-views/mixins.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 const { u } = converse.env;
 

src/plugins/bookmark-views/modals/bookmark-form.js

@@ -2,7 +2,7 @@ import '../components/bookmark-form.js';
 import BaseModal from "plugins/modal/modal.js";
 import { html } from "lit";
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 export default class BookmarkFormModal extends BaseModal {
 

src/plugins/bookmark-views/modals/bookmark-list.js

@@ -2,7 +2,7 @@ import '../components/bookmarks-list.js';
 import BaseModal from "plugins/modal/modal.js";
 import { html } from "lit";
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 export default class BookmarkListModal extends BaseModal {
 

src/plugins/bookmark-views/utils.js

@@ -1,7 +1,7 @@
 import invokeMap from 'lodash-es/invokeMap';
 import { Model } from '@converse/skeletor/src/model.js';
 import { __ } from 'i18n';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { checkBookmarksSupport } from '@converse/headless/plugins/bookmarks/utils';
 
 

src/plugins/chatboxviews/index.js

@@ -6,7 +6,7 @@
 import './view.js';
 import '@converse/headless/plugins/chatboxes/index.js';
 import ChatBoxViews from './container.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { calculateViewportHeightUnit } from './utils.js';
 
 import './styles/chats.scss';

src/plugins/chatboxviews/templates/chats.js

@@ -1,6 +1,6 @@
 import { html } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 
 function shouldShowChat (c) {

src/plugins/chatboxviews/view.js

@@ -1,7 +1,7 @@
 import tplBackgroundLogo from '../../templates/background_logo.js';
 import tplChats from './templates/chats.js';
 import { CustomElement } from 'shared/components/element.js';
-import { api, _converse } from '@converse/headless/core';
+import { api, _converse } from '@converse/headless';
 import { getAppSettings } from '@converse/headless/shared/settings/utils.js';
 import { render } from 'lit';
 

src/plugins/chatview/bottom-panel.js

@@ -2,7 +2,7 @@ import './message-form.js';
 import debounce from 'lodash-es/debounce';
 import tplBottomPanel from './templates/bottom-panel.js';
 import { ElementView } from '@converse/skeletor/src/element.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 import { clearMessages } from './utils.js';
 import { render } from 'lit';
 

src/plugins/chatview/chat.js

@@ -3,7 +3,7 @@ import 'plugins/chatview/bottom-panel.js';
 import BaseChatView from 'shared/chat/baseview.js';
 import tplChat from './templates/chat.js';
 import { __ } from 'i18n';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 /**
  * The view of an open/ongoing chat conversation.

src/plugins/chatview/heading.js

@@ -2,7 +2,7 @@ import 'shared/modals/user-details.js';
 import tplChatboxHead from './templates/chat-head.js';
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 
 import './styles/chat-head.scss';
 

src/plugins/chatview/index.js

@@ -7,7 +7,7 @@ import 'shared/chat/chat-content.js';
 import 'shared/chat/help-messages.js';
 import 'shared/chat/toolbar.js';
 import ChatView from './chat.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { clearHistory } from './utils.js';
 
 import './styles/index.scss';

src/plugins/chatview/message-form.js

@@ -1,7 +1,7 @@
 import tplMessageForm from './templates/message-form.js';
 import { ElementView } from '@converse/skeletor/src/element.js';
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { parseMessageForCommands } from './utils.js';
 import { prefixMentions } from '@converse/headless/utils/core.js';
 

src/plugins/chatview/templates/bottom-panel.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { api } from '@converse/headless/core';
+import { api } from '@converse/headless';
 import { html } from 'lit';
 
 

src/plugins/chatview/templates/chat-head.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { _converse } from '@converse/headless/core';
+import { _converse } from '@converse/headless';
 import { getStandaloneButtons, getDropdownButtons } from 'shared/chat/utils.js';
 import { html } from "lit";
 import { until } from 'lit/directives/until.js';

src/plugins/chatview/templates/chat.js

@@ -1,5 +1,5 @@
 import { html } from "lit";
-import { _converse } from '@converse/headless/core';
+import { _converse } from '@converse/headless';
 
 export default (o) => html`
     <div class="flyout box-flyout">

src/plugins/chatview/templates/message-form.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 import { html } from "lit";
 import { resetElementHeight } from '../utils.js';
 

src/plugins/chatview/utils.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 export function clearHistory (jid) {
     if (_converse.router.history.getFragment() === `converse/chat?jid=${jid}`) {

src/plugins/controlbox/api.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 const { u } = converse.env;
 

src/plugins/controlbox/constants.js

@@ -1,4 +1,4 @@
-import { converse } from '@converse/headless/core.js';
+import { converse } from '@converse/headless';
 
 const { Strophe } = converse.env;
 

src/plugins/controlbox/controlbox.js

@@ -1,6 +1,6 @@
 import tplControlbox from './templates/controlbox.js';
 import { CustomElement } from 'shared/components/element.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse } from '@converse/headless';
 import { LOGOUT } from '@converse/headless/shared/constants.js';
 
 const u = converse.env.utils;

src/plugins/controlbox/index.js

@@ -10,8 +10,7 @@ import ControlBox from './model.js';
 import ControlBoxToggle from './toggle.js';
 import ControlBoxView from './controlbox.js';
 import controlbox_api from './api.js';
-import log from '@converse/headless/log';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse, log } from '@converse/headless';
 import { addControlBox, clearSession, disconnect, onChatBoxesFetched } from './utils.js';
 
 import './styles/_controlbox.scss';

src/plugins/controlbox/loginform.js

@@ -2,7 +2,7 @@ import bootstrap from 'bootstrap.native';
 import tplLoginPanel from './templates/loginform.js';
 import { ANONYMOUS } from '@converse/headless/shared/constants';
 import { CustomElement } from 'shared/components/element.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse } from '@converse/headless';
 import { initConnection } from '@converse/headless/utils/init.js';
 import { updateSettingsWithFormData, validateJID } from './utils.js';
 

src/plugins/controlbox/model.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { Model } from '@converse/skeletor/src/model.js';
 
 const { dayjs } = converse.env;

src/plugins/controlbox/navback.js

@@ -1,6 +1,6 @@
 import tplControlboxNavback from "./templates/navback.js";
 import { CustomElement } from 'shared/components/element.js';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 
 class ControlBoxNavback extends CustomElement {

src/plugins/controlbox/templates/controlbox.js

@@ -1,5 +1,5 @@
 import tplSpinner from "templates/spinner.js";
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { html } from 'lit';
 
 const { Strophe } = converse.env;

src/plugins/controlbox/templates/loginform.js

@@ -3,7 +3,7 @@ import tplSpinner from 'templates/spinner.js';
 import { ANONYMOUS, EXTERNAL, LOGIN, PREBIND, CONNECTION_STATUS } from '@converse/headless/shared/constants';
 import { REPORTABLE_STATUSES, PRETTY_CONNECTION_STATUS, CONNECTION_STATUS_CSS_CLASS } from '../constants.js';
 import { __ } from 'i18n';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 import { html } from 'lit';
 
 const trust_checkbox = (checked) => {

src/plugins/controlbox/templates/toggle.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 import { html } from "lit";
 
 export default  (o) => {

src/plugins/controlbox/toggle.js

@@ -1,6 +1,6 @@
 import tplControlboxToggle from "./templates/toggle.js";
 import { CustomElement } from 'shared/components/element.js';
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 import { showControlBox } from './utils.js';
 
 

src/plugins/controlbox/utils.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n/index.js';
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 
 const { Strophe, u } = converse.env;
 

src/plugins/dragresize/components/dragresize.js

@@ -1,6 +1,6 @@
 import tplDragresize from "../templates/dragresize.js";
 import { CustomElement } from 'shared/components/element.js';
-import { api } from '@converse/headless/core.js';
+import { api } from '@converse/headless';
 
 
 class ConverseDragResize extends CustomElement {

src/plugins/dragresize/index.js

@@ -6,7 +6,7 @@
 import './components/dragresize.js';
 import { applyDragResistance, onMouseUp, onMouseMove } from './utils.js';
 import DragResizableMixin from './mixin.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 converse.plugins.add('converse-dragresize', {
     /* Plugin dependencies are other plugins which might be

src/plugins/dragresize/mixin.js

@@ -1,5 +1,5 @@
 import debounce from 'lodash-es/debounce';
-import { _converse } from '@converse/headless/core';
+import { _converse } from '@converse/headless';
 import { applyDragResistance } from './utils.js';
 
 const DragResizableMixin = {

src/plugins/dragresize/utils.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 const { u } = converse.env;
 

src/plugins/fullscreen/index.js

@@ -3,7 +3,7 @@
  * @license Mozilla Public License (MPLv2)
  * @copyright 2022, the Converse.js contributors
  */
-import { api, converse } from "@converse/headless/core";
+import { api, converse } from "@converse/headless";
 import { isUniView } from '@converse/headless/utils/core.js';
 
 import './styles/fullscreen.scss';

src/plugins/headlines-view/feed-list.js

@@ -1,6 +1,6 @@
 import tplFeedsList from './templates/feeds-list.js';
 import { CustomElement } from 'shared/components/element.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 /**
  * Custom element which renders a list of headline feeds

src/plugins/headlines-view/heading.js

@@ -1,7 +1,7 @@
 import tplChatHead from './templates/chat-head.js';
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
-import { _converse, api } from "@converse/headless/core.js";
+import { _converse, api } from "@converse/headless";
 
 
 export default class HeadlinesHeading extends CustomElement {

src/plugins/headlines-view/index.js

@@ -6,7 +6,7 @@
 import '../chatview/index.js';
 import './view.js';
 import { HeadlinesFeedsList } from './feed-list.js';
-import { _converse, converse } from '@converse/headless/core';
+import { _converse, converse } from '@converse/headless';
 
 import './styles/headlines.scss';
 import './styles/headlines-head.scss';

src/plugins/headlines-view/templates/chat-head.js

@@ -1,4 +1,4 @@
-import { _converse } from '@converse/headless/core';
+import { _converse } from '@converse/headless';
 import { html } from "lit";
 import { until } from 'lit/directives/until.js';
 import { getStandaloneButtons, getDropdownButtons } from 'shared/chat/utils.js';

src/plugins/headlines-view/templates/feeds-list.js

@@ -1,5 +1,5 @@
 import { __ } from 'i18n';
-import { _converse } from '@converse/headless/core';
+import { _converse } from '@converse/headless';
 import { html } from "lit";
 
 function tplHeadlinesFeedsListItem (el, feed) {

src/plugins/headlines-view/view.js

@@ -1,6 +1,6 @@
 import BaseChatView from 'shared/chat/baseview.js';
 import tplHeadlines from './templates/headlines.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 
 
 class HeadlinesFeedView extends BaseChatView {

src/plugins/mam-views/index.js

@@ -4,7 +4,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import './placeholder.js';
-import { api, converse } from '@converse/headless/core';
+import { api, converse } from '@converse/headless';
 import { fetchMessagesOnScrollUp, getPlaceholderTemplate } from './utils.js';
 
 

src/plugins/mam-views/placeholder.js

@@ -1,6 +1,6 @@
 import { CustomElement } from 'shared/components/element.js';
 import tplPlaceholder from './templates/placeholder.js';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 import { fetchArchivedMessages } from '@converse/headless/plugins/mam/utils.js';
 
 import './styles/placeholder.scss';

src/plugins/mam-views/utils.js

@@ -1,6 +1,5 @@
 import MAMPlaceholderMessage from '@converse/headless/plugins/mam/placeholder.js';
-import log from '@converse/headless/log.js';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api, log } from '@converse/headless';
 import { fetchArchivedMessages } from '@converse/headless/plugins/mam/utils';
 import { html } from 'lit/html.js';
 

src/plugins/minimize/components/minimized-chat.js

@@ -1,6 +1,6 @@
 import tplTrimmedChat from "../templates/trimmed_chat.js";
 import { CustomElement } from 'shared/components/element.js';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 import { maximize } from  '../utils.js';
 
 

src/plugins/minimize/index.js

@@ -7,7 +7,7 @@ import './view.js';
 import './components/minimized-chat.js';
 import debounce from 'lodash-es/debounce';
 import MinimizedChatsToggle from './toggle.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import {
     addMinimizeButtonToChat,
     addMinimizeButtonToMUC,

src/plugins/minimize/utils.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { __ } from 'i18n';
 
 const { dayjs, u } = converse.env;

src/plugins/minimize/view.js

@@ -1,7 +1,7 @@
 import MinimizedChatsToggle from './toggle.js';
 import tplChatsPanel from './templates/chats-panel.js';
 import { CustomElement } from 'shared/components/element';
-import { _converse, api } from '@converse/headless/core';
+import { _converse, api } from '@converse/headless';
 import { initStorage } from '@converse/headless/utils/storage.js';
 
 

src/plugins/modal/alert.js

@@ -1,6 +1,6 @@
 import BaseModal from "plugins/modal/modal.js";
 import tplAlertModal from "./templates/alert.js";
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 
 export default class Alert extends BaseModal {

src/plugins/modal/base.js

@@ -1,16 +1,14 @@
-import api from "@converse/headless/shared/api/index.js";
 import bootstrap from "bootstrap.native";
-import log from "@converse/headless/log";
 import sizzle from 'sizzle';
 import tplAlertComponent from "./templates/modal-alert.js";
 import { View } from '@converse/skeletor/src/view.js';
+import { api, log } from '@converse/headless';
 import { hasClass, addClass, removeElement, removeClass } from '../../utils/html.js';
 import { render } from 'lit';
 
 import './styles/_modal.scss';
 
 
-
 const BaseModal = View.extend({
     className: "modal",
     persistent: false, // Whether this modal should persist in the DOM once it's been closed

src/plugins/modal/confirm.js

@@ -1,7 +1,7 @@
 import BaseModal from "plugins/modal/modal.js";
 import tplPrompt from "./templates/prompt.js";
 import { getOpenPromise } from '@converse/openpromise';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 export default class Confirm extends BaseModal {
 

src/plugins/modal/index.js

@@ -4,7 +4,7 @@
  */
 import BootstrapModal from './base.js';
 import modal_api from './api.js';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 converse.env.BootstrapModal = BootstrapModal; // expose to plugins
 

src/plugins/muc-views/affiliation-form.js

@@ -1,8 +1,7 @@
-import log from '@converse/headless/log';
 import tplAffiliationForm from './templates/affiliation-form.js';
 import { CustomElement } from 'shared/components/element';
 import { __ } from 'i18n';
-import { api, converse } from '@converse/headless/core';
+import { api, converse, log } from '@converse/headless';
 import { setAffiliation } from '@converse/headless/plugins/muc/affiliations/utils.js';
 
 const { Strophe, sizzle } = converse.env;

src/plugins/muc-views/bottom-panel.js

@@ -1,7 +1,7 @@
 import 'shared/autocomplete/index.js';
 import BottomPanel from 'plugins/chatview/bottom-panel.js';
 import tplMUCBottomPanel from './templates/muc-bottom-panel.js';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { render } from 'lit';
 
 import './styles/muc-bottom-panel.scss';

src/plugins/muc-views/chatarea.js

@@ -1,7 +1,7 @@
 import tplMUCChatarea from './templates/muc-chatarea.js';
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
-import { api, converse } from '@converse/headless/core';
+import { api, converse } from '@converse/headless';
 
 
 const { u } = converse.env;

src/plugins/muc-views/config-form.js

@@ -1,8 +1,7 @@
-import log from "@converse/headless/log";
 import tplMUCConfigForm from "./templates/muc-config-form.js";
 import { CustomElement } from 'shared/components/element';
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse, log } from "@converse/headless";
 
 const { sizzle } = converse.env;
 const u = converse.env.utils;

src/plugins/muc-views/destroyed.js

@@ -1,6 +1,6 @@
 import tplMUCDestroyed from './templates/muc-destroyed.js';
 import { CustomElement } from 'shared/components/element';
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 
 
 class MUCDestroyed extends CustomElement {

src/plugins/muc-views/disconnected.js

@@ -1,7 +1,7 @@
 import tplMUCDisconnect from './templates/muc-disconnect.js';
 import { CustomElement } from 'shared/components/element';
 import { __ } from 'i18n';
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 
 
 class MUCDisconnected extends CustomElement {

src/plugins/muc-views/heading.js

@@ -5,7 +5,7 @@ import tplMUCHead from './templates/muc-head.js';
 import { CustomElement } from 'shared/components/element.js';
 import { Model } from '@converse/skeletor/src/model.js';
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { destroyMUC, showModeratorToolsModal } from './utils.js';
 
 import './styles/muc-head.scss';

src/plugins/muc-views/index.js

@@ -7,7 +7,7 @@ import '../chatboxviews/index.js';
 import './affiliation-form.js';
 import './role-form.js';
 import MUCView from './muc.js';
-import { api, converse } from '@converse/headless/core.js';
+import { api, converse } from '@converse/headless';
 import { clearHistory, confirmDirectMUCInvitation, parseMessageForMUCCommands } from './utils.js';
 
 const { Strophe } = converse.env;

src/plugins/muc-views/message-form.js

@@ -1,6 +1,6 @@
 import MessageForm from 'plugins/chatview/message-form.js';
 import tplMUCMessageForm from './templates/message-form.js';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { getAutoCompleteListItem } from './utils.js';
 
 

src/plugins/muc-views/modals/add-muc.js

@@ -1,7 +1,7 @@
 import tplAddMuc from "./templates/add-muc.js";
 import BaseModal from "plugins/modal/modal.js";
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 import '../styles/add-muc-modal.scss';
 

src/plugins/muc-views/modals/moderator-tools.js

@@ -1,7 +1,7 @@
 import '../modtools.js';
 import BaseModal from "plugins/modal/modal.js";
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 import { html } from 'lit';
 
 export default class ModeratorToolsModal extends BaseModal {

src/plugins/muc-views/modals/muc-details.js

@@ -1,7 +1,7 @@
 import BaseModal from "plugins/modal/modal.js";
 import tplMUCDetails from "./templates/muc-details.js";
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core";
+import { api } from "@converse/headless";
 
 import '../styles/muc-details-modal.scss';
 

src/plugins/muc-views/modals/muc-invite.js

@@ -2,7 +2,7 @@ import 'shared/autocomplete/index.js';
 import BaseModal from "plugins/modal/modal.js";
 import tplMUCInviteModal from "./templates/muc-invite.js";
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 const u = converse.env.utils;
 

src/plugins/muc-views/modals/muc-list.js

@@ -1,11 +1,10 @@
 import BaseModal from "plugins/modal/modal.js";
 import head from "lodash-es/head";
-import log from "@converse/headless/log";
 import tplMUCDescription from "../templates/muc-description.js";
 import tplMUCList from "../templates/muc-list.js";
 import tplSpinner from "templates/spinner.js";
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse, log } from "@converse/headless";
 import { getAttributes } from '@converse/headless/shared/parsers';
 
 const { Strophe, $iq, sizzle } = converse.env;

src/plugins/muc-views/modals/nickname.js

@@ -1,6 +1,6 @@
 import BaseModal from "plugins/modal/modal.js";
 import { __ } from 'i18n';
-import { api } from "@converse/headless/core.js";
+import { api } from "@converse/headless";
 import { html } from 'lit';
 
 export default class MUCNicknameModal extends BaseModal {

src/plugins/muc-views/modals/occupant.js

@@ -2,7 +2,7 @@ import BaseModal from "plugins/modal/modal.js";
 import tplOccupantModal from "./templates/occupant.js";
 import { Model } from '@converse/skeletor/src/model.js';
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 const { u } = converse.env;
 

src/plugins/muc-views/modals/templates/add-muc.js

@@ -1,6 +1,6 @@
 import DOMPurify from 'dompurify';
 import { __ } from 'i18n';
-import { api } from '@converse/headless/core.js';
+import { api } from '@converse/headless';
 import { html } from "lit";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { getAutoCompleteList } from "../../search.js";