From 54cf8970d5e8858ec818bc34d38a847d87b63027 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Wed, 21 Jan 2015 15:53:09 +0900 Subject: [PATCH] Updated lot's of dependencies. Socket.io 1.3.2 still not ready. --- bower.json | 31 +++++++++++++++---------------- webpack.config.js | 3 ++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bower.json b/bower.json index 5fbfb8b7..4204e633 100644 --- a/bower.json +++ b/bower.json @@ -2,14 +2,14 @@ "name": "stf", "version": "0.1.0", "dependencies": { - "angular": "1.3.9-build.3748", - "angular-cookies": "1.3.9-build.3748", - "angular-route": "1.3.9-build.3748", - "angular-sanitize": "1.3.9-build.3748", - "angular-animate": "1.3.9-build.3748", - "angular-touch": "1.3.9-build.3748", + "angular": "1.4.0-build.3803", + "angular-cookies": "1.4.0-build.3803", + "angular-route": "1.4.0-build.3803", + "angular-sanitize": "1.4.0-build.3803", + "angular-animate": "1.4.0-build.3803", + "angular-touch": "1.4.0-build.3803", "se7en-bootstrap-3": "~0.2.1", - "lodash": "~2.4.1", + "lodash": "~3.0.0", "oboe": "~2.1.0", "Snap.svg": "~0.3.0", "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", @@ -17,7 +17,7 @@ "stf-site": "~0.4.1", "stf-analytics": "~0.2.2", "angular-gettext": "git://github.com/rubenv/angular-gettext.git#6bf6a66d8b4fd6c5e0fddcee050991391977cf87", - "angular-ui-ace": "~0.1.1", + "angular-ui-ace": "~0.2.1", "ui-bootstrap-alerts": "~0.1.5", "requirejs": "~2.1.15", "stf-graphics": "~0.1.1", @@ -27,10 +27,10 @@ "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3", "angular-tree-control": "~0.2.7", "angular-loading-bar": "~0.6.0", - "underscore.string": "~2.4.0", - "bootstrap": "~3.3.1", + "underscore.string": "~3.0.0", + "bootstrap": "~3.3.2", "font-lato-2-subset": "~0.4.0", - "packery": "~1.3.1", + "packery": "~1.3.2", "draggabilly": "~1.1.1", "angular-elastic": "~2.4.2", "quick-ng-repeat": "~0.0.1", @@ -39,7 +39,7 @@ "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.5", "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67", "angular-ui-bootstrap": "~0.12.0", - "angular-ladda": "~0.1.10", + "angular-ladda": "~0.2.1", "ng-context-menu": "~1.0.1", "stats.js": "*", "components-font-awesome": "~4.2.0", @@ -50,13 +50,12 @@ }, "private": true, "resolutions": { - "angular": "1.3.9-build.3748", - "angular-sanitize": "1.3.9-build.3748", - "bootstrap": "~3.3.0", + "angular": "1.4.0-build.3803", + "angular-sanitize": "1.4.0-build.3803", "d3": "~3.5.2", "angular-bootstrap": "~0.12.0" }, "devDependencies": { - "angular-mocks": "1.3.9-build.3748" + "angular-mocks": "1.4.0-build.3803" } } diff --git a/webpack.config.js b/webpack.config.js index 18d8d0c4..50ee6acc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -38,7 +38,8 @@ module.exports = { 'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls', 'localforage': 'localforage/dist/localforage.js', 'socket.io': 'socket.io-client', - 'stats': 'stats.js/src/Stats.js' + 'stats': 'stats.js/src/Stats.js', + 'underscore.string': 'underscore.string/index' } }, module: {