ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Name the Webpack chunks (#3291)

rebase/4.0.0rc2
Nolan Lawson 2017-05-24 18:30:29 -07:00 committed by Eugen Rochko
parent 3572138b16
commit 135bdd149e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
View File

@ -49,7 +49,7 @@ class EmojiPickerDropdown extends React.PureComponent {
this.setState({active: true}); this.setState({active: true});
if (!EmojiPicker) { if (!EmojiPicker) {
this.setState({loading: true}); this.setState({loading: true});
import('emojione-picker').then(TheEmojiPicker => { import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
EmojiPicker = TheEmojiPicker.default; EmojiPicker = TheEmojiPicker.default;
this.setState({loading: false}); this.setState({loading: false});
}).catch(err => { }).catch(err => {

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

@ -18,13 +18,13 @@ const needsExtraPolyfills = !(
// This avoids shipping them all the polyfills. // This avoids shipping them all the polyfills.
if (needsBasePolyfills) { if (needsBasePolyfills) {
Promise.all([ Promise.all([
import('../mastodon/base_polyfills'), import(/* webpackChunkName: "base_polyfills" */ '../mastodon/base_polyfills'),
import('../mastodon/extra_polyfills'), import(/* webpackChunkName: "extra_polyfills" */ '../mastodon/extra_polyfills'),
]).then(main).catch(e => { ]).then(main).catch(e => {
console.error(e); // eslint-disable-line no-console console.error(e); // eslint-disable-line no-console
}); });
} else if (needsExtraPolyfills) { } else if (needsExtraPolyfills) {
import('../mastodon/extra_polyfills').then(main).catch(e => { import(/* webpackChunkName: "extra_polyfills" */ '../mastodon/extra_polyfills').then(main).catch(e => {
console.error(e); // eslint-disable-line no-console console.error(e); // eslint-disable-line no-console
}); });
} else { } else {