Merge branch 'canary' into chore/separate-static-paths-utils

vercel · Dec 17, 2024 · 22d9c2c · 22d9c2c
2 parents 20b4910 + 62c2f74
commit 22d9c2c
Show file tree

Hide file tree

Showing 293 changed files with 2,842 additions and 746 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -225,6 +225,15 @@
         ],
         "@typescript-eslint/no-import-type-side-effects": "error"
       }
+    },
+    {
+      "files": ["*.mdx"],
+      "extends": ["plugin:mdx/recommended"],
+      "parser": "eslint-mdx",
+      "rules": {
+        "react/jsx-no-undef": "off",
+        "react/self-closing-comp": "error"
+      }
     }
   ],
   "rules": {

diff --git a/docs/01-app/03-building-your-application/03-rendering/04-partial-prerendering.mdx b/docs/01-app/03-building-your-application/03-rendering/04-partial-prerendering.mdx
@@ -57,20 +57,20 @@ module.exports = nextConfig
 ```
 
 ```tsx filename="app/page.tsx" switcher
-import { Suspense } from "react"
-import { StaticComponent, DynamicComponent, Fallback } from "@/app/ui"
+import { Suspense } from 'react'
+import { StaticComponent, DynamicComponent, Fallback } from '@/app/ui'
 
 export const experimental_ppr = true
 
 export default function Page() {
-  return {
-     <>
+  return (
+    <>
       <StaticComponent />
       <Suspense fallback={<Fallback />}>
         <DynamicComponent />
       </Suspense>
-     </>
-  };
+    </>
+  )
 }
 ```
 

diff --git a/.../01-app/03-building-your-application/07-configuring/16-progressive-web-apps.mdx b/.../01-app/03-building-your-application/07-configuring/16-progressive-web-apps.mdx
@@ -103,9 +103,7 @@ import { subscribeUser, unsubscribeUser, sendNotification } from './actions'
 
 function urlBase64ToUint8Array(base64String: string) {
   const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
-  const base64 = (base64String + padding)
-    .replace(/\\-/g, '+')
-    .replace(/_/g, '/')
+  const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/')
 
   const rawData = window.atob(base64)
   const outputArray = new Uint8Array(rawData.length)
@@ -174,7 +172,8 @@ function PushNotificationManager() {
       ),
     })
     setSubscription(sub)
-    await subscribeUser(sub)
+    const serializedSub = JSON.parse(JSON.stringify(sub))
+    await subscribeUser(serializedSub)
   }
 
   async function unsubscribeFromPush() {

diff --git a/docs/01-app/04-api-reference/05-config/01-next-config-js/staticGeneration.mdx b/docs/01-app/04-api-reference/05-config/01-next-config-js/staticGeneration.mdx
@@ -23,13 +23,13 @@ export default nextConfig
 ```js filename="next.config.js" switcher
 const nextConfig = {
   experimental: {
-    staticGenerationRetryCount: 1
-    staticGenerationMaxConcurrency: 8
-    staticGenerationMinPagesPerWorker: 25
+    staticGenerationRetryCount: 1,
+    staticGenerationMaxConcurrency: 8,
+    staticGenerationMinPagesPerWorker: 25,
   },
 }
 
-export default nextConfig;
+export default nextConfig
 ```
 
 ## Config Options

diff --git a/examples/active-class-name/.gitignore b/examples/active-class-name/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/amp/.gitignore b/examples/amp/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/analyze-bundles/.gitignore b/examples/analyze-bundles/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-apollo-server-and-client-auth/.gitignore b/examples/api-routes-apollo-server-and-client-auth/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-apollo-server-and-client/.gitignore b/examples/api-routes-apollo-server-and-client/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-apollo-server/.gitignore b/examples/api-routes-apollo-server/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-cors/.gitignore b/examples/api-routes-cors/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-graphql/.gitignore b/examples/api-routes-graphql/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-middleware/.gitignore b/examples/api-routes-middleware/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-rate-limit/.gitignore b/examples/api-routes-rate-limit/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/api-routes-rest/.gitignore b/examples/api-routes-rest/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/app-dir-mdx/.gitignore b/examples/app-dir-mdx/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/auth-with-stytch/.gitignore b/examples/auth-with-stytch/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/auth/.gitignore b/examples/auth/.gitignore
@@ -3,7 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/auth0/.gitignore b/examples/auth0/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/basic-css/.gitignore b/examples/basic-css/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/basic-export/.gitignore b/examples/basic-export/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/blog-starter/.gitignore b/examples/blog-starter/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/blog-with-comment/.gitignore b/examples/blog-with-comment/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/blog/.gitignore b/examples/blog/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage

diff --git a/examples/cache-handler-redis/.gitignore b/examples/cache-handler-redis/.gitignore
@@ -3,8 +3,12 @@
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
-.yarn/install-state.gz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage