diff options
author | Chocobozzz <me@florianbigard.com> | 2021-08-17 14:31:30 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-08-17 14:31:30 +0200 |
commit | adb8809d43648ea0a64d6845bb39aa3bd0e005a6 (patch) | |
tree | affb946e1d63532046b569fe527789010bd7bace | |
parent | 1d4591fd9c724c9409da31612f6d8c008f1cb5e4 (diff) | |
download | PeerTube-adb8809d43648ea0a64d6845bb39aa3bd0e005a6.tar.gz PeerTube-adb8809d43648ea0a64d6845bb39aa3bd0e005a6.tar.zst PeerTube-adb8809d43648ea0a64d6845bb39aa3bd0e005a6.zip |
Fix webpack config
-rw-r--r-- | client/package.json | 3 | ||||
-rw-r--r-- | client/webpack/webpack.video-embed.js | 14 | ||||
-rw-r--r-- | client/yarn.lock | 10 |
3 files changed, 10 insertions, 17 deletions
diff --git a/client/package.json b/client/package.json index 6a9529cf6..1a04106f4 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -75,7 +75,6 @@ | |||
75 | "css-loader": "^6.2.0", | 75 | "css-loader": "^6.2.0", |
76 | "debug": "^4.3.1", | 76 | "debug": "^4.3.1", |
77 | "dexie": "^3.0.0", | 77 | "dexie": "^3.0.0", |
78 | "file-loader": "^6.0.0", | ||
79 | "focus-visible": "^5.0.2", | 78 | "focus-visible": "^5.0.2", |
80 | "hls.js": "^1.0.7", | 79 | "hls.js": "^1.0.7", |
81 | "html-loader": "^2.1.2", | 80 | "html-loader": "^2.1.2", |
@@ -99,7 +98,7 @@ | |||
99 | "process": "^0.11.10", | 98 | "process": "^0.11.10", |
100 | "protractor": "~7.0.0", | 99 | "protractor": "~7.0.0", |
101 | "purify-css": "^1.2.5", | 100 | "purify-css": "^1.2.5", |
102 | "raw-loader": "^4.0.0", | 101 | "raw-loader": "^4.0.2", |
103 | "rxjs": "^7.3.0", | 102 | "rxjs": "^7.3.0", |
104 | "sanitize-html": "^2.1.2", | 103 | "sanitize-html": "^2.1.2", |
105 | "sass": "^1.34.0", | 104 | "sass": "^1.34.0", |
diff --git a/client/webpack/webpack.video-embed.js b/client/webpack/webpack.video-embed.js index 2ecbd09af..8320d01e7 100644 --- a/client/webpack/webpack.video-embed.js +++ b/client/webpack/webpack.video-embed.js | |||
@@ -105,21 +105,23 @@ module.exports = function () { | |||
105 | 105 | ||
106 | { | 106 | { |
107 | test: /\.html$/, | 107 | test: /\.html$/, |
108 | use: 'raw-loader', | ||
109 | exclude: [ | 108 | exclude: [ |
110 | helpers.root('src/index.html'), | 109 | helpers.root('src/index.html'), |
111 | helpers.root('src/standalone/videos/embed.html'), | 110 | helpers.root('src/standalone/videos/embed.html'), |
112 | helpers.root('src/standalone/videos/test-embed.html') | 111 | helpers.root('src/standalone/videos/test-embed.html') |
113 | ] | 112 | ], |
113 | type: 'asset/source' | ||
114 | }, | 114 | }, |
115 | 115 | ||
116 | { | 116 | { |
117 | test: /\.(jpg|png|gif)$/, | 117 | test: /\.(jpg|png|gif|svg)$/, |
118 | use: 'url-loader' | 118 | type: 'asset' |
119 | }, | 119 | }, |
120 | 120 | ||
121 | { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' }, | 121 | { |
122 | { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' } | 122 | test: /\.(ttf|eot|woff2?)$/, |
123 | type: 'asset' | ||
124 | } | ||
123 | ] | 125 | ] |
124 | 126 | ||
125 | }, | 127 | }, |
diff --git a/client/yarn.lock b/client/yarn.lock index 6f087589f..b2120b31b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -4471,14 +4471,6 @@ file-entry-cache@^6.0.1: | |||
4471 | dependencies: | 4471 | dependencies: |
4472 | flat-cache "^3.0.4" | 4472 | flat-cache "^3.0.4" |
4473 | 4473 | ||
4474 | file-loader@^6.0.0: | ||
4475 | version "6.2.0" | ||
4476 | resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" | ||
4477 | integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== | ||
4478 | dependencies: | ||
4479 | loader-utils "^2.0.0" | ||
4480 | schema-utils "^3.0.0" | ||
4481 | |||
4482 | file-uri-to-path@1.0.0: | 4474 | file-uri-to-path@1.0.0: |
4483 | version "1.0.0" | 4475 | version "1.0.0" |
4484 | resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" | 4476 | resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" |
@@ -8653,7 +8645,7 @@ raw-body@2.4.0: | |||
8653 | iconv-lite "0.4.24" | 8645 | iconv-lite "0.4.24" |
8654 | unpipe "1.0.0" | 8646 | unpipe "1.0.0" |
8655 | 8647 | ||
8656 | raw-loader@^4.0.0: | 8648 | raw-loader@^4.0.2: |
8657 | version "4.0.2" | 8649 | version "4.0.2" |
8658 | resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" | 8650 | resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" |
8659 | integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA== | 8651 | integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA== |