PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Allow external assets loading (#25998)

Browse source
This commit is contained in:
Germain 2023-08-18 09:45:32 +01:00 committed by GitHub
parent 062e93a5d2
commit d9b4e531b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webpack.config.js
View file

@ -725,14 +725,20 @@ module.exports = (env, argv) => {
* @return {string} The returned paths will look like `img/warning.1234567.svg`. * @return {string} The returned paths will look like `img/warning.1234567.svg`.
*/ */
function getAssetOutputPath(url, resourcePath) { function getAssetOutputPath(url, resourcePath) {
const isKaTeX = resourcePath.includes("KaTeX");
// `res` is the parent dir for our own assets in various layers // `res` is the parent dir for our own assets in various layers
// `dist` is the parent dir for KaTeX assets // `dist` is the parent dir for KaTeX assets
const prefix = /^.*[/\\](dist|res)[/\\]/; const prefix = /^.*[/\\](dist|res)[/\\]/;
if (!resourcePath.match(prefix)) { /**
* Only needed for https://github.com/vector-im/element-web/pull/15939
* If keeping this, we are not able to load external assets such as SVG
* images coming from @vector-im/compound-web.
*/
if (isKaTeX && !resourcePath.match(prefix)) {
throw new Error(`Unexpected asset path: ${resourcePath}`); throw new Error(`Unexpected asset path: ${resourcePath}`);
} }
let outputDir = path.dirname(resourcePath).replace(prefix, ""); let outputDir = path.dirname(resourcePath).replace(prefix, "");
if (resourcePath.includes("KaTeX")) { if (isKaTeX) {
// Add a clearly named directory segment, rather than leaving the KaTeX // Add a clearly named directory segment, rather than leaving the KaTeX
// assets loose in each asset type directory. // assets loose in each asset type directory.
outputDir = path.join(outputDir, "KaTeX"); outputDir = path.join(outputDir, "KaTeX");