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) {
         tsConfig: helpers.root('tsconfig.webpack.json')
       }),
 
-      new InlineManifestWebpackPlugin(),
+      new InlineManifestWebpackPlugin()
     ],
 
     /*
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 @@
     "postinstall": "npm rebuild node-sass"
   },
   "license": "GPLv3",
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
     "@angular/animations": "~4.4.0",
     "@angular/common": "~4.4.0",
     "@angular/compiler": "~4.4.0",
@@ -32,13 +33,15 @@
     "@angular/router": "~4.4.0",
     "@angularclass/hmr": "^2.1.0",
     "@angularclass/hmr-loader": "^3.0.2",
-    "@ngx-meta/core": "^0.4.0-rc.2",
+    "@ngx-meta/core": "^4.0.1",
     "@types/core-js": "^0.9.28",
-    "@types/node": "^6.0.38",
-    "@types/source-map": "^0.1.26",
+    "@types/node": "^8.0.33",
+    "@types/source-map": "^0.5.1",
     "@types/uglify-js": "^2.0.27",
-    "@types/video.js": "5.16.0",
+    "@types/video.js": "6.2.0",
     "@types/webpack": "^3.0.0",
+    "@types/webtorrent": "^0.98.4",
+    "add-asset-html-webpack-plugin": "^2.0.1",
     "angular-pipes": "^6.0.0",
     "angular2-notifications": "^0.7.7",
     "angular2-template-loader": "^0.6.0",
@@ -50,14 +53,17 @@
     "bootstrap": "^3.3.6",
     "bootstrap-loader": "2.2.0",
     "bootstrap-sass": "^3.3.6",
+    "codelyzer": "^3.0.0-beta.4",
     "copy-webpack-plugin": "^4.0.0",
     "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
     "css-to-string-loader": "^0.1.3",
     "es6-shim": "^0.35.0",
+    "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.5",
     "html-webpack-plugin": "^2.19.0",
     "ie-shim": "^0.1.0",
+    "inline-manifest-webpack-plugin": "^3.0.1",
     "intl": "^1.2.4",
     "json-loader": "^0.5.4",
     "ng-router-loader": "^2.0.0",
@@ -67,6 +73,9 @@
     "node-sass": "^4.1.1",
     "normalize.css": "^7.0.0",
     "optimize-js-plugin": "0.0.4",
+    "primeng": "^4.2.0",
+    "purify-css": "^1.2.5",
+    "purifycss-webpack": "^0.7.0",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "^0.1.9",
     "resolve-url-loader": "^2.0.0",
@@ -75,35 +84,25 @@
     "sass-resources-loader": "^1.2.1",
     "script-ext-html-webpack-plugin": "^1.3.2",
     "source-map-loader": "^0.2.1",
+    "standard": "^10.0.0",
     "string-replace-loader": "^1.0.3",
     "style-loader": "^0.19.0",
     "tslib": "^1.5.0",
     "tslint": "^5.7.0",
+    "tslint-config-standard": "^6.0.1",
     "tslint-loader": "^3.3.0",
     "typescript": "^2.5.2",
+    "uglifyjs-webpack-plugin": "^0.4.6",
     "url-loader": "^0.6.2",
     "video.js": "^6.2.0",
     "videojs-dock": "^2.0.2",
     "webpack": "^3.3.0",
+    "webpack-bundle-analyzer": "^2.8.2",
+    "webpack-dev-server": "^2.4.5",
+    "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
     "webpack-merge": "~4.1.0",
     "webpack-notifier": "^1.3.0",
     "webtorrent": "^0.98.0",
     "zone.js": "~0.8.5"
-  },
-  "devDependencies": {
-    "@types/webtorrent": "^0.98.4",
-    "add-asset-html-webpack-plugin": "^2.0.1",
-    "codelyzer": "^3.0.0-beta.4",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "inline-manifest-webpack-plugin": "^3.0.1",
-    "primeng": "^4.2.0",
-    "purify-css": "^1.2.5",
-    "purifycss-webpack": "^0.7.0",
-    "standard": "^10.0.0",
-    "tslint-config-standard": "^6.0.1",
-    "uglifyjs-webpack-plugin": "^0.4.6",
-    "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-dev-server": "^2.4.5",
-    "webpack-dll-bundles-plugin": "^1.0.0-beta.5"
   }
 }
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 @@
-import { Route, PreloadingStrategy } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/timer';
-import 'rxjs/add/operator/switchMap';
+import { Route, PreloadingStrategy } from '@angular/router'
+import { Observable } from 'rxjs/Observable'
+import 'rxjs/add/observable/timer'
+import 'rxjs/add/operator/switchMap'
 
 export class PreloadSelectedModulesList implements PreloadingStrategy {
-  preload(route: Route, load: Function): Observable<any> {
-    if (!route.data || !route.data.preload) return Observable.of(null);
+  preload (route: Route, load: Function): Observable<any> {
+    if (!route.data || !route.data.preload) return Observable.of(null)
 
     if (typeof route.data.preload === 'number') {
-      return Observable.timer(route.data.preload).switchMap(() => load());
+      return Observable.timer(route.data.preload).switchMap(() => load())
     }
 
-    return load();
+    return load()
   }
 }
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'
   template: '<router-outlet></router-outlet>'
 })
 export class VideosComponent implements OnInit {
-  constructor(private videoService: VideoService) {}
+  constructor (private videoService: VideoService) {}
 
   ngOnInit () {
     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 @@
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"
 
-"@ngx-meta/core@^0.4.0-rc.2":
-  version "0.4.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-0.4.0-rc.2.tgz#1bd793103a1a5d463ba773db9f56d3eb8575c2c8"
+"@ngx-meta/core@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-4.0.1.tgz#b035febeeb92876920480f70719fcf953dc0245f"
   dependencies:
-    tslib "^1.7.0"
+    tslib "~1.7.1"
 
 "@types/bittorrent-protocol@*":
   version "2.2.2"
@@ -106,9 +106,9 @@
   version "8.0.25"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1"
 
-"@types/node@^6.0.38":
-  version "6.0.89"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.89.tgz#154be0e6a823760cd6083aa8c48f952e2e63e0b0"
+"@types/node@^8.0.33":
+  version "8.0.33"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
 "@types/parse-torrent-file@*":
   version "4.0.1"
@@ -130,14 +130,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/source-map@*":
+"@types/source-map@*", "@types/source-map@^0.5.1":
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
 
-"@types/source-map@^0.1.26":
-  version "0.1.29"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.1.29.tgz#d7048a60180b09f8aa6d53bda311c6b51cbd7018"
-
 "@types/tapable@*":
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.4.tgz#8181a228da46185439300e600c5ae3b3b3982585"
@@ -148,9 +144,9 @@
   dependencies:
     "@types/source-map" "*"
 
-"@types/video.js@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-5.16.0.tgz#b35085050b41b81b9425faa3616f925239685f88"
+"@types/video.js@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-6.2.0.tgz#1e7994e67b8ee37065762479f12ed812b54e6fa2"
 
 "@types/webpack@^3.0.0":
   version "3.0.13"
@@ -6720,7 +6716,7 @@ tsickle@^0.21.0:
     source-map "^0.5.6"
     source-map-support "^0.4.2"
 
-tslib@^1.0.0, tslib@^1.5.0, tslib@^1.7.0, tslib@^1.7.1:
+tslib@^1.0.0, tslib@^1.5.0, tslib@^1.7.1, tslib@~1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"