Get rid of eval

client/index.js

@@ -4,9 +4,9 @@ import mitt from 'mitt'
 import HeadManager from './head-manager'
 import { createRouter } from '../lib/router'
 import App from '../lib/app'
-import evalScript from '../lib/eval-script'
 import { loadGetInitialProps, getURL } from '../lib/utils'
 import ErrorDebugComponent from '../lib/error-debug'
+import PageLoader from '../lib/page-loader'
 
 // Polyfill Promise globally
 // This is needed because Webpack2's dynamic loading(common chunks) code
@@ -19,31 +19,47 @@ if (!window.Promise) {
 
 const {
   __NEXT_DATA__: {
-    component,
-    errorComponent,
     props,
     err,
     pathname,
-    query
+    query,
+    buildId
   },
   location
 } = window
 
-const Component = evalScript(component).default
-const ErrorComponent = evalScript(errorComponent).default
-let lastAppProps
-
-export const router = createRouter(pathname, query, getURL(), {
-  Component,
-  ErrorComponent,
-  err
-})
+const pageLoader = window.__NEXT_PAGE_LOADER__ = new PageLoader(buildId)
+if (window.__NEXT_LOADED_PAGES__) {
+  window.__NEXT_LOADED_PAGES__.forEach((fn) => fn())
+  delete window.__NEXT_LOADED_PAGES__
+}
 
 const headManager = new HeadManager()
 const appContainer = document.getElementById('__next')
 const errorContainer = document.getElementById('__next-error')
 
-export default () => {
+let lastAppProps
+export let router
+export let ErrorComponent
+let Component
+
+export default async () => {
+  ErrorComponent = await pageLoader.loadPage('/_error')
+
+  try {
+    Component = await pageLoader.loadPage(pathname)
+  } catch (err) {
+    console.error(`${err.message}\n${err.stack}`)
+    Component = ErrorComponent
+  }
+
+  router = createRouter(pathname, query, getURL(), {
+    pageLoader,
+    Component,
+    ErrorComponent,
+    err
+  })
+
   const emitter = mitt()
 
   router.subscribe(({ Component, props, hash, err }) => {
@@ -57,7 +73,10 @@ export default () => {
 }
 
 export async function render (props) {
-  if (props.err) {
+  // There are some errors we should ignore.
+  // Next.js rendering logic knows how to handle them.
+  // These are specially 404 errors
+  if (props.err && !props.err.ignore) {
     await renderError(props.err)
     return
   }
@@ -103,7 +122,7 @@ async function doRender ({ Component, props, hash, err, emitter }) {
   }
 
   if (emitter) {
-    emitter.emit('before-reactdom-render', { Component })
+    emitter.emit('before-reactdom-render', { Component, ErrorComponent })
   }
 
   Component = Component || lastAppProps.Component
@@ -118,6 +137,6 @@ async function doRender ({ Component, props, hash, err, emitter }) {
   ReactDOM.render(createElement(App, appProps), appContainer)
 
   if (emitter) {
-    emitter.emit('after-reactdom-render', { Component })
+    emitter.emit('after-reactdom-render', { Component, ErrorComponent })
   }
 }

client/next-dev.js

@@ -1,14 +1,40 @@
-import evalScript from '../lib/eval-script'
+import 'react-hot-loader/patch'
 import ReactReconciler from 'react-dom/lib/ReactReconciler'
-
-const { __NEXT_DATA__: { errorComponent } } = window
-const ErrorComponent = evalScript(errorComponent).default
-
-require('react-hot-loader/patch')
+import initOnDemandEntries from './on-demand-entries-client'
+import initWebpackHMR from './webpack-hot-middleware-client'
 
 const next = window.next = require('./')
 
-const emitter = next.default()
+next.default()
+  .then((emitter) => {
+    initOnDemandEntries()
+    initWebpackHMR()
+
+    let lastScroll
+
+    emitter.on('before-reactdom-render', ({ Component, ErrorComponent }) => {
+      // Remember scroll when ErrorComponent is being rendered to later restore it
+      if (!lastScroll && Component === ErrorComponent) {
+        const { pageXOffset, pageYOffset } = window
+        lastScroll = {
+          x: pageXOffset,
+          y: pageYOffset
+        }
+      }
+    })
+
+    emitter.on('after-reactdom-render', ({ Component, ErrorComponent }) => {
+      if (lastScroll && Component !== ErrorComponent) {
+        // Restore scroll after ErrorComponent was replaced with a page component by HMR
+        const { x, y } = lastScroll
+        window.scroll(x, y)
+        lastScroll = null
+      }
+    })
+  })
+  .catch((err) => {
+    console.error(`${err.message}\n${err.stack}`)
+  })
 
 // This is a patch to catch most of the errors throw inside React components.
 const originalMountComponent = ReactReconciler.mountComponent
@@ -21,25 +47,3 @@ ReactReconciler.mountComponent = function (...args) {
     throw err
   }
 }
-
-let lastScroll
-
-emitter.on('before-reactdom-render', ({ Component }) => {
-  // Remember scroll when ErrorComponent is being rendered to later restore it
-  if (!lastScroll && Component === ErrorComponent) {
-    const { pageXOffset, pageYOffset } = window
-    lastScroll = {
-      x: pageXOffset,
-      y: pageYOffset
-    }
-  }
-})
-
-emitter.on('after-reactdom-render', ({ Component }) => {
-  if (lastScroll && Component !== ErrorComponent) {
-    // Restore scroll after ErrorComponent was replaced with a page component by HMR
-    const { x, y } = lastScroll
-    window.scroll(x, y)
-    lastScroll = null
-  }
-})

client/next.js

@@ -1,3 +1,6 @@
 import next from './'
 
 next()
+  .catch((err) => {
+    console.error(`${err.message}\n${err.stack}`)
+  })

client/on-demand-entries-client.js

@@ -3,31 +3,33 @@
 import Router from '../lib/router'
 import fetch from 'unfetch'
 
-Router.ready(() => {
-  Router.router.events.on('routeChangeComplete', ping)
-})
+export default () => {
+  Router.ready(() => {
+    Router.router.events.on('routeChangeComplete', ping)
+  })
 
-async function ping () {
-  try {
-    const url = `/_next/on-demand-entries-ping?page=${Router.pathname}`
-    const res = await fetch(url)
-    const payload = await res.json()
-    if (payload.invalid) {
-      location.reload()
+  async function ping () {
+    try {
+      const url = `/_next/on-demand-entries-ping?page=${Router.pathname}`
+      const res = await fetch(url)
+      const payload = await res.json()
+      if (payload.invalid) {
+        location.reload()
+      }
+    } catch (err) {
+      console.error(`Error with on-demand-entries-ping: ${err.message}`)
     }
-  } catch (err) {
-    console.error(`Error with on-demand-entries-ping: ${err.message}`)
   }
-}
 
-async function runPinger () {
-  while (true) {
-    await new Promise((resolve) => setTimeout(resolve, 5000))
-    await ping()
+  async function runPinger () {
+    while (true) {
+      await new Promise((resolve) => setTimeout(resolve, 5000))
+      await ping()
+    }
   }
-}
 
-runPinger()
-  .catch((err) => {
-    console.error(err)
-  })
+  runPinger()
+    .catch((err) => {
+      console.error(err)
+    })
+}

client/webpack-hot-middleware-client.js

@@ -1,48 +1,50 @@
 import webpackHotMiddlewareClient from 'webpack-hot-middleware/client?overlay=false&reload=true'
 import Router from '../lib/router'
 
-const handlers = {
-  reload (route) {
-    if (route === '/_error') {
-      for (const r of Object.keys(Router.components)) {
-        const { err } = Router.components[r]
-        if (err) {
-          // reload all error routes
-          // which are expected to be errors of '/_error' routes
-          Router.reload(r)
+export default () => {
+  const handlers = {
+    reload (route) {
+      if (route === '/_error') {
+        for (const r of Object.keys(Router.components)) {
+          const { err } = Router.components[r]
+          if (err) {
+            // reload all error routes
+            // which are expected to be errors of '/_error' routes
+            Router.reload(r)
+          }
         }
+        return
       }
-      return
-    }
 
-    if (route === '/_document') {
-      window.location.reload()
-      return
-    }
+      if (route === '/_document') {
+        window.location.reload()
+        return
+      }
 
-    Router.reload(route)
-  },
+      Router.reload(route)
+    },
 
-  change (route) {
-    if (route === '/_document') {
-      window.location.reload()
-      return
-    }
+    change (route) {
+      if (route === '/_document') {
+        window.location.reload()
+        return
+      }
 
-    const { err } = Router.components[route] || {}
-    if (err) {
-      // reload to recover from runtime errors
-      Router.reload(route)
+      const { err } = Router.components[route] || {}
+      if (err) {
+        // reload to recover from runtime errors
+        Router.reload(route)
+      }
     }
   }
-}
 
-webpackHotMiddlewareClient.subscribe((obj) => {
-  const fn = handlers[obj.action]
-  if (fn) {
-    const data = obj.data || []
-    fn(...data)
-  } else {
-    throw new Error('Unexpected action ' + obj.action)
-  }
-})
+  webpackHotMiddlewareClient.subscribe((obj) => {
+    const fn = handlers[obj.action]
+    if (fn) {
+      const data = obj.data || []
+      fn(...data)
+    } else {
+      throw new Error('Unexpected action ' + obj.action)
+    }
+  })
+}

lib/error.js

@@ -3,14 +3,15 @@ import HTTPStatus from 'http-status'
 import Head from './head'
 
 export default class Error extends React.Component {
-  static getInitialProps ({ res, jsonPageRes }) {
-    const statusCode = res ? res.statusCode : (jsonPageRes ? jsonPageRes.status : null)
-    return { statusCode }
+  static getInitialProps ({ res, err }) {
+    const statusCode = res ? res.statusCode : (err ? err.statusCode : null)
+    const pageNotFound = statusCode === 404 || (err ? err.pageNotFound : false)
+    return { statusCode, pageNotFound }
   }
 
   render () {
-    const { statusCode } = this.props
-    const title = statusCode === 404
+    const { statusCode, pageNotFound } = this.props
+    const title = pageNotFound
       ? 'This page could not be found'
       : HTTPStatus[statusCode] || 'An unexpected error has occurred'