Commit 5a0dcbc9 authored by JJ Kasper's avatar JJ Kasper Committed by Joe Haddad

Update pages-loader to return one value (#8629)

* Update pages-loader to return one value

* de-dupe page mod update also
parent fcadad99
...@@ -13,15 +13,15 @@ const nextClientPagesLoader: loader.Loader = function() { ...@@ -13,15 +13,15 @@ const nextClientPagesLoader: loader.Loader = function() {
return ` return `
(window.__NEXT_P=window.__NEXT_P||[]).push([${stringifiedPage}, function() { (window.__NEXT_P=window.__NEXT_P||[]).push([${stringifiedPage}, function() {
var page = require(${stringifiedAbsolutePagePath}) var mod = require(${stringifiedAbsolutePagePath})
if(module.hot) { if(module.hot) {
module.hot.accept(${stringifiedAbsolutePagePath}, function() { module.hot.accept(${stringifiedAbsolutePagePath}, function() {
if(!next.router.components[${stringifiedPage}]) return if(!next.router.components[${stringifiedPage}]) return
var updatedPage = require(${stringifiedAbsolutePagePath}) var updatedPage = require(${stringifiedAbsolutePagePath})
next.router.update(${stringifiedPage}, updatedPage.default || updatedPage) next.router.update(${stringifiedPage}, updatedPage)
}) })
} }
return { page: page.default || page } return mod
}]); }]);
` `
} }
......
...@@ -141,9 +141,10 @@ export default class PageLoader { ...@@ -141,9 +141,10 @@ export default class PageLoader {
registerPage (route, regFn) { registerPage (route, regFn) {
const register = () => { const register = () => {
try { try {
const { error, page } = regFn() const mod = regFn()
this.pageCache[route] = { error, page } const pageData = { page: mod.default || mod, mod }
this.pageRegisterEvents.emit(route, { error, page }) this.pageCache[route] = pageData
this.pageRegisterEvents.emit(route, pageData)
} catch (error) { } catch (error) {
this.pageCache[route] = { error } this.pageCache[route] = { error }
this.pageRegisterEvents.emit(route, { error }) this.pageRegisterEvents.emit(route, { error })
......
...@@ -195,7 +195,8 @@ export default class Router implements BaseRouter { ...@@ -195,7 +195,8 @@ export default class Router implements BaseRouter {
this.replace(url, as, options) this.replace(url, as, options)
} }
update(route: string, Component: ComponentType) { update(route: string, mod: any) {
const Component: ComponentType = mod.default || mod
const data = this.components[route] const data = this.components[route]
if (!data) { if (!data) {
throw new Error(`Cannot update unavailable route: ${route}`) throw new Error(`Cannot update unavailable route: ${route}`)
......
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