Remove global lodash

conversejs · Dec 29, 2020 · 9a2ded5 · 9a2ded5
1 parent c1847a0
commit 9a2ded5
Show file tree

Hide file tree

Showing 32 changed files with 280 additions and 342 deletions.
diff --git a/images/icons.svg b/images/icons.svg
diff --git a/karma.conf.js b/karma.conf.js
@@ -11,6 +11,7 @@ module.exports = function(config) {
       { pattern: 'dist/*.css.map', included: false },
       { pattern: "dist/icons.js", served: true },
       { pattern: "dist/emojis.js", served: true },
+      "node_modules/lodash/lodash.min.js",
       "dist/converse.js",
       "dist/converse.css",
       { pattern: "dist/images/**/*.*", included: false },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,10 +71,12 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.12.7",
     "@converse/headless": "file:src/headless",
+    "@converse/skeletor": "conversejs/skeletor#56a284bd36a07977d69c08d78e7c8c0fc9fc5c87",
     "@fortawesome/fontawesome-free": "5.14.0",
     "autoprefixer": "^9.8.6",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
+    "babel-plugin-lodash": "^3.3.4",
     "bootstrap": "^4.3.1",
     "bootstrap.native": "^2.0.27",
     "bootstrap.native-loader": "2.0.0",
@@ -105,7 +107,6 @@
     "lerna": "^3.22.1",
     "lit-element": "^2.4.0",
     "lit-html": "^1.2.1",
-    "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
     "mini-css-extract-plugin": "^0.9.0",
     "minimist": "^1.2.3",
     "node-sass": "^4.14.1",

diff --git a/spec/bookmarks.js b/spec/bookmarks.js
@@ -1,4 +1,4 @@
-/* global mock, converse */
+/* global mock, converse, _ */
 
 const { Strophe, u, sizzle, $iq } = converse.env;
 
@@ -136,7 +136,7 @@ describe("A chat room", function () {
             ['rosterGroupsFetched'], {},
             async function (done, _converse) {
 
-        const { u, _ } = converse.env;
+        const { u } = converse.env;
         await mock.waitUntilDiscoConfirmed(
             _converse, _converse.bare_jid,
             [{'category': 'pubsub', 'type': 'pep'}],

diff --git a/spec/chatbox.js b/spec/chatbox.js
@@ -1,6 +1,5 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const _ = converse.env._;
 const $msg = converse.env.$msg;
 const Strophe = converse.env.Strophe;
 const u = converse.env.utils;

diff --git a/spec/controlbox.js b/spec/controlbox.js
@@ -1,6 +1,5 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const _ = converse.env._;
 const $msg = converse.env.$msg;
 const u = converse.env.utils;
 const Strophe = converse.env.Strophe;

diff --git a/spec/headline.js b/spec/headline.js
@@ -1,4 +1,4 @@
-/*global mock */
+/*global mock, converse, _ */
 
 describe("A headlines box", function () {
 
@@ -147,7 +147,7 @@ describe("A headlines box", function () {
         mock.initConverse(
             ['rosterGroupsFetched', 'chatBoxesFetched'], {}, function (done, _converse) {
 
-        const { $msg, _ } = converse.env;
+        const { $msg } = converse.env;
         _converse.allow_non_roster_messaging = false;
         const stanza = $msg({
                 'type': 'headline',

diff --git a/spec/http-file-upload.js b/spec/http-file-upload.js
@@ -1,8 +1,7 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
 const Strophe = converse.env.Strophe;
 const $iq = converse.env.$iq;
-const _ = converse.env._;
 const sizzle = converse.env.sizzle;
 const u = converse.env.utils;
 

diff --git a/spec/messages.js b/spec/messages.js
@@ -1,6 +1,6 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const { Promise, Strophe, $msg, dayjs, sizzle, _ } = converse.env;
+const { Promise, Strophe, $msg, dayjs, sizzle } = converse.env;
 const u = converse.env.utils;
 
 

diff --git a/spec/modtools.js b/spec/modtools.js
@@ -1,6 +1,5 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const _ = converse.env._;
 const $iq = converse.env.$iq;
 const $pres = converse.env.$pres;
 const sizzle = converse.env.sizzle;

diff --git a/spec/muc.js b/spec/muc.js
@@ -1,6 +1,5 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const _ = converse.env._;
 const $pres = converse.env.$pres;
 const $iq = converse.env.$iq;
 const $msg = converse.env.$msg;

diff --git a/spec/notification.js b/spec/notification.js
@@ -1,6 +1,6 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const { Strophe, _ } = converse.env;
+const { Strophe } = converse.env;
 const $msg = converse.env.$msg;
 const u = converse.env.utils;
 

diff --git a/spec/omemo.js b/spec/omemo.js
@@ -1,6 +1,6 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const { $iq, $pres, $msg, _, omemo, Strophe } = converse.env;
+const { $iq, $pres, $msg, omemo, Strophe } = converse.env;
 const u = converse.env.utils;
 
 async function deviceListFetched (_converse, jid) {

diff --git a/spec/push.js b/spec/push.js
@@ -1,8 +1,7 @@
-/*global mock */
+/*global mock, converse, _ */
 
 const $iq = converse.env.$iq;
 const Strophe = converse.env.Strophe;
-const _ = converse.env._;
 const sizzle = converse.env.sizzle;
 const u = converse.env.utils;
 const original_timeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;

diff --git a/spec/receipts.js b/spec/receipts.js
@@ -1,6 +1,6 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
-const { Promise, Strophe, $msg, sizzle, _ } = converse.env;
+const { Promise, Strophe, $msg, sizzle } = converse.env;
 const u = converse.env.utils;
 
 

diff --git a/spec/register.js b/spec/register.js
@@ -1,8 +1,8 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
 const Strophe = converse.env.Strophe;
 const $iq = converse.env.$iq;
-const { _, sizzle}  = converse.env;
+const { sizzle}  = converse.env;
 const u = converse.env.utils;
 
 describe("The Registration Panel", function () {

diff --git a/spec/room_registration.js b/spec/room_registration.js
@@ -1,7 +1,6 @@
-/*global mock */
+/*global mock, converse, _ */
 
-const _ = converse.env._,
-      $iq = converse.env.$iq,
+const $iq = converse.env.$iq,
       Strophe = converse.env.Strophe,
       sizzle = converse.env.sizzle,
       u = converse.env.utils;

diff --git a/spec/roster.js b/spec/roster.js
@@ -1,9 +1,8 @@
-/*global mock, converse */
+/*global mock, converse, _ */
 
 const $iq = converse.env.$iq;
 const $pres = converse.env.$pres;
 const Strophe = converse.env.Strophe;
-const _ = converse.env._;
 const sizzle = converse.env.sizzle;
 const u = converse.env.utils;
 

diff --git a/src/components/emoji-picker.js b/src/components/emoji-picker.js
@@ -1,10 +1,10 @@
 import "./emoji-picker-content.js";
 import DOMNavigator from "../shared/dom-navigator";
+import debounce from 'lodash/debounce';
 import { BaseDropdown } from "./dropdown.js";
 import { CustomElement } from './element.js';
 import { __ } from '../i18n';
 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";
 import { until } from 'lit-html/directives/until.js';

diff --git a/src/components/font-awesome.js b/src/components/font-awesome.js
@@ -1,19 +1,9 @@
 import { CustomElement } from './element.js';
-import { html } from "lit-element";
-import { unsafeSVG } from 'lit-html/directives/unsafe-svg.js';
-import { until } from 'lit-html/directives/until.js';
-
+import tpl_icons from 'templates/icons.js';
 
 export class FontAwesome extends CustomElement {
-
-    constructor () {
-        super();
-        const promise = import(/*webpackChunkName: "icons" */ '../../images/icons.svg');
-        this.data = promise.then(d => html`${unsafeSVG(d.default())}`);
-    }
-
     render () {  // eslint-disable-line class-methods-use-this
-        return html`${until(this.data, '')}`;
+        return tpl_icons();
     }
 }
 

diff --git a/src/converse.js b/src/converse.js
@@ -4,8 +4,6 @@
  * @license Mozilla Public License (MPLv2)
  */
 
-import _ from './lodash.noconflict';
-
 import "@converse/headless/headless";
 import "i18n";
 import "shared/registry.js";
@@ -60,20 +58,6 @@ const WHITELISTED_PLUGINS = [
     'converse-singleton'
 ];
 
-// Use Mustache style syntax for variable interpolation
-/* Configuration of Lodash templates (this config is distinct to the
- * config of requirejs-tpl in main.js). This one is for normal inline templates.
- */
-_.templateSettings = {
-    'escape': /\{\{\{([\s\S]+?)\}\}\}/g,
-    'evaluate': /\{\[([\s\S]+?)\]\}/g,
-    'interpolate': /\{\{([\s\S]+?)\}\}/g,
-    'imports': { '_': _ }
-};
-
-converse.env._ = _;
-
-
 const initialize = converse.initialize;
 
 converse.initialize = function (settings, callback) {

diff --git a/src/headless/shared/connection.js b/src/headless/shared/connection.js
@@ -1,9 +1,10 @@
+import debounce from 'lodash/debounce';
+import isElement from 'lodash/isElement';
 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 "../core.js";
-import { debounce, isElement } from 'lodash';
 
 
 const BOSH_WAIT = 59;

diff --git a/src/headless/shared/rsm.js b/src/headless/shared/rsm.js
@@ -7,7 +7,7 @@
  *   Copyright 2006-2017 Strophe (https://github.com/strophe/strophejs)
  */
 import { _converse, converse } from "../core.js";
-import { pick } from 'lodash-es'
+import pick from 'lodash/pick';
 
 const { Strophe, $build } = converse.env;
 

diff --git a/src/lodash.noconflict.js b/src/lodash.noconflict.js
diff --git a/src/templates/chatroom_bookmark_toggle.html b/src/templates/chatroom_bookmark_toggle.html
diff --git a/src/templates/chatroom_dragresize.html b/src/templates/chatroom_dragresize.html