Unverified Commit 5030486a authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Don’t add loadable if it’s not used (#7995)

parent 4347fa4d
...@@ -296,7 +296,7 @@ Loadable.preloadAll = () => { ...@@ -296,7 +296,7 @@ Loadable.preloadAll = () => {
}) })
} }
Loadable.preloadReady = ids => { Loadable.preloadReady = (ids = []) => {
return new Promise(resolve => { return new Promise(resolve => {
const res = () => { const res = () => {
initialized = true initialized = true
...@@ -307,4 +307,8 @@ Loadable.preloadReady = ids => { ...@@ -307,4 +307,8 @@ Loadable.preloadReady = ids => {
}) })
} }
if (typeof window !== 'undefined') {
window.__NEXT_PRELOADREADY = Loadable.preloadReady
}
export default Loadable export default Loadable
...@@ -7,7 +7,6 @@ import mitt from 'next-server/dist/lib/mitt' ...@@ -7,7 +7,6 @@ import mitt from 'next-server/dist/lib/mitt'
import { loadGetInitialProps, getURL } from 'next-server/dist/lib/utils' import { loadGetInitialProps, getURL } from 'next-server/dist/lib/utils'
import PageLoader from './page-loader' import PageLoader from './page-loader'
import * as envConfig from 'next-server/config' import * as envConfig from 'next-server/config'
import Loadable from 'next-server/dist/lib/loadable'
import { HeadManagerContext } from 'next-server/dist/lib/head-manager-context' import { HeadManagerContext } from 'next-server/dist/lib/head-manager-context'
import { DataManagerContext } from 'next-server/dist/lib/data-manager-context' import { DataManagerContext } from 'next-server/dist/lib/data-manager-context'
import { RouterContext } from 'next-server/dist/lib/router-context' import { RouterContext } from 'next-server/dist/lib/router-context'
...@@ -155,7 +154,9 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => { ...@@ -155,7 +154,9 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
initialErr = error initialErr = error
} }
await Loadable.preloadReady(dynamicIds || []) if (window.__NEXT_PRELOADREADY) {
await window.__NEXT_PRELOADREADY(dynamicIds)
}
if (dynamicBuildId === true) { if (dynamicBuildId === true) {
pageLoader.onDynamicBuildId() pageLoader.onDynamicBuildId()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment