Move more dependencies from bower to NPM

bower.json

@@ -8,10 +8,6 @@
     "sinon": "^1.17.3"
   },
   "dependencies": {
-    "requirejs": "~2.2.0",
-    "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
-    "requirejs-text": "~2.0.14",
-    "requirejs-tpl-jcbrand": "*",
     "bootstrap": "~3.2.0",
     "fontawesome": "~4.1.0",
     "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",

config.js

@@ -22,7 +22,7 @@ require.config({
         "jquery":                   "node_modules/jquery/dist/jquery",
         "jquery-private":           "src/jquery-private",
         "jquery.browser":           "node_modules/jquery.browser/dist/jquery.browser",
-        "jquery.easing":            "components/jquery-easing-original/index",          // XXX: Only required for https://conversejs.org website
+        "jquery.easing":            "node_modules/jquery-easing/jquery.easing.1.3.umd",          // XXX: Only required for https://conversejs.org website
         "moment":                   "node_modules/moment/moment",
         "pluggable":                "node_modules/pluggable.js/pluggable",
         "strophe":                  "node_modules/strophe.js/src/wrapper",
@@ -38,8 +38,8 @@ require.config({
         "strophe.ping":             "src/strophe.ping",
         "strophe.rsm":              "components/strophejs-plugins/rsm/strophe.rsm",
         "strophe.vcard":            "src/strophe.vcard",
-        "text":                     'components/requirejs-text/text',
-        "tpl":                      'components/requirejs-tpl-jcbrand/tpl',
+        "text":                     "node_modules/requirejs-text/text",
+        "tpl":                      "node_modules/requirejs-undertemplate/tpl",
         "typeahead":                "components/typeahead.js/index",
         "underscore":               "node_modules/underscore/underscore",
         "utils":                    "src/utils",
@@ -70,9 +70,9 @@ require.config({
         "crypto.cipher-core":   "node_modules/otr/vendor/cryptojs/cipher-core",
         "crypto.core":          "node_modules/otr/vendor/cryptojs/core",
         "crypto.enc-base64":    "node_modules/otr/vendor/cryptojs/enc-base64",
-        "crypto.evpkdf":        "components/crypto-js-evanvosberg/src/evpkdf",
+        "crypto.evpkdf":        "node_modules/crypto-js/src/evpkdf",
         "crypto.hmac":          "node_modules/otr/vendor/cryptojs/hmac",
-        "crypto.md5":           "components/crypto-js-evanvosberg/src/md5",
+        "crypto.md5":           "node_modules/crypto-js/src/md5",
         "crypto.mode-ctr":      "node_modules/otr/vendor/cryptojs/mode-ctr",
         "crypto.pad-nopadding": "node_modules/otr/vendor/cryptojs/pad-nopadding",
         "crypto.sha1":          "node_modules/otr/vendor/cryptojs/sha1",

dev.html

@@ -13,7 +13,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-    <script src="components/requirejs/require.js"></script>
+    <script src="node_modules/requirejs/require.js"></script>
     <script src="config.js"></script>
     <script src="converse.js"></script>
 </head>

package.json

@@ -39,9 +39,11 @@
     "grunt-contrib-jst": "~1.0.0",
     "grunt-json": "^0.2.0",
     "http-server": "^0.7.4",
+    "jquery-easing": "0.0.1",
     "jshint": "^2.8.0",
     "phantom-jasmine": "0.1.8",
     "phantomjs": "~1.9.7-1",
+    "requirejs": "~2.2.0",
     "po2json": "^0.3.0"
   },
   "dependencies": {
@@ -49,14 +51,15 @@
     "backbone": "1.1.2",
     "backbone.browserStorage": "0.0.3",
     "backbone.overview": "0.0.2",
-    "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
+    "crypto-js": "3.1.2-5",
     "jed": "0.5.4",
     "jquery": "1.12.3",
     "jquery.browser": ">=0.1.0",
     "moment": "~2.12.0",
     "otr": "0.2.16",
     "pluggable.js": "0.0.2",
-    "requirejs": "~2.2.0",
+    "requirejs-undertemplate": "~0.0.4",
+    "requirejs-text": "~2.0.12",
     "strophe.js": "1.2.8",
     "underscore": "~1.8.3"
   }

tests.html

@@ -10,7 +10,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script src="config.js"></script>
     <script src="converse.js"></script>
-    <script data-main="tests/main" src="components/requirejs/require.js"></script>
+    <script data-main="tests/main" src="node_modules/requirejs/require.js"></script>
 </head>
 
 <body>