mirror of https://github.com/BTCPrivate/copay.git
Add underscore to bower and karma conf
This commit is contained in:
parent
a0c7d2cb66
commit
e2df438485
|
@ -83,6 +83,7 @@ module.exports = function(grunt) {
|
||||||
'js/shell.js', // shell must be loaded before moment due to the way moment loads in a commonjs env
|
'js/shell.js', // shell must be loaded before moment due to the way moment loads in a commonjs env
|
||||||
'lib/moment/min/moment.min.js',
|
'lib/moment/min/moment.min.js',
|
||||||
'lib/qrcode-generator/js/qrcode.js',
|
'lib/qrcode-generator/js/qrcode.js',
|
||||||
|
'lib/underscore/underscore.js',
|
||||||
'lib/bitcore.js',
|
'lib/bitcore.js',
|
||||||
'lib/crypto-js/rollups/sha256.js',
|
'lib/crypto-js/rollups/sha256.js',
|
||||||
'lib/crypto-js/rollups/pbkdf2.js',
|
'lib/crypto-js/rollups/pbkdf2.js',
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
"socket.io-client": ">=1.0.0",
|
"socket.io-client": ">=1.0.0",
|
||||||
"mousetrap": "1.4.6",
|
"mousetrap": "1.4.6",
|
||||||
"zeroclipboard": "~1.3.5",
|
"zeroclipboard": "~1.3.5",
|
||||||
"ng-idle": "*"
|
"ng-idle": "*",
|
||||||
|
"underscore": "~1.7.0"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"angular": "=1.2.19"
|
"angular": "=1.2.19"
|
||||||
|
|
|
@ -29,6 +29,7 @@ module.exports = function(config) {
|
||||||
'lib/angular-foundation/mm-foundation.min.js',
|
'lib/angular-foundation/mm-foundation.min.js',
|
||||||
'lib/angular-foundation/mm-foundation-tpls.min.js',
|
'lib/angular-foundation/mm-foundation-tpls.min.js',
|
||||||
'lib/bitcore.js',
|
'lib/bitcore.js',
|
||||||
|
'lib/underscore/underscore.js',
|
||||||
'lib/crypto-js/rollups/sha256.js',
|
'lib/crypto-js/rollups/sha256.js',
|
||||||
'lib/crypto-js/rollups/pbkdf2.js',
|
'lib/crypto-js/rollups/pbkdf2.js',
|
||||||
'lib/crypto-js/rollups/aes.js',
|
'lib/crypto-js/rollups/aes.js',
|
||||||
|
|
|
@ -17,7 +17,8 @@
|
||||||
"optimist": "^0.6.1",
|
"optimist": "^0.6.1",
|
||||||
"preconditions": "^1.0.7",
|
"preconditions": "^1.0.7",
|
||||||
"request": "^2.40.0",
|
"request": "^2.40.0",
|
||||||
"sinon": "1.9.1"
|
"sinon": "1.9.1",
|
||||||
|
"underscore": "^1.7.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"shell": "node shell/scripts/launch.js",
|
"shell": "node shell/scripts/launch.js",
|
||||||
|
@ -72,7 +73,7 @@
|
||||||
"travis-cov": "0.2.5",
|
"travis-cov": "0.2.5",
|
||||||
"uglifyify": "1.2.3",
|
"uglifyify": "1.2.3",
|
||||||
"crypto-js": "3.1.2",
|
"crypto-js": "3.1.2",
|
||||||
"shelljs":"0.3.0",
|
"shelljs": "0.3.0",
|
||||||
"browser-request": "0.3.2",
|
"browser-request": "0.3.2",
|
||||||
"request": "2.40.0"
|
"request": "2.40.0"
|
||||||
},
|
},
|
||||||
|
|
|
@ -43,6 +43,9 @@ var createBundle = function(opts) {
|
||||||
b.require('browser-request', {
|
b.require('browser-request', {
|
||||||
expose: 'request'
|
expose: 'request'
|
||||||
});
|
});
|
||||||
|
b.require('underscore', {
|
||||||
|
expose: 'underscore'
|
||||||
|
});
|
||||||
|
|
||||||
b.require('./copay', {
|
b.require('./copay', {
|
||||||
expose: 'copay'
|
expose: 'copay'
|
||||||
|
|
Loading…
Reference in New Issue