Merge branch 'canary' into fix/i18n-static-file-check

kodiakhq[bot] · web-flow · commit 397988fb4d23 · 2022-01-21T20:06:40.000Z
diff --git a/docs/api-reference/next.config.js/configuring-the-build-id.md b/docs/api-reference/next.config.js/configuring-the-build-id.md
@@ -4,7 +4,7 @@ description: Configure the build id, which is used to identify the current build
 
 # Configuring the Build ID
 
-Next.js uses a constant id generated at build time to identify which version of your application is being served. This can cause problems in multi-server deployments when `next build` is ran on every server. In order to keep a static build id between builds you can provide your own build id.
+Next.js uses a constant id generated at build time to identify which version of your application is being served. This can cause problems in multi-server deployments when `next build` is run on every server. In order to keep a consistent build id between builds you can provide your own build id.
 
 Open `next.config.js` and add the `generateBuildId` function:
 
diff --git a/docs/authentication.md b/docs/authentication.md
@@ -62,7 +62,7 @@ export async function getServerSideProps(context) {
 }
 ```
 
-Let's transform the profile example to use [server-side rendering](/docs/basic-features/pages#server-side-rendering). If there's a session, return `user` as a prop to the `Profile` component in the page. Notice there is not a loading skeleton in [this example](https://next-with-iron-session.vercel.app/).
+Let's transform the profile example to use [server-side rendering](/docs/basic-features/pages#server-side-rendering). If there's a session, return `user` as a prop to the `Profile` component in the page. Notice there is not a loading skeleton in [this example](https://iron-session-example.vercel.app/).
 
 ```jsx
 // pages/profile.js
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.9-canary.4"
+  "version": "12.0.9-canary.5"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "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.9-canary.4",
+    "@next/eslint-plugin-next": "12.0.9-canary.5",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native",
diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
@@ -4,7 +4,7 @@ import { stringify } from 'querystring'
 import { API_ROUTE, DOT_NEXT_ALIAS, PAGES_DIR_ALIAS } from '../lib/constants'
 import { MIDDLEWARE_ROUTE } from '../lib/constants'
 import { __ApiPreviewProps } from '../server/api-utils'
-import { isTargetLikeServerless } from '../server/config'
+import { isTargetLikeServerless } from '../server/utils'
 import { normalizePagePath } from '../server/normalize-page-path'
 import { warn } from './output/log'
 import { MiddlewareLoaderOptions } from './webpack/loaders/next-middleware-loader'
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -57,7 +57,8 @@ import {
   isDynamicRoute,
 } from '../shared/lib/router/utils'
 import { __ApiPreviewProps } from '../server/api-utils'
-import loadConfig, { isTargetLikeServerless } from '../server/config'
+import loadConfig from '../server/config'
+import { isTargetLikeServerless } from '../server/utils'
 import { BuildManifest } from '../server/get-page-files'
 import { normalizePagePath } from '../server/normalize-page-path'
 import { getPagePath } from '../server/require'
