Explorar o código

Moving crypto-js to NPM dependency broke tests

JC Brand %!s(int64=8) %!d(string=hai) anos
pai
achega
197d50496e
Modificáronse 3 ficheiros con 6 adicións e 4 borrados
  1. 1 0
      bower.json
  2. 2 2
      config.js
  3. 3 2
      package.json

+ 1 - 0
bower.json

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

+ 2 - 2
config.js

@@ -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":        "node_modules/crypto-js/src/evpkdf",
+        "crypto.evpkdf":        "components/crypto-js-evanvosberg/src/evpkdf",
         "crypto.hmac":          "node_modules/otr/vendor/cryptojs/hmac",
-        "crypto.md5":           "node_modules/crypto-js/src/md5",
+        "crypto.md5":           "components/crypto-js-evanvosberg/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",

+ 3 - 2
package.json

@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "bower": "latest",
+    "greenkeeper": "^4.0.0",
     "grunt": "^1.0.1",
     "grunt-cli": "^1.1.0",
     "grunt-contrib-cssmin": "~1.0.1",
@@ -43,8 +44,8 @@
     "jshint": "^2.8.0",
     "phantom-jasmine": "0.1.8",
     "phantomjs": "~1.9.7-1",
-    "requirejs": "~2.2.0",
-    "po2json": "^0.3.0"
+    "po2json": "^0.3.0",
+    "requirejs": "~2.2.0"
   },
   "dependencies": {
     "almond": "~0.3.1",