Merge branch 'canary' into named_func_docs

vercel · Oct 2, 2020 · 810b8ed · 810b8ed
2 parents f10ebd6 + 75a0ef9
commit 810b8ed
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/docs/api-reference/next.config.js/rewrites.md b/docs/api-reference/next.config.js/rewrites.md
@@ -17,6 +17,8 @@ Rewrites allow you to map an incoming request path to a different destination pa
 
 Rewrites are only available on the Node.js environment and do not affect client-side routing.
 
+Rewrites are not able to override public files or routes in the pages directory as these have higher priority than rewrites. For example, if you have `pages/index.js` you are not able to rewrite `/` to another location unless you rename the `pages/index.js` file.
+
 To use rewrites you can use the `rewrites` key in `next.config.js`:
 
 ```js

diff --git a/docs/basic-features/built-in-css-support.md b/docs/basic-features/built-in-css-support.md
@@ -52,7 +52,7 @@ In production, all CSS files will be automatically concatenated into a single mi
 
 ### Import styles from `node_modules`
 
-Importing a CSS file from `node_modules` is permitted in anywhere your application.
+Since Next.js **9.5.4**, importing a CSS file from `node_modules` is permitted anywhere in your application.
 
 For global stylesheets, like `bootstrap` or `nprogress`, you should import the file inside `pages/_app.js`.
 For example:

diff --git a/docs/basic-features/static-file-serving.md b/docs/basic-features/static-file-serving.md
@@ -16,7 +16,7 @@ function MyImage() {
 export default MyImage
 ```
 
-This folder is also useful for `robots.txt`, Google Site Verification, and any other static files (including `.html`)!
+This folder is also useful for `robots.txt`, `favicon.ico`, Google Site Verification, and any other static files (including `.html`)!
 
 > **Note**: Don't name the `public` directory anything else. The name cannot be changed and is the only directory used to serve static assets.
 

diff --git a/docs/basic-features/typescript.md b/docs/basic-features/typescript.md
@@ -41,7 +41,7 @@ You're now ready to start converting files from `.js` to `.tsx` and leveraging t
 
 > A file named `next-env.d.ts` will be created in the root of your project. This file ensures Next.js types are picked up by the TypeScript compiler. **You cannot remove it**, however, you can edit it (but you don't need to).
 
-> Next.js `strict` mode is turned off by default. When you feel comfortable with TypeScript, it's recommended to turn it on in your `tsconfig.json`.
+> TypeScript `strict` mode is turned off by default. When you feel comfortable with TypeScript, it's recommended to turn it on in your `tsconfig.json`.
 
 By default, Next.js will do type checking as part of `next build`. We recommend using code editor type checking during development.
 

diff --git a/examples/with-mux-video/README.md b/examples/with-mux-video/README.md
@@ -4,7 +4,9 @@ This example uses Mux Video, an API-first platform for video. The example featur
 
 ## Demo
 
-### [https://with-mux-video.now.sh/](https://with-mux-video.now.sh/)
+### [https://with-mux-video.vercel.app/](https://with-mux-video.vercel.app/)
+
+### This project was used to create [stream.new](https://stream.new/)
 
 ## Deploy your own
 

diff --git a/examples/with-mux-video/components/layout.js b/examples/with-mux-video/components/layout.js
@@ -4,9 +4,9 @@ import { MUX_HOME_PAGE_URL } from '../constants'
 export default function Layout({
   title,
   description,
-  metaTitle,
+  metaTitle = 'Mux + Next.js',
   metaDescription,
-  image,
+  image = 'https://with-mux-video.vercel.app/mux-nextjs-og-image.png',
   children,
   loadTwitterWidget,
 }) {

diff --git a/examples/with-mux-video/public/mux-nextjs-og-image.png b/examples/with-mux-video/public/mux-nextjs-og-image.png