diff --git a/packages/next/build/output/log.ts b/packages/next/build/output/log.ts
@@ -1,4 +1,4 @@
-import chalk from 'next/dist/compiled/chalk'
+import chalk from '../../lib/chalk'
 
 export const prefixes = {
   wait: chalk.cyan('wait') + '  -',
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts b/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts
@@ -1,7 +1,15 @@
-import { IncomingMessage, ServerResponse } from 'http'
+import type { IncomingMessage, ServerResponse } from 'http'
+import type { Rewrite } from '../../../../lib/load-custom-routes'
+import type { BuildManifest } from '../../../../server/get-page-files'
+import type { NextConfig } from '../../../../server/config'
+import type {
+  GetServerSideProps,
+  GetStaticPaths,
+  GetStaticProps,
+} from '../../../../types'
+
 import { format as formatUrl, UrlWithParsedQuery, parse as parseUrl } from 'url'
 import { parse as parseQs, ParsedUrlQuery } from 'querystring'
-import { Rewrite } from '../../../../lib/load-custom-routes'
 import { normalizeLocalePath } from '../../../../shared/lib/i18n/normalize-locale-path'
 import pathMatch from '../../../../shared/lib/router/utils/path-match'
 import { getRouteRegex } from '../../../../shared/lib/router/utils/route-regex'
@@ -11,19 +19,12 @@ import {
   prepareDestination,
 } from '../../../../shared/lib/router/utils/prepare-destination'
 import { __ApiPreviewProps } from '../../../../server/api-utils'
-import { BuildManifest } from '../../../../server/get-page-files'
-import {
-  GetServerSideProps,
-  GetStaticPaths,
-  GetStaticProps,
-} from '../../../../types'
 import { acceptLanguage } from '../../../../server/accept-header'
 import { detectLocaleCookie } from '../../../../shared/lib/i18n/detect-locale-cookie'
 import { detectDomainLocale } from '../../../../shared/lib/i18n/detect-domain-locale'
 import { denormalizePagePath } from '../../../../server/denormalize-page-path'
 import cookie from 'next/dist/compiled/cookie'
 import { TEMPORARY_REDIRECT_STATUS } from '../../../../shared/lib/constants'
-import { NextConfig } from '../../../../server/config'
 import { addRequestMeta } from '../../../../server/request-meta'
 import { BaseNextRequest } from '../../../../server/base-http'
 
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
@@ -28,7 +28,8 @@ import {
   SERVERLESS_DIRECTORY,
   SERVER_DIRECTORY,
 } from '../shared/lib/constants'
-import loadConfig, { isTargetLikeServerless } from '../server/config'
+import loadConfig from '../server/config'
+import { isTargetLikeServerless } from '../server/utils'
 import { NextConfigComplete } from '../server/config-shared'
 import { eventCliSession } from '../telemetry/events'
 import { hasNextSupport } from '../telemetry/ci-info'
diff --git a/packages/next/lib/chalk.ts b/packages/next/lib/chalk.ts
@@ -0,0 +1,9 @@
+let chalk: typeof import('next/dist/compiled/chalk')
+
+if (typeof window === 'undefined') {
+  chalk = require('next/dist/compiled/chalk')
+} else {
+  chalk = require('./web/chalk').default
+}
+
+export default chalk
diff --git a/packages/next/lib/load-custom-routes.ts b/packages/next/lib/load-custom-routes.ts
@@ -1,6 +1,6 @@
 import type { NextConfig } from '../server/config'
 
-import chalk from 'next/dist/compiled/chalk'
+import chalk from './chalk'
 import { parse as parseUrl } from 'url'
 import * as pathToRegexp from 'next/dist/compiled/path-to-regexp'
 import { escapeStringRegexp } from '../shared/lib/escape-regexp'
diff --git a/packages/next/lib/web/chalk.ts b/packages/next/lib/web/chalk.ts
@@ -0,0 +1,19 @@
+// In the web runtime, we create an alternative object that just outputs the
+// message to the console without any styling. The same APIs are supported
+// for compatibility:
+// - chalk.red('error')
+// - chalk.bold.cyan('message')
+// - chalk.hex('#fff').underline('hello')
+const log = console.log
+const chalk: any = new Proxy(log, {
+  get(_, prop: string) {
+    if (
+      ['hex', 'rgb', 'ansi256', 'bgHex', 'bgRgb', 'bgAnsi256'].includes(prop)
+    ) {
+      return () => chalk
+    }
+    return chalk
+  },
+})
+
+export default chalk
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.9-canary.4",
+  "version": "12.0.9-canary.5",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -71,7 +71,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.0.9-canary.4",
+    "@next/env": "12.0.9-canary.5",
     "caniuse-lite": "^1.0.30001283",
     "postcss": "8.4.5",
     "styled-jsx": "5.0.0-beta.7",
@@ -119,11 +119,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "1.2.1",
     "@napi-rs/triples": "1.0.3",
-    "@next/polyfill-module": "12.0.9-canary.4",
-    "@next/polyfill-nomodule": "12.0.9-canary.4",
-    "@next/react-dev-overlay": "12.0.9-canary.4",
-    "@next/react-refresh-utils": "12.0.9-canary.4",
-    "@next/swc": "12.0.9-canary.4",
+    "@next/polyfill-module": "12.0.9-canary.5",
+    "@next/polyfill-nomodule": "12.0.9-canary.5",
+    "@next/react-dev-overlay": "12.0.9-canary.5",
+    "@next/react-refresh-utils": "12.0.9-canary.5",
+    "@next/swc": "12.0.9-canary.5",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/next/server/api-utils.ts b/packages/next/server/api-utils.ts
@@ -1,7 +1,7 @@
-import { IncomingMessage, ServerResponse } from 'http'
+import type { IncomingMessage, ServerResponse } from 'http'
+
 import { parse } from 'next/dist/compiled/content-type'
 import { CookieSerializeOptions } from 'next/dist/compiled/cookie'
-import getRawBody from 'next/dist/compiled/raw-body'
 import { PageConfig, PreviewData } from 'next/types'
 import { Stream } from 'stream'
 import { isResSent, NextApiRequest, NextApiResponse } from '../shared/lib/utils'
@@ -157,6 +157,8 @@ export async function parseBody(
   let buffer
 
   try {
+    const getRawBody =
+      require('next/dist/compiled/raw-body') as typeof import('next/dist/compiled/raw-body')
     buffer = await getRawBody(req, { encoding, limit })
   } catch (e) {
     if (isError(e) && e.type === 'entity.too.large') {
diff --git a/packages/next/server/base-http.ts b/packages/next/server/base-http.ts
@@ -1,5 +1,6 @@
 import type { ServerResponse, IncomingMessage, IncomingHttpHeaders } from 'http'
 import type { Writable, Readable } from 'stream'
+
 import { PERMANENT_REDIRECT_STATUS } from '../shared/lib/constants'
 import {
   getCookieParser,
diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
diff --git a/packages/next/server/lib/find-page-file.ts b/packages/next/server/lib/find-page-file.ts
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
diff --git a/packages/next/server/send-payload.ts b/packages/next/server/send-payload.ts
diff --git a/packages/next/server/utils.ts b/packages/next/server/utils.ts
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export async function getServerSideProps(context) {`
`62`	`62`	`}`
`63`	`63`	```
`64`	`64`
`65`		-Let's transform the profile example to use [server-side rendering](/docs/basic-features/pages#server-side-rendering). If there's a session, return `user` as a prop to the `Profile` component in the page. Notice there is not a loading skeleton in [this example](https://next-with-iron-session.vercel.app/).
	`65`	+Let's transform the profile example to use [server-side rendering](/docs/basic-features/pages#server-side-rendering). If there's a session, return `user` as a prop to the `Profile` component in the page. Notice there is not a loading skeleton in [this example](https://iron-session-example.vercel.app/).
`66`	`66`
`67`	`67`	```jsx
`68`	`68`	`// pages/profile.js`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`"registry": "https://registry.npmjs.org/"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`		`- "version": "12.0.9-canary.4"`
	`19`	`+ "version": "12.0.9-canary.5"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/eslint-plugin-next",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"description": "ESLint plugin for NextJS.",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/bundle-analyzer",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/codemod",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"chalk": "4.1.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/env",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/mdx",`
`3`		`- "version": "12.0.9-canary.4",`
	`3`	`+ "version": "12.0.9-canary.5",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`