Merge branch 'canary' into eslint

vercel · Apr 5, 2021 · 80808a0 · 80808a0
2 parents 74f5daa + 9986d7c
commit 80808a0
Show file tree

Hide file tree

Showing 66 changed files with 874 additions and 607 deletions.
diff --git a/docs/api-reference/next/router.md b/docs/api-reference/next/router.md
@@ -99,7 +99,7 @@ import { useRouter } from 'next/router'
 export default function Page() {
   const router = useRouter()
 
-  return <span onClick={() => router.push('/post/abc')}>Click me</span>
+  return <button onClick={() => router.push('/post/abc')}>Click me</button>
 }
 ```
 
@@ -137,7 +137,7 @@ export default function ReadMore({ post }) {
   const router = useRouter()
 
   return (
-    <span
+    <button
       onClick={() => {
         router.push({
           pathname: '/post/[pid]',
@@ -146,7 +146,7 @@ export default function ReadMore({ post }) {
       }}
     >
       Click here to read more
-    </span>
+    </button>
   )
 }
 ```
@@ -171,7 +171,7 @@ import { useRouter } from 'next/router'
 export default function Page() {
   const router = useRouter()
 
-  return <span onClick={() => router.replace('/home')}>Click me</span>
+  return <button onClick={() => router.replace('/home')}>Click me</button>
 }
 ```
 
@@ -282,7 +282,7 @@ import { useRouter } from 'next/router'
 export default function Page() {
   const router = useRouter()
 
-  return <span onClick={() => router.back()}>Click here to go back</span>
+  return <button onClick={() => router.back()}>Click here to go back</button>
 }
 ```
 
@@ -298,7 +298,7 @@ import { useRouter } from 'next/router'
 export default function Page() {
   const router = useRouter()
 
-  return <span onClick={() => router.reload()}>Click here to reload</span>
+  return <button onClick={() => router.reload()}>Click here to reload</button>
 }
 ```
 

diff --git a/examples/custom-routes-proxying/next.config.js b/examples/custom-routes-proxying/next.config.js
@@ -1,16 +1,12 @@
 module.exports = {
   async rewrites() {
-    return [
-      // we need to define a no-op rewrite to trigger checking
-      // all pages/static files before we attempt proxying
-      {
-        source: '/:path*',
-        destination: '/:path*',
-      },
-      {
-        source: '/:path*',
-        destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
-      },
-    ]
+    return {
+      fallback: [
+        {
+          source: '/:path*',
+          destination: `https://custom-routes-proxying-endpoint.vercel.app/:path*`,
+        },
+      ],
+    }
   },
 }
diff --git a/examples/custom-server-express/README.md b/examples/custom-server-express/README.md
@@ -28,11 +28,11 @@ npm install body-parser
 
 Use the package within server.js:
 
-```bash
-const bodyParser = require('body-parser');
+```js
+const bodyParser = require('body-parser')
 
 app.prepare().then(() => {
-  const server = express();
+  const server = express()
   server.use(bodyParser.urlencoded({ extended: true }))
   server.use(bodyParser.json())
 })

diff --git a/examples/with-glamor/.babelrc b/examples/with-glamor/.babelrc
diff --git a/examples/with-glamor/.gitignore b/examples/with-glamor/.gitignore
diff --git a/examples/with-glamor/README.md b/examples/with-glamor/README.md
diff --git a/examples/with-glamor/next.config.js b/examples/with-glamor/next.config.js
diff --git a/examples/with-glamor/package.json b/examples/with-glamor/package.json
diff --git a/examples/with-glamor/pages/_document.js b/examples/with-glamor/pages/_document.js
diff --git a/examples/with-glamor/pages/index.js b/examples/with-glamor/pages/index.js
diff --git a/examples/with-mqtt-js/.env.local.example b/examples/with-mqtt-js/.env.local.example
@@ -1,4 +1,4 @@
-NEXT_MQTT_URI="wss://test.mosquitto.org:8081/mqtt"
-NEXT_MQTT_CLIENTID="a_client_id"
-NEXT_MQTT_USERNAME="username"
-CONTENTFUL_PREVIEW_SECRET="a_secure_password"
+NEXT_PUBLIC_MQTT_URI="wss://test.mosquitto.org:8081/mqtt"
+NEXT_PUBLIC_MQTT_CLIENTID="a_client_id"
+NEXT_PUBLIC_MQTT_USERNAME="username"
+NEXT_PUBLIC_MQTT_PASSWORD="a_secure_password"
diff --git a/examples/with-style-sheet/.gitignore b/examples/with-style-sheet/.gitignore
diff --git a/examples/with-style-sheet/README.md b/examples/with-style-sheet/README.md
diff --git a/examples/with-style-sheet/babel.config.js b/examples/with-style-sheet/babel.config.js
diff --git a/examples/with-style-sheet/lib/styleSheet.js b/examples/with-style-sheet/lib/styleSheet.js
diff --git a/examples/with-style-sheet/next.config.js b/examples/with-style-sheet/next.config.js
diff --git a/examples/with-style-sheet/package.json b/examples/with-style-sheet/package.json