aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-09-19 22:09:12 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-09-19 22:09:12 +0200
commitd268c551cc0cbe2f83f8cc9533ce5f636eda860a (patch)
tree29c53c0e693689bae73007ae8fe13d456f3b0547 /client
parentd3cd34be2fd03ea79145dfa8eb16e82d2e23191b (diff)
downloadPeerTube-d268c551cc0cbe2f83f8cc9533ce5f636eda860a.tar.gz
PeerTube-d268c551cc0cbe2f83f8cc9533ce5f636eda860a.tar.zst
PeerTube-d268c551cc0cbe2f83f8cc9533ce5f636eda860a.zip
Client: update to angular 2.0
Diffstat (limited to 'client')
-rw-r--r--client/config/webpack.common.js14
-rw-r--r--client/package.json30
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')
9const HtmlWebpackPlugin = require('html-webpack-plugin') 9const HtmlWebpackPlugin = require('html-webpack-plugin')
10const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin 10const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin
11const AssetsPlugin = require('assets-webpack-plugin') 11const AssetsPlugin = require('assets-webpack-plugin')
12const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin')
12const WebpackNotifierPlugin = require('webpack-notifier') 13const WebpackNotifierPlugin = require('webpack-notifier')
13 14
14/* 15/*
@@ -202,6 +203,19 @@ module.exports = function (options) {
202 name: [ 'polyfills', 'vendor' ].reverse() 203 name: [ 'polyfills', 'vendor' ].reverse()
203 }), 204 }),
204 205
206 /**
207 * Plugin: ContextReplacementPlugin
208 * Description: Provides context to Angular's use of System.import
209 *
210 * See: https://webpack.github.io/docs/list-of-plugins.html#contextreplacementplugin
211 * See: https://github.com/angular/angular/issues/11580
212 */
213 new ContextReplacementPlugin(
214 // The (\\|\/) piece accounts for path separators in *nix and Windows
215 /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
216 helpers.root('src') // location of your src
217 ),
218
205 /* 219 /*
206 * Plugin: CopyWebpackPlugin 220 * Plugin: CopyWebpackPlugin
207 * Description: Copy files and directories in webpack. 221 * 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 @@
18 }, 18 },
19 "license": "GPLv3", 19 "license": "GPLv3",
20 "dependencies": { 20 "dependencies": {
21 "@angular/common": "2.0.0-rc.6", 21 "@angular/common": "2.0.0",
22 "@angular/compiler": "2.0.0-rc.6", 22 "@angular/compiler": "2.0.0",
23 "@angular/core": "2.0.0-rc.6", 23 "@angular/core": "2.0.0",
24 "@angular/forms": "2.0.0-rc.6", 24 "@angular/forms": "2.0.0",
25 "@angular/http": "2.0.0-rc.6", 25 "@angular/http": "2.0.0",
26 "@angular/platform-browser": "2.0.0-rc.6", 26 "@angular/platform-browser": "2.0.0",
27 "@angular/platform-browser-dynamic": "2.0.0-rc.6", 27 "@angular/platform-browser-dynamic": "2.0.0",
28 "@angular/router": "3.0.0-rc.2", 28 "@angular/router": "3.0.0",
29 "@angularclass/hmr": "^1.2.0", 29 "@angularclass/hmr": "^1.2.0",
30 "@angularclass/hmr-loader": "^3.0.1", 30 "@angularclass/hmr-loader": "^3.0.2",
31 "@types/core-js": "^0.9.28", 31 "@types/core-js": "^0.9.28",
32 "@types/node": "^6.0.38", 32 "@types/node": "^6.0.38",
33 "@types/source-map": "^0.1.26", 33 "@types/source-map": "^0.1.26",
@@ -41,24 +41,24 @@
41 "bootstrap-sass": "^3.3.6", 41 "bootstrap-sass": "^3.3.6",
42 "compression-webpack-plugin": "^0.3.1", 42 "compression-webpack-plugin": "^0.3.1",
43 "copy-webpack-plugin": "^3.0.1", 43 "copy-webpack-plugin": "^3.0.1",
44 "core-js": "^2.4.0", 44 "core-js": "^2.4.1",
45 "css-loader": "^0.23.1", 45 "css-loader": "^0.25.0",
46 "es6-promise": "^3.0.2", 46 "es6-promise": "^3.0.2",
47 "es6-promise-loader": "^1.0.1", 47 "es6-promise-loader": "^1.0.1",
48 "es6-shim": "^0.35.0", 48 "es6-shim": "^0.35.0",
49 "file-loader": "^0.8.5", 49 "file-loader": "^0.9.0",
50 "html-webpack-plugin": "^2.19.0", 50 "html-webpack-plugin": "^2.19.0",
51 "ie-shim": "^0.1.0", 51 "ie-shim": "^0.1.0",
52 "intl": "^1.2.4", 52 "intl": "^1.2.4",
53 "json-loader": "^0.5.4", 53 "json-loader": "^0.5.4",
54 "ng2-bootstrap": "1.1.1", 54 "ng2-bootstrap": "^1.1.5",
55 "ng2-file-upload": "^1.0.3", 55 "ng2-file-upload": "^1.0.3",
56 "node-sass": "^3.7.0", 56 "node-sass": "^3.7.0",
57 "normalize.css": "^4.1.1", 57 "normalize.css": "^4.1.1",
58 "raw-loader": "^0.5.1", 58 "raw-loader": "^0.5.1",
59 "reflect-metadata": "0.1.3", 59 "reflect-metadata": "0.1.3",
60 "resolve-url-loader": "^1.4.3", 60 "resolve-url-loader": "^1.4.3",
61 "rxjs": "5.0.0-beta.11", 61 "rxjs": "5.0.0-beta.12",
62 "sass-loader": "^3.2.0", 62 "sass-loader": "^3.2.0",
63 "source-map-loader": "^0.1.5", 63 "source-map-loader": "^0.1.5",
64 "string-replace-loader": "^1.0.3", 64 "string-replace-loader": "^1.0.3",
@@ -73,7 +73,7 @@
73 "webpack-merge": "^0.14.1", 73 "webpack-merge": "^0.14.1",
74 "webpack-notifier": "^1.3.0", 74 "webpack-notifier": "^1.3.0",
75 "webtorrent": "^0.96.0", 75 "webtorrent": "^0.96.0",
76 "zone.js": "0.6.17" 76 "zone.js": "0.6.23"
77 }, 77 },
78 "devDependencies": { 78 "devDependencies": {
79 "codelyzer": "0.0.28", 79 "codelyzer": "0.0.28",