Merge pull request #9869 from vector-im/jryans/twemoji-windows

Fix Twemoji loading on Windows dev machines
This commit is contained in:
J. Ryan Stinnett 2019-05-28 18:25:38 +01:00 committed by GitHub
commit 53d8341886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -76,7 +76,7 @@ module.exports = {
// lifetime for assets while still delivering changes quickly. // lifetime for assets while still delivering changes quickly.
oneOf: [ oneOf: [
{ {
// Images referenced in CSS files // Assets referenced in CSS files
issuer: /\.(scss|css)$/, issuer: /\.(scss|css)$/,
loader: 'file-loader', loader: 'file-loader',
options: { options: {
@ -92,11 +92,15 @@ module.exports = {
}, },
}, },
{ {
// Images referenced in HTML and JS files // Assets referenced in HTML and JS files
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[hash:7].[ext]', name: '[name].[hash:7].[ext]',
outputPath: getImgOutputPath, outputPath: getImgOutputPath,
publicPath: function(url, resourcePath) {
const outputPath = getImgOutputPath(url, resourcePath);
return toPublicPath(outputPath);
},
}, },
}, },
], ],