mirror of
https://github.com/kikobar/mastodon.git
synced 2024-12-23 22:34:13 +00:00
Use RegExp for require.context to filter custom stylesheets (#2950)
ExtractTextWebpackPlugin extracts the content of loaded files, which means it loads files loaded by require.context but not required after that. However the former implementation is not aware of that. require.context can have a RegExp to filter files to load. This change gives a RegExp which matches with SCSSes with 'custom' prefix to require.context to take advantage of the feature.
This commit is contained in:
parent
08e94d1b19
commit
af6a84da14
|
@ -15,12 +15,7 @@ window.Perf = require('react-addons-perf');
|
|||
Rails.start();
|
||||
|
||||
require.context('../images/', true);
|
||||
|
||||
const customContext = require.context('../../assets/stylesheets/', false);
|
||||
|
||||
if (customContext.keys().indexOf('./custom.scss') !== -1) {
|
||||
customContext('./custom.scss');
|
||||
}
|
||||
require.context('../../assets/stylesheets/', false, /custom.*\.scss$/);
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const mountNode = document.getElementById('mastodon');
|
||||
|
|
Loading…
Reference in a new issue