Commit d7dec7d

committed

feat: make dynamic import disabling more clear

1 parent 3b55983 commit d7dec7dCopy full SHA for d7dec7d

File tree

+11

-22

lines changed

+11

-22

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ import Loadable from 'react-loadable';`
`3`	`3`	`import { Loading } from 'components/common';`
`4`	`4`	`import { fetchTodos } from 'actions/todos';`
`5`	`5`
	`6`	`+// NOTE: To turn off dynamic imports, import this container normally using:`
	`7`	`+// import TodosContainer from 'containers/Todos';`
`6`	`8`	`const TodosContainer = Loadable({`
`7`	`9`	`loader: () => import('../../containers/Todos'),`
`8`	`10`	`loading: Loading`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,15 +103,15 @@ export default function handleRender(req, res) {`
`103`	`103`	`</Provider>`
`104`	`104`	`);`
`105`	`105`
`106`		`- if (!config.enableDynamicImports) {`
`107`		`- return component;`
	`106`	`+ if (config.enableDynamicImports) {`
	`107`	`+ return (`
	`108`	`+ <Loadable.Capture report={moduleName => modules.push(moduleName)}>`
	`109`	`+ {component}`
	`110`	`+ </Loadable.Capture>`
	`111`	`+ );`
`108`	`112`	`}`
`109`	`113`
`110`		`- return (`
`111`		`- <Loadable.Capture report={moduleName => modules.push(moduleName)}>`
`112`		`- {component}`
`113`		`- </Loadable.Capture>`
`114`		`- );`
	`114`	`+ return component;`
`115`	`115`	`};`
`116`	`116`
`117`	`117`	`// Execute the render only after all promises have been resolved.`

Lines changed: 2 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ const entry = [`
`18`	`18`
`19`	`19`	`// Additional plugins`
`20`	`20`	`let plugins = [`
	`21`	`+ ...baseConfig.plugins,`
`21`	`22`	`new webpack.HotModuleReplacementPlugin(),`
`22`	`23`	`new webpack.NoEmitOnErrorsPlugin(),`
`23`	`24`	`new webpack.NamedModulesPlugin()`
`@@ -31,9 +32,6 @@ if (!config.enableDynamicImports) {`
`31`	`32`	`}));`
`32`	`33`	`}`
`33`	`34`
`34`		`-// Additional loaders`
`35`		`-const loaders = [];`
`36`		`-`
`37`	`35`	`const webpackConfig = {`
`38`	`36`	`...baseConfig,`
`39`	`37`	`devtool: 'eval',`
`@@ -44,18 +42,7 @@ const webpackConfig = {`
`44`	`42`	`...baseConfig.entry.app`
`45`	`43`	`]`
`46`	`44`	`},`
`47`		`- plugins: [`
`48`		`- // don't use the first plugin (isomorphic plugin)`
`49`		`- ...baseConfig.plugins,`
`50`		`- ...plugins`
`51`		`- ],`
`52`		`- module: {`
`53`		`- ...baseConfig.module,`
`54`		`- rules: [`
`55`		`- ...baseConfig.module.rules,`
`56`		`- ...loaders`
`57`		`- ]`
`58`		`- }`
	`45`	`+ plugins`
`59`	`46`	`};`
`60`	`47`
`61`	`48`	`console.info('Firing up Webpack dev server...\n');`

Comments

(0)