Merge branch 'feature/DISF-1268_totem-webpack' into hotfix/2.1.7

tipee-sa · Dec 20, 2018 · b6971b0 · b6971b0
2 parents d5a1c5a + 2f3df9a
commit b6971b0
Show file tree

Hide file tree

Showing 10 changed files with 4,099 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/lib/vendors/
 node_modules/
 *.iml
 .idea

diff --git a/bower.json b/bower.json
diff --git a/dist/session.min.js b/dist/session.min.js
diff --git a/dist/session.min.js.map b/dist/session.min.js.map
diff --git a/lib/otp.js b/lib/otp.js
@@ -1,7 +1,7 @@
 /*jslint browser: true */
 /*global define */
 
-define(['cryptojs.sha512', 'cryptojs.hmac'], function (CryptoJS) {
+define(['cryptojs'], function (CryptoJS) {
     'use strict';
 
     var /**

diff --git a/lib/session.js b/lib/session.js
@@ -1,7 +1,7 @@
 /*jslint browser: true */
 /*global define */
 
-define(['srp', 'jquery', 'otp', 'cryptojs.sha256', 'cryptojs.enc-base64'], function (Srp, jQuery, Otp, CryptoJS) {
+define(['srp', 'jquery', 'otp', 'cryptojs'], function (Srp, jQuery, Otp, CryptoJS) {
     'use strict';
 
     var /**

diff --git a/lib/srp.js b/lib/srp.js
@@ -1,7 +1,7 @@
 /*jslint browser: true */
 /*global define */
 
-define(['bignum', 'cryptojs.sha1', 'cryptojs.sha512'], function (Bn, CryptoJS) {
+define(['bignum', 'cryptojs'], function (Bn, CryptoJS) {
     'use strict';
 
     /**