aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-04-17 12:24:18 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-04-26 21:22:51 +0200
commit240c64c5f4277f0ce36c094f0663bd30d264ec40 (patch)
tree35f24d8287153bf6991004c454701d1257b2b7b9
parentc689fcdca23e8693b6b6386fff779f9330f7f1c4 (diff)
downloadPeerTube-240c64c5f4277f0ce36c094f0663bd30d264ec40.tar.gz
PeerTube-240c64c5f4277f0ce36c094f0663bd30d264ec40.tar.zst
PeerTube-240c64c5f4277f0ce36c094f0663bd30d264ec40.zip
Client: avoid loading javascript ressource over the network
-rw-r--r--client/config/webpack.common.js22
-rw-r--r--client/package.json2
2 files changed, 2 insertions, 22 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 35ea8ed28..80d77b400 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -72,11 +72,7 @@ module.exports = function (options) {
72 */ 72 */
73 extensions: [ '.ts', '.js', '.json', '.scss' ], 73 extensions: [ '.ts', '.js', '.json', '.scss' ],
74 74
75 modules: [ helpers.root('src'), helpers.root('node_modules') ], 75 modules: [ helpers.root('src'), helpers.root('node_modules') ]
76
77 alias: {
78 'video.js': 'video.js/dist/alt/video.novtt'
79 }
80 }, 76 },
81 77
82 /* 78 /*
@@ -224,22 +220,6 @@ module.exports = function (options) {
224 to: 'assets/webtorrent' 220 to: 'assets/webtorrent'
225 }, 221 },
226 { 222 {
227 from: 'node_modules/video.js/dist/video.min.js',
228 to: 'assets/video-js'
229 },
230 {
231 from: 'node_modules/video.js/dist/video-js.min.css',
232 to: 'assets/video-js'
233 },
234 {
235 from: 'node_modules/videojs-dock/dist/videojs-dock.min.js',
236 to: 'assets/video-js'
237 },
238 {
239 from: 'node_modules/videojs-dock/dist/videojs-dock.css',
240 to: 'assets/video-js'
241 },
242 {
243 from: 'src/standalone', 223 from: 'src/standalone',
244 to: 'standalone' 224 to: 'standalone'
245 } 225 }
diff --git a/client/package.json b/client/package.json
index 3e68007de..84cb8e13a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -78,7 +78,7 @@
78 "tslint-loader": "^3.3.0", 78 "tslint-loader": "^3.3.0",
79 "typescript": "~2.2.0", 79 "typescript": "~2.2.0",
80 "url-loader": "^0.5.7", 80 "url-loader": "^0.5.7",
81 "video.js": "^5.11.9", 81 "video.js": "^5.19.2",
82 "videojs-dock": "^2.0.2", 82 "videojs-dock": "^2.0.2",
83 "webpack": "^2.2.0", 83 "webpack": "^2.2.0",
84 "webpack-md5-hash": "0.0.5", 84 "webpack-md5-hash": "0.0.5",