Move all plugin files to ./plugin folders

Rename converse-core.js to core.js

package-lock.json

@@ -2757,7 +2757,8 @@
 			"dependencies": {
 				"filesize": {
 					"version": "6.1.0",
-					"resolved": false
+					"resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
+					"integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="
 				},
 				"fs-extra": {
 					"version": "8.1.0",
@@ -2813,20 +2814,22 @@
 				},
 				"localforage": {
 					"version": "1.7.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz",
+					"integrity": "sha512-1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ==",
 					"requires": {
 						"lie": "3.1.1"
 					}
 				},
 				"pluggable.js": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pluggable.js/-/pluggable.js-2.0.1.tgz",
+					"integrity": "sha512-SBt6v6Tbp20Jf8hU0cpcc/+HBHGMY8/Q+yA6Ih0tBQE8tfdZ6U4PRG0iNvUUjLx/hVyOP53n0UfGBymlfaaXCg==",
 					"requires": {
 						"lodash": "^4.17.11"
 					}
 				},
 				"skeletor.js": {
-					"version": "0.0.1",
+					"version": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
 					"from": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
 					"requires": {
 						"lodash": "^4.17.14"
@@ -2834,7 +2837,11 @@
 				},
 				"strophe.js": {
 					"version": "github:strophe/strophejs#c4a94e59877c06dc2395f4ccbd26f3fee67a4c9f",
-					"from": "strophe.js@github:strophe/strophejs#c4a94e59877c06dc2395f4ccbd26f3fee67a4c9f"
+					"from": "strophe.js@github:strophe/strophejs#c4a94e59877c06dc2395f4ccbd26f3fee67a4c9f",
+					"requires": {
+						"abab": "^2.0.3",
+						"xmldom": "^0.1.27"
+					}
 				},
 				"twemoji": {
 					"version": "12.1.5",
@@ -4441,21 +4448,21 @@
 			}
 		},
 		"@octokit/auth-token": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.3.tgz",
-			"integrity": "sha512-fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg==",
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz",
+			"integrity": "sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==",
 			"dev": true,
 			"requires": {
-				"@octokit/types": "^5.0.0"
+				"@octokit/types": "^6.0.0"
 			}
 		},
 		"@octokit/endpoint": {
-			"version": "6.0.9",
-			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.9.tgz",
-			"integrity": "sha512-3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw==",
+			"version": "6.0.10",
+			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz",
+			"integrity": "sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==",
 			"dev": true,
 			"requires": {
-				"@octokit/types": "^5.0.0",
+				"@octokit/types": "^6.0.0",
 				"is-plain-object": "^5.0.0",
 				"universal-user-agent": "^6.0.0"
 			},
@@ -4474,6 +4481,12 @@
 				}
 			}
 		},
+		"@octokit/openapi-types": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-1.2.2.tgz",
+			"integrity": "sha512-vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw==",
+			"dev": true
+		},
 		"@octokit/plugin-enterprise-rest": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz",
@@ -4528,14 +4541,14 @@
 			}
 		},
 		"@octokit/request": {
-			"version": "5.4.10",
-			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.10.tgz",
-			"integrity": "sha512-egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw==",
+			"version": "5.4.12",
+			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.12.tgz",
+			"integrity": "sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==",
 			"dev": true,
 			"requires": {
 				"@octokit/endpoint": "^6.0.1",
 				"@octokit/request-error": "^2.0.0",
-				"@octokit/types": "^5.0.0",
+				"@octokit/types": "^6.0.3",
 				"deprecation": "^2.0.0",
 				"is-plain-object": "^5.0.0",
 				"node-fetch": "^2.6.1",
@@ -4544,12 +4557,12 @@
 			},
 			"dependencies": {
 				"@octokit/request-error": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.3.tgz",
-					"integrity": "sha512-GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA==",
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz",
+					"integrity": "sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==",
 					"dev": true,
 					"requires": {
-						"@octokit/types": "^5.0.1",
+						"@octokit/types": "^6.0.0",
 						"deprecation": "^2.0.0",
 						"once": "^1.4.0"
 					}
@@ -4615,11 +4628,12 @@
 			}
 		},
 		"@octokit/types": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
-			"integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.0.3.tgz",
+			"integrity": "sha512-6y0Emzp+uPpdC5QLzUY1YRklvqiZBMTOz2ByhXdmTFlc3lNv8Mi28dX1U1b4scNtFMUa3tkpjofNFJ5NqMJaZw==",
 			"dev": true,
 			"requires": {
+				"@octokit/openapi-types": "^1.2.0",
 				"@types/node": ">= 8"
 			}
 		},
@@ -13879,10 +13893,13 @@
 					}
 				},
 				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-					"dev": true
