Merge branch 'canary' into patch-1

.eslintignore

@@ -4,6 +4,7 @@ node_modules
 **/.vscode/**
 **/dist/**
 e2e-tests/**
+examples/cms-sanity/sanity.types.ts
 examples/with-eslint/**
 examples/with-typescript-eslint-jest/**
 examples/with-kea/**

.github/actions/next-integration-stat/package.json

@@ -22,7 +22,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }

.github/actions/next-stats-action/package.json

@@ -19,7 +19,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }

.github/actions/upload-turboyet-data/package.json

@@ -13,7 +13,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }

.github/workflows/build_and_deploy.yml

@@ -275,6 +275,9 @@ jobs:
           cache-provider: 'turbo'
           shared-key: build-${{ matrix.settings.target }}-${{ hashFiles('.cargo/config.toml') }}
 
+      - name: Clear native build
+        run: rm -rf packages/next-swc/native
+
       # we only need custom caching for docker builds
       # as they are on an older Node.js version and have
       # issues with turbo caching

azure-pipelines.yml

@@ -69,8 +69,9 @@ stages:
           - script: npx playwright@1.35.1 install chromium
             condition: eq(variables['isDocsOnly'], 'No')
 
+          # Test critical app router and CNA tests to cover basic usage cases with windows
           - script: |
-              node run-tests.js -c 1 test/production/pages-dir/production/test/index.test.ts test/integration/css-client-nav/test/index.test.js test/integration/rewrites-has-condition/test/index.test.js
+              node run-tests.js -c 1 test/production/pages-dir/production/test/index.test.ts test/integration/css-client-nav/test/index.test.js test/integration/rewrites-has-condition/test/index.test.js test/integration/create-next-app/examples.test.ts test/integration/create-next-app/index.test.ts test/integration/create-next-app/package-manager/pnpm.test.ts
             condition: eq(variables['isDocsOnly'], 'No')
             displayName: 'Run tests'
 

docs/02-app/01-building-your-application/02-data-fetching/02-server-actions-and-mutations.mdx

@@ -917,6 +917,7 @@ export function addItem() {
 Defining a Server Action inside a component creates a [closure](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Closures) where the action has access to the outer function's scope. For example, the `publish` action has access to the `publishVersion` variable:
 
 ```tsx filename="app/page.tsx" switcher
+'use client'
 export default function Page() {
   const publishVersion = await getLatestVersion();
 
@@ -928,11 +929,12 @@ export default function Page() {
     ...
   }
 
-  return <button action={publish}>Publish</button>;
+  return <button onClick={publish}>Publish</button>;
 }
 ```
 
 ```jsx filename="app/page.js" switcher
+'use client'
 export default function Page() {
   const publishVersion = await getLatestVersion();
 
@@ -944,7 +946,7 @@ export default function Page() {
     ...
   }
 
-  return <button action={publish}>Publish</button>;
+  return <button onClick={publish}>Publish</button>;
 }
 ```
 

docs/02-app/01-building-your-application/06-optimizing/13-memory-usage.mdx

@@ -72,11 +72,11 @@ const nextConfig = {
     config,
     { buildId, dev, isServer, defaultLoaders, nextRuntime, webpack }
   ) => {
-    if (cfg.cache && !dev) {
-      cfg.cache = Object.freeze({
+    if (config.cache && !dev) {
+      config.cache = Object.freeze({
         type: 'memory',
       })
-      cfg.cache.maxMemoryGenerations = 0
+      config.cache.maxMemoryGenerations = 0
     }
     // Important: return the modified config
     return config