treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Name the Webpack chunks (#3291)

lolsob-rspec
Nolan Lawson 2017-05-24 18:30:29 -07:00 committed by Eugen Rochko
parent 1a1c5a0271
commit 576afed755
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});
if (!EmojiPicker) {
this.setState({loading: true});
import('emojione-picker').then(TheEmojiPicker => {
import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
EmojiPicker = TheEmojiPicker.default;
this.setState({loading: false});
}).catch(err => {

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

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