From b95ec55e3e8e8eb5abde4b77403e7787d57e74c8 Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Fri, 9 Oct 2015 16:31:59 +0900
Subject: [PATCH] Update dependencies. Fix npm 3 flattened paths for our
 webpack middleware.

---
 bower.json                          | 8 +++-----
 lib/units/app/middleware/webpack.js | 2 +-
 package.json                        | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bower.json b/bower.json
index 2bf39c2a..a4f3f05f 100644
--- a/bower.json
+++ b/bower.json
@@ -25,12 +25,12 @@
     "angular-elastic": "~2.5.1",
     "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.6.0",
     "angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
-    "angular-ui-bootstrap": "~0.13.4",
+    "angular-ui-bootstrap": "~0.14.0",
     "ng-context-menu": "~1.0.2",
     "components-font-awesome": "~4.4.0",
     "epoch": "~0.6.0",
     "ng-epoch": "~1.0.7",
-    "eventEmitter": "~4.2.11",
+    "eventEmitter": "~4.3.0",
     "angular-ladda": "~0.3.1",
     "d3": "~3.5.6",
     "spin.js": "~2.3.2"
@@ -42,8 +42,6 @@
   "resolutions": {
     "angular": "~1.5.0",
     "d3": "~3.5.5",
-    "spin.js": "~2.3.2",
-    "angular-bootstrap": "~0.13.4",
-    "angular-cookies": "~1.5.0"
+    "spin.js": "~2.3.2"
   }
 }
diff --git a/lib/units/app/middleware/webpack.js b/lib/units/app/middleware/webpack.js
index 0910322d..f3ccce45 100644
--- a/lib/units/app/middleware/webpack.js
+++ b/lib/units/app/middleware/webpack.js
@@ -5,7 +5,7 @@ var webpack = require('webpack')
 var mime = require('mime')
 var Promise = require('bluebird')
 var _ = require('lodash')
-var MemoryFileSystem = require('webpack/node_modules/memory-fs')
+var MemoryFileSystem = require('memory-fs')
 
 var logger = require('../../../util/logger')
 var lifecycle = require('../../../util/lifecycle')
diff --git a/package.json b/package.json
index 46dee6af..7908876e 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "bower": "^1.5.2",
     "chai": "^3.2.0",
     "css-loader": "^0.19.0",
-    "del": "^1.2.1",
+    "del": "^2.0.1",
     "event-stream": "^3.3.0",
     "exports-loader": "^0.6.2",
     "extract-text-webpack-plugin": "^0.8.2",
@@ -121,10 +121,11 @@
     "karma-webpack": "^1.6.0",
     "less": "^2.4.0",
     "less-loader": "^2.1.0",
+    "memory-fs": "^0.2.0",
     "node-libs-browser": "^0.5.2",
     "node-sass": "^3.3.3",
     "phantomjs": "^1.9.18",
-    "protractor": "^2.2.0",
+    "protractor": "^2.5.1",
     "protractor-html-screenshot-reporter": "0.0.21",
     "raw-loader": "^0.5.1",
     "run-sequence": "^1.1.2",
@@ -136,7 +137,7 @@
     "style-loader": "^0.12.3",
     "template-html-loader": "^0.0.3",
     "url-loader": "^0.5.5",
-    "webpack": "^1.12.0",
+    "webpack": "^1.12.2",
     "webpack-dev-server": "^1.7.0"
   },
   "engines": {