Merge branch 'canary' into cms-builder-io-example

teleaziz · web-flow · commit ac68f16b7531 · 2021-12-01T15:23:05.000-08:00
diff --git a/.github/labeler.json b/.github/labeler.json
@@ -10,7 +10,8 @@
       "packages/next-codemod/**",
       "packages/eslint-plugin-next/**",
       "packages/eslint-config-next/**",
-      "packages/next-env/**"
+      "packages/next-env/**",
+      "packages/next-swc/**"
     ],
     "created-by: Chrome Aurora": [
       { "type": "user", "pattern": "spanicker" },
@@ -31,6 +32,11 @@
       { "type": "user", "pattern": "leerob" },
       { "type": "user", "pattern": "kdy1" },
       { "type": "user", "pattern": "timneutkens" }
+    ],
+    "created-by: Next.js docs team": [
+      { "type": "user", "pattern": "MaedahBatool" },
+      { "type": "user", "pattern": "molebox" },
+      { "type": "user", "pattern": "ismaelrumzan" }
     ]
   }
 }
diff --git a/docs/deployment.md b/docs/deployment.md
@@ -76,7 +76,7 @@ Next.js can be deployed to any hosting provider that supports Node.js. Make sure
 
 `next build` builds the production application in the `.next` folder. After building, `next start` starts a Node.js server that supports [hybrid pages](/docs/basic-features/pages.md), serving both statically generated and server-side rendered pages.
 
-If you are using [`next/image`](/docs/basic-features/image-optimization.md), consider adding `sharp` for more performant [Image Optimization](/docs/basic-features/image-optimization.md) in your production environment by running `npm install sharp` in your project directory.
+If you are using [`next/image`](/docs/basic-features/image-optimization.md), consider adding `sharp` for more performant [Image Optimization](/docs/basic-features/image-optimization.md) in your production environment by running `npm install sharp` in your project directory. On Linux platforms, `sharp` may require [additional configuration](https://sharp.pixelplumbing.com/install#linux-memory-allocator) to prevent excessive memory usage.
 
 ### Docker Image
 
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.5-canary.12"
+  "version": "12.0.5-canary.13"
 }
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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+    "@next/eslint-plugin-next": "12.0.5-canary.13",
     "@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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "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.5-canary.12",
+  "version": "12.0.5-canary.13",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.0.5-canary.12",
+  "version": "12.0.5-canary.13",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native"
diff --git a/packages/next/client/link.tsx b/packages/next/client/link.tsx
@@ -291,11 +291,12 @@ function Link(props: React.PropsWithChildren<LinkProps>) {
   }
 
   childProps.onMouseEnter = (e: React.MouseEvent) => {
-    if (!isLocalURL(href)) return
     if (child.props && typeof child.props.onMouseEnter === 'function') {
       child.props.onMouseEnter(e)
     }
-    prefetch(router, href, as, { priority: true })
+    if (isLocalURL(href)) {
+      prefetch(router, href, as, { priority: true })
+    }
   }
 
   // If child is an <a> tag and doesn't have a href attribute, or if the 'passHref' property is
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.5-canary.12",
+  "version": "12.0.5-canary.13",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,10 +70,10 @@
     "@babel/runtime": "7.15.4",
     "@hapi/accept": "5.0.2",
     "@napi-rs/triples": "1.0.3",
-    "@next/env": "12.0.5-canary.12",
-    "@next/polyfill-module": "12.0.5-canary.12",
-    "@next/react-dev-overlay": "12.0.5-canary.12",
-    "@next/react-refresh-utils": "12.0.5-canary.12",
+    "@next/env": "12.0.5-canary.13",
+    "@next/polyfill-module": "12.0.5-canary.13",
+    "@next/react-dev-overlay": "12.0.5-canary.13",
+    "@next/react-refresh-utils": "12.0.5-canary.13",
     "acorn": "8.5.0",
     "assert": "2.0.0",
     "browserify-zlib": "0.2.0",
