cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Akihiko Odaki 2017-05-10 02:51:45 +09:00 committed by Eugen Rochko
parent 08e94d1b19
commit af6a84da14
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/packs/application.js
View File

@ -15,12 +15,7 @@ window.Perf = require('react-addons-perf');
Rails.start(); Rails.start();
require.context('../images/', true); require.context('../images/', true);
require.context('../../assets/stylesheets/', false, /custom.*\.scss$/);
const customContext = require.context('../../assets/stylesheets/', false);
if (customContext.keys().indexOf('./custom.scss') !== -1) {
customContext('./custom.scss');
}
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const mountNode = document.getElementById('mastodon'); const mountNode = document.getElementById('mastodon');