Merge branch 'canary' into eslint8

Author: ykzts

.eslintrc.json

@@ -30,14 +30,15 @@
   },
   "overrides": [
     {
-      "files": ["test/**/*.test.js"],
+      "files": ["test/**/*.js", "test/**/*.ts", "**/*.test.ts"],
       "extends": ["plugin:jest/recommended"],
       "rules": {
         "jest/expect-expect": "off",
         "jest/no-disabled-tests": "off",
         "jest/no-conditional-expect": "off",
         "jest/valid-title": "off",
-        "jest/no-interpolation-in-snapshots": "off"
+        "jest/no-interpolation-in-snapshots": "off",
+        "jest/no-export": "off"
       }
     },
     { "files": ["**/__tests__/**"], "env": { "jest": true } },

docs/api-routes/response-helpers.md

@@ -89,7 +89,7 @@ type ResponseData {
   message: string
 }
 
-export default function handler(req: NextApiRequest, res: NextApiResponse<ResponseData>) => {
+export default function handler(req: NextApiRequest, res: NextApiResponse<ResponseData>) {
   res.status(200).json({ message: 'Hello from Next.js!' })
 }
 ```

docs/authentication.md

@@ -48,7 +48,7 @@ const Profile = () => {
 export default Profile
 ```
 
-You can view this [example in action](https://next-with-iron-session.vercel.app/). Check out the [`with-iron-session`](https://github.com/vercel/next.js/tree/canary/examples/with-iron-session) example to see how it works.
+You can view this [example in action](https://iron-session-example.vercel.app/). Check out the [`with-iron-session`](https://github.com/vercel/next.js/tree/canary/examples/with-iron-session) example to see how it works.
 
 ### Authenticating Server-Rendered Pages
 
@@ -71,10 +71,7 @@ import withSession from '../lib/session'
 import Layout from '../components/Layout'
 
 export const getServerSideProps = withSession(async function ({ req, res }) {
-  // Get the user's session based on the request
-  const user = req.session.get('user')
-
-  if (!user) {
+  if (!req.session.user) {
     return {
       redirect: {
         destination: '/login',
@@ -119,7 +116,7 @@ Now that we've discussed authentication patterns, let's look at specific provide
 
 If you have an existing database with user data, you'll likely want to utilize an open-source solution that's provider agnostic.
 
-- If you want a low-level, encrypted, and stateless session utility use [`next-iron-session`](https://github.com/vercel/next.js/tree/canary/examples/with-iron-session).
+- If you want a low-level, encrypted, and stateless session utility use [`iron-session`](https://github.com/vercel/next.js/tree/canary/examples/with-iron-session).
 - If you want a full-featured authentication system with built-in providers (Google, Facebook, GitHub…), JWT, JWE, email/password, magic links and more… use [`next-auth`](https://github.com/nextauthjs/next-auth-example).
 
 Both of these libraries support either authentication pattern. If you're interested in [Passport](http://www.passportjs.org/), we also have examples for it using secure and encrypted cookies:

docs/routing/introduction.md

@@ -6,7 +6,7 @@ description: Next.js has a built-in, opinionated, and file-system based Router.
 
 Next.js has a file-system based router built on the [concept of pages](/docs/basic-features/pages.md).
 
-When a file is added to the `pages` directory it's automatically available as a route.
+When a file is added to the `pages` directory, it's automatically available as a route.
 
 The files inside the `pages` directory can be used to define most common patterns.
 
@@ -19,14 +19,14 @@ The router will automatically route files named `index` to the root of the direc
 
 #### Nested routes
 
-The router supports nested files. If you create a nested folder structure files will be automatically routed in the same way still.
+The router supports nested files. If you create a nested folder structure, files will automatically be routed in the same way still.
 
 - `pages/blog/first-post.js` → `/blog/first-post`
 - `pages/dashboard/settings/username.js` → `/dashboard/settings/username`
 
 #### Dynamic route segments
 
-To match a dynamic segment you can use the bracket syntax. This allows you to match named parameters.
+To match a dynamic segment, you can use the bracket syntax. This allows you to match named parameters.
 
 - `pages/blog/[slug].js` → `/blog/:slug` (`/blog/hello-world`)
 - `pages/[username]/settings.js` → `/:username/settings` (`/foo/settings`)
@@ -68,7 +68,7 @@ function Home() {
 export default Home
 ```
 
-In the example above we have multiple links, each one maps a path (`href`) to a known page:
+The example above uses multiple links. Each one maps a path (`href`) to a known page:
 
 - `/` → `pages/index.js`
 - `/about` → `pages/about.js`

examples/with-storybook-styled-jsx-scss/.storybook/preview.js

@@ -1,3 +1,13 @@
+import { StyleRegistry } from 'styled-jsx'
+
+export const decorators = [
+  (Story) => (
+    <StyleRegistry>
+      <Story />
+    </StyleRegistry>
+  ),
+]
+
 export const parameters = {
   actions: { argTypesRegex: '^on[A-Z].*' },
 }

examples/with-storybook-styled-jsx-scss/package.json

@@ -9,7 +9,7 @@
     "build-storybook": "build-storybook --no-dll"
   },
   "dependencies": {
-    "next": "^10.0.0",
+    "next": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

lerna.json

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

package.json

@@ -39,7 +39,7 @@
     "next-no-sourcemaps": "node --trace-deprecation packages/next/dist/bin/next",
     "clean-trace-jaeger": "rm -rf test/integration/basic/.next && TRACE_TARGET=JAEGER node --trace-deprecation --enable-source-maps packages/next/dist/bin/next build test/integration/basic",
     "debug": "node --inspect packages/next/dist/bin/next",
-    "postinstall": "node scripts/install-native.mjs"
+    "postinstall": "git config feature.manyFiles true && node scripts/install-native.mjs"
   },
   "pre-commit": "lint-staged",
   "devDependencies": {

packages/create-next-app/package.json

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

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.0.4-canary.12",
+  "version": "12.0.4",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.4-canary.12",
+    "@next/eslint-plugin-next": "12.0.4",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",