@@ -120,8 +120,8 @@
   "peerDependencies": {
     "fibers": ">= 3.1.0",
     "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
-    "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0",
+    "react": "^17.0.2 || ^18.0.0-0",
+    "react-dom": "^17.0.2 || ^18.0.0-0",
     "sass": "^1.3.0"
   },
   "peerDependenciesMeta": {
@@ -156,7 +156,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.2.1",
-    "@next/polyfill-nomodule": "12.0.5-canary.12",
+    "@next/polyfill-nomodule": "12.0.5-canary.13",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -1008,12 +1008,13 @@ export async function renderToHTML(
       serverComponentManifest
     )
     const reader = stream.getReader()
-    return new RenderResult((innerRes, next) => {
+    const piper: NodeWritablePiper = (innerRes, next) => {
       bufferedReadFromReadableStream(reader, (val) => innerRes.write(val)).then(
         () => next(),
         (innerErr) => next(innerErr)
       )
-    })
+    }
+    return new RenderResult(chainPipers([piper]))
   }
 
   // we preload the buildManifest for auto-export dynamic pages
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.0.5-canary.12",
+  "version": "12.0.5-canary.13",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.0.5-canary.12",
+  "version": "12.0.5-canary.13",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/test/integration/client-navigation/pages/absolute-url.js b/test/integration/client-navigation/pages/absolute-url.js
@@ -11,6 +11,8 @@ export async function getServerSideProps({ query: { port } }) {
 
 export default function Page({ port }) {
   const router = useRouter()
+  const [hover, setHover] = React.useState(false)
+
   return (
     <>
       <Link href="https://vercel.com/">
@@ -61,6 +63,17 @@ export default function Page({ port }) {
       <Link href="mailto:idk@idk.com">
         <a id="mailto-link">mailto:idk@idk.com</a>
       </Link>
+      <br />
+      <Link href="https://vercel.com/">
+        <a
+          id="absolute-link-mouse-events"
+          data-hover={hover}
+          onMouseEnter={() => setHover(true)}
+          onMouseLeave={() => setHover(false)}
+        >
+          https://vercel.com/
+        </a>
+      </Link>
     </>
   )
 }
diff --git a/test/integration/client-navigation/test/index.test.js b/test/integration/client-navigation/test/index.test.js
@@ -118,6 +118,21 @@ describe('Client Navigation', () => {
       )
     })
 
+    it('should call mouse handlers with an absolute url', async () => {
+      const browser = await webdriver(
+        context.appPort,
+        `/absolute-url?port=${context.appPort}`
+      )
+
+      await browser.elementByCss('#absolute-link-mouse-events').moveTo()
+
+      expect(
+        await browser
+          .waitForElementByCss('#absolute-link-mouse-events')
+          .getAttribute('data-hover')
+      ).toBe('true')
+    })
+
     it('should navigate an absolute local url', async () => {
       const browser = await webdriver(
         context.appPort,
diff --git a/test/integration/react-streaming-and-server-components/app/pages/index.server.js b/test/integration/react-streaming-and-server-components/app/pages/index.server.js
@@ -19,7 +19,7 @@ export default function Index({ header, router }) {
 
 export function getServerSideProps({ req }) {
   const { headers } = req
-  const header = headers[headerKey]
+  const header = headers[headerKey] || ''
 
   return {
     props: {
diff --git a/test/integration/react-streaming-and-server-components/test/index.test.js b/test/integration/react-streaming-and-server-components/test/index.test.js
@@ -86,6 +86,20 @@ async function nextDev(dir, port) {
   })
 }
 
+async function resolveStreamResponse(response, onData) {
+  let result = ''
+  onData = onData || (() => {})
+  await new Promise((resolve) => {
+    response.body.on('data', (chunk) => {
+      result += chunk.toString()
+      onData(chunk.toString(), result)
+    })
+
+    response.body.on('end', resolve)
+  })
+  return result
+}
+
 describe('concurrentFeatures - basic', () => {
   it('should warn user for experimental risk with server components', async () => {
     const edgeRuntimeWarning =
@@ -296,24 +310,17 @@ async function runBasicTests(context, env) {
   it('should support streaming', async () => {
     await fetchViaHTTP(context.appPort, '/streaming', null, {}).then(
       async (response) => {
-        let result = ''
         let gotFallback = false
         let gotData = false
 
-        await new Promise((resolve) => {
-          response.body.on('data', (chunk) => {
-            result += chunk.toString()
-
-            gotData = result.includes('next_streaming_data')
-            if (!gotFallback) {
-              gotFallback = result.includes('next_streaming_fallback')
-              if (gotFallback) {
-                expect(gotData).toBe(false)
-              }
+        await resolveStreamResponse(response, (_, result) => {
+          gotData = result.includes('next_streaming_data')
+          if (!gotFallback) {
+            gotFallback = result.includes('next_streaming_fallback')
+            if (gotFallback) {
+              expect(gotData).toBe(false)
             }
-          })
-
-          response.body.on('end', () => resolve())
+          }
         })
 
         expect(gotFallback).toBe(true)
@@ -327,6 +334,15 @@ async function runBasicTests(context, env) {
     expect(content).toMatchInlineSnapshot('"next_streaming_data"')
   })
 
+  it('should support streaming flight request', async () => {
+    await fetchViaHTTP(context.appPort, '/?__flight__=1').then(
+      async (response) => {
+        const result = await resolveStreamResponse(response)
+        expect(result).toContain('component:index.server')
+      }
+    )
+  })
+
   it('should support api routes', async () => {
     const res = await renderViaHTTP(context.appPort, '/api/ping')
     expect(res).toContain('pong')

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`"registry": "https://registry.npmjs.org/"`
`18`	`18`	`}`
`19`	`19`	`},`
`20`		`- "version": "12.0.5-canary.12"`
	`20`	`+ "version": "12.0.5-canary.13"`
`21`	`21`	`}`
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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`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.5-canary.12",`
	`3`	`+ "version": "12.0.5-canary.13",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"repository": {`