Remove config settings which are already in main.js file.

src/build-no-jquery.js

@@ -3,16 +3,10 @@
     name: "components/almond/almond.js",
     out: "../builds/converse.nojquery.min.js",
     include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-full",
-        "jquery":                   "src/jquery-external"
+        "jquery":                   "src/jquery-external",
+        "jquery-private":           "src/jquery-external-private"
     }
 })

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

@@ -3,22 +3,6 @@
     name: "components/almond/almond.js",
     out: "../builds/converse-no-locales-no-otr.min.js",
     include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
-    map: {
-        // '*' means all modules will get 'jquery-private'
-        // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
-        // 'jquery-private' wants the real jQuery module
-        // though. If this line was not here, there would
-        // be an unresolvable cyclic dependency.
-        'jquery-private': { 'jquery': 'jquery' }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-no-otr",

src/build-no-otr.js

@@ -3,22 +3,6 @@
     name: "components/almond/almond.js",
     out: "../builds/converse-no-otr.min.js",
     include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
-    map: {
-        // '*' means all modules will get 'jquery-private'
-        // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
-        // 'jquery-private' wants the real jQuery module
-        // though. If this line was not here, there would
-        // be an unresolvable cyclic dependency.
-        'jquery-private': { 'jquery': 'jquery' }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-no-otr"

src/build-website-no-otr.js

@@ -3,22 +3,6 @@
     name: "components/almond/almond.js",
     out: "../builds/converse.website-no-otr.min.js",
     include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
-    map: {
-        // '*' means all modules will get 'jquery-private'
-        // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
-        // 'jquery-private' wants the real jQuery module
-        // though. If this line was not here, there would
-        // be an unresolvable cyclic dependency.
-        'jquery-private': { 'jquery': 'jquery' }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-website-no-otr"

src/build-website.js

@@ -3,22 +3,6 @@
     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
-        }
-    },
-    map: {
-        // '*' means all modules will get 'jquery-private'
-        // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
-        // 'jquery-private' wants the real jQuery module
-        // though. If this line was not here, there would
-        // be an unresolvable cyclic dependency.
-        'jquery-private': { 'jquery': 'jquery' }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-website"

src/build.js

@@ -3,22 +3,6 @@
     name: "components/almond/almond.js",
     out: "../builds/converse.min.js",
     include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
-    map: {
-        // '*' means all modules will get 'jquery-private'
-        // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
-        // 'jquery-private' wants the real jQuery module
-        // though. If this line was not here, there would
-        // be an unresolvable cyclic dependency.
-        'jquery-private': { 'jquery': 'jquery' }
-    },
     mainConfigFile: '../main.js',
     paths: {
         "converse-dependencies":    "src/deps-full"