Remove core.js

src/headless/core.js

@@ -1,17 +0,0 @@
-/**
- * @copyright The Converse.js contributors
- * @license Mozilla Public License (MPLv2)
- */
-import './shared/constants.js';
-import _converse from './shared/_converse';
-import advancedFormat from 'dayjs/plugin/advancedFormat';
-import api from './shared/api/index.js';
-import dayjs from 'dayjs';
-import i18n from './shared/i18n';
-
-export { converse } from './shared/api/public.js';
-export { _converse };
-export { i18n };
-export { api };
-
-dayjs.extend(advancedFormat);

src/headless/index.js

@@ -1,27 +1,37 @@
+import './shared/constants.js';
+import _converse from './shared/_converse';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import api from './shared/api/index.js';
+import dayjs from 'dayjs';
+import i18n from './shared/i18n';
+import { converse } from './shared/api/public.js';
+
+dayjs.extend(advancedFormat);
+
 /* START: Removable components
  * --------------------
  * Any of the following components may be removed if they're not needed.
  */
-import "./plugins/bookmarks/index.js";  // XEP-0199 XMPP Ping
-import "./plugins/bosh.js";             // XEP-0206 BOSH
-import "./plugins/caps/index.js";       // XEP-0115 Entity Capabilities
-import "./plugins/chat/index.js";       // RFC-6121 Instant messaging
-import "./plugins/chatboxes/index.js";
-import "./plugins/disco/index.js";      // XEP-0030 Service discovery
-import "./plugins/adhoc/index.js";      // XEP-0050 Ad Hoc Commands
-import "./plugins/headlines/index.js";  // Support for headline messages
-import "./plugins/mam/index.js";        // XEP-0313 Message Archive Management
-import "./plugins/muc/index.js";        // XEP-0045 Multi-user chat
-import "./plugins/ping/index.js";       // XEP-0199 XMPP Ping
-import "./plugins/pubsub.js";           // XEP-0060 Pubsub
-import "./plugins/roster/index.js";     // RFC-6121 Contacts Roster
-import "./plugins/smacks/index.js";     // XEP-0198 Stream Management
-import "./plugins/status/index.js";
-import "./plugins/vcard/index.js";      // XEP-0054 VCard-temp
+
+import './plugins/bookmarks/index.js'; // XEP-0199 XMPP Ping
+import './plugins/bosh.js'; // XEP-0206 BOSH
+import './plugins/caps/index.js'; // XEP-0115 Entity Capabilities
+import './plugins/chat/index.js'; // RFC-6121 Instant messaging
+import './plugins/chatboxes/index.js';
+import './plugins/disco/index.js'; // XEP-0030 Service discovery
+import './plugins/adhoc/index.js'; // XEP-0050 Ad Hoc Commands
+import './plugins/headlines/index.js'; // Support for headline messages
+import './plugins/mam/index.js'; // XEP-0313 Message Archive Management
+import './plugins/muc/index.js'; // XEP-0045 Multi-user chat
+import './plugins/ping/index.js'; // XEP-0199 XMPP Ping
+import './plugins/pubsub.js'; // XEP-0060 Pubsub
+import './plugins/roster/index.js'; // RFC-6121 Contacts Roster
+import './plugins/smacks/index.js'; // XEP-0198 Stream Management
+import './plugins/status/index.js';
+import './plugins/vcard/index.js'; // XEP-0054 VCard-temp
 /* END: Removable components */
 
 import log from './log.js';
-import { converse, _converse, i18n, api } from "./core.js";
 
 export { api, converse, _converse, i18n, log };
 

src/headless/plugins/adhoc/api.js

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

src/headless/plugins/adhoc/index.js

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

src/headless/plugins/adhoc/utils.js

@@ -1,5 +1,5 @@
 import sizzle from 'sizzle';
-import { converse } from "@converse/headless/core";
+import { converse } from "@converse/headless";
 import { getAttributes } from '@converse/headless/shared/parsers';
 
 const { Strophe, u } = converse.env;

src/headless/plugins/bookmarks/collection.js

@@ -1,7 +1,7 @@
 import "@converse/headless/plugins/muc/index.js";
 import Bookmark from './model.js';
 import log from "@converse/headless/log.js";
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { getOpenPromise } from '@converse/openpromise';
 import { initStorage } from '@converse/headless/utils/storage.js';
 

src/headless/plugins/bookmarks/index.js

