From 2b12606f1fdbce6eee4e0e26de789e466f9bfc54 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 20 Feb 2020 16:26:50 -0600
Subject: [PATCH 1/2] Add err.sh for getStaticProps error

---
 errors/invalid-getstaticprops-value.md      | 17 +++++++++++++++++
 packages/next/next-server/server/render.tsx |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 errors/invalid-getstaticprops-value.md

diff --git a/errors/invalid-getstaticprops-value.md b/errors/invalid-getstaticprops-value.md
new file mode 100644
index 000000000000000..5368ba600194ab4
--- /dev/null
+++ b/errors/invalid-getstaticprops-value.md
@@ -0,0 +1,17 @@
+# Invalid unstable_getStaticProps Return Value
+
+#### Why This Error Occurred
+
+In one of the page's `unstable_getStaticProps` the return value had the incorrect shape.
+
+#### Possible Ways to Fix It
+
+Make sure to return the following shape from `unstable_getStaticProps`:
+
+```js
+export async function unstable_getStaticProps() {
+  return {
+    props: { [key: string]: any }
+  }
+}
+```
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index a20d35bf27e98a7..1655cc22cc0f4fd 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -246,7 +246,8 @@ const invalidKeysMsg = (methodName: string, invalidKeys: string[]) => {
   return (
     `Additional keys were returned from \`${methodName}\`. Properties intended for your component must be nested under the \`props\` key, e.g.:` +
     `\n\n\treturn { props: { title: 'My Title', content: '...' } }` +
-    `\n\nKeys that need to be moved: ${invalidKeys.join(', ')}.`
+    `\n\nKeys that need to be moved: ${invalidKeys.join(', ')}.` +
+    `See here for more info: https://err.sh/zeit/next.js/invalid-getstaticprops-value`
   )
 }
 

From 7d421d8434e6d9de47866bfb19a62983c85ab4cd Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Fri, 21 Feb 2020 00:32:14 -0500
Subject: [PATCH 2/2] Prettify error

---
 packages/next/cli/next-build.ts             | 2 +-
 packages/next/export/worker.js              | 4 ++--
 packages/next/next-server/server/render.tsx | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/next/cli/next-build.ts b/packages/next/cli/next-build.ts
index eff5d0bc8bd85b1..a0389f3a2e89baa 100755
--- a/packages/next/cli/next-build.ts
+++ b/packages/next/cli/next-build.ts
@@ -45,7 +45,7 @@ const nextBuild: cliCommand = argv => {
   build(dir)
     .then(() => process.exit(0))
     .catch(err => {
-      // tslint:disable-next-line
+      console.error('')
       console.error('> Build error occurred')
       printAndExit(err)
     })
diff --git a/packages/next/export/worker.js b/packages/next/export/worker.js
index 2ca8fb688cb2337..3997d954e3cf3fa 100644
--- a/packages/next/export/worker.js
+++ b/packages/next/export/worker.js
@@ -264,8 +264,8 @@ export default async function({
     return results
   } catch (error) {
     console.error(
-      `\nError occurred prerendering page "${path}" https://err.sh/zeit/next.js/prerender-error:`,
-      error
+      `\nError occurred prerendering page "${path}" https://err.sh/next.js/prerender-error:\n` +
+        error
     )
     return { ...results, error: true }
   }
diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index 1655cc22cc0f4fd..84e4273b2ec38ed 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -247,7 +247,7 @@ const invalidKeysMsg = (methodName: string, invalidKeys: string[]) => {
     `Additional keys were returned from \`${methodName}\`. Properties intended for your component must be nested under the \`props\` key, e.g.:` +
     `\n\n\treturn { props: { title: 'My Title', content: '...' } }` +
     `\n\nKeys that need to be moved: ${invalidKeys.join(', ')}.` +
-    `See here for more info: https://err.sh/zeit/next.js/invalid-getstaticprops-value`
+    `\nRead more: https://err.sh/next.js/invalid-getstaticprops-value`
   )
 }