aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/config/webpack.common.js2
-rw-r--r--client/package.json41
-rw-r--r--client/src/app/core/routing/preload-selected-modules-list.ts16
-rw-r--r--client/src/app/videos/videos.component.ts2
-rw-r--r--client/yarn.lock28
5 files changed, 42 insertions, 47 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 83bcbc240..9cd33d2ed 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -301,7 +301,7 @@ module.exports = function (options) {
301 tsConfig: helpers.root('tsconfig.webpack.json') 301 tsConfig: helpers.root('tsconfig.webpack.json')
302 }), 302 }),
303 303
304 new InlineManifestWebpackPlugin(), 304 new InlineManifestWebpackPlugin()
305 ], 305 ],
306 306
307 /* 307 /*
diff --git a/client/package.json b/client/package.json
index eaa31c22f..8b949ef80 100644
--- a/client/package.json
+++ b/client/package.json
@@ -19,7 +19,8 @@
19 "postinstall": "npm rebuild node-sass" 19 "postinstall": "npm rebuild node-sass"
20 }, 20 },
21 "license": "GPLv3", 21 "license": "GPLv3",
22 "dependencies": { 22 "dependencies": {},
23 "devDependencies": {
23 "@angular/animations": "~4.4.0", 24 "@angular/animations": "~4.4.0",
24 "@angular/common": "~4.4.0", 25 "@angular/common": "~4.4.0",
25 "@angular/compiler": "~4.4.0", 26 "@angular/compiler": "~4.4.0",
@@ -32,13 +33,15 @@
32 "@angular/router": "~4.4.0", 33 "@angular/router": "~4.4.0",
33 "@angularclass/hmr": "^2.1.0", 34 "@angularclass/hmr": "^2.1.0",
34 "@angularclass/hmr-loader": "^3.0.2", 35 "@angularclass/hmr-loader": "^3.0.2",
35 "@ngx-meta/core": "^0.4.0-rc.2", 36 "@ngx-meta/core": "^4.0.1",
36 "@types/core-js": "^0.9.28", 37 "@types/core-js": "^0.9.28",
37 "@types/node": "^6.0.38", 38 "@types/node": "^8.0.33",
38 "@types/source-map": "^0.1.26", 39 "@types/source-map": "^0.5.1",
39 "@types/uglify-js": "^2.0.27", 40 "@types/uglify-js": "^2.0.27",
40 "@types/video.js": "5.16.0", 41 "@types/video.js": "6.2.0",
41 "@types/webpack": "^3.0.0", 42 "@types/webpack": "^3.0.0",
43 "@types/webtorrent": "^0.98.4",
44 "add-asset-html-webpack-plugin": "^2.0.1",
42 "angular-pipes": "^6.0.0", 45 "angular-pipes": "^6.0.0",
43 "angular2-notifications": "^0.7.7", 46 "angular2-notifications": "^0.7.7",
44 "angular2-template-loader": "^0.6.0", 47 "angular2-template-loader": "^0.6.0",
@@ -50,14 +53,17 @@
50 "bootstrap": "^3.3.6", 53 "bootstrap": "^3.3.6",
51 "bootstrap-loader": "2.2.0", 54 "bootstrap-loader": "2.2.0",
52 "bootstrap-sass": "^3.3.6", 55 "bootstrap-sass": "^3.3.6",
56 "codelyzer": "^3.0.0-beta.4",
53 "copy-webpack-plugin": "^4.0.0", 57 "copy-webpack-plugin": "^4.0.0",
54 "core-js": "^2.4.1", 58 "core-js": "^2.4.1",
55 "css-loader": "^0.28.4", 59 "css-loader": "^0.28.4",
56 "css-to-string-loader": "^0.1.3", 60 "css-to-string-loader": "^0.1.3",
57 "es6-shim": "^0.35.0", 61 "es6-shim": "^0.35.0",
62 "extract-text-webpack-plugin": "^3.0.0",
58 "file-loader": "^1.1.5", 63 "file-loader": "^1.1.5",
59 "html-webpack-plugin": "^2.19.0", 64 "html-webpack-plugin": "^2.19.0",
60 "ie-shim": "^0.1.0", 65 "ie-shim": "^0.1.0",
66 "inline-manifest-webpack-plugin": "^3.0.1",
61 "intl": "^1.2.4", 67 "intl": "^1.2.4",
62 "json-loader": "^0.5.4", 68 "json-loader": "^0.5.4",
63 "ng-router-loader": "^2.0.0", 69 "ng-router-loader": "^2.0.0",
@@ -67,6 +73,9 @@
67 "node-sass": "^4.1.1", 73 "node-sass": "^4.1.1",
68 "normalize.css": "^7.0.0", 74 "normalize.css": "^7.0.0",
69 "optimize-js-plugin": "0.0.4", 75 "optimize-js-plugin": "0.0.4",
76 "primeng": "^4.2.0",
77 "purify-css": "^1.2.5",
78 "purifycss-webpack": "^0.7.0",
70 "raw-loader": "^0.5.1", 79 "raw-loader": "^0.5.1",
71 "reflect-metadata": "^0.1.9", 80 "reflect-metadata": "^0.1.9",
72 "resolve-url-loader": "^2.0.0", 81 "resolve-url-loader": "^2.0.0",
@@ -75,35 +84,25 @@
75 "sass-resources-loader": "^1.2.1", 84 "sass-resources-loader": "^1.2.1",
76 "script-ext-html-webpack-plugin": "^1.3.2", 85 "script-ext-html-webpack-plugin": "^1.3.2",
77 "source-map-loader": "^0.2.1", 86 "source-map-loader": "^0.2.1",
87 "standard": "^10.0.0",
78 "string-replace-loader": "^1.0.3", 88 "string-replace-loader": "^1.0.3",
79 "style-loader": "^0.19.0", 89 "style-loader": "^0.19.0",
80 "tslib": "^1.5.0", 90 "tslib": "^1.5.0",
81 "tslint": "^5.7.0", 91 "tslint": "^5.7.0",
92 "tslint-config-standard": "^6.0.1",
82 "tslint-loader": "^3.3.0", 93 "tslint-loader": "^3.3.0",
83 "typescript": "^2.5.2", 94 "typescript": "^2.5.2",
95 "uglifyjs-webpack-plugin": "^0.4.6",
84 "url-loader": "^0.6.2", 96 "url-loader": "^0.6.2",
85 "video.js": "^6.2.0", 97 "video.js": "^6.2.0",
86 "videojs-dock": "^2.0.2", 98 "videojs-dock": "^2.0.2",
87 "webpack": "^3.3.0", 99 "webpack": "^3.3.0",
100 "webpack-bundle-analyzer": "^2.8.2",
101 "webpack-dev-server": "^2.4.5",
102 "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
88 "webpack-merge": "~4.1.0", 103 "webpack-merge": "~4.1.0",
89 "webpack-notifier": "^1.3.0", 104 "webpack-notifier": "^1.3.0",
90 "webtorrent": "^0.98.0", 105 "webtorrent": "^0.98.0",
91 "zone.js": "~0.8.5" 106 "zone.js": "~0.8.5"
92 },
93 "devDependencies": {
94 "@types/webtorrent": "^0.98.4",
95 "add-asset-html-webpack-plugin": "^2.0.1",
96 "codelyzer": "^3.0.0-beta.4",
97 "extract-text-webpack-plugin": "^3.0.0",
98 "inline-manifest-webpack-plugin": "^3.0.1",
99 "primeng": "^4.2.0",
100 "purify-css": "^1.2.5",
101 "purifycss-webpack": "^0.7.0",
102 "standard": "^10.0.0",
103 "tslint-config-standard": "^6.0.1",
104 "uglifyjs-webpack-plugin": "^0.4.6",
105 "webpack-bundle-analyzer": "^2.8.2",
106 "webpack-dev-server": "^2.4.5",
107 "webpack-dll-bundles-plugin": "^1.0.0-beta.5"
108 } 107 }
109} 108}
diff --git a/client/src/app/core/routing/preload-selected-modules-list.ts b/client/src/app/core/routing/preload-selected-modules-list.ts
index dd5be6ad9..8a458ec3e 100644
--- a/client/src/app/core/routing/preload-selected-modules-list.ts
+++ b/client/src/app/core/routing/preload-selected-modules-list.ts
@@ -1,16 +1,16 @@
1import { Route, PreloadingStrategy } from '@angular/router'; 1import { Route, PreloadingStrategy } from '@angular/router'
2import { Observable } from 'rxjs/Observable'; 2import { Observable } from 'rxjs/Observable'
3import 'rxjs/add/observable/timer'; 3import 'rxjs/add/observable/timer'
4import 'rxjs/add/operator/switchMap'; 4import 'rxjs/add/operator/switchMap'
5 5
6export class PreloadSelectedModulesList implements PreloadingStrategy { 6export class PreloadSelectedModulesList implements PreloadingStrategy {
7 preload(route: Route, load: Function): Observable<any> { 7 preload (route: Route, load: Function): Observable<any> {
8 if (!route.data || !route.data.preload) return Observable.of(null); 8 if (!route.data || !route.data.preload) return Observable.of(null)
9 9
10 if (typeof route.data.preload === 'number') { 10 if (typeof route.data.preload === 'number') {
11 return Observable.timer(route.data.preload).switchMap(() => load()); 11 return Observable.timer(route.data.preload).switchMap(() => load())
12 } 12 }
13 13
14 return load(); 14 return load()
15 } 15 }
16} 16}
diff --git a/client/src/app/videos/videos.component.ts b/client/src/app/videos/videos.component.ts
index 26d9d28d4..80ff46a0a 100644
--- a/client/src/app/videos/videos.component.ts
+++ b/client/src/app/videos/videos.component.ts
@@ -6,7 +6,7 @@ import { VideoService } from './shared'
6 template: '<router-outlet></router-outlet>' 6 template: '<router-outlet></router-outlet>'
7}) 7})
8export class VideosComponent implements OnInit { 8export class VideosComponent implements OnInit {
9 constructor(private videoService: VideoService) {} 9 constructor (private videoService: VideoService) {}
10 10
11 ngOnInit () { 11 ngOnInit () {
12 this.videoService.loadVideoCategories() 12 this.videoService.loadVideoCategories()
diff --git a/client/yarn.lock b/client/yarn.lock
index f2ee71447..bcfcc8dec 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -80,11 +80,11 @@
80 version "2.1.3" 80 version "2.1.3"
81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f" 81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"
82 82
83"@ngx-meta/core@^0.4.0-rc.2": 83"@ngx-meta/core@^4.0.1":
84 version "0.4.0-rc.2" 84 version "4.0.1"
85 resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-0.4.0-rc.2.tgz#1bd793103a1a5d463ba773db9f56d3eb8575c2c8" 85 resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-4.0.1.tgz#b035febeeb92876920480f70719fcf953dc0245f"
86 dependencies: 86 dependencies:
87 tslib "^1.7.0" 87 tslib "~1.7.1"
88 88
89"@types/bittorrent-protocol@*": 89"@types/bittorrent-protocol@*":
90 version "2.2.2" 90 version "2.2.2"
@@ -106,9 +106,9 @@
106 version "8.0.25" 106 version "8.0.25"
107 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1" 107 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1"
108 108
109"@types/node@^6.0.38": 109"@types/node@^8.0.33":
110 version "6.0.89" 110 version "8.0.33"
111 resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.89.tgz#154be0e6a823760cd6083aa8c48f952e2e63e0b0" 111 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
112 112
113"@types/parse-torrent-file@*": 113"@types/parse-torrent-file@*":
114 version "4.0.1" 114 version "4.0.1"
@@ -130,14 +130,10 @@
130 dependencies: 130 dependencies:
131 "@types/node" "*" 131 "@types/node" "*"
132 132
133"@types/source-map@*": 133"@types/source-map@*", "@types/source-map@^0.5.1":
134 version "0.5.1" 134 version "0.5.1"
135 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367" 135 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
136 136
137"@types/source-map@^0.1.26":
138 version "0.1.29"
139 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.1.29.tgz#d7048a60180b09f8aa6d53bda311c6b51cbd7018"
140
141"@types/tapable@*": 137"@types/tapable@*":
142 version "0.2.4" 138 version "0.2.4"
143 resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.4.tgz#8181a228da46185439300e600c5ae3b3b3982585" 139 resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.4.tgz#8181a228da46185439300e600c5ae3b3b3982585"
@@ -148,9 +144,9 @@
148 dependencies: 144 dependencies:
149 "@types/source-map" "*" 145 "@types/source-map" "*"
150 146
151"@types/video.js@5.16.0": 147"@types/video.js@6.2.0":
152 version "5.16.0" 148 version "6.2.0"
153 resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-5.16.0.tgz#b35085050b41b81b9425faa3616f925239685f88" 149 resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.0.tgz#1e7994e67b8ee37065762479f12ed812b54e6fa2"
154 150
155"@types/webpack@^3.0.0": 151"@types/webpack@^3.0.0":
156 version "3.0.13" 152 version "3.0.13"
@@ -6720,7 +6716,7 @@ tsickle@^0.21.0:
6720 source-map "^0.5.6" 6716 source-map "^0.5.6"
6721 source-map-support "^0.4.2" 6717 source-map-support "^0.4.2"
6722 6718
6723tslib@^1.0.0, tslib@^1.5.0, tslib@^1.7.0, tslib@^1.7.1: 6719tslib@^1.0.0, tslib@^1.5.0, tslib@^1.7.1, tslib@~1.7.1:
6724 version "1.7.1" 6720 version "1.7.1"
6725 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" 6721 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
6726 6722