Fixes #3243

Use relative imports and import the `api` before `_converse`.

src/headless/index.js

@@ -1,7 +1,7 @@
 import './shared/constants.js';
-import _converse from './shared/_converse';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
 import api from './shared/api/index.js';
+import _converse from './shared/_converse';
 import dayjs from 'dayjs';
 import i18n from './shared/i18n';
 import { converse } from './shared/api/public.js';

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

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

src/headless/plugins/headlines/feed.js

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

src/headless/shared/api/index.js

@@ -1,8 +1,8 @@
 import connection_api from '../connection/api.js';
-import events_api from '../api/events.js';
-import promise_api from '../api/promise.js';
-import send_api from '../api/send.js';
-import user_api from '../api/user.js';
+import events_api from './events.js';
+import promise_api from './promise.js';
+import send_api from './send.js';
+import user_api from './user.js';
 import { settings_api } from '../settings/api.js';
 
 /**

src/headless/shared/api/promise.js

@@ -1,4 +1,4 @@
-import _converse from '@converse/headless/shared/_converse.js';
+import _converse from '../_converse.js';
 import { getOpenPromise } from '@converse/openpromise';
 import { waitUntil, isFunction } from '../../utils/core.js';
 

src/headless/shared/api/send.js

@@ -1,4 +1,4 @@
-import _converse from '../../shared/_converse.js';
+import _converse from '../_converse.js';
 import log from '../../log.js';
 import { Strophe } from 'strophe.js';
 import { TimeoutError } from '../errors.js';

src/headless/shared/connection/api.js

@@ -1,4 +1,4 @@
-import _converse from '@converse/headless/shared/_converse.js';
+import _converse from '../_converse.js';
 import { Strophe } from 'strophe.js';
 
 /**

src/headless/shared/settings/api.js

@@ -1,4 +1,4 @@
-import log from '@converse/headless/log.js';
+import log from '../../log.js';
 import {
     clearUserSettings,
     extendAppSettings,
@@ -8,7 +8,7 @@ import {
     unregisterListener,
     updateAppSettings,
     updateUserSettings,
-} from '@converse/headless/shared/settings/utils.js';
+} from './utils.js';
 
 /**
  * This grouping allows access to the

src/headless/shared/settings/utils.js

@@ -1,4 +1,4 @@
-import { _converse } from '@converse/headless';
+import _converse from '../_converse.js';
 import isEqual from "lodash-es/isEqual.js";
 import log from '@converse/headless/log';
 import pick from 'lodash-es/pick';
@@ -6,7 +6,7 @@ import u from '@converse/headless/utils/core';
 import { DEFAULT_SETTINGS } from './constants.js';
 import { Events } from '@converse/skeletor/src/events.js';
 import { Model } from '@converse/skeletor/src/model.js';
-import { initStorage } from '@converse/headless/utils/storage.js';
+import { initStorage } from '../../utils/storage.js';
 
 let app_settings;
 let init_settings = {}; // Container for settings passed in via converse.initialize

src/headless/utils/storage.js

@@ -1,9 +1,10 @@
 import Storage from '@converse/skeletor/src/storage.js';
-import { _converse, api } from '@converse/headless';
+import _converse from '../shared/_converse.js';
+import { settings_api } from '../shared/settings/api.js';
 
 export function getDefaultStore () {
     if (_converse.config.get('trusted')) {
-        const is_non_persistent = api.settings.get('persistent_store') === 'sessionStorage';
+        const is_non_persistent = settings_api.get('persistent_store') === 'sessionStorage';
         return is_non_persistent ? 'session': 'persistent';
     } else {
         return 'session';
@@ -11,7 +12,7 @@ export function getDefaultStore () {
 }
 
 function storeUsesIndexedDB (store) {
-    return store === 'persistent' && api.settings.get('persistent_store') === 'IndexedDB';
+    return store === 'persistent' && settings_api.get('persistent_store') === 'IndexedDB';
 }
 
 export function createStore (id, store) {

src/shared/registry.js

@@ -1,4 +1,4 @@
-import api from "@converse/headless/shared/api/index.js";
+import { api } from "@converse/headless";
 
 const registry = {};
 
@@ -8,7 +8,7 @@ const registry = {};
  * @namespace api.elements
  * @memberOf api
  */
-api.elements = {
+const elements = {
     registry,
 
     /**
@@ -41,3 +41,5 @@ api.elements = {
         });
     }
 }
+
+Object.assign(api, { elements });