Client dependencies upgrade

client/angular.json

@@ -153,7 +153,7 @@
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "6kb",
-                  "maximumError": "10kb"
+                  "maximumError": "50kb"
                 }
               ],
               "fileReplacements": [

client/package.json

@@ -26,30 +26,24 @@
     "sass-lint": "sass-lint"
   },
   "typings": "*.d.ts",
-  "resolutions": {
-    "video.js": "^7",
-    "webtorrent/create-torrent/junk": "^1",
-    "simple-get": "^2.8.1",
-    "punycode": "^1.4.1"
-  },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900.1",
-    "@angular/animations": "~9.0.0",
+    "@angular-devkit/build-angular": "~0.901.0",
+    "@angular/animations": "~9.1.0",
     "@angular/cdk": "^9.0.0",
-    "@angular/cli": "~9.0.1",
-    "@angular/common": "~9.0.0",
-    "@angular/compiler": "~9.0.0",
-    "@angular/compiler-cli": "~9.0.0",
-    "@angular/core": "~9.0.0",
-    "@angular/forms": "~9.0.0",
-    "@angular/language-service": "~9.0.0",
-    "@angular/platform-browser": "~9.0.0",
-    "@angular/platform-browser-dynamic": "~9.0.0",
-    "@angular/router": "~9.0.0",
-    "@angular/service-worker": "~9.0.0",
+    "@angular/cli": "~9.1.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/language-service": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
+    "@angular/service-worker": "~9.1.0",
     "@angularclass/hmr": "^2.1.3",
     "@neos21/bootstrap3-glyphicons": "^1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^5.2.1",
+    "@ng-bootstrap/ng-bootstrap": "^6.0.2",
     "@ngx-i18nsupport/ngx-i18nsupport": "^1.1.6",
     "@ngx-loading-bar/core": "^4.2.0",
     "@ngx-loading-bar/http-client": "^4.2.0",
@@ -84,23 +78,23 @@
     "debug": "^4.1.1",
     "dexie": "^2.0.4",
     "extract-text-webpack-plugin": "4.0.0-beta.0",
-    "file-loader": "^4.1.0",
+    "file-loader": "^6.0.0",
     "focus-visible": "^5.0.2",
     "hls.js": "^0.13.2",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
+    "html-loader": "^1.0.0",
+    "html-webpack-plugin": "^4.0.3",
     "https-browserify": "^1.0.0",
     "jasmine-core": "^3.1.0",
-    "jasmine-spec-reporter": "^4.2.1",
+    "jasmine-spec-reporter": "^5.0.1",
     "jschannel": "^1.0.2",
     "karma": "^4.0.1",
     "karma-chrome-launcher": "^3.0.0",
     "karma-coverage-istanbul-reporter": "^2.0.2",
-    "karma-jasmine": "^2.0.1",
+    "karma-jasmine": "^3.1.1",
     "karma-jasmine-html-reporter": "^1.3.1",
     "linkifyjs": "^2.1.5",
     "lodash-es": "^4.17.4",
-    "markdown-it": "^9.0.1",
+    "markdown-it": "^10.0.0",
     "ngx-chips": "2.1.0",
     "ngx-pipes": "^2.6.0",
     "node-sass": "^4.9.3",
@@ -112,20 +106,20 @@
     "protractor": "^5.4.3",
     "purify-css": "^1.2.5",
     "purifycss-webpack": "^0.7.0",
-    "raw-loader": "^1",
+    "raw-loader": "^4.0.0",
     "rxjs": "^6.5.2",
     "sanitize-html": "^1.18.4",
     "sass-lint": "^1.13.1",
-    "sass-loader": "7",
+    "sass-loader": "8.0.2",
     "sass-resources-loader": "^2.0.0",
     "socket.io-client": "^2.2.0",
     "stream-browserify": "^2.0.1",
     "stream-http": "^3.0.0",
     "terser-webpack-plugin": "^2.1.3",
-    "tslint": "^5.7.0",
+    "tslint": "^6.1.0",
     "tslint-angular": "^3.0.2",
-    "tslint-config-standard": "^8.0.1",
-    "typescript": "~3.7.5",
+    "tslint-config-standard": "^9.0.0",
+    "typescript": "~3.8.3",
     "video.js": "^7",
     "videojs-contextmenu-ui": "^5.0.0",
     "videojs-contrib-quality-levels": "^2.0.9",
@@ -142,6 +136,9 @@
   "dependencies": {
     "@angular/localize": "^9.0.0",
     "@ngx-i18nsupport/tooling": "^8.0.3",
+    "junk": "^3.1.0",
+    "punycode": "^2.1.1",
+    "simple-get": "^3.1.0",
     "tslib": "^1.10.0"
   }
 }

client/src/app/shared/images/global-icon.component.ts

