Merge branch 'canary' into update-react-rsc-api

vercel · Oct 18, 2021 · 76d02c4 · 76d02c4
2 parents 2ea895b + 74c5c5b
commit 76d02c4
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 23 deletions.
diff --git a/docs/basic-features/eslint.md b/docs/basic-features/eslint.md
@@ -181,6 +181,16 @@ The `next/core-web-vitals` rule set is enabled when `next lint` is run for the f
 
 ESLint also contains code formatting rules, which can conflict with your existing [Prettier](https://prettier.io/) setup. We recommend including [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) in your ESLint config to make ESLint and Prettier work together.
 
+First, install the dependency:
+
+```bash
+npm install --save-dev eslint-config-prettier
+# or
+yarn add --dev eslint-config-prettier
+```
+
+Then, add `prettier` to your existing ESLint config:
+
 ```json
 {
   "extends": ["next", "prettier"]

diff --git a/errors/no-cache.md b/errors/no-cache.md
@@ -82,7 +82,7 @@ uses: actions/cache@v2
 with:
   path: ${{ github.workspace }}/.next/cache
   # Generate a new cache whenever packages or source files change.
-  key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]sx?') }}
+  key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
   # If source files changed but packages didn't, rebuild from a prior cache.
   restore-keys: |
     ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.1.3-canary.82"
+  "version": "11.1.3-canary.83"
 }
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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+    "@next/eslint-plugin-next": "11.1.3-canary.83",
     "@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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/build/webpack/plugins/next-trace-entrypoints-plugin.ts b/packages/next/build/webpack/plugins/next-trace-entrypoints-plugin.ts
@@ -327,7 +327,11 @@ export class TraceEntryPointsPlugin implements webpack.Plugin {
                 for (const file of fileList!) {
                   const reason = reasons!.get(file)
 
-                  if (!reason || reason.type === 'initial' || !reason.parents) {
+                  if (
+                    !reason ||
+                    !reason.parents ||
+                    (reason.type === 'initial' && reason.parents.size === 0)
+                  ) {
                     continue
                   }
                   propagateToParents(reason.parents, file)

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "11.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -66,10 +66,10 @@
   "dependencies": {
     "@babel/runtime": "7.15.4",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.1.3-canary.82",
-    "@next/polyfill-module": "11.1.3-canary.82",
-    "@next/react-dev-overlay": "11.1.3-canary.82",
-    "@next/react-refresh-utils": "11.1.3-canary.82",
+    "@next/env": "11.1.3-canary.83",
+    "@next/polyfill-module": "11.1.3-canary.83",
+    "@next/react-dev-overlay": "11.1.3-canary.83",
+    "@next/react-refresh-utils": "11.1.3-canary.83",
     "@node-rs/helper": "1.2.1",
     "assert": "2.0.0",
     "browserify-zlib": "0.2.0",
@@ -150,7 +150,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "11.1.3-canary.82",
+    "@next/polyfill-nomodule": "11.1.3-canary.83",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "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.1.3-canary.82",
+  "version": "11.1.3-canary.83",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/test/integration/production/pages/client-error.js b/test/integration/production/pages/client-error.js
@@ -0,0 +1,13 @@
+import Link from 'next/link'
+import Error from 'next/error'
+
+export default function Page(props) {
+  return (
+    <>
+      <Error title="something went wrong (on purpose)" />
+      <Link href="/">
+        <a>to home</a>
+      </Link>
+    </>
+  )
+}
diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
@@ -58,7 +58,7 @@ describe('Production Usage', () => {
   })
 
   it('should contain generated page count in output', async () => {
-    const pageCount = 39
+    const pageCount = 40
     expect(output).toContain(`Generating static pages (0/${pageCount})`)
     expect(output).toContain(
       `Generating static pages (${pageCount}/${pageCount})`
@@ -79,6 +79,22 @@ describe('Production Usage', () => {
         ],
         notTests: [/node_modules\/react\/cjs\/react\.development\.js/],
       },
+      {
+        page: '/client-error',
+        tests: [
+          /webpack-runtime\.js/,
+          /chunks\/.*?\.js/,
+          /node_modules\/react\/index\.js/,
+          /node_modules\/react\/package\.json/,
+          /node_modules\/react\/cjs\/react\.production\.min\.js/,
+          /next\/link\.js/,
+          /next\/dist\/client\/link\.js/,
+          /next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
+          /next\/dist\/pages\/_error\.js/,
+          /next\/error\.js/,
+        ],
+        notTests: [/node_modules\/react\/cjs\/react\.development\.js/],
+      },
       {
         page: '/dynamic',
         tests: [
@@ -110,6 +126,8 @@ describe('Production Usage', () => {
         notTests: [
           /node_modules\/react\/cjs\/react\.development\.js/,
           /node_modules\/nanoid\/index\.cjs/,
+          /next\/dist\/pages\/_error\.js/,
+          /next\/error\.js/,
         ],
       },
       {