+					"version": "7.3.4",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+					"integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
 				},
 				"type-fest": {
 					"version": "0.18.1",

src/components/adhoc-commands.js

@@ -1,9 +1,9 @@
-import "./autocomplete.js"
+import "../plugins/autocomplete.js"
 import log from "@converse/headless/log";
 import sizzle from "sizzle";
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { api, converse } from "@converse/headless/converse-core";
+import { api, converse } from "@converse/headless/core";
 import { html } from "lit-html";
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
 

src/components/autocomplete.js

@@ -1,7 +1,7 @@
 import { AutoComplete, FILTER_CONTAINS, FILTER_STARTSWITH } from "../converse-autocomplete.js";
 import { CustomElement } from './element.js';
 import { html } from 'lit-element';
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 
 export default class AutoCompleteComponent extends CustomElement {
 

src/components/brand-heading.js

@@ -1,4 +1,4 @@
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 import { component } from 'haunted';
 import { html } from 'lit-html';
 

src/components/chat_content.js

@@ -3,7 +3,7 @@ import xss from "xss/dist/xss";
 import { CustomElement } from './element.js';
 import { html } from 'lit-element';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 
 export default class ChatContent extends CustomElement {
 

src/components/converse.js

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

src/components/dropdown.js

@@ -1,6 +1,6 @@
-import DOMNavigator from "../dom-navigator";
+import DOMNavigator from "../shared/dom-navigator.js";
 import { CustomElement } from './element.js';
-import { converse, api } from "@converse/headless/converse-core";
+import { converse, api } from "@converse/headless/core";
 import { html } from 'lit-element';
 import { until } from 'lit-html/directives/until.js';
 

src/components/emoji-picker-content.js

@@ -1,6 +1,6 @@
 import sizzle from 'sizzle';
 import { CustomElement } from './element.js';
-import { _converse, converse, api } from "@converse/headless/converse-core";
+import { _converse, converse, api } from "@converse/headless/core";
 import { html } from "lit-element";
 import { tpl_all_emojis, tpl_search_results } from "../templates/emoji_picker.js";
 

src/components/emoji-picker.js

@@ -1,9 +1,9 @@
 import "./emoji-picker-content.js";
-import DOMNavigator from "../dom-navigator";
+import DOMNavigator from "../shared/dom-navigator";
 import { BaseDropdown } from "./dropdown.js";
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { debounce } from "lodash-es";
 import { html } from "lit-element";
 import { tpl_emoji_picker } from "../templates/emoji_picker.js";

src/components/help_messages.js

@@ -1,7 +1,7 @@
 import './icons.js';
 import xss from 'xss/dist/xss';
 import { CustomElement } from './element.js';
-import { api } from '@converse/headless/converse-core';
+import { api } from '@converse/headless/core';
 import { html } from 'lit-element';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
 

src/components/image_picker.js

@@ -2,7 +2,7 @@ import { CustomElement } from './element.js';
 import { __ } from '../i18n';
 import { html } from 'lit-element';
 import { renderAvatar } from "../templates/directives/avatar.js";
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 
 const i18n_alt_avatar = __('Your avatar image');
 

src/components/message-actions.js

@@ -1,6 +1,6 @@
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 import { html } from 'lit-element';
 import { until } from 'lit-html/directives/until.js';
 

src/components/message-body.js

@@ -1,7 +1,7 @@
-import '../converse-registry';
+import '../shared/registry.js';
 import ImageModal from '../modals/image.js';
 import { CustomElement } from './element.js';
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 import { renderBodyText } from './../templates/directives/body';
 
 

src/components/message-history.js

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import tpl_new_day from "../templates//new_day.js";
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { _converse, api } from "@converse/headless/converse-core";
+import { _converse, api } from "@converse/headless/core";
 import { html } from 'lit-element';
 import { repeat } from 'lit-html/directives/repeat.js';
 

src/components/message.js

@@ -1,7 +1,7 @@
-import './message-body.js';
-import '../converse-registry';
+import '../shared/registry';
 import './dropdown.js';
 import './message-actions.js';
+import './message-body.js';
 import { getDerivedMessageProps } from './message-history';
 import MessageVersionsModal from '../modals/message-versions.js';
 import dayjs from 'dayjs';
@@ -10,7 +10,7 @@ import tpl_chat_message from '../templates/chat_message.js';
 import tpl_spinner from '../templates/spinner.js';
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { _converse, api, converse } from  '@converse/headless/converse-core';
+import { _converse, api, converse } from  '@converse/headless/core';
 import { html } from 'lit-element';
 import { renderAvatar } from './../templates/directives/avatar';
 

src/components/minimized_chat.js

@@ -1,6 +1,6 @@
 import { CustomElement } from './element.js';
 import tpl_trimmed_chat from "templates/trimmed_chat.js";
-import { api, _converse } from "@converse/headless/converse-core";
+import { api, _converse } from "@converse/headless/core";
 
 
 export default class MinimizedChat extends CustomElement {

src/components/muc-sidebar.js

@@ -1,7 +1,7 @@
-import "./autocomplete.js"
+import "../plugins/autocomplete.js"
 import tpl_muc_sidebar from "templates/muc_sidebar.js";
 import { CustomElement } from './element.js';
-import { api, converse } from "@converse/headless/converse-core";
+import { api, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/components/toolbar.js

@@ -1,7 +1,7 @@
 import "./emoji-picker.js";
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { html } from 'lit-element';
 import { until } from 'lit-html/directives/until.js';
 

src/converse.js

@@ -6,37 +6,38 @@
 
 import _ from './lodash.noconflict';
 
+import "@converse/headless/headless";
+import "i18n";
+import "shared/registry.js";
+
 /* START: Removable components
  * --------------------
  * Any of the following components may be removed if they're not needed.
  */
-import "@converse/headless/headless";
-import "i18n";
-import "converse-registry";
-import "converse-autocomplete";
-import "converse-bookmark-views";  // Views for XEP-0048 Bookmarks
-import "converse-chatview";        // Renders standalone chat boxes for single user chat
-import "converse-controlbox";      // The control box
-import "converse-dragresize";      // Allows chat boxes to be resized by dragging them
-import "converse-fullscreen";
-import "converse-mam-views";
-import "converse-minimize";        // Allows chat boxes to be minimized
-import "converse-muc-views";       // Views related to MUC
-import "converse-headlines-view";
-import "converse-notification";    // HTML5 Notifications
-import "converse-omemo";
-import "converse-profile";
-import "converse-push";            // XEP-0357 Push Notifications
-import "converse-register";        // XEP-0077 In-band registration
-import "converse-roomslist";       // Show currently open chat rooms
-import "converse-rosterview";
-import "converse-singleton";
-import "./components/converse.js";
+import "./plugins/autocomplete.js";
+import "./plugins/bookmark-views.js";  // Views for XEP-0048 Bookmarks
+import "./plugins/chatview.js";        // Renders standalone chat boxes for single user chat
+import "./plugins/controlbox.js";      // The control box
+import "./plugins/dragresize.js";      // Allows chat boxes to be resized by dragging them
+import "./plugins/fullscreen.js";
+import "./plugins/mam-views.js";
+import "./plugins/minimize.js";        // Allows chat boxes to be minimized
+import "./plugins/muc-views.js";       // Views related to MUC
+import "./plugins/headlines-view.js";
+import "./plugins/notifications.js";   // HTML5 Notifications
+import "./plugins/omemo.js";
+import "./plugins/profile.js";
+import "./plugins/push.js";            // XEP-0357 Push Notifications
+import "./plugins/register.js";        // XEP-0077 In-band registration
+import "./plugins/roomslist.js";       // Show currently open chat rooms
+import "./plugins/rosterview.js";
+import "./plugins/singleton.js";
 /* END: Removable components */
 
+import "./components/converse.js";
 import "../sass/converse.scss";
 
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 
 const WHITELISTED_PLUGINS = [
     'converse-autocomplete',

src/headless/converse-core.js → src/headless/core.js

@@ -16,7 +16,7 @@ import sizzle from 'sizzle';
 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 { Connection, MockConnection } from '@converse/headless/shared/connection.js';
 import { CustomElement } from '../components/element';
 import { Events } from '@converse/skeletor/src/events.js';
 import { Model } from '@converse/skeletor/src/model.js';

src/headless/headless.js

@@ -2,25 +2,25 @@
  * --------------------
  * Any of the following components may be removed if they're not needed.
  */
-import "./converse-adhoc";       // XEP-0050 Ad Hoc Commands
-import "./converse-bookmarks";   // XEP-0199 XMPP Ping
-import "./converse-bosh";        // XEP-0206 BOSH
-import "./converse-caps";        // XEP-0115 Entity Capabilities
-import "./converse-carbons";     // XEP-0280 Message Carbons
-import "./converse-chat";        // RFC-6121 Instant messaging
-import "./converse-chatboxes";
-import "./converse-disco";       // XEP-0030 Service discovery
-import "./converse-headlines";   // Support for headline messages
-import "./converse-mam";         // XEP-0313 Message Archive Management
-import "./converse-muc";         // XEP-0045 Multi-user chat
-import "./converse-ping";        // XEP-0199 XMPP Ping
-import "./converse-pubsub";      // XEP-0060 Pubsub
-import "./converse-roster";      // RFC-6121 Contacts Roster
-import "./converse-smacks";      // XEP-0198 Stream Management
-import "./converse-status";      // XEP-0199 XMPP Ping
-import "./converse-vcard";       // XEP-0054 VCard-temp
+import "./plugins/adhoc.js";       // XEP-0050 Ad Hoc Commands
+import "./plugins/bookmarks.js";   // XEP-0199 XMPP Ping
+import "./plugins/bosh.js";        // XEP-0206 BOSH
+import "./plugins/caps.js";        // XEP-0115 Entity Capabilities
+import "./plugins/carbons.js";     // XEP-0280 Message Carbons
+import "./plugins/chat.js";        // RFC-6121 Instant messaging
+import "./plugins/chatboxes.js";
+import "./plugins/disco.js";       // XEP-0030 Service discovery
+import "./plugins/headlines.js";   // Support for headline messages
+import "./plugins/mam.js";         // XEP-0313 Message Archive Management
+import "./plugins/muc.js";         // XEP-0045 Multi-user chat
+import "./plugins/ping.js";        // XEP-0199 XMPP Ping
+import "./plugins/pubsub.js";      // XEP-0060 Pubsub
+import "./plugins/roster.js";      // RFC-6121 Contacts Roster
+import "./plugins/smacks.js";      // XEP-0198 Stream Management
+import "./plugins/status.js";      // XEP-0199 XMPP Ping
+import "./plugins/vcard.js";       // XEP-0054 VCard-temp
 /* END: Removable components */
 
-import { converse } from "./converse-core";
+import { converse } from "./core.js";
 
 export default converse;

src/headless/converse-adhoc.js → src/headless/plugins/adhoc.js

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

src/headless/converse-bookmarks.js → src/headless/plugins/bookmarks.js

@@ -5,11 +5,11 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "@converse/headless/converse-muc";
-import log from "./log";
+import "@converse/headless/plugins/muc";
+import log from "../log.js";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 
 const { Strophe, $iq, sizzle } = converse.env;
 const u = converse.env.utils;

src/headless/converse-bosh.js → src/headless/plugins/bosh.js

@@ -6,8 +6,8 @@
  */
 import 'strophe.js/src/bosh';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
+import { _converse, api, converse } from "../core.js";
+import log from "../log.js";
 
 const { Strophe } = converse.env;
 

src/headless/converse-caps.js → src/headless/plugins/caps.js

@@ -4,7 +4,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import SHA1 from 'strophe.js/src/sha1';
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 
 const { Strophe, $build } = converse.env;
 

src/headless/converse-carbons.js → src/headless/plugins/carbons.js

@@ -7,7 +7,7 @@
 
 import log from '@converse/headless/log';
 import { Strophe } from 'strophe.js/src/strophe';
-import { _converse, api, converse } from "./converse-core";
+import { _converse, api, converse } from "../core.js";
 
 
 /* Ask the XMPP server to enable Message Carbons

src/headless/converse-chat.js → src/headless/plugins/chat.js

@@ -4,11 +4,11 @@
  * @license Mozilla Public License (MPLv2)
  */
 import filesize from "filesize";
-import log from "./log";
-import st from "./utils/stanza";
+import log from "../log.js";
+import st from "../utils/stanza";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "./converse-core";
+import { _converse, api, converse } from "../core.js";
 import { find, isMatch, isObject, pick } from "lodash-es";
 
 const { $msg, Strophe, sizzle, utils } = converse.env;

src/headless/converse-chatboxes.js → src/headless/plugins/chatboxes.js

@@ -3,10 +3,10 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "./converse-emoji";
+import "./emoji/index.js";
 import { Collection } from "@converse/skeletor/src/collection";
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
+import { _converse, api, converse } from "../core.js";
+import log from "../log";
 
 const { Strophe } = converse.env;
 

src/headless/converse-disco.js → src/headless/plugins/disco.js

@@ -4,11 +4,11 @@
  * @license Mozilla Public License (MPLv2)
  * @description Converse plugin which add support for XEP-0030: Service Discovery
  */
-import log from "./log";
+import log from "../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-core";
+import { _converse, api, converse } from "../core.js";
 import { isObject } from "lodash-es";
 
 const { Strophe, $iq, utils } = converse.env;

src/headless/converse-emoji.js → src/headless/plugins/emoji/index.js

@@ -3,9 +3,9 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import { ASCII_REPLACE_REGEX, CODEPOINTS_REGEX } from './emoji_regexes.js';
+import { ASCII_REPLACE_REGEX, CODEPOINTS_REGEX } from './regexes.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "./converse-core";
+import { _converse, api, converse } from "../../core.js";
 import { html } from 'lit-html';
 
 const u = converse.env.utils;
@@ -374,7 +374,7 @@ converse.plugins.add('converse-emoji', {
                 async initialize () {
                     if (!converse.emojis.initialized) {
                         converse.emojis.initialized = true;
-                        const { default: json } = await import(/*webpackChunkName: "emojis" */ './emojis.json');
+                        const { default: json } = await import(/*webpackChunkName: "emojis" */ './emoji.json');
                         converse.emojis.json = json;
                         converse.emojis.by_sn = Object.keys(json).reduce((result, cat) => Object.assign(result, json[cat]), {});
                         converse.emojis.list = Object.values(converse.emojis.by_sn);

src/headless/converse-headlines.js → src/headless/plugins/headlines.js

@@ -3,8 +3,8 @@
  * @copyright 2020, the Converse.js contributors
  * @description XEP-0045 Multi-User Chat Views
  */
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import st from "./utils/stanza";
+import { _converse, api, converse } from "@converse/headless/core";
+import st from "../utils/stanza";
 
 
 converse.plugins.add('converse-headlines', {

src/headless/converse-mam.js → src/headless/plugins/mam.js

@@ -4,13 +4,12 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "./converse-disco";
-import "./converse-rsm";
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import log from "./log";
+import "./disco";
+import { _converse, api, converse } from "@converse/headless/core";
+import log from "../log.js";
 import sizzle from "sizzle";
-import st from "./utils/stanza";
-import { RSM } from '@converse/headless/converse-rsm';
+import st from "../utils/stanza";
+import { RSM } from '@converse/headless/shared/rsm';
 
 const { Strophe, $iq, dayjs } = converse.env;
 const { NS } = Strophe;

src/headless/converse-muc.js → src/headless/plugins/muc.js

@@ -4,18 +4,18 @@
  * @license Mozilla Public License (MPLv2)
  * @description Implements the non-view logic for XEP-0045 Multi-User Chat
  */
-import "./converse-chat";
-import "./converse-disco";
-import "./converse-emoji";
+import "./chat";
+import "./disco";
+import "./emoji/index.js";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
 import { debounce, intersection, invoke, isElement, isObject, pick, zipObject } from "lodash-es";
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
-import muc_utils from "./utils/muc";
-import st from "./utils/stanza";
-import u from "./utils/form";
-import p from "./utils/parse-helpers";
+import { _converse, api, converse } from "../core.js";
+import log from "../log";
+import muc_utils from "../utils/muc";
+import st from "../utils/stanza";
+import u from "../utils/form";
+import p from "../utils/parse-helpers";
 
 export const ROLES = ['moderator', 'participant', 'visitor'];
 export const AFFILIATIONS = ['owner', 'admin', 'member', 'outcast', 'none'];
@@ -227,7 +227,7 @@ converse.plugins.add('converse-muc', {
         /**
          * Determines info message visibility based on
          * muc_show_info_messages configuration setting
-         * @param {*} code 
+         * @param {*} code
          * @memberOf _converse
          */
         _converse.isInfoVisible = function (code) {

src/headless/converse-ping.js → src/headless/plugins/ping.js

@@ -6,8 +6,8 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
+import { _converse, api, converse } from "../core.js";
+import log from "../log.js";
 
 const { Strophe, $iq } = converse.env;
 const u = converse.env.utils;

src/headless/converse-pubsub.js → src/headless/plugins/pubsub.js

@@ -3,9 +3,9 @@
  * @copyright The Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "./converse-disco";
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
+import "./disco";
+import { _converse, api, converse } from "../core.js";
+import log from "../log.js";
 
 const { Strophe, $iq } = converse.env;
 

src/headless/converse-roster.js → src/headless/plugins/roster.js

@@ -3,12 +3,12 @@
  * @copyright The Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "@converse/headless/converse-status";
+import "@converse/headless/plugins/status";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
 import { invoke, isNaN, propertyOf, sum } from "lodash-es";
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import log from "./log";
+import { _converse, api, converse } from "@converse/headless/core";
+import log from "../log.js";
 
 const { Strophe, $iq, $pres, dayjs, sizzle } = converse.env;
 const u = converse.env.utils;
@@ -1103,4 +1103,3 @@ converse.plugins.add('converse-roster', {
         });
     }
 });
-

src/headless/converse-smacks.js → src/headless/plugins/smacks.js

@@ -4,8 +4,8 @@
  * @license Mozilla Public License (MPLv2)
  * @description Converse.js plugin which adds support for XEP-0198: Stream Management
  */
-import { _converse, api, converse } from "./converse-core";
-import log from "./log";
+import { _converse, api, converse } from "../core.js";
+import log from "../log.js";
 
 const { Strophe } = converse.env;
 const u = converse.env.utils;

src/headless/converse-status.js → src/headless/plugins/status.js

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

src/headless/converse-vcard.js → src/headless/plugins/vcard.js

@@ -3,11 +3,11 @@
  * @copyright The Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "./converse-status";
+import "./status";
 import log from "@converse/headless/log";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "./converse-core";
+import { _converse, api, converse } from "../core.js";
 
 const { Strophe, $iq, dayjs } = converse.env;
 const u = converse.env.utils;

src/headless/connection.js → src/headless/shared/connection.js

@@ -1,8 +1,8 @@
-import log from "./log";
+import log from "../log.js";
 import sizzle from 'sizzle';
 import u from '@converse/headless/utils/core';
 import { Strophe } from 'strophe.js/src/core';
-import { _converse, api, clearSession, tearDown } from "./converse-core";
+import { _converse, api, clearSession, tearDown } from "../core.js";
 import { debounce, isElement } from 'lodash';
 
 

src/headless/converse-rsm.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 "./converse-core";
+import { _converse, converse } from "../core.js";
 import { pick } from 'lodash-es'
 
 const { Strophe, $build } = converse.env;

src/headless/utils/muc.js

@@ -4,7 +4,7 @@
  * @description This is the MUC utilities module.
  */
 import { difference, indexOf } from "lodash-es";
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 import u from "./core";
 
 const { Strophe, sizzle } = converse.env;

src/headless/utils/stanza.js

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import sizzle from 'sizzle';
 import u from '@converse/headless/utils/core';
 import log from "../log";
-import { _converse, api } from "@converse/headless/converse-core";
+import { _converse, api } from "@converse/headless/core";
 
 const Strophe = strophe.default.Strophe;
 const $msg = strophe.default.$msg;

src/i18n/index.js

@@ -7,7 +7,7 @@
 import Jed from 'jed';
 import dayjs from 'dayjs';
 import log from "@converse/headless/log";
-import { _converse, api, i18n } from '@converse/headless/converse-core';
+import { _converse, api, i18n } from '@converse/headless/core';
 
 
 function detectLocale (library_check) {

src/modals/add-contact.js

@@ -1,7 +1,7 @@
 import BootstrapModal from "./base.js";
 import tpl_add_contact_modal from "./templates/add-contact.js";
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { compact, debounce } from "lodash-es";
 
 const { Strophe } = converse.env;

src/modals/add-muc.js

@@ -2,7 +2,7 @@ import tpl_add_muc from "./templates/add-muc.js";
 import BootstrapModal from "./base.js";
 import { Strophe } from 'strophe.js/src/strophe';
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/modals/base.js

@@ -2,7 +2,7 @@ import bootstrap from "bootstrap.native";
 import log from "@converse/headless/log";
 import tpl_alert_component from "templates/alert.js";
 import { View } from '@converse/skeletor/src/view.js';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { render } from 'lit-html';
 
 const { sizzle } = converse.env;

src/modals/chat-status.js

@@ -1,7 +1,7 @@
 import BootstrapModal from "./base.js";
 import tpl_chat_status_modal from "./templates/chat-status.js";
 import { __ } from '../i18n';
-import { _converse, converse } from "@converse/headless/converse-core";
+import { _converse, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/modals/confirm.js

@@ -1,6 +1,6 @@
 import BootstrapModal from './base.js';
 import tpl_prompt from "./templates/prompt.js";
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/modals/moderator-tools.js

@@ -2,9 +2,9 @@ import BootstrapModal from "./base.js";
 import log from "@converse/headless/log";
 import sizzle from "sizzle";
 import tpl_moderator_tools_modal from "./templates/moderator-tools.js";
-import { AFFILIATIONS, ROLES } from "@converse/headless/converse-muc.js";
+import { AFFILIATIONS, ROLES } from "@converse/headless/plugins/muc.js";
 import { __ } from '../i18n';
-import { api, converse } from "@converse/headless/converse-core";
+import { api, converse } from "@converse/headless/core";
 
 const { Strophe } = converse.env;
 const u = converse.env.utils;

src/modals/muc-commands.js

@@ -1,6 +1,6 @@
 import BootstrapModal from "./base.js";
 import { __ } from '../i18n';
-import { api, converse } from "@converse/headless/converse-core";
+import { api, converse } from "@converse/headless/core";
 import log from "@converse/headless/log";
 import sizzle from "sizzle";
 import tpl_muc_commands_modal from "../templates/muc_commands_modal.js";

src/modals/muc-invite.js

@@ -1,6 +1,6 @@
 import BootstrapModal from "./base.js";
 import tpl_muc_invite_modal from "./templates/muc-invite.js";
-import { _converse, converse } from "@converse/headless/converse-core";
+import { _converse, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/modals/muc-list.js

@@ -7,7 +7,7 @@ import tpl_room_description from "templates/room_description.html";
 import tpl_spinner from "templates/spinner.js";
 import { Strophe, $iq } from 'strophe.js/src/strophe';
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { head } from "lodash-es";
 
 const u = converse.env.utils;

src/modals/occupant.js

@@ -1,6 +1,6 @@
 import BootstrapModal from "./base.js";
 import tpl_occupant_modal from "./templates/occupant.js";
-import { _converse, api } from "@converse/headless/converse-core";
+import { _converse, api } from "@converse/headless/core";
 
 
 const OccupantModal = BootstrapModal.extend({

src/modals/profile.js

@@ -4,7 +4,7 @@ import log from "@converse/headless/log";
 import sizzle from 'sizzle';
 import tpl_profile_modal from "./templates/profile.js";
 import { __ } from '../i18n';
-import { _converse, api } from "@converse/headless/converse-core";
+import { _converse, api } from "@converse/headless/core";
 
 
 const ProfileModal = BootstrapModal.extend({

src/modals/templates/profile.js

@@ -1,7 +1,7 @@
 import "../../components/image_picker.js";
 import spinner from "../../templates/spinner.js";
 import { __ } from '../../i18n';
-import { _converse, converse } from  "@converse/headless/converse-core";
+import { _converse, converse } from  "@converse/headless/core";
 import { html } from "lit-html";
 import { modal_header_close_button } from "./buttons.js";
 

src/modals/templates/user-settings.js

@@ -1,7 +1,7 @@
 import '../../components/adhoc-commands.js';
 import xss from "xss/dist/xss";
 import { __ } from '../../i18n';
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 import { html } from "lit-html";
 import { modal_header_close_button } from "./buttons.js"
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';

src/modals/user-details.js

@@ -2,7 +2,7 @@ import BootstrapModal from "./base.js";
 import log from "@converse/headless/log";
 import tpl_user_details_modal from "./templates/user-details.js";
 import { __ } from '../i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/converse-autocomplete.js → src/plugins/autocomplete.js

@@ -7,7 +7,7 @@
  * @license Mozilla Public License (MPLv2)
  */
 import { Events } from '@converse/skeletor/src/events.js';
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/converse-bookmark-views.js → src/plugins/bookmark-views.js

@@ -4,13 +4,13 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "@converse/headless/converse-muc";
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import tpl_bookmarks_list from "templates/bookmarks_list.js"
-import tpl_muc_bookmark_form from "templates/muc_bookmark_form.js";
+import "@converse/headless/plugins/muc";
+import { _converse, api, converse } from "@converse/headless/core";
+import tpl_bookmarks_list from "../templates/bookmarks_list.js"
+import tpl_muc_bookmark_form from "../templates/muc_bookmark_form.js";
 import { Model } from '@converse/skeletor/src/model.js';
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
+import { __ } from '../i18n';
 import { invokeMap } from 'lodash-es';
 
 const { Strophe } = converse.env;

src/converse-chatboxviews.js → src/plugins/chatboxviews.js

@@ -3,14 +3,14 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import './components/converse.js';
-import "@converse/headless/converse-chatboxes";
-import tpl_avatar from "templates/avatar.js";
-import tpl_background_logo from "templates/background_logo.js";
-import tpl_converse from "templates/converse.js";
+import '../components/converse.js';
+import "@converse/headless/plugins/chatboxes";
+import tpl_avatar from "../templates/avatar.js";
+import tpl_background_logo from "../templates/background_logo.js";
+import tpl_converse from "../templates/converse.js";
 import { Overview } from "@converse/skeletor/src/overview";
 import { View } from "@converse/skeletor/src/view";
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import { render } from "lit-html";
 import { result } from "lodash-es";
 

src/converse-chatview.js → src/plugins/chatview.js

@@ -3,11 +3,11 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import './components/chat_content.js';
-import './components/help_messages.js';
-import './components/toolbar.js';
-import 'converse-chatboxviews';
-import 'converse-modal';
+import '../components/chat_content.js';
+import '../components/help_messages.js';
+import '../components/toolbar.js';
+import './chatboxviews';
+import './modal.js';
 import log from '@converse/headless/log';
 import tpl_chatbox from 'templates/chatbox.js';
 import tpl_chatbox_head from 'templates/chatbox_head.js';
@@ -16,8 +16,8 @@ import tpl_spinner from 'templates/spinner.js';
 import tpl_toolbar from 'templates/toolbar.js';
 import UserDetailsModal from 'modals/user-details.js';
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
-import { _converse, api, converse } from '@converse/headless/converse-core';
+import { __ } from '../i18n';
+import { _converse, api, converse } from '@converse/headless/core';
 import { debounce } from 'lodash-es';
 import { html, render } from 'lit-html';
 

src/converse-controlbox.js → src/plugins/controlbox.js

@@ -3,17 +3,17 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "converse-chatview";
-import "./components/brand-heading";
+import "./chatview";
+import "../components/brand-heading";
 import bootstrap from "bootstrap.native";
 import log from "@converse/headless/log";
-import tpl_controlbox from "templates/controlbox.js";
-import tpl_controlbox_toggle from "templates/controlbox_toggle.html";
-import tpl_login_panel from "templates/login_panel.js";
+import tpl_controlbox from "../templates/controlbox.js";
+import tpl_controlbox_toggle from "../templates/controlbox_toggle.html";
+import tpl_login_panel from "../templates/login_panel.js";
 import { Model } from '@converse/skeletor/src/model.js';
 import { View } from "@converse/skeletor/src/view";
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { render } from 'lit-html';
 
 const { Strophe, dayjs } = converse.env;

src/converse-dragresize.js → src/plugins/dragresize.js

@@ -3,11 +3,11 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "converse-chatview";
-import "converse-controlbox";
+import "./chatview.js";
+import "./controlbox.js";
 import { debounce } from "lodash-es";
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import tpl_dragresize from "templates/dragresize.html";
+import { _converse, api, converse } from "@converse/headless/core";
+import tpl_dragresize from "../templates/dragresize.html";
 
 const u = converse.env.utils;
 

src/converse-fullscreen.js → src/plugins/fullscreen.js

@@ -3,11 +3,11 @@
  * @license Mozilla Public License (MPLv2)
  * @copyright 2020, the Converse.js contributors
  */
-import "@converse/headless/converse-muc";
-import "converse-chatview";
-import "converse-controlbox";
-import "converse-singleton";
-import { api, converse } from "@converse/headless/converse-core";
+import "./chatview.js";
+import "./controlbox.js";
+import "./singleton.js";
+import "@converse/headless/plugins/muc";
+import { api, converse } from "@converse/headless/core";
 
 
 converse.plugins.add('converse-fullscreen', {

src/converse-headlines-view.js → src/plugins/headlines-view.js

@@ -3,13 +3,12 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "converse-chatview";
-import tpl_chatbox from "templates/chatbox.js";
-import tpl_headline_panel from "templates/headline_panel.js";
-import { ChatBoxView } from "./converse-chatview";
+import tpl_chatbox from "../templates/chatbox.js";
+import tpl_headline_panel from "../templates/headline_panel.js";
+import { ChatBoxView } from "./chatview";
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { render } from "lit-html";
 
 const u = converse.env.utils;

src/converse-mam-views.js → src/plugins/mam-views.js

@@ -5,7 +5,7 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 
 
 converse.plugins.add('converse-mam-views', {

src/converse-minimize.js → src/plugins/minimize.js

@@ -3,13 +3,13 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import './components/minimized_chat.js';
-import 'converse-chatview';
-import tpl_chats_panel from 'templates/chats_panel.js';
+import '../components/minimized_chat.js';
+import './chatview.js';
+import tpl_chats_panel from '../templates/chats_panel.js';
 import { Model } from '@converse/skeletor/src/model.js';
 import { View } from '@converse/skeletor/src/view';
-import { __ } from './i18n';
-import { _converse, api, converse } from '@converse/headless/converse-core';
+import { __ } from '../i18n';
+import { _converse, api, converse } from '@converse/headless/core';
 import { debounce } from 'lodash-es';
 import { render } from 'lit-html';
 

src/converse-modal.js → src/plugins/modal.js

@@ -3,11 +3,11 @@
  * @copyright The Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import Alert from './modals/alert.js';
-import BootstrapModal from './modals/base.js';
-import Confirm from './modals/confirm.js';
+import Alert from '../modals/alert.js';
+import BootstrapModal from '../modals/base.js';
+import Confirm from '../modals/confirm.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 
 
 converse.env.BootstrapModal = BootstrapModal; // expose to plugins

src/converse-muc-views.js → src/plugins/muc-views.js

@@ -4,31 +4,31 @@
  * @description XEP-0045 Multi-User Chat Views
  * @license Mozilla Public License (MPLv2)
  */
-import "./components/muc-sidebar";
+import "../components/muc-sidebar";
+import "./modal.js";
 import "@converse/headless/utils/muc";
-import "converse-modal";
-import AddMUCModal from 'modals/add-muc.js';
-import MUCInviteModal from 'modals/muc-invite.js';
-import MUCListModal from 'modals/muc-list.js';
-import ModeratorToolsModal from "./modals/moderator-tools.js";
-import OccupantModal from 'modals/occupant.js';
-import RoomDetailsModal from 'modals/muc-details.js';
+import AddMUCModal from '../modals/add-muc.js';
+import MUCInviteModal from '../modals/muc-invite.js';
+import MUCListModal from '../modals/muc-list.js';
+import ModeratorToolsModal from "../modals/moderator-tools.js";
+import OccupantModal from '../modals/occupant.js';
+import RoomDetailsModal from '../modals/muc-details.js';
 import log from "@converse/headless/log";
-import tpl_chatroom from "templates/chatroom.js";
-import tpl_muc_bottom_panel from "templates/muc_bottom_panel.js";
-import tpl_muc_destroyed from "templates/muc_destroyed.js";
-import tpl_muc_disconnect from "templates/muc_disconnect.js";
-import tpl_chatroom_head from "templates/chatroom_head.js";
-import tpl_muc_nickname_form from "templates/muc_nickname_form.js";
-import tpl_muc_config_form from "templates/muc_config_form.js";
-import tpl_muc_password_form from "templates/muc_password_form.js";
-import tpl_room_panel from "templates/room_panel.js";
-import tpl_spinner from "templates/spinner.js";
-import { ChatBoxView } from "./converse-chatview";
+import tpl_chatroom from "../templates/chatroom.js";
+import tpl_chatroom_head from "../templates/chatroom_head.js";
+import tpl_muc_bottom_panel from "../templates/muc_bottom_panel.js";
+import tpl_muc_config_form from "../templates/muc_config_form.js";
+import tpl_muc_destroyed from "../templates/muc_destroyed.js";
+import tpl_muc_disconnect from "../templates/muc_disconnect.js";
+import tpl_muc_nickname_form from "../templates/muc_nickname_form.js";
+import tpl_muc_password_form from "../templates/muc_password_form.js";
+import tpl_room_panel from "../templates/room_panel.js";
+import tpl_spinner from "../templates/spinner.js";
+import { ChatBoxView } from "./chatview.js";
 import { Model } from '@converse/skeletor/src/model.js';
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { debounce } from "lodash-es";
 import { render } from "lit-html";
 

src/converse-notification.js → src/plugins/notifications.js

@@ -5,8 +5,8 @@
  */
 import Favico from 'favico.js-slevomat';
 import log from "@converse/headless/log";
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 
 const { Strophe } = converse.env;
 const u = converse.env.utils;

src/converse-oauth.js → src/plugins/oauth.js

@@ -6,9 +6,9 @@
 import { Collection } from "@converse/skeletor/src/collection";
 import { View } from '@converse/skeletor/src/view.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 import hello from "hellojs";
-import tpl_oauth_providers from "templates/oauth_providers.js";
+import tpl_oauth_providers from "../templates/oauth_providers.js";
 
 
 // The following line registers your plugin.
@@ -128,4 +128,3 @@ converse.plugins.add("converse-oauth", {
         });
     }
 });
-

src/converse-omemo.js → src/plugins/omemo.js

@@ -5,13 +5,13 @@
  */
 /* global libsignal */
 
-import "converse-profile";
-import 'modals/user-details.js';
+import "./profile.js";
+import '../modals/user-details.js';
 import log from "@converse/headless/log";
 import { Collection } from "@converse/skeletor/src/collection";
 import { Model } from '@converse/skeletor/src/model.js';
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { concat, debounce, difference, invokeMap, range, omit } from "lodash-es";
 import { html } from 'lit-html';
 

src/converse-profile.js → src/plugins/profile.js

@@ -3,15 +3,15 @@
  * @copyright The Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "modals/profile.js";
-import "modals/chat-status.js";
-import "@converse/headless/converse-status";
-import "@converse/headless/converse-vcard";
-import "converse-modal";
-import UserSettingsModal from "modals/user-settings";
-import tpl_profile from "templates/profile.js";
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import "../modals/chat-status.js";
+import "../modals/profile.js";
+import "./modal.js";
+import "@converse/headless/plugins/status";
+import "@converse/headless/plugins/vcard";
+import UserSettingsModal from "../modals/user-settings";
+import tpl_profile from "../templates/profile.js";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 
 
 converse.plugins.add('converse-profile', {

src/converse-push.js → src/plugins/push.js

@@ -6,7 +6,7 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { _converse, api, converse } from "@converse/headless/core";
 import log from "@converse/headless/log";
 
 const { Strophe, $iq } = converse.env;

src/converse-register.js → src/plugins/register.js

@@ -6,18 +6,18 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "converse-controlbox";
+import "./controlbox.js";
 import log from "@converse/headless/log";
-import tpl_form_input from "templates/form_input.html";
-import tpl_form_username from "templates/form_username.html";
-import tpl_register_panel from "templates/register_panel.html";
-import tpl_registration_form from "templates/registration_form.html";
-import tpl_registration_request from "templates/registration_request.html";
-import tpl_spinner from "templates/spinner.js";
+import tpl_form_input from "../templates/form_input.html";
+import tpl_form_username from "../templates/form_username.html";
+import tpl_register_panel from "../templates/register_panel.html";
+import tpl_registration_form from "../templates/registration_form.html";
+import tpl_registration_request from "../templates/registration_request.html";
+import tpl_spinner from "../templates/spinner.js";
 import utils from "@converse/headless/utils/form";
 import { View } from "@converse/skeletor/src/view";
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { pick } from "lodash-es";
 import { render } from 'lit-html';
 
@@ -654,4 +654,3 @@ converse.plugins.add('converse-register', {
         /************************ END Event Handlers ************************/
     }
 });
-

src/converse-roomslist.js → src/plugins/roomslist.js

@@ -6,13 +6,13 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "@converse/headless/converse-muc";
+import "@converse/headless/plugins/muc";
 import RoomDetailsModal from 'modals/muc-details.js';
-import { _converse, api, converse } from "@converse/headless/converse-core";
-import tpl_rooms_list from "templates/rooms_list.js";
+import { _converse, api, converse } from "@converse/headless/core";
+import tpl_rooms_list from "../templates/rooms_list.js";
 import { Model } from '@converse/skeletor/src/model.js';
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
+import { __ } from '../i18n';
 
 
 const { Strophe } = converse.env;

src/converse-rosterview.js → src/plugins/rosterview.js

@@ -3,22 +3,22 @@
  * @copyright 2020, the Converse.js contributors
  * @license Mozilla Public License (MPLv2)
  */
-import "@converse/headless/converse-chatboxes";
-import "@converse/headless/converse-roster";
-import "converse-modal";
-import "modals/add-contact.js";
+import "./modal";
+import "@converse/headless/plugins/chatboxes";
+import "@converse/headless/plugins/roster";
+import "../modals/add-contact.js";
 import log from "@converse/headless/log";
-import tpl_group_header from "templates/group_header.html";
-import tpl_pending_contact from "templates/pending_contact.html";
-import tpl_requesting_contact from "templates/requesting_contact.html";
-import tpl_roster from "templates/roster.html";
-import tpl_roster_filter from "templates/roster_filter.js";
-import tpl_roster_item from "templates/roster_item.html";
+import tpl_group_header from "../templates/group_header.html";
+import tpl_pending_contact from "../templates/pending_contact.html";
+import tpl_requesting_contact from "../templates/requesting_contact.html";
+import tpl_roster from "../templates/roster.html";
+import tpl_roster_filter from "../templates/roster_filter.js";
+import tpl_roster_item from "../templates/roster_item.html";
 import { Model } from '@converse/skeletor/src/model.js';
 import { OrderedListView } from "@converse/skeletor/src/overview";
 import { View } from '@converse/skeletor/src/view.js';
-import { __ } from './i18n';
-import { _converse, api, converse } from "@converse/headless/converse-core";
+import { __ } from '../i18n';
+import { _converse, api, converse } from "@converse/headless/core";
 import { debounce, has, without } from "lodash-es";
 
 const u = converse.env.utils;
@@ -817,7 +817,7 @@ converse.plugins.add('converse-rosterview', {
 
         function initRosterView () {
             /* Create an instance of RosterView once the RosterGroups
-             * collection has been created (in @converse/headless/converse-core.js)
+             * collection has been created (in @converse/headless/core.js)
              */
             if (api.settings.get("authentication") === _converse.ANONYMOUS) {
                 return;

src/converse-singleton.js → src/plugins/singleton.js

@@ -4,7 +4,7 @@
  * @license Mozilla Public License (MPLv2)
  * @description A plugin which restricts Converse to only one chat.
  */
-import { api, converse } from "@converse/headless/converse-core";
+import { api, converse } from "@converse/headless/core";
 
 
 converse.plugins.add('converse-singleton', {

src/dom-navigator.js → src/shared/dom-navigator.js

@@ -4,8 +4,8 @@
  * This module started as a fork of Rubens Mariuzzo's dom-navigator.
  * @copyright Rubens Mariuzzo, JC Brand
  */
-import u from './utils/html';
-import { converse } from  "@converse/headless/converse-core";
+import u from '../utils/html';
+import { converse } from  "@converse/headless/core";
 
 const { keycodes } = converse;
 

src/shared/message/text.js

@@ -1,10 +1,9 @@
 import URI from 'urijs';
 import log from '@converse/headless/log';
-import { _converse, api, converse } from '@converse/headless/converse-core';
-import { convertASCII2Emoji } from '@converse/headless/converse-emoji.js';
-import { html } from 'lit-html';
+import { _converse, api, converse } from '@converse/headless/core';
 import { containsDirectives, getDirectiveAndLength, getDirectiveTemplate, isQuoteDirective } from './styling.js';
-import { getCodePointReferences, getEmojiMarkup, getShortnameReferences } from '../../headless/converse-emoji.js';
+import { convertASCII2Emoji, getCodePointReferences, getEmojiMarkup, getShortnameReferences } from '@converse/headless/plugins/emoji/index.js';
+import { html } from 'lit-html';
 
 const u = converse.env.utils;
 

src/converse-registry.js → src/shared/registry.js

@@ -1,4 +1,4 @@
-import { api } from "@converse/headless/converse-core";
+import { api } from "@converse/headless/core";
 
 const registry = {};
 

src/templates/chatbox_head.js

@@ -1,4 +1,4 @@
-import { _converse } from '@converse/headless/converse-core';
+import { _converse } from '@converse/headless/core';
 import { html } from "lit-html";
 import { renderAvatar } from './directives/avatar.js';
 import { until } from 'lit-html/directives/until.js';

src/templates/chatroom_head.js

@@ -2,7 +2,7 @@ import '../components/dropdown.js';
 import { __ } from '../i18n';
 import { html } from "lit-html";
 import { until } from 'lit-html/directives/until.js';
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 
 const u = converse.env.utils;
 

src/templates/directives/body.js

@@ -1,5 +1,5 @@
 import { MessageText } from '../../shared/message/text.js';
-import { api, converse } from  "@converse/headless/converse-core";
+import { api, converse } from  "@converse/headless/core";
 import { directive, html } from "lit-html";
 import { until } from 'lit-html/directives/until.js';
 

src/templates/directives/image.js

@@ -1,4 +1,4 @@
-import { converse } from "@converse/headless/converse-core";
+import { converse } from "@converse/headless/core";
 import { directive, html } from "lit-html";
 
 

src/templates/directives/retraction.js

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

src/templates/emoji_picker.js

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

src/templates/login_panel.js

@@ -1,6 +1,6 @@
 import tpl_spinner from './spinner.js';
 import { __ } from '../i18n';
-import { _converse, api } from "@converse/headless/converse-core";
+import { _converse, api } from "@converse/headless/core";
 import { html } from "lit-html";
 
 

src/templates/muc_nickname_form.js

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

src/templates/profile.js

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

src/templates/toolbar.js

@@ -1,5 +1,5 @@
 import { html } from "lit-html";
-import { api } from '@converse/headless/converse-core.js';
+import { api } from '@converse/headless/core.js';
 
 export default (o) => {
     const message_limit = api.settings.get('message_limit');

src/utils/html.js

@@ -19,7 +19,7 @@ import tpl_image from "../templates/image.js";
 import tpl_select_option from "../templates/select_option.html";
 import tpl_video from "../templates/video.js";
 import u from "../headless/utils/core";
-import { api } from  "@converse/headless/converse-core";
+import { api } from  "@converse/headless/core";
 import { html, render } from "lit-html";
 import { isFunction } from "lodash-es";