aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/assets/player/bezels/bezels-plugin.ts2
-rw-r--r--client/src/assets/player/bezels/pause-bezel.ts2
-rw-r--r--client/src/assets/player/p2p-media-loader/hls-plugin.ts2
-rw-r--r--client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts2
-rw-r--r--client/src/assets/player/peertube-player-manager.ts4
-rw-r--r--client/src/assets/player/peertube-plugin.ts2
-rw-r--r--client/src/assets/player/peertube-videojs-typings.ts2
-rw-r--r--client/src/assets/player/upnext/end-card.ts2
-rw-r--r--client/src/assets/player/upnext/upnext-plugin.ts2
-rw-r--r--client/src/assets/player/videojs-components/next-video-button.ts2
-rw-r--r--client/src/assets/player/videojs-components/p2p-info-button.ts2
-rw-r--r--client/src/assets/player/videojs-components/peertube-link-button.ts2
-rw-r--r--client/src/assets/player/videojs-components/peertube-load-progress-bar.ts2
-rw-r--r--client/src/assets/player/videojs-components/resolution-menu-button.ts2
-rw-r--r--client/src/assets/player/videojs-components/resolution-menu-item.ts2
-rw-r--r--client/src/assets/player/videojs-components/settings-dialog.ts2
-rw-r--r--client/src/assets/player/videojs-components/settings-menu-button.ts2
-rw-r--r--client/src/assets/player/videojs-components/settings-menu-item.ts2
-rw-r--r--client/src/assets/player/videojs-components/settings-panel-child.ts2
-rw-r--r--client/src/assets/player/videojs-components/settings-panel.ts2
-rw-r--r--client/src/assets/player/videojs-components/theater-button.ts2
-rw-r--r--client/src/assets/player/webtorrent/webtorrent-plugin.ts2
-rw-r--r--client/src/standalone/videos/embed.ts2
-rw-r--r--client/tsconfig.json1
-rw-r--r--client/webpack/webpack.video-embed.js2
25 files changed, 26 insertions, 25 deletions
diff --git a/client/src/assets/player/bezels/bezels-plugin.ts b/client/src/assets/player/bezels/bezels-plugin.ts
index ad8bfa703..ca88bc1f9 100644
--- a/client/src/assets/player/bezels/bezels-plugin.ts
+++ b/client/src/assets/player/bezels/bezels-plugin.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import './pause-bezel' 2import './pause-bezel'
3 3
4const Plugin = videojs.getPlugin('plugin') 4const Plugin = videojs.getPlugin('plugin')
diff --git a/client/src/assets/player/bezels/pause-bezel.ts b/client/src/assets/player/bezels/pause-bezel.ts
index d9ef9a390..886574380 100644
--- a/client/src/assets/player/bezels/pause-bezel.ts
+++ b/client/src/assets/player/bezels/pause-bezel.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3function getPauseBezel () { 3function getPauseBezel () {
4 return ` 4 return `
diff --git a/client/src/assets/player/p2p-media-loader/hls-plugin.ts b/client/src/assets/player/p2p-media-loader/hls-plugin.ts
index 6937d147a..9e2ac1aa4 100644
--- a/client/src/assets/player/p2p-media-loader/hls-plugin.ts
+++ b/client/src/assets/player/p2p-media-loader/hls-plugin.ts
@@ -2,7 +2,7 @@
2// We duplicated this plugin to choose the hls.js version we want, because streamroot only provide a bundled file 2// We duplicated this plugin to choose the hls.js version we want, because streamroot only provide a bundled file
3 3
4import * as Hlsjs from 'hls.js/dist/hls.light.js' 4import * as Hlsjs from 'hls.js/dist/hls.light.js'
5import videojs from 'video.js/dist/alt/video.core.js' 5import videojs from 'video.js'
6import { HlsjsConfigHandlerOptions, QualityLevelRepresentation, QualityLevels, VideoJSTechHLS } from '../peertube-videojs-typings' 6import { HlsjsConfigHandlerOptions, QualityLevelRepresentation, QualityLevels, VideoJSTechHLS } from '../peertube-videojs-typings'
7 7
8type ErrorCounts = { 8type ErrorCounts = {
diff --git a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
index 161c92b5e..46c6bbaf2 100644
--- a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
+++ b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import { P2PMediaLoaderPluginOptions, PlayerNetworkInfo } from '../peertube-videojs-typings' 2import { P2PMediaLoaderPluginOptions, PlayerNetworkInfo } from '../peertube-videojs-typings'
3import { Engine, initHlsJsPlayer, initVideoJsContribHlsJsPlayer } from 'p2p-media-loader-hlsjs' 3import { Engine, initHlsJsPlayer, initVideoJsContribHlsJsPlayer } from 'p2p-media-loader-hlsjs'
4import { Events, Segment } from 'p2p-media-loader-core' 4import { Events, Segment } from 'p2p-media-loader-core'
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index 50701eefe..12e460f03 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -1,6 +1,6 @@
1import { VideoFile } from '../../../../shared/models/videos' 1import { VideoFile } from '../../../../shared/models/videos'
2import videojs from 'video.js/dist/alt/video.core.js' 2import videojs from 'video.js'
3import 'videojs-hotkeys' 3import 'videojs-hotkeys/videojs.hotkeys'
4import 'videojs-dock' 4import 'videojs-dock'
5import 'videojs-contextmenu-ui' 5import 'videojs-contextmenu-ui'
6import 'videojs-contrib-quality-levels' 6import 'videojs-contrib-quality-levels'
diff --git a/client/src/assets/player/peertube-plugin.ts b/client/src/assets/player/peertube-plugin.ts
index afd8d678b..5085f7f86 100644
--- a/client/src/assets/player/peertube-plugin.ts
+++ b/client/src/assets/player/peertube-plugin.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core' 1import videojs from 'video.js'
2import './videojs-components/settings-menu-button' 2import './videojs-components/settings-menu-button'
3import { 3import {
4 PeerTubePluginOptions, 4 PeerTubePluginOptions,
diff --git a/client/src/assets/player/peertube-videojs-typings.ts b/client/src/assets/player/peertube-videojs-typings.ts
index 9616dd326..a4e4c580c 100644
--- a/client/src/assets/player/peertube-videojs-typings.ts
+++ b/client/src/assets/player/peertube-videojs-typings.ts
@@ -4,7 +4,7 @@ import { P2pMediaLoaderPlugin } from './p2p-media-loader/p2p-media-loader-plugin
4import { PlayerMode } from './peertube-player-manager' 4import { PlayerMode } from './peertube-player-manager'
5import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager' 5import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager'
6import { VideoFile } from '@shared/models' 6import { VideoFile } from '@shared/models'
7import videojs from 'video.js/dist/alt/video.core.js' 7import videojs from 'video.js'
8import { Config, Level } from 'hls.js' 8import { Config, Level } from 'hls.js'
9 9
10declare module 'video.js' { 10declare module 'video.js' {
diff --git a/client/src/assets/player/upnext/end-card.ts b/client/src/assets/player/upnext/end-card.ts
index c39a9c913..8fabfc3fd 100644
--- a/client/src/assets/player/upnext/end-card.ts
+++ b/client/src/assets/player/upnext/end-card.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3function getMainTemplate (options: any) { 3function getMainTemplate (options: any) {
4 return ` 4 return `
diff --git a/client/src/assets/player/upnext/upnext-plugin.ts b/client/src/assets/player/upnext/upnext-plugin.ts
index ac7699e9a..db969024d 100644
--- a/client/src/assets/player/upnext/upnext-plugin.ts
+++ b/client/src/assets/player/upnext/upnext-plugin.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import { EndCardOptions } from './end-card' 2import { EndCardOptions } from './end-card'
3 3
4const Plugin = videojs.getPlugin('plugin') 4const Plugin = videojs.getPlugin('plugin')
diff --git a/client/src/assets/player/videojs-components/next-video-button.ts b/client/src/assets/player/videojs-components/next-video-button.ts
index c97ecdda6..22b32f06b 100644
--- a/client/src/assets/player/videojs-components/next-video-button.ts
+++ b/client/src/assets/player/videojs-components/next-video-button.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3const Button = videojs.getComponent('Button') 3const Button = videojs.getComponent('Button')
4 4
diff --git a/client/src/assets/player/videojs-components/p2p-info-button.ts b/client/src/assets/player/videojs-components/p2p-info-button.ts
index e340337ed..db6806fed 100644
--- a/client/src/assets/player/videojs-components/p2p-info-button.ts
+++ b/client/src/assets/player/videojs-components/p2p-info-button.ts
@@ -1,5 +1,5 @@
1import { PlayerNetworkInfo } from '../peertube-videojs-typings' 1import { PlayerNetworkInfo } from '../peertube-videojs-typings'
2import videojs from 'video.js/dist/alt/video.core.js' 2import videojs from 'video.js'
3import { bytes } from '../utils' 3import { bytes } from '../utils'
4 4
5const Button = videojs.getComponent('Button') 5const Button = videojs.getComponent('Button')
diff --git a/client/src/assets/player/videojs-components/peertube-link-button.ts b/client/src/assets/player/videojs-components/peertube-link-button.ts
index 4151758d4..63e92eb77 100644
--- a/client/src/assets/player/videojs-components/peertube-link-button.ts
+++ b/client/src/assets/player/videojs-components/peertube-link-button.ts
@@ -1,5 +1,5 @@
1import { buildVideoLink } from '../utils' 1import { buildVideoLink } from '../utils'
2import videojs from 'video.js/dist/alt/video.core.js' 2import videojs from 'video.js'
3 3
4const Button = videojs.getComponent('Button') 4const Button = videojs.getComponent('Button')
5class PeerTubeLinkButton extends Button { 5class PeerTubeLinkButton extends Button {
diff --git a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts
index 395720c53..7869b56ce 100644
--- a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts
+++ b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3const Component = videojs.getComponent('Component') 3const Component = videojs.getComponent('Component')
4 4
diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/videojs-components/resolution-menu-button.ts
index d49ca0230..98e7f56fc 100644
--- a/client/src/assets/player/videojs-components/resolution-menu-button.ts
+++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3import { LoadedQualityData } from '../peertube-videojs-typings' 3import { LoadedQualityData } from '../peertube-videojs-typings'
4import { ResolutionMenuItem } from './resolution-menu-item' 4import { ResolutionMenuItem } from './resolution-menu-item'
diff --git a/client/src/assets/player/videojs-components/resolution-menu-item.ts b/client/src/assets/player/videojs-components/resolution-menu-item.ts
index cb0d219ad..73ad47d2b 100644
--- a/client/src/assets/player/videojs-components/resolution-menu-item.ts
+++ b/client/src/assets/player/videojs-components/resolution-menu-item.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import { AutoResolutionUpdateData, ResolutionUpdateData } from '../peertube-videojs-typings' 2import { AutoResolutionUpdateData, ResolutionUpdateData } from '../peertube-videojs-typings'
3 3
4const MenuItem = videojs.getComponent('MenuItem') 4const MenuItem = videojs.getComponent('MenuItem')
diff --git a/client/src/assets/player/videojs-components/settings-dialog.ts b/client/src/assets/player/videojs-components/settings-dialog.ts
index 8fd5ad96c..41911e7e8 100644
--- a/client/src/assets/player/videojs-components/settings-dialog.ts
+++ b/client/src/assets/player/videojs-components/settings-dialog.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3const Component = videojs.getComponent('Component') 3const Component = videojs.getComponent('Component')
4 4
diff --git a/client/src/assets/player/videojs-components/settings-menu-button.ts b/client/src/assets/player/videojs-components/settings-menu-button.ts
index 749128bdc..011323267 100644
--- a/client/src/assets/player/videojs-components/settings-menu-button.ts
+++ b/client/src/assets/player/videojs-components/settings-menu-button.ts
@@ -1,7 +1,7 @@
1// Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu 1// Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu
2import { SettingsMenuItem } from './settings-menu-item' 2import { SettingsMenuItem } from './settings-menu-item'
3import { toTitleCase } from '../utils' 3import { toTitleCase } from '../utils'
4import videojs from 'video.js/dist/alt/video.core.js' 4import videojs from 'video.js'
5 5
6import { SettingsDialog } from './settings-dialog' 6import { SettingsDialog } from './settings-dialog'
7import { SettingsPanel } from './settings-panel' 7import { SettingsPanel } from './settings-panel'
diff --git a/client/src/assets/player/videojs-components/settings-menu-item.ts b/client/src/assets/player/videojs-components/settings-menu-item.ts
index 8d364591b..f1342f179 100644
--- a/client/src/assets/player/videojs-components/settings-menu-item.ts
+++ b/client/src/assets/player/videojs-components/settings-menu-item.ts
@@ -1,6 +1,6 @@
1// Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu 1// Thanks to Yanko Shterev: https://github.com/yshterev/videojs-settings-menu
2import { toTitleCase } from '../utils' 2import { toTitleCase } from '../utils'
3import videojs from 'video.js/dist/alt/video.core.js' 3import videojs from 'video.js'
4import { SettingsButton } from './settings-menu-button' 4import { SettingsButton } from './settings-menu-button'
5import { SettingsDialog } from './settings-dialog' 5import { SettingsDialog } from './settings-dialog'
6import { SettingsPanel } from './settings-panel' 6import { SettingsPanel } from './settings-panel'
diff --git a/client/src/assets/player/videojs-components/settings-panel-child.ts b/client/src/assets/player/videojs-components/settings-panel-child.ts
index 6dee6d7df..d1582412c 100644
--- a/client/src/assets/player/videojs-components/settings-panel-child.ts
+++ b/client/src/assets/player/videojs-components/settings-panel-child.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3const Component = videojs.getComponent('Component') 3const Component = videojs.getComponent('Component')
4 4
diff --git a/client/src/assets/player/videojs-components/settings-panel.ts b/client/src/assets/player/videojs-components/settings-panel.ts
index 833ee2f21..1ad8bb1fc 100644
--- a/client/src/assets/player/videojs-components/settings-panel.ts
+++ b/client/src/assets/player/videojs-components/settings-panel.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2 2
3const Component = videojs.getComponent('Component') 3const Component = videojs.getComponent('Component')
4 4
diff --git a/client/src/assets/player/videojs-components/theater-button.ts b/client/src/assets/player/videojs-components/theater-button.ts
index 41875af71..f862ee224 100644
--- a/client/src/assets/player/videojs-components/theater-button.ts
+++ b/client/src/assets/player/videojs-components/theater-button.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import { saveTheaterInStore, getStoredTheater } from '../peertube-player-local-storage' 2import { saveTheaterInStore, getStoredTheater } from '../peertube-player-local-storage'
3 3
4const Button = videojs.getComponent('Button') 4const Button = videojs.getComponent('Button')
diff --git a/client/src/assets/player/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
index 26fb5a245..cb3deacc6 100644
--- a/client/src/assets/player/webtorrent/webtorrent-plugin.ts
+++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
@@ -1,4 +1,4 @@
1import videojs from 'video.js/dist/alt/video.core.js' 1import videojs from 'video.js'
2import * as WebTorrent from 'webtorrent' 2import * as WebTorrent from 'webtorrent'
3import { renderVideo } from './video-renderer' 3import { renderVideo } from './video-renderer'
4import { LoadedQualityData, PlayerNetworkInfo, WebtorrentPluginOptions } from '../peertube-videojs-typings' 4import { LoadedQualityData, PlayerNetworkInfo, WebtorrentPluginOptions } from '../peertube-videojs-typings'
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index 6616fab48..286757e5e 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -15,7 +15,7 @@ import {
15import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' 15import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type'
16import { PeerTubeEmbedApi } from './embed-api' 16import { PeerTubeEmbedApi } from './embed-api'
17import { TranslationsManager } from '../../assets/player/translations-manager' 17import { TranslationsManager } from '../../assets/player/translations-manager'
18import videojs from 'video.js/dist/alt/video.core.js' 18import videojs from 'video.js'
19import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' 19import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings'
20 20
21type Translations = { [ id: string ]: string } 21type Translations = { [ id: string ]: string }
diff --git a/client/tsconfig.json b/client/tsconfig.json
index d9e798f91..ce83a4f11 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -24,6 +24,7 @@
24 ], 24 ],
25 "baseUrl": "./", 25 "baseUrl": "./",
26 "paths": { 26 "paths": {
27 "video.js": [ "node_modules/video.js/core" ],
27 "@app/*": [ "src/app/*" ], 28 "@app/*": [ "src/app/*" ],
28 "@shared/*": [ "../shared/*" ], 29 "@shared/*": [ "../shared/*" ],
29 "fs": [ "src/shims/noop.ts" ], 30 "fs": [ "src/shims/noop.ts" ],
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index 84ab83669..252040bb7 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -27,7 +27,7 @@ module.exports = function () {
27 modules: [ helpers.root('src'), helpers.root('node_modules') ], 27 modules: [ helpers.root('src'), helpers.root('node_modules') ],
28 28
29 alias: { 29 alias: {
30 'video.js$': path.resolve('node_modules/video.js/dist/alt/video.core.novtt.js') 30 'video.js$': path.resolve('node_modules/video.js/core.js')
31 } 31 }
32 }, 32 },
33 33