Use @converse/skeletor, lodash-es and latest webpack-dev-server

This commit is contained in:
JC Brand 2020-06-08 16:08:50 +02:00
parent da62d27678
commit b0cb489769
41 changed files with 901 additions and 300 deletions

1005
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -93,7 +93,7 @@
"karma-jasmine": "^3.1.1",
"karma-jasmine-html-reporter": "^1.5.3",
"karma-webpack": "^4.0.2",
"lerna": "^3.21.0",
"lerna": "^3.22.0",
"lit-element": "^2.3.1",
"lit-html": "^1.2.1",
"lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
@ -114,7 +114,7 @@
"urijs": "^1.19.2",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.1",
"xss": "^1.0.6"
}

View File

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

View File

@ -8,10 +8,10 @@ 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 { Model } from 'skeletor.js/src/model.js';
import { View } from 'skeletor.js/src/view.js';
import { Model } from '@converse/skeletor/src/model.js';
import { View } from '@converse/skeletor/src/view.js';
import { __ } from '@converse/headless/i18n';
import { invokeMap } from 'lodash';
import { invokeMap } from 'lodash-es';
const { Strophe } = converse.env;
const u = converse.env.utils;

View File

@ -7,10 +7,10 @@ import "@converse/headless/converse-chatboxes";
import tpl_avatar from "templates/avatar.svg";
import tpl_background_logo from "templates/background_logo.html";
import tpl_chatboxes from "templates/chatboxes.html";
import { Overview } from "skeletor.js/src/overview";
import { View } from "skeletor.js/src/view";
import { Overview } from "@converse/skeletor/src/overview";
import { View } from "@converse/skeletor/src/view";
import { _converse, api, converse } from "@converse/headless/converse-core";
import { result } from "lodash";
import { result } from "lodash-es";
const u = converse.env.utils;

View File

@ -18,10 +18,10 @@ import tpl_toolbar from "templates/toolbar.js";
import tpl_toolbar_fileupload from "templates/toolbar_fileupload.html";
import tpl_user_details_modal from "templates/user_details_modal.js";
import { BootstrapModal } from "./converse-modal.js";
import { View } from 'skeletor.js/src/view.js';
import { View } from '@converse/skeletor/src/view.js';
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";
import { debounce, isString } from "lodash";
import { debounce, isString } from "lodash-es";
import { html, render } from "lit-html";

View File

@ -10,8 +10,8 @@ import tpl_brand_heading from "templates/converse_brand_heading.html";
import tpl_controlbox from "templates/controlbox.html";
import tpl_controlbox_toggle from "templates/controlbox_toggle.html";
import tpl_login_panel from "templates/login_panel.js";
import { Model } from 'skeletor.js/src/model.js';
import { View } from "skeletor.js/src/view";
import { Model } from '@converse/skeletor/src/model.js';
import { View } from "@converse/skeletor/src/view";
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";

View File

@ -5,7 +5,7 @@
*/
import "converse-chatview";
import "converse-controlbox";
import { debounce } from "lodash";
import { debounce } from "lodash-es";
import { _converse, api, converse } from "@converse/headless/converse-core";
import tpl_dragresize from "templates/dragresize.html";

View File

@ -9,10 +9,10 @@ import bootstrap from "bootstrap.native";
import emoji_picker from "templates/emoji_picker.js";
import sizzle from 'sizzle';
import tpl_emoji_button from "templates/emoji_button.html";
import { View } from "skeletor.js/src/view";
import { View } from "@converse/skeletor/src/view";
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from '@converse/headless/converse-core';
import { debounce, find } from "lodash";
import { debounce, find } from "lodash-es";
const u = converse.env.utils;

View File

@ -6,7 +6,7 @@
import "converse-chatview";
import tpl_chatbox from "templates/chatbox.js";
import tpl_headline_panel from "templates/headline_panel.js";
import { View } from 'skeletor.js/src/view.js';
import { View } from '@converse/skeletor/src/view.js';
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";
import { render } from "lit-html";

View File

