terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Fix some issues related to rendering.

Browse source
This commit is contained in:
Arunoda Susiripala 2017-04-05 02:38:38 +05:30
parent e3d68ff401
commit 03209d88fd
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/index.js
View file

@ -31,13 +31,13 @@ const {
location location
} = window } = window
window.NEXT_PAGE_LOADER = new PageLoader(buildId) const pageLoader = window.NEXT_PAGE_LOADER = new PageLoader(buildId)
const Component = evalScript(component).default const Component = evalScript(component).default
const ErrorComponent = evalScript(errorComponent).default const ErrorComponent = evalScript(errorComponent).default
let lastAppProps let lastAppProps
export const router = createRouter(pathname, query, getURL(), { export const router = createRouter(pathname, query, getURL(), {
pageLoader,
Component, Component,
ErrorComponent, ErrorComponent,
err err

9
lib/router/router.js
View file

@ -1,5 +1,3 @@
/* global NEXT_PAGE_LOADER */
import { parse, format } from 'url' import { parse, format } from 'url'
import mitt from 'mitt' import mitt from 'mitt'
import shallowEquals from '../shallow-equals' import shallowEquals from '../shallow-equals'
@ -10,7 +8,7 @@ import { _notifyBuildIdMismatch } from './'
const webpackModule = module const webpackModule = module
export default class Router { export default class Router {
constructor (pathname, query, as, { Component, ErrorComponent, err } = {}) { constructor (pathname, query, as, { pageLoader, Component, ErrorComponent, err } = {}) {
// represents the current component key // represents the current component key
this.route = toRoute(pathname) this.route = toRoute(pathname)
@ -26,6 +24,7 @@ export default class Router {
// Handling Router Events // Handling Router Events
this.events = mitt() this.events = mitt()
this.pageLoader = pageLoader
this.prefetchQueue = new PQueue({ concurrency: 2 }) this.prefetchQueue = new PQueue({ concurrency: 2 })
this.ErrorComponent = ErrorComponent this.ErrorComponent = ErrorComponent
this.pathname = pathname this.pathname = pathname
@ -80,7 +79,7 @@ export default class Router {
async reload (route) { async reload (route) {
delete this.components[route] delete this.components[route]
NEXT_PAGE_LOADER.clearCache(route) this.pageLoader.clearCache(route)
if (route !== this.route) return if (route !== this.route) return
@ -335,7 +334,7 @@ export default class Router {
}) })
} }
return await NEXT_PAGE_LOADER.loadPage(route) return await this.pageLoader.loadPage(route)
} }
abortComponentLoad (as) { abortComponentLoad (as) {

2
server/build/plugins/pages-plugin.js
View file

@ -12,7 +12,7 @@ export default class PagesPlugin {
pages.forEach((chunk) => { pages.forEach((chunk) => {
const page = compilation.assets[chunk.name] const page = compilation.assets[chunk.name]
const pageName = matchRouteName.exec(chunk.name)[1] const pageName = matchRouteName.exec(chunk.name)[1]
const routeName = `/${pageName.replace(/index$/, '')}` const routeName = `/${pageName.replace(/[/\\]index$/, '')}`
const content = page.source() const content = page.source()
const newContent = ` const newContent = `