@@ -8,7 +8,7 @@ import "@converse/headless/plugins/muc/index.js";
 import Bookmark from './model.js';
 import Bookmarks from './collection.js';
 import { Collection } from "@converse/skeletor/src/collection.js";
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { initBookmarks, getNicknameFromBookmark, handleBookmarksPush } from './utils.js';
 
 const { Strophe } = converse.env;

src/headless/plugins/bookmarks/model.js

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

src/headless/plugins/bookmarks/utils.js

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

src/headless/plugins/bosh.js

@@ -7,7 +7,7 @@ import 'strophe.js/src/bosh';
 import log from "../log.js";
 import { BOSH_WAIT } from '@converse/headless/shared/constants.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "../core.js";
+import { _converse, api, converse } from "../index.js";
 import { setUserJID, } from '@converse/headless/utils/init.js';
 
 const { Strophe } = converse.env;

src/headless/plugins/caps/index.js

@@ -2,7 +2,7 @@
  * @copyright 2022, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import { api, converse } from '@converse/headless/core';
+import { api, converse } from '@converse/headless';
 import { addCapsNode } from './utils.js';
 
 const { Strophe } = converse.env;

src/headless/plugins/caps/utils.js

@@ -1,4 +1,4 @@
-import { _converse, converse } from '@converse/headless/core.js';
+import { _converse, converse } from '@converse/headless';
 import { arrayBufferToBase64, stringToArrayBuffer  } from '@converse/headless/utils/arraybuffer.js';
 
 const { Strophe, $build } = converse.env;

src/headless/plugins/chat/api.js

@@ -1,4 +1,4 @@
-import { _converse, api } from "../../core.js";
+import { _converse, api } from "../../index.js";
 import log from "../../log.js";
 
 

src/headless/plugins/chat/index.js

@@ -7,7 +7,7 @@ import MessageMixin from './message.js';
 import ModelWithContact from './model-with-contact.js';
 import chat_api from './api.js';
 import { Collection } from '@converse/skeletor/src/collection';
-import { _converse, api, converse } from '../../core.js';
+import { _converse, api, converse } from '../../index.js';
 import {
     autoJoinChats,
     enableCarbons,

src/headless/plugins/chat/message.js

@@ -1,7 +1,7 @@
 import ModelWithContact from './model-with-contact.js';
 import dayjs from 'dayjs';
 import log from '../../log.js';
-import { _converse, api, converse } from '../../core.js';
+import { _converse, api, converse } from '../../index.js';
 import { getOpenPromise } from '@converse/openpromise';
 
 const { Strophe, sizzle, u } = converse.env;

src/headless/plugins/chat/model-with-contact.js

@@ -1,5 +1,5 @@
 import { Model } from '@converse/skeletor/src/model.js';
-import { api } from "../../core.js";
+import { api } from "../../index.js";
 import { getOpenPromise } from '@converse/openpromise';
 
 const ModelWithContact = Model.extend({

src/headless/plugins/chat/model.js

@@ -5,7 +5,7 @@ import log from '@converse/headless/log';
 import pick from "lodash-es/pick";
 import { Model } from '@converse/skeletor/src/model.js';
 import { TimeoutError } from '../../shared/errors.js';
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import { debouncedPruneHistory, handleCorrection } from '@converse/headless/shared/chat/utils.js';
 import { filesize } from "filesize";
 import { getMediaURLsMetadata } from '@converse/headless/shared/parsers.js';

src/headless/plugins/chat/parsers.js

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import log from '@converse/headless/log';
 import u from '@converse/headless/utils/core';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { rejectMessage } from '@converse/headless/shared/actions';
 
 import {

src/headless/plugins/chat/utils.js

@@ -1,5 +1,4 @@
-import log from '@converse/headless/log.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse, log } from '@converse/headless';
 import { isArchived, isHeadline, isServerMessage, } from '@converse/headless/shared/parsers';
 import { parseMessage } from './parsers.js';
 import { shouldClearCache } from '@converse/headless/utils/core.js';

src/headless/plugins/chatboxes/api.js

@@ -1,4 +1,4 @@
-import { _converse, api } from "../../core.js";
+import { _converse, api } from "../../index.js";
 import { createChatBox } from './utils.js';
 
 /**

src/headless/plugins/chatboxes/chatboxes.js

@@ -1,5 +1,5 @@
 import { Collection } from "@converse/skeletor/src/collection";
-import { _converse, api } from "../../core.js";
+import { _converse, api } from "../../index.js";
 import { initStorage } from '@converse/headless/utils/storage.js';
 
 const ChatBoxes = Collection.extend({

src/headless/plugins/chatboxes/index.js

@@ -5,7 +5,7 @@
 import "../emoji/index.js";
 import ChatBoxes from './chatboxes.js';
 import chatboxes_api from './api.js';
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 
 const { Strophe } = converse.env;
 

src/headless/plugins/chatboxes/utils.js

@@ -1,4 +1,4 @@
-import { _converse, converse } from "../../core.js";
+import { _converse, converse } from "../../index.js";
 import log from "../../log";
 
 const { Strophe } = converse.env;

src/headless/plugins/disco/api.js

@@ -1,6 +1,6 @@
 import isObject from "lodash-es/isObject";
 import log from "@converse/headless/log.js";
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { getOpenPromise } from '@converse/openpromise';
 
 const { Strophe, $iq } = converse.env;

src/headless/plugins/disco/entity.js

@@ -1,8 +1,7 @@
-import log from '@converse/headless/log.js';
 import sizzle from 'sizzle';
 import { Collection } from '@converse/skeletor/src/collection';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse, log } from '@converse/headless';
 import { getOpenPromise } from '@converse/openpromise';
 
 const { Strophe } = converse.env;

src/headless/plugins/disco/index.js

@@ -5,7 +5,7 @@
  */
 import DiscoEntities from './entities.js';
 import DiscoEntity from './entity.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse } from '@converse/headless';
 import {
     clearSession,
     initStreamFeatures,

src/headless/plugins/disco/utils.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from "@converse/headless/core.js";
+import { _converse, api, converse } from "@converse/headless";
 import { Collection } from "@converse/skeletor/src/collection";
 
 const { Strophe, $iq } = converse.env;

src/headless/plugins/emoji/index.js

@@ -5,7 +5,7 @@
  */
 import './utils.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import { getOpenPromise } from '@converse/openpromise';
 
 

src/headless/plugins/emoji/utils.js

@@ -1,5 +1,5 @@
 import { ASCII_REPLACE_REGEX, CODEPOINTS_REGEX } from './regexes.js';
-import { converse } from "../../core.js";
+import { converse } from "../../index.js";
 
 const { u } = converse.env;
 

src/headless/plugins/headlines/api.js

@@ -1,4 +1,4 @@
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 
 export default {
     /**

src/headless/plugins/headlines/feed.js

@@ -1,5 +1,5 @@
 import ChatBox from '@converse/headless/plugins/chat/model.js';
-import { _converse, api } from '../../core.js';
+import { _converse, api } from '../../index.js';
 
 
 export default class HeadlinesFeed extends ChatBox {

src/headless/plugins/headlines/index.js

@@ -4,7 +4,7 @@
  */
 import HeadlinesFeed from './feed.js';
 import headlines_api from './api.js';
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import { onHeadlineMessage } from './utils.js';
 
 

src/headless/plugins/headlines/utils.js

@@ -1,4 +1,4 @@
-import { _converse, api } from "@converse/headless/core";
+import { _converse, api } from "@converse/headless";
 import { isHeadline, isServerMessage } from '@converse/headless/shared/parsers';
 import { parseMessage } from '@converse/headless/plugins/chat/parsers';
 

src/headless/plugins/mam/api.js

@@ -2,7 +2,7 @@ import log from '@converse/headless/log';
 import sizzle from "sizzle";
 import { RSM } from '@converse/headless/shared/rsm';
 import { TimeoutError } from '../../shared/errors.js';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 
 const { Strophe, $iq, dayjs } = converse.env;
 const { NS } = Strophe;

src/headless/plugins/mam/index.js

@@ -14,7 +14,7 @@ import {
     fetchNewestMessages,
     handleMAMResult
 } from './utils.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 const { Strophe } = converse.env;
 const { NS } = Strophe;

src/headless/plugins/mam/placeholder.js

@@ -1,5 +1,5 @@
 import { Model } from '@converse/skeletor/src/model.js';
-import { converse } from '../../core.js';
+import { converse } from '../../index.js';
 
 const u = converse.env.utils;
 

src/headless/plugins/mam/utils.js

@@ -1,7 +1,7 @@
 import MAMPlaceholderMessage from './placeholder.js';
 import log from '@converse/headless/log';
 import sizzle from 'sizzle';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { parseMUCMessage } from '@converse/headless/plugins/muc/parsers';
 import { parseMessage } from '@converse/headless/plugins/chat/parsers';
 

src/headless/plugins/muc/affiliations/utils.js

@@ -5,8 +5,7 @@
 import { AFFILIATIONS } from '@converse/headless/plugins/muc/index.js';
 import difference from 'lodash-es/difference';
 import indexOf from 'lodash-es/indexOf';
-import log from "@converse/headless/log";
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse, log } from '@converse/headless';
 import { parseMemberListIQ } from '../parsers.js';
 
 const { Strophe, $iq, u } = converse.env;

src/headless/plugins/muc/api.js

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

src/headless/plugins/muc/index.js

@@ -13,7 +13,7 @@ import ChatRoomOccupants from './occupants.js';
 import affiliations_api from './affiliations/api.js';
 import muc_api from './api.js';
 import { Collection } from '@converse/skeletor/src/collection';
-import { _converse, api, converse } from '../../core.js';
+import { _converse, api, converse } from '../../index.js';
 import {
     autoJoinRooms,
     disconnectChatRooms,

src/headless/plugins/muc/message.js

@@ -1,5 +1,5 @@
 import { Strophe } from 'strophe.js';
-import { _converse, api } from '../../core.js';
+import { _converse, api } from '../../index.js';
 
 /**
  * Mixing that turns a Message model into a ChatRoomMessage model.

src/headless/plugins/muc/muc.js

@@ -8,7 +8,7 @@ import { Model } from '@converse/skeletor/src/model.js';
 import { ROOMSTATUS } from './constants.js';
 import { Strophe, $build, $iq, $msg, $pres } from 'strophe.js';
 import { TimeoutError } from '../../shared/errors.js';
-import { _converse, api, converse } from '../../core.js';
+import { _converse, api, converse } from '../../index.js';
 import { computeAffiliationsDelta, setAffiliations, getAffiliationList }  from './affiliations/utils.js';
 import { getOpenPromise } from '@converse/openpromise';
 import { handleCorrection } from '../../shared/chat/utils.js';

src/headless/plugins/muc/occupants.js

@@ -3,7 +3,7 @@ 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';
-import { _converse, api, converse } from '../../core.js';
+import { _converse, api, converse } from '../../index.js';
 import { getAffiliationList } from './affiliations/utils.js';
 import { getAutoFetchedAffiliationLists } from './utils.js';
 import { getUniqueId } from '@converse/headless/utils/core.js';

src/headless/plugins/muc/parsers.js

@@ -20,7 +20,7 @@ import {
     isValidReceiptRequest,
     throwErrorIfInvalidForward,
 } from '@converse/headless/shared/parsers';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 const { Strophe, sizzle, u } = converse.env;
 const { NS } = Strophe;

src/headless/plugins/muc/utils.js

@@ -1,7 +1,6 @@
 import isObject from 'lodash-es/isObject';
-import log from "@converse/headless/log.js";
 import { ROLES } from './constants.js';
-import { _converse, api, converse } from '@converse/headless/core.js';
+import { _converse, api, converse, log } from '@converse/headless';
 import { safeSave } from '@converse/headless/utils/core.js';
 
 const { Strophe, sizzle, u } = converse.env;

src/headless/plugins/ping/index.js

@@ -6,7 +6,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import ping_api from './api.js';
-import { api, converse } from "@converse/headless/core.js";
+import { api, converse } from "@converse/headless";
 import { onWindowStateChanged, registerHandlers, unregisterIntervalHandler } from './utils.js';
 
 const { Strophe } = converse.env;

src/headless/plugins/ping/utils.js

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

src/headless/plugins/pubsub.js

@@ -4,7 +4,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import "./disco/index.js";
-import { _converse, api, converse } from "../core.js";
+import { _converse, api, converse } from "../index.js";
 import log from "../log.js";
 
 const { Strophe, $iq } = converse.env;

src/headless/plugins/roster/api.js

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

src/headless/plugins/roster/contact.js

@@ -1,6 +1,6 @@
 import '@converse/headless/plugins/status/api.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { getOpenPromise } from '@converse/openpromise';
 import { rejectPresenceSubscription } from './utils.js';
 

src/headless/plugins/roster/contacts.js

@@ -2,7 +2,7 @@ import RosterContact from './contact.js';
 import log from "@converse/headless/log";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from "@converse/skeletor/src/model";
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { initStorage } from '@converse/headless/utils/storage.js';
 import { rejectPresenceSubscription } from './utils.js';
 

src/headless/plugins/roster/index.js

@@ -7,7 +7,7 @@ import RosterContact from './contact.js';
 import RosterContacts from './contacts.js';
 import roster_api from './api.js';
 import { Presence, Presences } from './presence.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import {
     onChatBoxesInitialized,
     onClearSession,

src/headless/plugins/roster/presence.js

@@ -1,7 +1,7 @@
 import isNaN from "lodash-es/isNaN";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { converse } from "@converse/headless/core";
+import { converse } from "@converse/headless";
 import { initStorage } from '@converse/headless/utils/storage.js';
 
 const { Strophe, dayjs, sizzle } = converse.env;

src/headless/plugins/roster/utils.js

@@ -2,7 +2,7 @@ import log from "@converse/headless/log";
 import { Model } from '@converse/skeletor/src/model.js';
 import { RosterFilter } from '@converse/headless/plugins/roster/filter.js';
 import { STATUS_WEIGHTS } from "../../shared/constants";
-import { _converse, api, converse } from "@converse/headless/core";
+import { _converse, api, converse } from "@converse/headless";
 import { initStorage } from '@converse/headless/utils/storage.js';
 import { shouldClearCache } from '@converse/headless/utils/core.js';
 

src/headless/plugins/smacks/index.js

@@ -3,7 +3,7 @@
  * @license Mozilla Public License (MPLv2)
  * @description Converse.js plugin which adds support for XEP-0198: Stream Management
  */
-import { api, converse } from '@converse/headless/core.js';
+import { api, converse } from '@converse/headless';
 import { enableStreamManagement, initSessionData, sendEnableStanza, onStanzaSent } from './utils.js';
 
 const { Strophe } = converse.env;

src/headless/plugins/smacks/utils.js

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

src/headless/plugins/status/api.js

@@ -1,4 +1,5 @@
-import { _converse, api } from '../../core';
+import api from '../../shared/api/index.js';
+import _converse from '../../shared/_converse.js';
 import { STATUS_WEIGHTS } from '../../shared/constants';
 
 

src/headless/plugins/status/index.js

@@ -4,7 +4,7 @@
  */
 import XMPPStatus from './status.js';
 import status_api from './api.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { shouldClearCache } from '@converse/headless/utils/core.js';
 import {
     addStatusToMUCJoinPresence,

src/headless/plugins/status/status.js

@@ -1,7 +1,7 @@
 import isNaN from 'lodash-es/isNaN';
 import isObject from 'lodash-es/isObject';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 
 const { Strophe, $pres } = converse.env;
 

src/headless/plugins/status/utils.js

@@ -1,4 +1,4 @@
-import { _converse, api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless';
 import { initStorage } from '@converse/headless/utils/storage.js';
 
 const { Strophe, $build } = converse.env;

src/headless/plugins/vcard/api.js

@@ -1,5 +1,5 @@
 import log from "@converse/headless/log";
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import { createStanza, getVCard } from './utils.js';
 
 const { dayjs, u } = converse.env;

src/headless/plugins/vcard/index.js

@@ -6,7 +6,7 @@ import "../status";
 import VCard from './vcard.js';
 import vcard_api from './api.js';
 import { Collection } from "@converse/skeletor/src/collection";
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import {
     clearVCardsSession,
     initVCardCollection,

src/headless/plugins/vcard/utils.js

@@ -1,5 +1,5 @@
 import log from "@converse/headless/log";
-import { _converse, api, converse } from "../../core.js";
+import { _converse, api, converse } from "../../index.js";
 import { initStorage } from '@converse/headless/utils/storage.js';
 import { shouldClearCache } from '@converse/headless/utils/core.js';
 

src/headless/plugins/vcard/vcard.js

@@ -1,5 +1,5 @@
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse } from "../../core.js";
+import { _converse } from "../../index.js";
 
 /**
  * Represents a VCard

src/headless/shared/api/presence.js

@@ -1,4 +1,4 @@
-import { _converse, api } from '../../core.js';
+import { _converse, api } from '../../index.js';
 
 
 export default {

src/headless/shared/connection/index.js

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

src/headless/shared/rsm.js

@@ -6,7 +6,7 @@
  *   Some code taken from the Strophe RSM plugin, licensed under the MIT License
  *   Copyright 2006-2017 Strophe (https://github.com/strophe/strophejs)
  */
-import { _converse, converse } from "../core.js";
+import { _converse, converse } from "../index.js";
 import pick from 'lodash-es/pick';
 
 const { Strophe, $build } = converse.env;