@ -6,7 +6,7 @@
* @license Mozilla Public License (MPLv2)
*/
import { converse } from "@converse/headless/converse-core";
import { debounce } from 'lodash'
import { debounce } from 'lodash-es'
converse.plugins.add('converse-mam-views', {

View File

@ -7,12 +7,12 @@ import "converse-chatview";
import tpl_chats_panel from "templates/chats_panel.html";
import tpl_toggle_chats from "templates/toggle_chats.html";
import tpl_trimmed_chat from "templates/trimmed_chat.html";
import { Model } from 'skeletor.js/src/model.js';
import { Overview } from "skeletor.js/src/overview";
import { View } from "skeletor.js/src/view";
import { Model } from '@converse/skeletor/src/model.js';
import { Overview } from "@converse/skeletor/src/overview";
import { View } from "@converse/skeletor/src/view";
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";
import { debounce, sum } from 'lodash';
import { debounce, sum } from 'lodash-es';
const { dayjs } = converse.env;
const u = converse.env.utils;

View File

@ -3,9 +3,9 @@
* @copyright The Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import { View } from 'skeletor.js/src/view.js';
import { Model } from 'skeletor.js/src/model.js';
import { isString } from "lodash";
import { View } from '@converse/skeletor/src/view.js';
import { Model } from '@converse/skeletor/src/model.js';
import { isString } from "lodash-es";
import { render } from 'lit-html';
import { __ } from '@converse/headless/i18n';
import bootstrap from "bootstrap.native";

View File

@ -26,11 +26,11 @@ import tpl_room_description from "templates/room_description.html";
import tpl_room_panel from "templates/room_panel.html";
import tpl_spinner from "templates/spinner.html";
import { BootstrapModal } from "./converse-modal.js";
import { Model } from 'skeletor.js/src/model.js';
import { View } from 'skeletor.js/src/view.js';
import { Model } from '@converse/skeletor/src/model.js';
import { View } from '@converse/skeletor/src/view.js';
import { __ } from '@converse/headless/i18n';
import { api, converse } from "@converse/headless/converse-core";
import { debounce, head, isString, isUndefined } from "lodash";
import { debounce, head, isString, isUndefined } from "lodash-es";
import { render } from "lit-html";
const { Strophe, sizzle, $iq, $pres } = converse.env;

View File

@ -3,9 +3,9 @@
* @copyright 2020, the Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import { Collection } from "skeletor.js/src/collection";
import { View } from 'skeletor.js/src/view.js';
import { Model } from 'skeletor.js/src/model.js';
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 hello from "hellojs";
import tpl_oauth_providers from "templates/oauth_providers.js";

View File

@ -8,11 +8,11 @@
import "converse-profile";
import log from "@converse/headless/log";
import tpl_toolbar_omemo from "templates/toolbar_omemo.html";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { __ } from '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";
import { concat, debounce, difference, invokeMap, range, omit } from "lodash";
import { concat, debounce, difference, invokeMap, range, omit } from "lodash-es";
const { Strophe, sizzle, $build, $iq, $msg } = converse.env;
const u = converse.env.utils;

View File

@ -7,7 +7,7 @@
* @license Mozilla Public License (MPLv2)
*/
import { _converse, api, converse } from "@converse/headless/converse-core";
import { filter, reject } from 'lodash';
import { filter, reject } from 'lodash-es';
import log from "@converse/headless/log";
const { Strophe, $iq } = converse.env;

View File

@ -8,8 +8,8 @@
*/
import "converse-controlbox";
import { __ } from '@converse/headless/i18n';
import { View } from "skeletor.js/src/view";
import { pick } from "lodash";
import { View } from "@converse/skeletor/src/view";
import { pick } from "lodash-es";
import { _converse, api, converse } from "@converse/headless/converse-core";
import log from "@converse/headless/log";
import tpl_form_input from "templates/form_input.html";

View File

@ -10,8 +10,8 @@ import "@converse/headless/converse-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 { Model } from 'skeletor.js/src/model.js';
import { View } from 'skeletor.js/src/view.js';
import { Model } from '@converse/skeletor/src/model.js';
import { View } from '@converse/skeletor/src/view.js';
import { __ } from '@converse/headless/i18n';

View File

@ -15,12 +15,12 @@ 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 { BootstrapModal } from "./converse-modal.js";
import { Model } from 'skeletor.js/src/model.js';
import { OrderedListView } from "skeletor.js/src/overview";
import { View } from 'skeletor.js/src/view.js';
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 '@converse/headless/i18n';
import { _converse, api, converse } from "@converse/headless/converse-core";
import { compact, debounce, has, isString, uniq, without } from "lodash";
import { compact, debounce, has, isString, uniq, without } from "lodash-es";
const { Strophe } = converse.env;
const u = converse.env.utils;

View File

@ -7,8 +7,8 @@
*/
import "@converse/headless/converse-muc";
import log from "./log";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.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";
const { Strophe, $iq, sizzle } = converse.env;

View File

@ -5,7 +5,7 @@
* @description Converse.js plugin which add support for XEP-0206: XMPP Over BOSH
*/
import 'strophe.js/src/bosh';
import { Model } from 'skeletor.js/src/model.js';
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "./converse-core";
import log from "./log";

View File

@ -5,7 +5,7 @@
*/
import SHA1 from 'strophe.js/src/sha1';
import { converse } from "@converse/headless/converse-core";
import { get } from "lodash";
import { get } from "lodash-es";
const { Strophe, $build } = converse.env;

View File

@ -6,10 +6,10 @@
import filesize from "filesize";
import log from "./log";
import st from "./utils/stanza";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "./converse-core";
import { find, isMatch, isObject, isString, pick } from "lodash";
import { find, isMatch, isObject, isString, pick } from "lodash-es";
const { $msg, Strophe, sizzle, utils } = converse.env;
const u = converse.env.utils;

View File

@ -4,9 +4,9 @@
* @license Mozilla Public License (MPLv2)
*/
import "./converse-emoji";
import { Collection } from "skeletor.js/src/collection";
import { Collection } from "@converse/skeletor/src/collection";
import { _converse, api, converse } from "./converse-core";
import { isString } from "lodash";
import { isString } from "lodash-es";
import log from "./log";
const { Strophe } = converse.env;

View File

@ -3,17 +3,11 @@
* @copyright The Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import { Collection } from "skeletor.js/src/collection";
import { Events } from 'skeletor.js/src/events.js';
import { Model } from 'skeletor.js/src/model.js';
import { Router } from 'skeletor.js/src/router.js';
import { __, i18n } from './i18n';
import { assignIn, debounce, invoke, isFunction, isObject, isString, pick } from 'lodash';
import 'strophe.js/src/websocket';
import './polyfill';
import 'strophe.js/src/websocket';
import * as strophe from 'strophe.js/src/core';
import Storage from '@converse/skeletor/src/storage.js';
import _ from './lodash.noconflict';
import Storage from 'skeletor.js/src/storage.js';
import advancedFormat from 'dayjs/plugin/advancedFormat';
import dayjs from 'dayjs';
import log from '@converse/headless/log';
@ -21,6 +15,12 @@ import pluggable from 'pluggable.js/src/pluggable';
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 { Events } from '@converse/skeletor/src/events.js';
import { Model } from '@converse/skeletor/src/model.js';
import { Router } from '@converse/skeletor/src/router.js';
import { __, i18n } from './i18n';
import { assignIn, debounce, invoke, isFunction, isObject, isString, pick } from 'lodash-es';
const Strophe = strophe.default.Strophe;
const $build = strophe.default.$build;
@ -1907,7 +1907,7 @@ Object.assign(converse, {
* @property {function} converse.env.$pres - Creates a Strophe.Builder with an <presence/> element as the root.
* @property {function} converse.env.Promise - The Promise implementation used by Converse.
* @property {function} converse.env.Strophe - The [Strophe](http://strophe.im/strophejs) XMPP library used by Converse.
* @property {object} converse.env._ - The instance of [lodash](http://lodash.com) used by Converse.
* @property {object} converse.env._ - The instance of [lodash-es](http://lodash.com) used by Converse.
* @property {function} converse.env.f - And instance of Lodash with its methods wrapped to produce immutable auto-curried iteratee-first data-last methods.
* @property {object} converse.env.dayjs - [DayJS](https://github.com/iamkun/dayjs) date manipulation library.
* @property {function} converse.env.sizzle - [Sizzle](https://sizzlejs.com) CSS selector engine.

View File

@ -6,10 +6,10 @@
*/
import log from "./log";
import sizzle from "sizzle";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "./converse-core";
import { isEmpty, isObject } from "lodash";
import { isEmpty, isObject } from "lodash-es";
const { Strophe, $iq, utils } = converse.env;

View File

@ -3,8 +3,8 @@
* @copyright 2020, the Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import { Model } from 'skeletor.js/src/model.js';
import { find, uniq } from "lodash";
import { Model } from '@converse/skeletor/src/model.js';
import { find, uniq } from "lodash-es";
import * as twemoji from "twemoji";
import { _converse, api, converse } from "./converse-core";

View File

@ -3,7 +3,7 @@
* @copyright 2020, the Converse.js contributors
* @description XEP-0045 Multi-User Chat Views
*/
import { isString } from "lodash";
import { isString } from "lodash-es";
import { _converse, api, converse } from "@converse/headless/converse-core";
import st from "./utils/stanza";

View File

@ -7,7 +7,7 @@
import "./converse-disco";
import "./converse-rsm";
import { _converse, api, converse } from "@converse/headless/converse-core";
import { intersection, pick } from 'lodash'
import { intersection, pick } from 'lodash-es'
import log from "./log";
import sizzle from "sizzle";
import st from "./utils/stanza";

View File

@ -7,9 +7,9 @@
import "./converse-chat";
import "./converse-disco";
import "./converse-emoji";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { clone, debounce, intersection, invoke, isElement, isObject, isString, pick, uniq, zipObject } from "lodash";
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { clone, debounce, intersection, invoke, isElement, isObject, isString, pick, uniq, zipObject } from "lodash-es";
import { _converse, api, converse } from "./converse-core";
import log from "./log";
import muc_utils from "./utils/muc";

View File

@ -4,9 +4,9 @@
* @license Mozilla Public License (MPLv2)
*/
import "@converse/headless/converse-status";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { invoke, isEmpty, isNaN, isString, propertyOf, sum } from "lodash";
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { invoke, isEmpty, isNaN, isString, propertyOf, sum } from "lodash-es";
import { _converse, api, converse } from "@converse/headless/converse-core";
import log from "./log";

View File

@ -3,8 +3,8 @@
* @copyright The Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import { isNaN, isObject, isString } from "lodash";
import { Model } from 'skeletor.js/src/model.js';
import { isNaN, isObject, isString } from "lodash-es";
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "@converse/headless/converse-core";
const { Strophe, $build, $pres } = converse.env;

View File

@ -6,10 +6,10 @@
import "./converse-status";
import log from "@converse/headless/log";
import tpl_vcard from "./templates/vcard.html";
import { Collection } from "skeletor.js/src/collection";
import { Model } from 'skeletor.js/src/model.js';
import { Collection } from "@converse/skeletor/src/collection";
import { Model } from '@converse/skeletor/src/model.js';
import { _converse, api, converse } from "./converse-core";
import { has, isString } from "lodash";
import { has, isString } from "lodash-es";
const { Strophe, $iq, dayjs } = converse.env;
const u = converse.env.utils;

View File

@ -1,4 +1,4 @@
import { isElement } from 'lodash';
import { isElement } from 'lodash-es';
const LEVELS = {
'debug': 0,

View File

@ -84,6 +84,12 @@
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
"lodash-es": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
"integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==",
"dev": true
},
"pluggable.js": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pluggable.js/-/pluggable.js-2.0.1.tgz",
@ -93,20 +99,6 @@
"lodash": "^4.17.11"
}
},
"skeletor.js": {
"version": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"from": "github:skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"dev": true,
"requires": {
"lodash": "^4.17.14"
}
},
"strophe.js": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.3.4.tgz",
"integrity": "sha512-jSLDG8jolhAwGOSgiJ7DTMSYK3wVoEJHKtpVRyEacQZ6CWA6z2WRPJpcFMjsIweq5aP9/XIvKUQqHBu/ZhvESA==",
"dev": true
},
"twemoji": {
"version": "12.1.5",
"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-12.1.5.tgz",

View File

@ -16,7 +16,7 @@
"templates/*.svg"
],
"keywords": [
"converse.js",
"converse.js",
"XMPP",
"Jabber",
"chat",
@ -36,11 +36,11 @@
},
"gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
"devDependencies": {
"skeletor.js": "skeletorjs/skeletor#bf6d9c86f9fcf224fa9d9af5a25380b77aa4b561",
"@converse/skeletor": "conversejs/skeletor#b260c554f4ce961c29deea4740083e58a489aa9b",
"filesize": "^6.1.0",
"jed": "1.1.1",
"localforage": "^1.7.3",
"lodash": "^4.17.15",
"lodash-es": "^4.17.15",
"pluggable.js": "2.0.1",
"strophe.js": "1.3.5",
"twemoji": "^12.1.2"

View File

@ -4,8 +4,8 @@
* @description This is the core utilities module.
*/
import * as strophe from 'strophe.js/src/core';
import { Model } from 'skeletor.js/src/model.js';
import { compact, last, isElement, isObject, isString } from "lodash";
import { Model } from '@converse/skeletor/src/model.js';
import { compact, last, isElement, isObject, isString } from "lodash-es";
import log from "@converse/headless/log";
import sizzle from "sizzle";

View File

@ -3,7 +3,7 @@
* @license Mozilla Public License (MPLv2)
* @description This is the MUC utilities module.
*/
import { difference, indexOf } from "lodash";
import { difference, indexOf } from "lodash-es";
import { converse } from "@converse/headless/converse-core";
import u from "./core";

View File

@ -1,6 +1,6 @@
import { _converse, api, converse } from "@converse/headless/converse-core";
import { directive, html } from "lit-html";
import { isString } from "lodash";
import { isString } from "lodash-es";
const u = converse.env.utils;

View File

@ -21,7 +21,7 @@ import tpl_video from "../templates/video.js";
import u from "../headless/utils/core";
import { api } from "@converse/headless/converse-core";
import { html } from "lit-html";
import { isFunction } from "lodash";
import { isFunction } from "lodash-es";
const APPROVED_URL_PROTOCOLS = ['http', 'https', 'xmpp', 'mailto'];