@@ -2,59 +2,59 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@
 import { HooksService } from '@app/core/plugins/hooks.service'
 
 const icons = {
-  'add': require('!!raw-loader?!../../../assets/images/global/add.svg'),
-  'user': require('!!raw-loader?!../../../assets/images/global/user.svg'),
-  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg'),
-  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg'),
-  'help': require('!!raw-loader?!../../../assets/images/global/help.svg'),
-  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg'),
-  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg'),
-  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg'),
-  'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg'),
-  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg'),
-  'no': require('!!raw-loader?!../../../assets/images/global/no.svg'),
-  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg'),
-  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg'),
-  'history': require('!!raw-loader?!../../../assets/images/global/history.svg'),
-  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg'),
-  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg'),
-  'download': require('!!raw-loader?!../../../assets/images/global/download.svg'),
-  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg'),
-  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg'),
-  'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg'),
-  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg'),
-  'server': require('!!raw-loader?!../../../assets/images/global/server.svg'),
-  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg'),
-  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg'),
-  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg'),
-  'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg'),
-  'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg'),
-  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg'),
-  'support': require('!!raw-loader?!../../../assets/images/video/support.svg'),
-  'like': require('!!raw-loader?!../../../assets/images/video/like.svg'),
-  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg'),
-  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg'),
-  'share': require('!!raw-loader?!../../../assets/images/video/share.svg'),
-  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg'),
-  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'),
-  'play': require('!!raw-loader?!../../../assets/images/global/play.svg'),
-  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'),
-  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'),
-  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'),
-  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'),
-  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'),
-  'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg'),
-  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'),
-  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'),
-  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'),
-  'language': require('!!raw-loader?!../../../assets/images/menu/language.svg'),
-  'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg'),
-  'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg'),
-  'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg'),
-  'users': require('!!raw-loader?!../../../assets/images/global/users.svg'),
-  'search': require('!!raw-loader?!../../../assets/images/global/search.svg'),
-  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg'),
-  'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg')
+  'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default,
+  'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default,
+  'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default,
+  'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default,
+  'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default,
+  'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default,
+  'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default,
+  'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default,
+  'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default,
+  'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default,
+  'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default,
+  'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default,
+  'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default,
+  'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default,
+  'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default,
+  'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default,
+  'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default,
+  'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default,
+  'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default,
+  'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg').default,
+  'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default,
+  'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default,
+  'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default,
+  'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default,
+  'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default,
+  'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default,
+  'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default,
+  'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default,
+  'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default,
+  'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default,
+  'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default,
+  'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default,
+  'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default,
+  'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default,
+  'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default,
+  'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default,
+  'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default,
+  'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default,
+  'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default,
+  'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default,
+  'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default,
+  'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default,
+  'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default,
+  'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default,
+  'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default,
+  'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default,
+  'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default,
+  'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default,
+  'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default,
+  'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default,
+  'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default,
+  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default,
+  'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default
 }
 
 export type GlobalIconName = keyof typeof icons

client/src/assets/player/p2p-media-loader/hls-plugin.ts

@@ -13,6 +13,8 @@ type Metadata = {
   levels: Hlsjs.Level[]
 }
 
+type CustomAudioTrack = AudioTrack & { name?: string, lang?: string }
+
 const registerSourceHandler = function (vjs: typeof videojs) {
   if (!Hlsjs.isSupported()) {
     console.warn('Hls.js is not supported in this browser!')
@@ -91,7 +93,7 @@ class Html5Hlsjs {
   private readonly source: videojs.Tech.SourceObject
   private readonly vjs: typeof videojs
 
-  private hls: Hlsjs & { manualLevel?: number } // FIXME: typings
+  private hls: Hlsjs & { manualLevel?: number, audioTrack?: any, audioTracks?: CustomAudioTrack[] } // FIXME: typings
   private hlsjsConfig: Partial<Hlsjs.Config & { cueHandler: any }> = null
 
   private _duration: number = null
@@ -393,7 +395,7 @@ class Html5Hlsjs {
   }
 
   private _onAudioTracks () {
-    const hlsAudioTracks = this.hls.audioTracks as (AudioTrack & { name?: string, lang?: string })[] // FIXME typings
+    const hlsAudioTracks = this.hls.audioTracks
     const playerAudioTracks = this.tech.audioTracks()
 
     if (hlsAudioTracks.length > 1 && playerAudioTracks.length === 0) {

client/webpack/webpack.video-embed.js

@@ -78,10 +78,12 @@ module.exports = function () {
               {
                 loader: 'sass-loader',
                 options: {
-                  sourceMap: true,
-                  includePaths: [
-                    helpers.root('src/sass/include')
-                  ]
+                  sassOptions: {
+                    sourceMap: true,
+                    includePaths: [
+                      helpers.root('src/sass/include')
+                    ]
+                  }
                 }
               }
             ]
@@ -131,7 +133,7 @@ module.exports = function () {
         template: 'src/standalone/videos/embed.html',
         filename: 'embed.html',
         title: 'PeerTube',
-        chunksSortMode: 'dependency',
+        chunksSortMode: 'auto',
         inject: 'body',
         chunks: ['video-embed']
       }),
@@ -140,7 +142,7 @@ module.exports = function () {
         template: '!!html-loader!src/standalone/videos/test-embed.html',
         filename: 'test-embed.html',
         title: 'PeerTube',
-        chunksSortMode: 'dependency',
+        chunksSortMode: 'auto',
         inject: 'body',
         chunks: ['test-embed']
       }),