Merge branch 'canary' into 10-24-Remove_throw_for_unknown_messages_in…

…_hot-reloader-client
vercel · Nov 3, 2023 · c0319c4 · c0319c4
2 parents 7acbaf0 + 53b684a
commit c0319c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/02-app/01-building-your-application/07-configuring/05-mdx.mdx b/docs/02-app/01-building-your-application/07-configuring/05-mdx.mdx
@@ -1,5 +1,6 @@
 ---
-title: MDX
+title: Markdown and MDX
+nav_title: MDX
 description: Learn how to configure MDX to write JSX in your markdown files.
 ---
 
@@ -70,7 +71,7 @@ const withMDX = require('@next/mdx')()
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  // Configure `pageExtensions`` to include MDX files
+  // Configure `pageExtensions` to include MDX files
   pageExtensions: ['js', 'jsx', 'mdx', 'ts', 'tsx'],
   // Optionally, add any other Next.js config below
 }

diff --git a/docs/03-pages/01-building-your-application/06-configuring/06-mdx.mdx b/docs/03-pages/01-building-your-application/06-configuring/06-mdx.mdx
@@ -1,5 +1,6 @@
 ---
-title: MDX
+title: Markdown and MDX
+nav_title: MDX
 description: Learn how to configure MDX to write JSX in your markdown files.
 source: app/building-your-application/configuring/mdx
 ---

diff --git a/packages/next/src/build/babel/loader/get-config.ts b/packages/next/src/build/babel/loader/get-config.ts
@@ -233,7 +233,7 @@ function checkCustomBabelConfigDeprecation(
 
   if (isPresetReadyToDeprecate && unsupportedPlugins.length === 0) {
     Log.warn(
-      `It looks like there is a custom Babel configuration can be removed ${
+      `It looks like there is a custom Babel configuration that can be removed${
         pluginReasons.length > 0 ? ':' : '.'
       }`
     )