Remove alias for `xss`. Upgrade pluggable.js to version 2.0.1

dev.html

@@ -9,7 +9,7 @@
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="dist/converse.css" />
     <script src="3rdparty/libsignal-protocol.js"></script>
     <script src="dist/converse.js"></script>
 </head>

package-lock.json

@@ -1735,9 +1735,9 @@
       "dev": true
     },
     "@octokit/request": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-3.0.2.tgz",
-      "integrity": "sha512-lBH2hf2Yuh9XlmP3MSpn3jL9DyCGG+cuPXDRQiJMK42BwW6xFhwWmG1k6xWykcLM4GwZG/5fuwcqnQXYG0ZTSg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-3.0.3.tgz",
+      "integrity": "sha512-M7pUfsiaiiUMEP4/SMysTeWxyGrkoQg6FBPEtCBIFgeDnzHaPboTpUZGTh6u1GQXdrlzMfPVn/vQs98js1QtwQ==",
       "dev": true,
       "requires": {
         "@octokit/endpoint": "^5.1.0",
@@ -1766,12 +1766,12 @@
       }
     },
     "@octokit/rest": {
-      "version": "16.25.3",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.3.tgz",
-      "integrity": "sha512-/6/Isn9pNoKUQwuWUaskxMC6kFxtXTHhzsgYbyirEQ3UvcLciHvPgtRTbuV3bbVf0x4+4WEfKaI9UzxmPQ3W3A==",
+      "version": "16.25.4",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.4.tgz",
+      "integrity": "sha512-62G8sb5PmIDhnu6K4W39If0BdA+P6VLuY83nMjjHyQiXH1QbjiKKeEv9uwRHe7XTcyZbVNG9M5zt5uxOpMW8CQ==",
       "dev": true,
       "requires": {
-        "@octokit/request": "3.0.2",
+        "@octokit/request": "3.0.3",
         "atob-lite": "^2.0.0",
         "before-after-hook": "^1.4.0",
         "btoa-lite": "^1.0.0",
@@ -11863,12 +11863,11 @@
       }
     },
     "pluggable.js": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pluggable.js/-/pluggable.js-2.0.0.tgz",
-      "integrity": "sha512-FgrSayXWfQQWL+RSDiCAFZbkEsY7hTZCiSuN9Ar/mcHpesxOPfrSzJKp+YbimOt9QFtSd+lR8Uob5tgkdQSOzg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pluggable.js/-/pluggable.js-2.0.1.tgz",
+      "integrity": "sha512-SBt6v6Tbp20Jf8hU0cpcc/+HBHGMY8/Q+yA6Ih0tBQE8tfdZ6U4PRG0iNvUUjLx/hVyOP53n0UfGBymlfaaXCg==",
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "^4.17.11"
       }
     },
     "po2json": {
@@ -14098,9 +14097,9 @@
       }
     },
     "uglify-js": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.11.tgz",
-      "integrity": "sha512-izPJg8RsSyqxbdnqX36ExpbH3K7tDBsAU/VfNv89VkMFy3z39zFjunQGsSHOlGlyIfGLGprGeosgQno3bo2/Kg==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.12.tgz",
+      "integrity": "sha512-KeQesOpPiZNgVwJj8Ge3P4JYbQHUdZzpx6Fahy6eKAYRSV4zhVmLXoC+JtOeYxcHCHTve8RG1ZGdTvpeOUM26Q==",
       "dev": true,
       "optional": true,
       "requires": {

package.json

@@ -5,6 +5,7 @@
   "main": "dist/converse.min.js",
   "files": [
     "CHANGES.md",
+    "LICENSE.txt",
     "README.md",
     "dist/",
     "locale/**/*.json",
@@ -86,7 +87,6 @@
     "minimist": "^1.2.0",
     "node-sass": "^4.11.0",
     "npm": "^6.4.1",
-    "pluggable.js": "2.0.0",
     "po2json": "^0.4.4",
     "requirejs": "2.3.5",
     "run-headless-chromium": "^0.1.1",

spec/converse.js

@@ -9,7 +9,7 @@
           u = converse.env.utils;
 
     describe("Converse", function() {
-        
+
         describe("Authentication", function () {
 
             it("needs either a bosh_service_url a websocket_url or both", mock.initConverse((done, _converse) => {
@@ -352,7 +352,7 @@
 
         describe("The \"settings\" API", function() {
             it("has methods 'get' and 'set' to set configuration settings", mock.initConverse(
-                    null, null, {'play_sounds': true}, 
+                    null, null, {'play_sounds': true},
                     (done, _converse) => {
 
                 expect(_.keys(_converse.api.settings)).toEqual(["update", "get", "set"]);

src/converse-chatview.js

@@ -26,7 +26,7 @@ import tpl_toolbar from "templates/toolbar.html";
 import tpl_toolbar_fileupload from "templates/toolbar_fileupload.html";
 import tpl_user_details_modal from "templates/user_details_modal.html";
 import u from "@converse/headless/utils/emoji";
-import xss from "xss";
+import xss from "xss/dist/xss";
 
 const { $msg, Backbone, Promise, Strophe, _, b64_sha1, f, sizzle, dayjs } = converse.env;
 

src/converse-message-view.js

@@ -14,7 +14,7 @@ import tpl_info from "templates/info.html";
 import tpl_message from "templates/message.html";
 import tpl_message_versions_modal from "templates/message_versions_modal.html";
 import u from "@converse/headless/utils/emoji";
-import xss from "xss";
+import xss from "xss/dist/xss";
 
 const { Backbone, _, dayjs } = converse.env;
 

src/converse-muc-views.js

@@ -35,7 +35,7 @@ import tpl_room_item from "templates/room_item.html";
 import tpl_room_panel from "templates/room_panel.html";
 import tpl_rooms_results from "templates/rooms_results.html";
 import tpl_spinner from "templates/spinner.html";
-import xss from "xss";
+import xss from "xss/dist/xss";
 
 
 const { Backbone, Promise, Strophe, dayjs, f, sizzle, _, $build, $iq, $msg, $pres } = converse.env;

src/headless/converse-core.js

@@ -13,7 +13,7 @@ import advancedFormat from 'dayjs/plugin/advancedFormat'
 import dayjs from "dayjs";
 import f from "./lodash.fp";
 import i18n from "./i18n";
-import pluggable from "pluggable.js/dist/pluggable";
+import pluggable from "pluggable.js/src/pluggable";
 import polyfill from "./polyfill";
 import sizzle from "sizzle";
 import u from "@converse/headless/utils/core";

src/headless/package-lock.json

@@ -4,43 +4,6 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
-		"backbone": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz",
-			"integrity": "sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==",
-			"dev": true,
-			"requires": {
-				"underscore": ">=1.8.3"
-			}
-		},
-		"backbone.browserStorage": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/backbone.browserStorage/-/backbone.browserStorage-0.0.5.tgz",
-			"integrity": "sha512-Cf8B90EIWyHMm/ReS5yFmFMOXPVNda6QcTFcdyp1RW/1zM3LZF2Nf4U601/seIaEu/X8cRVEKqTINpPKql3sxA==",
-			"dev": true,
-			"requires": {
-				"backbone": "~1.x.x",
-				"underscore": ">=1.4.0"
-			}
-		},
-		"es6-promise": {
-			"version": "4.2.6",
-			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
-			"integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
-			"dev": true
-		},
-		"filesize": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-			"integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-			"dev": true
-		},
-		"jed": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
-			"integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ=",
-			"dev": true
-		},
 		"lodash": {
 			"version": "4.17.11",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
@@ -55,52 +18,6 @@
 			"requires": {
 				"lodash": "^4.17.4"
 			}
-		},
-		"strophe.js": {
-			"version": "github:strophe/strophejs#f5173c0c606b8bc6204bb00b57b35bbc502d4b31",
-			"from": "github:strophe/strophejs#f5173c0c606b8bc6204bb00b57b35bbc502d4b31",
-			"dev": true
-		},
-		"strophejs-plugin-ping": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/strophejs-plugin-ping/-/strophejs-plugin-ping-0.0.3.tgz",
-			"integrity": "sha512-HS/ArEGKXfu36fihjUSfjqmqOSyppQTJUbrkfEtOBRJmnaP3LsRRe5T2S3dmCdsWHKORaJYc/OHSKfFlxHPdqw==",
-			"dev": true,
-			"requires": {
-				"strophe.js": "^1.2.12"
-			},
-			"dependencies": {
-				"strophe.js": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.3.2.tgz",
-					"integrity": "sha512-N6n93B0+0/qRazWUtgunJNE3DTfEpz363i17Uvnqh0lvl9iATnMtSoZtKjqN3reKPtjtBpbBRMWAQJRc688QkQ==",
-					"dev": true
-				}
-			}
-		},
-		"strophejs-plugin-rsm": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/strophejs-plugin-rsm/-/strophejs-plugin-rsm-0.0.2.tgz",
-			"integrity": "sha512-Yn/VpxNz3Gkb790rJkwMyjlwHWCjWA9UxIl5kwGnsr7Ofo1MHztgyQ8XwQF1DGFp3Y4oiXbjZ/whG3S/cIgIew==",
-			"dev": true
-		},
-		"twemoji": {
-			"version": "11.3.0",
-			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-11.3.0.tgz",
-			"integrity": "sha512-xN/vlR6+gDmfjt6LInAqwGAv3Agwrmzx5TD1jEFwKS19IOGDrX0/3OB8GP1wUYPVIdkaer5hw6qd+52jzvz0Lg==",
-			"dev": true
-		},
-		"underscore": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
-			"dev": true
-		},
-		"urijs": {
-			"version": "1.19.1",
-			"resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz",
-			"integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==",
-			"dev": true
 		}
 	}
 }

src/headless/package.json

@@ -28,7 +28,7 @@
     "filesize": "^3.6.1",
     "jed": "1.1.1",
     "lodash": "^4.17.11",
-    "pluggable.js": "2.0.0",
+    "pluggable.js": "2.0.1",
     "strophe.js": "strophe/strophejs#f5173c0c606b8bc6204bb00b57b35bbc502d4b31",
     "strophejs-plugin-ping": "0.0.3",
     "strophejs-plugin-rsm": "0.0.2",

webpack.config.js

@@ -128,8 +128,7 @@ const config = {
             "snabbdom-props":           path.resolve(__dirname, "node_modules/snabbdom/dist/snabbdom-props"),
             "snabbdom-style":           path.resolve(__dirname, "node_modules/snabbdom/dist/snabbdom-style"),
             "tovnode":                  path.resolve(__dirname, "node_modules/snabbdom/dist/tovnode"),
-            "underscore":               path.resolve(__dirname, "src/underscore-shim"),
-            "xss":                      path.resolve(__dirname, "node_modules/xss/dist/xss")
+            "underscore":               path.resolve(__dirname, "src/underscore-shim")
         }
     }
 }
@@ -163,6 +162,9 @@ function parameterize () {
         extend(config, {
             entry: path.resolve(__dirname, 'src/converse.js'),
             externals: [{
+                "backbone": "backbone",
+                "backbone.nativeview": "backbone.nativeview",
+                "backbone.vdomview": "backbone.vdomview",
                 "backbone.browserStorage": "backbone.browserStorage",
                 "backbone.overview": "backbone.overview",
                 "es6-promise": "es6-promise",