aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/webpack
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-06-26 08:37:26 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-07 08:28:14 +0200
commit583eb04b541175035d6d452ca626a96ebf2b7437 (patch)
tree114ba0a7004b4b2a7fc77444ef5fcb73414c6e93 /client/webpack
parent4504f09f6e85f09b0489debb547a17209d7176ea (diff)
downloadPeerTube-583eb04b541175035d6d452ca626a96ebf2b7437.tar.gz
PeerTube-583eb04b541175035d6d452ca626a96ebf2b7437.tar.zst
PeerTube-583eb04b541175035d6d452ca626a96ebf2b7437.zip
Upgrade to angular 10
Diffstat (limited to 'client/webpack')
-rw-r--r--client/webpack/webpack.video-embed.js18
1 files changed, 4 insertions, 14 deletions
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js
index b6a1c4c05..83622a974 100644
--- a/client/webpack/webpack.video-embed.js
+++ b/client/webpack/webpack.video-embed.js
@@ -1,7 +1,6 @@
1const helpers = require('./helpers') 1const helpers = require('./helpers')
2const path = require('path') 2const path = require('path')
3 3
4const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin
5const HtmlWebpackPlugin = require('html-webpack-plugin') 4const HtmlWebpackPlugin = require('html-webpack-plugin')
6const TerserPlugin = require('terser-webpack-plugin') 5const TerserPlugin = require('terser-webpack-plugin')
7const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin') 6const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin')
@@ -29,7 +28,7 @@ module.exports = function () {
29 alias: { 28 alias: {
30 'video.js$': path.resolve('node_modules/video.js/core.js'), 29 'video.js$': path.resolve('node_modules/video.js/core.js'),
31 '@root-helpers': path.resolve('src/root-helpers'), 30 '@root-helpers': path.resolve('src/root-helpers'),
32 '@shared': path.resolve('../shared') 31 '@shared/models': path.resolve('../shared/models'),
33 } 32 }
34 }, 33 },
35 34
@@ -54,13 +53,12 @@ module.exports = function () {
54 test: /\.ts$/, 53 test: /\.ts$/,
55 use: [ 54 use: [
56 { 55 {
57 loader: 'awesome-typescript-loader', 56 loader: 'ts-loader',
58 options: { 57 options: {
59 configFileName: 'tsconfig.json' 58 configFile: 'tsconfig.base.json'
60 } 59 }
61 } 60 }
62 ], 61 ]
63 exclude: [/\.(spec|e2e)\.ts$/]
64 }, 62 },
65 63
66 { 64 {
@@ -75,12 +73,6 @@ module.exports = function () {
75 importLoaders: 1 73 importLoaders: 1
76 } 74 }
77 }, 75 },
78 // {
79 // loader: 'resolve-url-loader',
80 // options: {
81 // debug: true
82 // }
83 // },
84 { 76 {
85 loader: 'sass-loader', 77 loader: 'sass-loader',
86 options: { 78 options: {
@@ -135,8 +127,6 @@ module.exports = function () {
135 } 127 }
136 }), 128 }),
137 129
138 new CheckerPlugin(),
139
140 new HtmlWebpackPlugin({ 130 new HtmlWebpackPlugin({
141 template: 'src/standalone/videos/embed.html', 131 template: 'src/standalone/videos/embed.html',
142 filename: 'embed.html', 132 filename: 'embed.html',