Merge remote-tracking branch 'upstream/canary' into fix/special-public-files

ijjk · ijjk · commit 728bf2583510 · 2020-01-09T19:44:37.000-06:00
diff --git a/examples/with-higher-order-component/README.md b/examples/with-higher-order-component/README.md
@@ -30,16 +30,13 @@ Install it and run:
 ```bash
 npm install
 npm run dev
-# or
-yarn
-yarn dev
 ```
 
 **yarn**
 
 ```bash
-npm install
-npm run dev
+yarn
+yarn dev
 ```
 
 Deploy it to the cloud with [now](https://zeit.co/now)
diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.8-canary.9"
+  "version": "9.1.8-canary.10"
 }
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": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "keywords": [
     "react",
     "next",
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": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [
diff --git a/packages/next-plugin-material-ui/package.json b/packages/next-plugin-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "nextjs": {
     "name": "Material UI",
     "required-env": []
diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "nextjs": {
     "name": "Sentry",
     "required-env": [
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.8-canary.9",
+  "version": "9.1.8-canary.10",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@`
`12`	`12`	`"registry": "https://registry.npmjs.org/"`
`13`	`13`	`}`
`14`	`14`	`},`
`15`		`- "version": "9.1.8-canary.9"`
	`15`	`+ "version": "9.1.8-canary.10"`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`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/bundle-analyzer",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`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/mdx",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`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-google-analytics",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`4`	`4`	`"nextjs": {`
`5`	`5`	`"name": "Google Analytics",`
`6`	`6`	`"required-env": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/plugin-material-ui",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`4`	`4`	`"nextjs": {`
`5`	`5`	`"name": "Material UI",`
`6`	`6`	`"required-env": []`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/plugin-sentry",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`4`	`4`	`"nextjs": {`
`5`	`5`	`"name": "Sentry",`
`6`	`6`	`"required-env": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "next",`
`3`		`- "version": "9.1.8-canary.9",`
	`3`	`+ "version": "9.1.8-canary.10",`
`4`	`4`	`"description": "The React Framework",`
`5`	`5`	`"main": "./dist/server/next.js",`
`6`	`6`	`"license": "MIT",`