zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Exclude packs/custom.js from webpack compilation to prevent breakage (#3719) 

due to the change in #3373
This commit is contained in:
Eugen Rochko 2017-06-13 03:55:36 +02:00 committed by GitHub
parent 47ace633dc
commit 85af2405cf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/webpack/shared.js
View File

@ -12,7 +12,7 @@ const localePackPaths = require('./generateLocalePacks');
const extensionGlob = `**/*{${paths.extensions.join(',')}}*`; const extensionGlob = `**/*{${paths.extensions.join(',')}}*`;
const packPaths = sync(join(paths.source, paths.entry, extensionGlob)); const packPaths = sync(join(paths.source, paths.entry, extensionGlob));
const entryPacks = [].concat(packPaths).concat(localePackPaths); const entryPacks = [].concat(packPaths).concat(localePackPaths).filter(path => path !== join(paths.source, paths.entry, 'custom.js'));
const customApplicationStyle = resolve(join(paths.source, 'styles/custom.scss')); const customApplicationStyle = resolve(join(paths.source, 'styles/custom.scss'));
const originalApplicationStyle = resolve(join(paths.source, 'styles/application.scss')); const originalApplicationStyle = resolve(join(paths.source, 'styles/application.scss'));