Merge branch 'canary' into eslint8

Author: ykzts

.eslintignore

@@ -24,6 +24,7 @@ packages/next-codemod/**/*.d.ts
 packages/next-env/**/*.d.ts
 packages/create-next-app/templates/**
 test/integration/eslint/**
+test/development/basic/legacy-decorators/**/*
 test-timings.json
 packages/next/build/swc/tests/**
 bench/nested-deps/pages/**

.github/.kodiak.toml

@@ -13,6 +13,7 @@ notify_on_conflict = false
 [merge.message]
 title = "pull_request_title"
 body = "pull_request_body"
+include_coauthors= true
 include_pr_number = true
 body_type = "markdown"
 strip_html_comments = true

docs/api-reference/data-fetching/getInitialProps.md

@@ -139,6 +139,6 @@ For more information on what to do next, we recommend the following sections:
 <div class="card">
   <a href="/docs/advanced-features/automatic-static-optimization.md">
     <b>Automatic Static Optimization:</b>
-    <small>Learn about how Nextjs automatically optimizes your pages.</small>
+    <small>Learn about how Next.js automatically optimizes your pages.</small>
   </a>
 </div>

docs/api-reference/next.config.js/headers.md

@@ -365,7 +365,7 @@ module.exports = {
         headers: [
           {
             key: 'x-hello',
-            value: 'worlld',
+            value: 'world',
           },
         ],
       },

docs/api-reference/next/image.md

@@ -123,7 +123,7 @@ If you are using `layout="fill"` or `layout="responsive"`, it's important to ass
 
 For example, when the parent element will constrain the image to always be less than half the viewport width, use `sizes="50vw"`. Without `sizes`, the image will be sent at twice the necessary resolution, decreasing performance.
 
-If you are using `layout="intrinsic"` or `layout="fixed"`, then `sizes` is not needed because the upperbound width is constrained already.
+If you are using `layout="intrinsic"` or `layout="fixed"`, then `sizes` is not needed because the upper bound width is constrained already.
 
 [Learn more](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-sizes).
 

docs/basic-features/data-fetching.md

@@ -68,7 +68,7 @@ The `context` parameter is an object containing the following keys:
 - `previewData` contains the preview data set by `setPreviewData`. See the [Preview Mode documentation](/docs/advanced-features/preview-mode.md).
 - `locale` contains the active locale (if you've enabled [Internationalized Routing](/docs/advanced-features/i18n-routing.md)).
 - `locales` contains all supported locales (if you've enabled [Internationalized Routing](/docs/advanced-features/i18n-routing.md)).
-- `defaultLocale` contains the configured default locale (if you've enabled Internationalized Routing).
+- `defaultLocale` contains the configured default locale (if you've enabled [Internationalized Routing](/docs/advanced-features/i18n-routing.md)).
 
 `getStaticProps` should return an object with:
 

docs/basic-features/image-optimization.md

@@ -187,7 +187,7 @@ The recommended way to style the inner `<img>` is to set the `className` prop on
 
 Alternatively, you can import a [global stylesheet](/docs/basic-features/built-in-css-support#adding-a-global-stylesheet) and manually set the `className` prop to the same name used in the global stylesheet.
 
-You cannot use [styled-jsx](/basic-features/built-in-css-support.md#css-in-js) because its scoped to the current component.
+You cannot use [styled-jsx](/docs/basic-features/built-in-css-support.md#css-in-js) because it's scoped to the current component.
 
 You cannot use the `style` prop because the `<Image>` component does not pass it through to the underlying `<img>`.
 

docs/deployment.md

@@ -67,7 +67,7 @@ Next.js can be deployed to any hosting provider that supports Node.js. Make sure
 ```json
 {
   "scripts": {
-    "dev": "next",
+    "dev": "next dev",
     "build": "next build",
     "start": "next start"
   }

docs/testing.md

@@ -114,7 +114,7 @@ Since Cypress is testing a real Next.js application, it requires the Next.js ser
 
 Run `npm run build` and `npm run start`, then run `npm run cypress` in another terminal window to start Cypress.
 
-> **Note:** Alternatively, you can install the `start-server-and-test` package and add it to the `package.json` scripts field: `"test": "start-server-and-test start http://localhost:3000 cypress"` to start the Next.js production server in conjuction with Cypress. Remember to rebuild your application after new changes.
+> **Note:** Alternatively, you can install the `start-server-and-test` package and add it to the `package.json` scripts field: `"test": "start-server-and-test start http://localhost:3000 cypress"` to start the Next.js production server in conjunction with Cypress. Remember to rebuild your application after new changes.
 
 ### Getting ready for Continuous Integration (CI)
 

errors/manifest.json

@@ -339,6 +339,10 @@
           "title": "no-router-instance",
           "path": "/errors/no-router-instance.md"
         },
+        {
+          "title": "no-server-import-in-page",
+          "path": "/errors/no-server-import-in-page.md"
+        },
         {
           "title": "no-sync-scripts",
           "path": "/errors/no-sync-scripts.md"