Merge branch 'canary' into docs/i18n-export

vercel · Nov 19, 2020 · 4b43376 · 4b43376
2 parents 0fde781 + 8193df5
commit 4b43376
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -631,7 +631,7 @@ const nextServerlessLoader: loader.Loader = function () {
           const {
             default: getRouteNoAssetPath,
           } = require('next/dist/next-server/lib/router/utils/get-route-from-asset-path');
-          _nextData = true;
+          _nextData = ${page === '/_error' ? 'false' : 'true'};
           parsedUrl.pathname = getRouteNoAssetPath(
             parsedUrl.pathname.replace(
               new RegExp('/_next/data/${escapedBuildId}/'),

diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
@@ -1785,6 +1785,11 @@ const runTests = (dev = false, isEmulatedServerless = false) => {
       })
     }
   }
+
+  // this should come very last
+  it('should not have attempted sending invalid payload', async () => {
+    expect(stderr).not.toContain('argument entity must be string')
+  })
 }
 
 describe('SSG Prerender', () => {