1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-03 17:59:28 +02:00

- Adding bluebird from bower instead of npm so we don't have to build it every time.

This commit is contained in:
Gunther Brunner 2014-03-26 15:34:13 +09:00
parent e99922abe8
commit 35ae4627fe
2 changed files with 5 additions and 2 deletions

View file

@ -24,7 +24,8 @@
"angular-bootstrap": "~0.10.0", "angular-bootstrap": "~0.10.0",
"angular-dialog-service": "~3.1.0", "angular-dialog-service": "~3.1.0",
"ng-file-upload": "~1.2.10", "ng-file-upload": "~1.2.10",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3" "angular-growl-v2": "JanStevens/angular-growl-2#~0.5.3",
"bluebird": "~1.1.1"
}, },
"private": true, "private": true,
"resolutions": { "resolutions": {

View file

@ -24,6 +24,7 @@ module.exports = {
, 'socket.io': 'socket.io-client/dist/socket.io' , 'socket.io': 'socket.io-client/dist/socket.io'
, 'oboe': 'oboe/dist/oboe-browser' , 'oboe': 'oboe/dist/oboe-browser'
, 'ng-file-upload': 'ng-file-upload/angular-file-upload' , 'ng-file-upload': 'ng-file-upload/angular-file-upload'
, 'bluebird': 'bluebird/js/browser/bluebird'
} }
} }
, module: { , module: {
@ -50,10 +51,11 @@ module.exports = {
, { test: /angular-animate\.js/, loader: 'imports?angular=angular'} , { test: /angular-animate\.js/, loader: 'imports?angular=angular'}
, { test: /angular-growl\.js/, loader: 'imports?angular=angular'} , { test: /angular-growl\.js/, loader: 'imports?angular=angular'}
, { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'} , { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}
, { test: /uuid\.js/, loader: 'imports?require=>false'} , { test: /uuid\.js/, loader: 'imports?require=>undefined'}
, { test: /localforage\.js/, loader: 'script'} , { test: /localforage\.js/, loader: 'script'}
, { test: /ui-bootstrap-tpls\.js/, loader: 'script'} , { test: /ui-bootstrap-tpls\.js/, loader: 'script'}
, { test: /dialogs\.js/, loader: 'script'} , { test: /dialogs\.js/, loader: 'script'}
, { test: /bluebird\.js/, loader: 'imports?require=>undefined'}
] ]
, noParse: [ , noParse: [
// pathutil.resource('bower_components') // pathutil.resource('bower_components')