Merge branch 'canary' into fix/error-loop

huozhi · web-flow · commit 0ba37631f070 · 2021-06-25T22:47:13.000+08:00
diff --git a/examples/with-loading/pages/_app.js b/examples/with-loading/pages/_app.js
@@ -1,16 +1,32 @@
-import Router from 'next/router'
+import { useEffect } from 'react'
 import Link from 'next/link'
 import Head from 'next/head'
+import { useRouter } from 'next/router'
 import NProgress from 'nprogress'
 
-Router.events.on('routeChangeStart', (url) => {
-  console.log(`Loading: ${url}`)
-  NProgress.start()
-})
-Router.events.on('routeChangeComplete', () => NProgress.done())
-Router.events.on('routeChangeError', () => NProgress.done())
-
 export default function App({ Component, pageProps }) {
+  const router = useRouter()
+
+  useEffect(() => {
+    const handleStart = (url) => {
+      console.log(`Loading: ${url}`)
+      NProgress.start()
+    }
+    const handleStop = () => {
+      NProgress.done()
+    }
+
+    router.events.on('routeChangeStart', handleStart)
+    router.events.on('routeChangeComplete', handleStop)
+    router.events.on('routeChangeError', handleStop)
+
+    return () => {
+      router.events.off('routeChangeStart', handleStart)
+      router.events.off('routeChangeComplete', handleStop)
+      router.events.off('routeChangeError', handleStop)
+    }
+  }, [router])
+
   return (
     <>
       <Head>
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.0.2-canary.0"
+  "version": "11.0.2-canary.2"
 }
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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+    "@next/eslint-plugin-next": "11.0.2-canary.2",
     "@rushstack/eslint-patch": "^1.0.6",
     "@typescript-eslint/parser": "^4.20.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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next/build/webpack/plugins/profiling-plugin.ts b/packages/next/build/webpack/plugins/profiling-plugin.ts
@@ -76,7 +76,8 @@ export class ProfilingPlugin {
       this.traceHookPair(
         'webpack-invalidated',
         compiler.hooks.invalid,
-        compiler.hooks.done
+        compiler.hooks.done,
+        () => ({ name: compiler.name })
       )
     }
   }
@@ -86,7 +87,8 @@ export class ProfilingPlugin {
       this.traceHookPair(
         'webpack-compilation',
         compiler.hooks.beforeCompile,
-        compiler.hooks.afterCompile
+        compiler.hooks.afterCompile,
+        () => ({ name: compiler.name })
       )
     }
 
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -65,10 +65,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.0.2-canary.0",
-    "@next/polyfill-module": "11.0.2-canary.0",
-    "@next/react-dev-overlay": "11.0.2-canary.0",
-    "@next/react-refresh-utils": "11.0.2-canary.0",
+    "@next/env": "11.0.2-canary.2",
+    "@next/polyfill-module": "11.0.2-canary.2",
+    "@next/react-dev-overlay": "11.0.2-canary.2",
+    "@next/react-refresh-utils": "11.0.2-canary.2",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
     "browserify-zlib": "0.2.0",
@@ -152,7 +152,7 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
-    "@next/polyfill-nomodule": "11.0.2-canary.0",
+    "@next/polyfill-nomodule": "11.0.2-canary.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",
diff --git a/packages/next/telemetry/trace/report/to-telemetry.ts b/packages/next/telemetry/trace/report/to-telemetry.ts
@@ -1,13 +1,13 @@
 import { traceGlobals } from '../shared'
 
