Merge branch 'fix-set-cookie-header' of https://github.com/vercel/nex…

…t.js into fix-set-cookie-header
vercel · Oct 28, 2021 · dae9a97 · dae9a97
2 parents 056ca42 + 741aea0
commit dae9a97
Show file tree

Hide file tree

Showing 28 changed files with 93 additions and 82 deletions.
diff --git a/contributing.md b/contributing.md
@@ -15,8 +15,7 @@ To develop locally:
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
    own GitHub account and then
-   [clone](https://help.github.com/articles/cloning-a-repository/) it to your
-   local device.
+   [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
    ```
    git checkout -b MY_BRANCH_NAME
@@ -127,7 +126,7 @@ EXAMPLE=./test/integration/basic
 
 There are two options to develop with your local version of the codebase:
 
-### Set as local dependency in package.json
+### Set as a local dependency in package.json
 
 1. In your app's `package.json`, replace:
 
@@ -175,15 +174,15 @@ or
 
 This will use the version of `next` built inside of the Next.js monorepo and the
 main `yarn dev` monorepo command can be running to make changes to the local
-Next.js version at the same time (some changes might require re-running `yarn next-with-deps` to take affect).
+Next.js version at the same time (some changes might require re-running `yarn next-with-deps` to take effect).
 
 ## Adding warning/error descriptions
 
 In Next.js we have a system to add helpful links to warnings and errors.
 
 This allows for the logged message to be short while giving a broader description and instructions on how to solve the warning/error.
 
-In general all warnings and errors added should have these links attached.
+In general, all warnings and errors added should have these links attached.
 
 Below are the steps to add a new link:
 

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

diff --git a/packages/next/build/swc/Cargo.lock b/packages/next/build/swc/Cargo.lock