Render error when dynamic import throws

lib/dynamic.js

@@ -71,6 +71,12 @@ export default function dynamicComponent (p, o) {
           this.state.AsyncComponent = AsyncComponent
         }
       })
+
+      if (!this.ssr) {
+        promise.catch((error) => {
+          window.next.renderError(error)
+        })
+      }
     }
 
     loadBundle (props) {

package.json

@@ -34,7 +34,7 @@
     "posttestonly": "taskr posttest",
     "testall": "npm run testonly -- --coverage --forceExit --runInBand --verbose --bail",
     "pretest": "npm run lint",
-    "test": "cross-env npm run testall || npm run testall",
+    "test": "cross-env npm run testonly --watch --testPathPattern basic -t \"should render an error when no ssr with error in chunk\"",
     "coveralls": "nyc --instrument=false --source-map=false report --temp-directory=./coverage --reporter=text-lcov | coveralls",
     "lint": "standard 'bin/*' 'client/**/*.js' 'examples/**/*.js' 'lib/**/*.js' 'pages/**/*.js' 'server/**/*.js' 'test/**/*.js'",
     "prepublish": "npm run release",

server/document.js

@@ -190,14 +190,14 @@ export class NextScript extends Component {
             __NEXT_LOADED_CHUNKS__.push({ chunkName: chunkName, fn: fn })
           }
 
-          ${page === '_error' && `
+          ${page === '_error' ? `
           __NEXT_REGISTER_PAGE(${htmlescape(pathname)}, function() {
             var error = new Error('Page does not exist: ${htmlescape(pathname)}')
             error.statusCode = 404
 
             return { error: error }
           })
-          `}
+          ` : ''}
         `
       }} />}
       {page !== '/_error' && <script async id={`__NEXT_PAGE__${pathname}`} src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />}

test/integration/basic/components/hello-error.js

@@ -0,0 +1 @@
+throw new Error('Expected error')

test/integration/basic/pages/dynamic/no-ssr-error.js

@@ -0,0 +1,5 @@
+import dynamic from 'next/dynamic'
+
+const Hello = dynamic(import('../../components/hello-error'), { ssr: false })
+
+export default Hello

test/integration/basic/test/dynamic.js

@@ -57,6 +57,20 @@ export default (context, render) => {
         browser.close()
       })
 
+      it('should render an error when no ssr with error in chunk', async () => {
+        const browser = await webdriver(context.appPort, '/dynamic/no-ssr-error')
+
+        while (true) {
+          const bodyText = await browser
+            .elementByCss('body').text()
+          console.log(bodyText)
+          if (/Expected error/.test(bodyText)) break
+          await waitFor(1000)
+        }
+
+        browser.close()
+      })
+
       it('should render even there are no physical chunk exists', async () => {
         const browser = await webdriver(context.appPort, '/dynamic/no-chunk')
 

test/integration/basic/test/index.test.js

@@ -51,6 +51,7 @@ describe('Basic Features', () => {
       renderViaHTTP(context.appPort, '/nav/as-path-using-router'),
 
       renderViaHTTP(context.appPort, '/nested-cdm/index'),
+      renderViaHTTP(context.appPort, '/dynamic/no-ssr-error'),
 
       renderViaHTTP(context.appPort, '/hmr/about'),
       renderViaHTTP(context.appPort, '/hmr/contact'),