-const TRACE_EVENT_WHITELIST = new Map(
+const TRACE_EVENT_ACCESSLIST = new Map(
   Object.entries({
     'webpack-invalidated': 'WEBPACK_INVALIDATED',
   })
 )
 
 const reportToTelemetry = (spanName: string, duration: number) => {
-  const eventName = TRACE_EVENT_WHITELIST.get(spanName)
+  const eventName = TRACE_EVENT_ACCESSLIST.get(spanName)
   if (!eventName) {
     return
   }
diff --git a/packages/next/telemetry/trace/report/to-zipkin.ts b/packages/next/telemetry/trace/report/to-zipkin.ts
@@ -1,17 +1,16 @@
 import { randomBytes } from 'crypto'
 import fetch from 'node-fetch'
+import * as Log from '../../../build/output/log'
 
 let traceId = process.env.TRACE_ID
-if (!traceId) {
-  traceId = process.env.TRACE_ID = randomBytes(8).toString('hex')
-}
 
 const localEndpoint = {
-  serviceName: 'zipkin-query',
+  serviceName: 'nextjs',
   ipv4: '127.0.0.1',
   port: 9411,
 }
-const zipkinUrl = `http://${localEndpoint.ipv4}:${localEndpoint.port}/api/v2/spans`
+const zipkinUrl = `http://${localEndpoint.ipv4}:${localEndpoint.port}`
+const zipkinAPI = `${zipkinUrl}/api/v2/spans`
 
 const reportToLocalHost = (
   name: string,
@@ -21,6 +20,12 @@ const reportToLocalHost = (
   parentId?: string,
   attrs?: Object
 ) => {
+  if (!traceId) {
+    traceId = process.env.TRACE_ID = randomBytes(8).toString('hex')
+    Log.info(
+      `Zipkin trace will be available on ${zipkinUrl}/zipkin/traces/${traceId}`
+    )
+  }
   const body = [
     {
       traceId,
@@ -35,11 +40,11 @@ const reportToLocalHost = (
   ]
 
   // We intentionally do not block on I/O here.
-  fetch(zipkinUrl, {
+  fetch(zipkinAPI, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(body),
-  }).catch(() => {})
+  }).catch(console.log)
 }
 
 export default reportToLocalHost
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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "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": "11.0.2-canary.0",
+  "version": "11.0.2-canary.2",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/test/integration/basic/test/index.test.js b/test/integration/basic/test/index.test.js
@@ -2,7 +2,6 @@
 
 import { join } from 'path'
 import { renderViaHTTP, findPort, launchApp, killApp } from 'next-test-utils'
-import webdriver from 'next-webdriver'
 
 // test suits
 import hmr from './hmr'
@@ -21,54 +20,9 @@ describe('Basic Features', () => {
     context.server = await launchApp(join(__dirname, '../'), context.appPort, {
       env: { __NEXT_TEST_WITH_DEVTOOL: 1 },
     })
-
-    // pre-build all pages at the start
-    await Promise.all([
-      renderViaHTTP(context.appPort, '/process-env'),
-
-      renderViaHTTP(context.appPort, '/hmr/about'),
-      renderViaHTTP(context.appPort, '/hmr/style'),
-      renderViaHTTP(context.appPort, '/hmr/contact'),
-      renderViaHTTP(context.appPort, '/hmr/counter'),
-    ])
   })
   afterAll(() => killApp(context.server))
 
-  it('should polyfill Node.js modules', async () => {
-    const browser = await webdriver(context.appPort, '/node-browser-polyfills')
-
-    console.error({
-      logs: await browser.log('browser'),
-      content: await browser.eval('document.documentElement.innerHTML'),
-    })
-
-    await browser.waitForCondition('window.didRender')
-
-    const data = await browser
-      .waitForElementByCss('#node-browser-polyfills')
-      .text()
-    const parsedData = JSON.parse(data)
-
-    expect(parsedData.vm).toBe(105)
-    expect(parsedData.hash).toBe(
-      'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9'
-    )
-    expect(parsedData.buffer).toBe('hello world')
-    expect(parsedData.stream).toBe(true)
-    expect(parsedData.assert).toBe(true)
-    expect(parsedData.constants).toBe(7)
-    expect(parsedData.domain).toBe(true)
-    expect(parsedData.http).toBe(true)
-    expect(parsedData.https).toBe(true)
-    expect(parsedData.os).toBe('\n')
-    expect(parsedData.path).toBe('/hello/world/test.txt')
-    expect(parsedData.process).toBe('browser')
-    expect(parsedData.querystring).toBe('a=b')
-    expect(parsedData.stringDecoder).toBe(true)
-    expect(parsedData.sys).toBe(true)
-    expect(parsedData.timers).toBe(true)
-  })
-
   dynamic(context, (p, q) => renderViaHTTP(context.appPort, p, q))
   hmr(context, (p, q) => renderViaHTTP(context.appPort, p, q))
   errorRecovery(context, (p, q) => renderViaHTTP(context.appPort, p, q))
diff --git a/test/integration/polyfill-node-modules/next.config.js b/test/integration/polyfill-node-modules/next.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+  onDemandEntries: {
+    // Make sure entries are not getting disposed.
+    maxInactiveAge: 1000 * 60 * 60,
+  },
+}
diff --git a/test/integration/polyfill-node-modules/pages/node-browser-polyfills.js b/test/integration/polyfill-node-modules/pages/node-browser-polyfills.js
diff --git a/test/integration/polyfill-node-modules/test/index.test.js b/test/integration/polyfill-node-modules/test/index.test.js
@@ -0,0 +1,49 @@
+/* eslint-env jest */
+
+import { join } from 'path'
+import webdriver from 'next-webdriver'
+import { findPort, launchApp, killApp } from 'next-test-utils'
+
+jest.setTimeout(1000 * 60 * 2)
+
+const appDir = join(__dirname, '../')
+let appPort
+let app
+
+describe('Basic Features', () => {
+  beforeAll(async () => {
+    appPort = await findPort()
+    app = await launchApp(appDir, appPort)
+  })
+  afterAll(() => killApp(app))
+
+  it('should polyfill Node.js modules', async () => {
+    const browser = await webdriver(appPort, '/node-browser-polyfills')
+
+    await browser.waitForCondition('window.didRender')
+
+    const data = await browser
+      .waitForElementByCss('#node-browser-polyfills')
+      .text()
+    const parsedData = JSON.parse(data)
+
+    expect(parsedData.vm).toBe(105)
+    expect(parsedData.hash).toBe(
+      'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9'
+    )
+    expect(parsedData.buffer).toBe('hello world')
+    expect(parsedData.stream).toBe(true)
+    expect(parsedData.assert).toBe(true)
+    expect(parsedData.constants).toBe(7)
+    expect(parsedData.domain).toBe(true)
+    expect(parsedData.http).toBe(true)
+    expect(parsedData.https).toBe(true)
+    expect(parsedData.os).toBe('\n')
+    expect(parsedData.path).toBe('/hello/world/test.txt')
+    expect(parsedData.process).toBe('browser')
+    expect(parsedData.querystring).toBe('a=b')
+    expect(parsedData.stringDecoder).toBe(true)
+    expect(parsedData.sys).toBe(true)
+    expect(parsedData.timers).toBe(true)
+  })
+})

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": "11.0.2-canary.0"`
	`20`	`+ "version": "11.0.2-canary.2"`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`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/plugin-storybook",`
`3`		`- "version": "11.0.2-canary.0",`
	`3`	`+ "version": "11.0.2-canary.2",`
`4`	`4`	`"repository": {`
`5`	`5`	`"url": "vercel/next.js",`
`6`	`6`	`"directory": "packages/next-plugin-storybook"`