Merge remote-tracking branch 'origin/master'

Makefile

@@ -175,8 +175,6 @@ BUILDS = dist/converse.js \
 		 dist/converse-headless.min.js \
 		 dist/converse-muc-embedded.js \
 		 dist/converse-muc-embedded.min.js \
-		 dist/converse-no-jquery.js \
- 		 dist/converse-no-jquery.min.js \
 		 dist/converse-no-dependencies.min.js \
 		 dist/converse-no-dependencies.js
 
@@ -195,10 +193,6 @@ dist/converse-esnext.js: src node_modules
 	$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.js optimize=none 
 dist/converse-esnext.min.js: src node_modules
 	$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.min.js
-dist/converse-no-jquery.js: transpile src node_modules
-	$(RJS) -o src/build.js include=converse wrap.endFile=end-no-jquery.frag exclude=jquery exclude=jquery.noconflict out=dist/converse-no-jquery.js optimize=none 
-dist/converse-no-jquery.min.js: transpile src node_modules transpile
-	$(RJS) -o src/build.js include=converse wrap.endFile=end-no-jquery.frag exclude=jquery exclude=jquery.noconflict out=dist/converse-no-jquery.min.js
 dist/converse-no-dependencies.js: transpile src node_modules
 	$(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js
 dist/converse-no-dependencies.min.js: transpile src node_modules

demo/without_bundled_dependencies.html

@@ -13,11 +13,6 @@
     <link type="text/css" rel="stylesheet" media="screen" href="../css/theme.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.min.css" />
 
-    <!-- BEGIN JQUERY -->
-    <script type="text/javascript" src="../node_modules/jquery/dist/jquery.js"></script>
-    <script type="text/javascript" src="../node_modules/jquery.browser/dist/jquery.browser.js"></script>
-    <!-- END JQUERY -->
-
     <!-- BEGIN OTR: Off-the-record encryption stuff. Can be omitted if OTR is not used. -->
     <script type="text/javascript" src="../node_modules/otr/build/dep/crypto.js"></script>
     <script type="text/javascript" src="../node_modules/otr/build/dep/salsa20.js"></script>
@@ -34,24 +29,24 @@
     <script type="text/javascript" src="../node_modules/strophejs-plugin-ping/strophe.ping.js"></script>
     <!-- END STROPHE -->
 
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-attributes.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-class.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-dataset.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-eventlisteners.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-props.js"></script>
+    <script type="text/javascript" src="../node_modules/snabbdom/dist/snabbdom-style.js"></script>
+
     <!-- BEGIN BACKBONE -->
     <script type="text/javascript" src="../node_modules/lodash/lodash.js"></script>
-    <script type="text/javascript" src="../node_modules/backbone//backbone.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone/backbone.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.nativeview/backbone.nativeview.js"></script>
     <script type="text/javascript" src="../node_modules/backbone.browserStorage/backbone.browserStorage.js"></script>
-    <script type="text/javascript" src="../node_modules/backbone.overview/backbone.overview.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.overview/dist/backbone.overview.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.overview/dist/backbone.orderedlistview.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.vdomview/dist/backbone.vdomview.js"></script>
     <!-- END BACKBONE -->
 
-    <!-- BEGIN I18N -->
-    <!-- These files can be removed if you don't want to include any
-        translations for converse.js.
-        If you want to modify which translations are included, you can modify
-        src/locales.js to remove those you don't need, and then run `make
-        build` to generates a new dist/locales.js file.
-    -->
-    <script type="text/javascript" src="../node_modules/jed/jed.js"></script>
-    <script type="text/javascript" src="../dist/locales.js"></script>
-    <!-- END I18N -->
-
     <script type="text/javascript" src="../node_modules/awesomplete-avoid-xss/awesomplete.js"></script>
     <script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
 
@@ -83,7 +78,6 @@
 <script>
     converse.initialize({
         bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-        i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
         prebind: false,
         show_controlbox_by_default: true,
         debug: true,

package-lock.json

@@ -7908,9 +7908,9 @@
       }
     },
     "requirejs": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.3.tgz",
-      "integrity": "sha1-qln9OgKH6vQHlZoTgigES13WpqM=",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
+      "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
       "dev": true
     },
     "requires-port": {

package.json

@@ -61,7 +61,7 @@
     "otr": "0.2.16",
     "pluggable.js": "1.0.1",
     "po2json": "^0.4.4",
-    "requirejs": "2.3.3",
+    "requirejs": "2.3.5",
     "run-headless-chromium": "^0.1.1",
     "sinon": "^2.1.0",
     "sizzle": "^2.3.3",

src/build-no-dependencies.js

@@ -16,7 +16,8 @@
         "otr",
         "lodash",
         "lodash.converter",
-        "lodash.noconflict"
+        "lodash.noconflict",
+        "es6-promise"
     ],
     paths: {
         "backbone.vdomview":        "builds/backbone.vdomview",
@@ -36,6 +37,7 @@
         "converse-notification":    "builds/converse-notification",
         "converse-otr":             "builds/converse-otr",
         "converse-ping":            "builds/converse-ping",
+        "converse-profile":         "builds/converse-profile",
         "converse-register":        "builds/converse-register",
         "converse-roomslist":       "builds/converse-roomslist",
         "converse-rosterview":      "builds/converse-rosterview",

src/build.js

@@ -11,8 +11,8 @@
         "converse-core":            "builds/converse-core",
         "converse-disco":           "builds/converse-disco",
         "converse-dragresize":      "builds/converse-dragresize",
-        "converse-headline":        "builds/converse-headline",
         "converse-fullscreen":      "builds/converse-fullscreen",
+        "converse-headline":        "builds/converse-headline",
         "converse-mam":             "builds/converse-mam",
         "converse-minimize":        "builds/converse-minimize",
         "converse-muc":             "builds/converse-muc",
@@ -20,6 +20,7 @@
         "converse-notification":    "builds/converse-notification",
         "converse-otr":             "builds/converse-otr",
         "converse-ping":            "builds/converse-ping",
+        "converse-profile":         "builds/converse-profile",
         "converse-register":        "builds/converse-register",
         "converse-roomslist":       "builds/converse-roomslist",
         "converse-rosterview":      "builds/converse-rosterview",

src/end-no-dependencies.frag

     
-    define('jquery', [], function () { return jQuery; });
-    define('jquery.noconflict', [], function () { return jQuery; });
-    define('jquery.browser', [], function () { return jQuery; });
-    define('awesomplete', [], function () { return jQuery; });
+    define('awesomplete', [], function () { return Awesomplete; });
     define('lodash', [], function () { return _; });
+    define('underscore', [], function () { return _; });
     define('lodash.converter', [], function () { return fp; });
     define('lodash.noconflict', [], function () { return _; });
+    define('moment', [], function () { return moment; });
+    define('moment/locale/af', [], function () { return moment; });
+    define('moment/locale/ca', [], function () { return moment; });
+    define('moment/locale/de', [], function () { return moment; });
+    define('moment/locale/es', [], function () { return moment; });
+    define('moment/locale/fr', [], function () { return moment; });
+    define('moment/locale/he', [], function () { return moment; });
+    define('moment/locale/hu', [], function () { return moment; });
+    define('moment/locale/id', [], function () { return moment; });
+    define('moment/locale/it', [], function () { return moment; });
+    define('moment/locale/ja', [], function () { return moment; });
+    define('moment/locale/nb', [], function () { return moment; });
+    define('moment/locale/nl', [], function () { return moment; });
+    define('moment/locale/pl', [], function () { return moment; });
+    define('moment/locale/pt-br', [], function () { return moment; });
+    define('moment/locale/ru', [], function () { return moment; });
+    define('moment/locale/uk', [], function () { return moment; });
+    define('moment/moment', [], function () { return moment; });
+    define('i18n', [], function () { return; });
+    define('es6-promise', [], function () { return Promise; });
+
     define('strophe', [], function () {
         return {
             'Strophe':         Strophe,