2 files changed, 29 insertions, 15 deletions

diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 2ce44b6c7..88a3639d2 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -9,6 +9,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin
 const AssetsPlugin = require('assets-webpack-plugin')
+const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin')
 const WebpackNotifierPlugin = require('webpack-notifier')
 
 /*
@@ -202,6 +203,19 @@ module.exports = function (options) {
         name: [ 'polyfills', 'vendor' ].reverse()
       }),
 
+      /**
+       * Plugin: ContextReplacementPlugin
+       * Description: Provides context to Angular's use of System.import
+       *
+       * See: https://webpack.github.io/docs/list-of-plugins.html#contextreplacementplugin
+       * See: https://github.com/angular/angular/issues/11580
+      */
+      new ContextReplacementPlugin(
+        // The (\\|\/) piece accounts for path separators in *nix and Windows
+        /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+        helpers.root('src') // location of your src
+      ),
+
       /*
        * Plugin: CopyWebpackPlugin
        * Description: Copy files and directories in webpack.
diff --git a/client/package.json b/client/package.json
index c2f9c6953..8899429db 100644
--- a/client/package.json
+++ b/client/package.json
@@ -18,16 +18,16 @@
   },
   "license": "GPLv3",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.6",
-    "@angular/compiler": "2.0.0-rc.6",
-    "@angular/core": "2.0.0-rc.6",
-    "@angular/forms": "2.0.0-rc.6",
-    "@angular/http": "2.0.0-rc.6",
-    "@angular/platform-browser": "2.0.0-rc.6",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
-    "@angular/router": "3.0.0-rc.2",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/router": "3.0.0",
     "@angularclass/hmr": "^1.2.0",
-    "@angularclass/hmr-loader": "^3.0.1",
+    "@angularclass/hmr-loader": "^3.0.2",
     "@types/core-js": "^0.9.28",
     "@types/node": "^6.0.38",
     "@types/source-map": "^0.1.26",
@@ -41,24 +41,24 @@
     "bootstrap-sass": "^3.3.6",
     "compression-webpack-plugin": "^0.3.1",
     "copy-webpack-plugin": "^3.0.1",
-    "core-js": "^2.4.0",
-    "css-loader": "^0.23.1",
+    "core-js": "^2.4.1",
+    "css-loader": "^0.25.0",
     "es6-promise": "^3.0.2",
     "es6-promise-loader": "^1.0.1",
     "es6-shim": "^0.35.0",
-    "file-loader": "^0.8.5",
+    "file-loader": "^0.9.0",
     "html-webpack-plugin": "^2.19.0",
     "ie-shim": "^0.1.0",
     "intl": "^1.2.4",
     "json-loader": "^0.5.4",
-    "ng2-bootstrap": "1.1.1",
+    "ng2-bootstrap": "^1.1.5",
     "ng2-file-upload": "^1.0.3",
     "node-sass": "^3.7.0",
     "normalize.css": "^4.1.1",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "0.1.3",
     "resolve-url-loader": "^1.4.3",
-    "rxjs": "5.0.0-beta.11",
+    "rxjs": "5.0.0-beta.12",
     "sass-loader": "^3.2.0",
     "source-map-loader": "^0.1.5",
     "string-replace-loader": "^1.0.3",
@@ -73,7 +73,7 @@
     "webpack-merge": "^0.14.1",
     "webpack-notifier": "^1.3.0",
     "webtorrent": "^0.96.0",
-    "zone.js": "0.6.17"
+    "zone.js": "0.6.23"
   },
   "devDependencies": {
     "codelyzer": "0.0.28",