Merge branch 'canary' into shu/02b2

vercel · Oct 27, 2022 · 7bd8fe0 · 7bd8fe0
2 parents 40df54b + bbe7fdd
commit 7bd8fe0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/docs/api-reference/next/font.md b/docs/api-reference/next/font.md
@@ -294,7 +294,7 @@ import { greatVibes, sourceCodePro400 } from '@/fonts';
 ## Next Steps
 
 <div class="card">
-  <a href="/docs/optimizing/fonts.md">
+  <a href="/docs/basic-features/font-optimization.md">
     <b>Font Optmization</b>
     <small>Learn how to optimize fonts with the Font module.</small>
   </a>

diff --git a/docs/basic-features/font-optimization.md b/docs/basic-features/font-optimization.md
@@ -152,7 +152,7 @@ Every time you call the `localFont` or Google font function, that font is hosted
 
 <div class="card">
   <a href="/docs/basic-features/image-optimization.md">
-    <b>Image Optmization</b>
+    <b>Image Optimization</b>
     <small>Learn how to optimize images with the Image component.</small>
   </a>
 </div>
diff --git a/examples/with-turbopack/README.md b/examples/with-turbopack/README.md
@@ -14,7 +14,7 @@ This playground is a mirror of the [Next.js v13 App Directory Playground](https:
 **Note:** The playground uses [Tailwind CSS](https://tailwindcss.com). However, Turbopack does not yet support fully [PostCSS](https://turbo.build/pack/docs/features/css#postcss), but it does support CSS and CSS Modules. [As a workaround](https://turbo.build/pack/docs/features/css#tailwind-css), we run Tailwind through it's CLI upon `postinstall`. For live reload of CSS, you can run Tailwind in another process with the `--watch` flag or install `concurrently` and modify your `dev` script:
 
 ```bash
-yarn install concurrently --dev
+yarn add concurrently --dev
 ```
 
 Then modify your `dev` script in `package.json`:

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1427,25 +1427,10 @@ export default async function getBaseWebpackConfig(
           // and all other chunk depend on them so there is no
           // duplication that need to be pulled out.
           chunks: (chunk: any) =>
-            !/^(polyfills|main|main-app|pages\/_app)$/.test(chunk.name),
+            !/^(polyfills|main|pages\/_app)$/.test(chunk.name),
           cacheGroups: {
             framework: {
-              chunks: (chunk) => {
-                const name = chunk.name
-
-                // Skip app directory and include shared modules in main-app.
-                if (
-                  name &&
-                  hasAppDir &&
-                  (name === 'main-app' ||
-                    name === 'app-internals' ||
-                    name.startsWith('app/'))
-                ) {
-                  return false
-                }
-
-                return true
-              },
+              chunks: 'all',
               name: 'framework',
               test(module: any) {
                 const resource = module.nameForCondition?.()