Merge branch 'canary' into rename-zeitco-new-import

errors/invalid-getstaticpaths-value.md

@@ -9,7 +9,7 @@ In one of the page's `unstable_getStaticPaths` the return value had the incorrec
 Make sure to return the following shape from `unstable_getStaticPaths`:
 
 ```js
-export async function unstable_getStaticProps() {
+export async function unstable_getStaticPaths() {
   return {
     paths: Array<string | { params: { [key: string]: string } }>
   }

errors/routes-must-be-array.md

@@ -0,0 +1,42 @@
+# Custom Routes must return an array
+
+#### Why This Error Occurred
+
+When defining custom routes an array wasn't returned from either `headers`, `rewrites`, or `redirects`.
+
+#### Possible Ways to Fix It
+
+Make sure to return an array that contains the routes.
+
+**Before**
+
+```js
+// next.config.js
+module.exports = {
+  experimental: {
+    async rewrites() {
+      return {
+        source: '/feedback',
+        destination: '/feedback/general',
+      }
+    },
+  },
+}
+```
+
+**After**
+
+```js
+module.exports = {
+  experimental: {
+    async rewrites() {
+      return [
+        {
+          source: '/feedback',
+          destination: '/feedback/general',
+        },
+      ]
+    },
+  },
+}
+```

examples/with-mobx-keystone-typescript/components/Clock.tsx

@@ -16,9 +16,7 @@ const Clock: FC<Props> = props => {
     font: '50px menlo, monaco, monospace',
     padding: '15px',
   }
-  return (
-    <div style={divStyle}>{format(new Date(props.lastUpdate as number))}</div>
-  )
+  return <div style={divStyle}>{format(props.lastUpdate)}</div>
 }
 
 export { Clock }

examples/with-mobx-keystone-typescript/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "mobx": "^5.15.1",
-    "mobx-keystone": "^0.30.0",
+    "mobx-keystone": "^0.41.0",
     "mobx-react-lite": "^1.5.2",
     "next": "latest",
     "react": "^16.12.0",

examples/with-mobx-keystone-typescript/store/root.ts

@@ -1,16 +1,19 @@
-import { Model, model, prop, modelAction, timestampAsDate } from 'mobx-keystone'
+import {
+  Model,
+  model,
+  prop,
+  modelAction,
+  prop_dateTimestamp,
+} from 'mobx-keystone'
 
 @model('store/root')
 class RootStore extends Model({
   foo: prop<number | null>(0),
-  lastUpdate: prop<number | null>(new Date().getTime()),
+  lastUpdate: prop_dateTimestamp(() => new Date()),
   light: prop(false),
 }) {
   timer!: ReturnType<typeof setInterval>
 
-  @timestampAsDate('lastUpdate')
-  lastUpdateDate!: Date
-
   @modelAction
   start() {
     this.timer = setInterval(() => {
@@ -19,7 +22,7 @@ class RootStore extends Model({
   }
   @modelAction
   update() {
-    this.lastUpdate = Date.now()
+    this.lastUpdate = new Date()
     this.light = true
   }
 

lerna.json

@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.2.3-canary.10"
+  "version": "9.2.3-canary.12"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "keywords": [
     "react",
     "next",

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-google-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [

packages/next-plugin-material-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "nextjs": {
     "name": "Material UI",
     "required-env": []

packages/next-plugin-sentry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "nextjs": {
     "name": "Sentry",
     "required-env": [

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "9.2.3-canary.10",
+  "version": "9.2.3-canary.12",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next/build/index.ts

@@ -113,21 +113,24 @@ export default async function build(dir: string, conf = null): Promise<void> {
   const { target } = config
   const buildId = await generateBuildId(config.generateBuildId, nanoid)
   const distDir = path.join(dir, config.distDir)
+  const headers: Header[] = []
   const rewrites: Rewrite[] = []
   const redirects: Redirect[] = []
-  const headers: Header[] = []
 
   if (typeof config.experimental.redirects === 'function') {
-    redirects.push(...(await config.experimental.redirects()))
-    checkCustomRoutes(redirects, 'redirect')
+    const _redirects = await config.experimental.redirects()
+    checkCustomRoutes(_redirects, 'redirect')
+    redirects.push(..._redirects)
   }
   if (typeof config.experimental.rewrites === 'function') {
-    rewrites.push(...(await config.experimental.rewrites()))
-    checkCustomRoutes(rewrites, 'rewrite')
+    const _rewrites = await config.experimental.rewrites()
+    checkCustomRoutes(_rewrites, 'rewrite')
+    rewrites.push(..._rewrites)
   }
   if (typeof config.experimental.headers === 'function') {
-    headers.push(...(await config.experimental.headers()))
-    checkCustomRoutes(headers, 'header')
+    const _headers = await config.experimental.headers()
+    checkCustomRoutes(_headers, 'header')
+    headers.push(..._headers)
   }
 
   if (ciEnvironment.isCI) {