Don’t include script that we know is going to error (#3747)

* Don’t include script that we know is going to error * Add check to make sure page script is not included * Loop over script tags, cheerio fails on /

Don’t include script that we know is going to error (#3747)
* Don’t include script that we know is going to error * Add check to make sure page script is not included * Loop over script tags, cheerio fails on /
9a104611 · Tim Neutkens · Arunoda Susiripala · 2ba6a9af · 9a104611 · 9a104611
隐藏空白更改
内联并排

Showing with 25 addition and 5 deletion

server/document.js server/document.js +13 -4

server/render.js server/render.js +2 -1

test/integration/basic/test/rendering.js test/integration/basic/test/rendering.js +10 -0

未找到文件。
--- a/server/document.js
+++ b/server/document.js
@@ -84,12 +84,12 @@ export class Head extends Component {

  render () {
    const { head, styles, __NEXT_DATA__ } = this.context._documentProps
-    const { pathname, buildId, assetPrefix } = __NEXT_DATA__
+    const { page, pathname, buildId, assetPrefix } = __NEXT_DATA__
    const pagePathname = getPagePathname(pathname)

    return <head {...this.props}>
      {(head || []).map((h, i) => React.cloneElement(h, { key: h.key || i }))}
-      <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} as='script' />
+      {page !== '_error' && <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} as='script' />}
      <link rel='preload' href={`${assetPrefix}/_next/${buildId}/page/_error.js`} as='script' />
      {this.getPreloadDynamicChunks()}
      {this.getPreloadMainLinks()}
@@ -173,7 +173,7 @@ export class NextScript extends Component {

  render () {
    const { staticMarkup, __NEXT_DATA__, chunks } = this.context._documentProps
-    const { pathname, buildId, assetPrefix } = __NEXT_DATA__
+    const { page, pathname, buildId, assetPrefix } = __NEXT_DATA__
    const pagePathname = getPagePathname(pathname)

    __NEXT_DATA__.chunks = chunks.names
@@ -193,9 +193,18 @@ export class NextScript extends Component {
          __NEXT_REGISTER_CHUNK = function (chunkName, fn) {
            __NEXT_LOADED_CHUNKS__.push({ chunkName: chunkName, fn: fn })
          }
+
+          ${page === '_error' && `
+          __NEXT_REGISTER_PAGE('/index', function() {
+            var error = new Error('Page does not exist: ${htmlescape(pathname)}')
+            error.statusCode = 404
+    
+            return { error: error }
+          })
+          `}
        `
      }} />}
-      <script async id={`__NEXT_PAGE__${pathname}`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />
+      {page !== '_error' && <script async id={`__NEXT_PAGE__${pathname}`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page${pagePathname}`} />}
      <script async id={`__NEXT_PAGE__/_error`} type='text/javascript' src={`${assetPrefix}/_next/${buildId}/page/_error.js`} />
      {staticMarkup ? null : this.getDynamicChunks()}
      {staticMarkup ? null : this.getScripts()}

--- a/server/render.js
+++ b/server/render.js
@@ -105,7 +105,8 @@ async function doRender (req, res, pathname, query, {
  const doc = createElement(Document, {
    __NEXT_DATA__: {
      props,
-      pathname,
+      page, // the rendered page
+      pathname, // the requested path
      query,
      buildId,
      buildStats,

--- a/test/integration/basic/test/rendering.js
+++ b/test/integration/basic/test/rendering.js
@@ -112,6 +112,16 @@ export default function ({ app }, suiteName, render, fetch) {
      expect($('h2').text()).toBe('This page could not be found.')
    })

+    test('error 404 should not have page script', async () => {
+      const $ = await get$('/non-existent')
+      $('script[src]').each((index, element) => {
+        const src = $(element).attr('src')
+        if (src.includes('/non-existent')) {
+          throw new Error('Page includes page script')
+        }
+      })
+    })
+
    describe('with the HOC based router', () => {
      it('should navigate as expected', async () => {
        const $ = await get$('/nav/with-hoc')