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

Remove all the inline code.

Browse source
This commit is contained in:
Arunoda Susiripala 2017-04-05 17:13:34 +05:30
parent 822a99b0d5
commit 76bfc38a09
4 changed files with 48 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/index.js
View file

@ -35,7 +35,15 @@ if (window.NEXT_LOADED_PAGES) {
} }
const ErrorComponent = pageLoader.loadPageSync('/_error') const ErrorComponent = pageLoader.loadPageSync('/_error')
const Component = pageLoader.loadPageSync(pathname) || ErrorComponent let Component
try {
Component = pageLoader.loadPageSync(pathname)
} catch (err) {
console.error(`${err.message}\n${err.stack}`)
Component = ErrorComponent
}
let lastAppProps let lastAppProps
export const router = createRouter(pathname, query, getURL(), { export const router = createRouter(pathname, query, getURL(), {

15
server/document.js
View file

@ -95,25 +95,16 @@ export class NextScript extends Component {
return this.getChunkScript('app.js', { async: true }) return this.getChunkScript('app.js', { async: true })
} }
getMainComponents () {
const { component, errorComponent } = this.context._documentProps
return (
<div>
<script dangerouslySetInnerHTML={{ __html: component }} />
<script dangerouslySetInnerHTML={{ __html: errorComponent }} />
</div>
)
}
render () { render () {
const { staticMarkup, __NEXT_DATA__ } = this.context._documentProps const { staticMarkup, __NEXT_DATA__ } = this.context._documentProps
const { pathname, buildId } = __NEXT_DATA__
return <div> return <div>
{staticMarkup ? null : <script dangerouslySetInnerHTML={{ {staticMarkup ? null : <script dangerouslySetInnerHTML={{
__html: `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}; module={};` __html: `__NEXT_DATA__ = ${htmlescape(__NEXT_DATA__)}; module={};`
}} />} }} />}
{staticMarkup ? null : this.getMainComponents()} <script type='text/javascript' src={`/_next/${buildId}/page${pathname}`} />
<script type='text/javascript' src={`/_next/${buildId}/page/_error`} />
{staticMarkup ? null : this.getScripts()} {staticMarkup ? null : this.getScripts()}
</div> </div>
} }

12
server/index.js
View file

@ -114,6 +114,18 @@ export default class Server {
await this.serveStatic(req, res, p) await this.serveStatic(req, res, p)
}, },
'/_next/:buildId/page/_error': async (req, res, params) => {
if (!this.handleBuildId(params.buildId, res)) {
const error = new Error('INVALID_BUILD_ID')
const customFields = { buildIdMismatched: true }
return await renderScriptError(req, res, '/_error', error, customFields, this.renderOpts)
}
const p = join(this.dir, '.next/client-bundles/pages/_error.js')
await this.serveStatic(req, res, p)
},
'/_next/:buildId/page/:path*': async (req, res, params) => { '/_next/:buildId/page/:path*': async (req, res, params) => {
const paths = params.path || [''] const paths = params.path || ['']
const page = `/${paths.join('/')}` const page = `/${paths.join('/')}`

30
server/render.js
View file

@ -131,10 +131,19 @@ export async function renderScriptError (req, res, page, error, customFields, op
if (error.code === 'ENOENT') { if (error.code === 'ENOENT') {
res.setHeader('Content-Type', 'text/javascript') res.setHeader('Content-Type', 'text/javascript')
res.end(` res.end(`
var error = new Error('Page not exists: ${page}') function loadPage () {
error.pageNotFound = true var error = new Error('Page not exists: ${page}')
error.statusCode = 404 error.pageNotFound = true
NEXT_PAGE_LOADER.registerPage('${page}', error) error.statusCode = 404
NEXT_PAGE_LOADER.registerPage('${page}', error)
}
if (window.NEXT_PAGE_LOADER) {
loadPage()
} else {
window.NEXT_LOADED_PAGES = window.NEXT_LOADED_PAGES || []
window.NEXT_LOADED_PAGES.push(loadPage)
}
`) `)
return return
} }
@ -146,8 +155,17 @@ export async function renderScriptError (req, res, page, error, customFields, op
} }
res.end(` res.end(`
var error = ${JSON.stringify(errorJson)} function loadPage () {
NEXT_PAGE_LOADER.registerPage('${page}', error) var error = ${JSON.stringify(errorJson)}
NEXT_PAGE_LOADER.registerPage('${page}', error)
}
if (window.NEXT_PAGE_LOADER) {
loadPage()
} else {
window.NEXT_LOADED_PAGES = window.NEXT_LOADED_PAGES || []
window.NEXT_LOADED_PAGES.push(loadPage)
}
`) `)
} }