Make an extra build specifically for including the website deps

Makefile

@@ -46,7 +46,7 @@ po2json:
 ## Release management
 
 minjs: 
-	./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js
+	./node_modules/requirejs/bin/r.js -o src/build.js && ./node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-no-otr.js && ./node_modules/requirejs/bin/r.js -o src/build-website.js
 
 mincss:
 	grunt cssmin

index.html

@@ -14,7 +14,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script data-main="main" src="components/requirejs/require.js"></script>
     <!--
-    <script src="builds/converse.min.js"></script>
+    <script src="builds/converse.website.min.js"></script>
     -->
 </head>
 

main.js

@@ -36,7 +36,7 @@ config = {
         "eventemitter": "components/otr/build/dep/eventemitter",
         "moment": "components/momentjs/moment",
         "otr": "components/otr/build/otr",
-        "converse-dependencies": "src/deps-full"
+        "converse-dependencies": "src/deps-website"
     },
 
     tpl: {

src/build-no-locales-no-otr.js

@@ -17,7 +17,7 @@
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
         "underscore": "components/underscore/underscore",
         "backbone": "components/backbone/backbone",
-        "backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
+        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview": "components/backbone.overview/backbone.overview",
         "strophe": "components/strophe/strophe",
         "strophe.muc": "components/strophe.muc/index",

src/build-no-otr.js

@@ -30,7 +30,7 @@
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
         "underscore": "components/underscore/underscore",
         "backbone": "components/backbone/backbone",
-        "backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
+        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview": "components/backbone.overview/backbone.overview",
         "strophe": "components/strophe/strophe",
         "strophe.muc": "components/strophe.muc/index",

src/build-website.js

@@ -0,0 +1,65 @@
+({
+    baseUrl: "../",
+    name: "components/almond/almond.js",
+    out: "../builds/converse.website.min.js",
+    include: ['main'],
+    tpl: {
+        // Use Mustache style syntax for variable interpolation
+        templateSettings: {
+            evaluate : /\{\[([\s\S]+?)\]\}/g,
+            interpolate : /\{\{([\s\S]+?)\}\}/g
+        }
+    },
+    paths: {
+        "jquery": "components/jquery/dist/jquery",
+        "jed": "components/jed/jed",
+        "locales": "locale/locales",
+        "af": "locale/af/LC_MESSAGES/af",
+        "de": "locale/de/LC_MESSAGES/de",
+        "en": "locale/en/LC_MESSAGES/en",
+        "es": "locale/es/LC_MESSAGES/es",
+        "fr": "locale/fr/LC_MESSAGES/fr",
+        "he": "locale/he/LC_MESSAGES/he",
+        "hu": "locale/hu/LC_MESSAGES/hu",
+        "id": "locale/id/LC_MESSAGES/id",
+        "it": "locale/it/LC_MESSAGES/it",
+        "ja": "locale/ja/LC_MESSAGES/ja",
+        "nl": "locale/nl/LC_MESSAGES/nl",
+        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
+        "ru": "locale/ru/LC_MESSAGES/ru",
+        "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
+        "underscore": "components/underscore/underscore",
+        "backbone": "components/backbone/backbone",
+        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
+        "backbone.overview": "components/backbone.overview/backbone.overview",
+        "bootstrap": "components/bootstrap/dist/js/bootstrap",                  // XXX: Only required for https://conversejs.org website
+        "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
+        "strophe": "components/strophe/strophe",
+        "strophe.muc": "components/strophe.muc/index",
+        "strophe.roster": "components/strophe.roster/index",
+        "strophe.vcard": "components/strophe.vcard/index",
+        "strophe.disco": "components/strophe.disco/index",
+        "salsa20": "components/otr/build/dep/salsa20",
+        "bigint": "src/bigint",
+        "crypto.core": "components/otr/vendor/cryptojs/core",
+        "crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
+        "crypto.md5": "components/crypto-js-evanvosberg/src/md5",
+        "crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
+        "crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
+        "crypto.aes": "components/otr/vendor/cryptojs/aes",
+        "crypto.sha1": "components/otr/vendor/cryptojs/sha1",
+        "crypto.sha256": "components/otr/vendor/cryptojs/sha256",
+        "crypto.hmac": "components/otr/vendor/cryptojs/hmac",
+        "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
+        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
+        "crypto": "src/crypto",
+        "eventemitter": "components/otr/build/dep/eventemitter",
+        "otr": "components/otr/build/otr",
+        "converse-dependencies": "src/deps-website",
+        "moment":"components/momentjs/moment",
+        "converse-templates":"src/templates",
+        "tpl": "components/requirejs-tpl-jcbrand/tpl",
+        "text": "components/requirejs-text/text"
+    }
+})

src/build.js

@@ -31,7 +31,7 @@
         "jquery.browser": "components/jquery.browser/dist/jquery.browser",
         "underscore": "components/underscore/underscore",
         "backbone": "components/backbone/backbone",
-        "backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
+        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview": "components/backbone.overview/backbone.overview",
         "strophe": "components/strophe/strophe",
         "strophe.muc": "components/strophe.muc/index",

src/deps-full.js

@@ -2,12 +2,10 @@ define("converse-dependencies", [
     "otr",
     "moment",
     "locales",
-    "bootstrap",
     "backbone.browserStorage",
     "backbone.overview",
     "jquery.tinysort",
     "jquery.browser",
-    "jquery.easing",
     "strophe",
     "strophe.muc",
     "strophe.roster",

src/deps-website.js

@@ -0,0 +1,21 @@
+define("converse-dependencies", [
+    "otr",
+    "moment",
+    "locales",
+    "bootstrap", // XXX: Can be removed, only for https://conversejs.org
+    "backbone.browserStorage",
+    "backbone.overview",
+    "jquery.tinysort",
+    "jquery.browser",
+    "jquery.easing", // XXX: Can be removed, only for https://conversejs.org
+    "strophe",
+    "strophe.muc",
+    "strophe.roster",
+    "strophe.vcard",
+    "strophe.disco"
+], function(otr, moment) {
+    return {
+        'otr': otr,
+        'moment': moment
+    };
+});