Merge branch 'canary' into zt/upgrade-react

Author: ztanner

.github/workflows/build_and_test.yml

@@ -424,6 +424,7 @@ jobs:
         'test-dev',
         'test-prod',
         'test-integration',
+        'test-firefox-safari',
         'test-ppr-dev',
         'test-ppr-prod',
         'test-ppr-integration',

.github/workflows/turbopack-nextjs-build-integration-tests.yml

@@ -40,7 +40,7 @@ jobs:
     name: Setup Next.js build
     uses: ./.github/workflows/setup-nextjs-build.yml
     with:
-      version: ${{ inputs.version }}
+      version: ${{ inputs.version || 'canary' }}
 
   # Actual test scheduling. These jobs mimic the same jobs in Next.js repo,
   # which we do allow some of duplications to make it easier to update if upstream changes.
@@ -70,7 +70,7 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ inputs.version }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt}}-${{ github.run_number }}
+          key: ${{ inputs.version || 'canary' }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt}}-${{ github.run_number }}
           fail-on-cache-miss: true
 
       - name: Enable corepack and install yarn
@@ -96,9 +96,8 @@ jobs:
           path: |
             test/turbopack-test-junit-report
 
-  # TODO: Implement specifically running production tests only for Turbopack. Enabling this now enables running `test/integration` with development mode too.
   test-integration-production:
-    name: Next.js production integration test (Integration)
+    name: Next.js integration test (Integration)
     needs: [setup_nextjs]
     runs-on:
       - 'self-hosted'
@@ -117,7 +116,7 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ inputs.version }}-${{ github.sha }}
+          key: ${{ inputs.version || 'canary' }}-${{ github.sha }}
           fail-on-cache-miss: true
 
       - name: Enable corepack and install yarn
@@ -145,8 +144,7 @@ jobs:
   # Collect integration test results from execute_tests,
   # Store it as github artifact for next step to consume.
   collect_nextjs_production_integration_stat:
-    # needs: [test-production, test-integration-production]
-    needs: [test-production]
+    needs: [test-production, test-integration-production]
     name: Next.js integration test production status report
     runs-on:
       - 'self-hosted'
@@ -164,7 +162,7 @@ jobs:
       - name: Collect integration test stat
         uses: ./.github/actions/next-integration-stat
         with:
-          diff_base: ${{ inputs.diff_base }}
+          diff_base: ${{ inputs.diff_base || 'none' }}
 
       - name: Store artifacts
         uses: actions/upload-artifact@v4
@@ -176,8 +174,7 @@ jobs:
             passed-test-path-list.json
 
   upload_test_report:
-    # needs: [test-production, test-integration-production]
-    needs: [test-production]
+    needs: [test-production, test-integration-production]
     name: Upload test report to datadog
     runs-on:
       - 'self-hosted'

.github/workflows/turbopack-nextjs-dev-integration-tests.yml

@@ -40,7 +40,7 @@ jobs:
     name: Setup Next.js build
     uses: ./.github/workflows/setup-nextjs-build.yml
     with:
-      version: ${{ inputs.version }}
+      version: ${{ inputs.version || 'canary' }}
 
   # Actual test scheduling. These jobs mimic the same jobs in Next.js repo,
   # which we do allow some of duplications to make it easier to update if upstream changes.
@@ -70,7 +70,7 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ inputs.version }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt}}-${{ github.run_number }}
+          key: ${{ inputs.version || 'canary' }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt}}-${{ github.run_number }}
           fail-on-cache-miss: true
 
       - name: Enable corepack and install yarn
@@ -116,7 +116,7 @@ jobs:
         id: restore-build
         with:
           path: ./*
-          key: ${{ inputs.version }}-${{ github.sha }}
+          key: ${{ inputs.version || 'canary' }}-${{ github.sha }}
           fail-on-cache-miss: true
 
       - name: Enable corepack and install yarn
@@ -162,7 +162,7 @@ jobs:
       - name: Collect integration test stat
         uses: ./.github/actions/next-integration-stat
         with:
-          diff_base: ${{ inputs.diff_base }}
+          diff_base: ${{ inputs.diff_base || 'none' }}
 
       - name: Store artifacts
         uses: actions/upload-artifact@v4

docs/02-app/01-building-your-application/01-routing/10-parallel-routes.mdx

@@ -64,7 +64,7 @@ export default function Layout({ children, team, analytics }) {
 }
 ```
 
-However, slots are **not** [route segments](/docs/app/building-your-application/routing#route-segments) and do not affect the URL structure. For example, for `/dashboard/@analytics/views`, the URL will be `/dashboard/views` since `@analytics` is a slot.
+However, slots are **not** [route segments](/docs/app/building-your-application/routing#route-segments) and do not affect the URL structure. For example, for `/@analytics/views`, the URL will be `/views` since `@analytics` is a slot.
 
 > **Good to know**:
 >
@@ -95,7 +95,7 @@ Consider the following folder structure. The `@team` slot has a `/settings` page
   height="930"
 />
 
-When navigating to `/dashboard/settings`, the `@team` slot will render the `/settings` page while maintaining the currently active page for the `@analytics` slot.
+When navigating to `/settings`, the `@team` slot will render the `/settings` page while maintaining the currently active page for the `@analytics` slot.
 
 On refresh, Next.js will render a `default.js` for `@analytics`. If `default.js` doesn't exist, a `404` is rendered instead.
 
@@ -183,31 +183,31 @@ For example, the `@analytics` slot has two subpages: `/page-views` and `/visitor
 
 Within `@analytics`, create a [`layout`](/docs/app/building-your-application/routing/pages-and-layouts) file to share the tabs between the two pages:
 
-```tsx filename="app/dashboard/@analytics/layout.tsx" switcher
+```tsx filename="app/@analytics/layout.tsx" switcher
 import Link from 'next/link'
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
       <nav>
-        <Link href="/dashboard/page-views">Page Views</Link>
-        <Link href="/dashboard/visitors">Visitors</Link>
+        <Link href="/page-views">Page Views</Link>
+        <Link href="/visitors">Visitors</Link>
       </nav>
       <div>{children}</div>
     </>
   )
 }
 ```
 
-```jsx filename="app/dashboard/@analytics/layout.js" switcher
+```jsx filename="app/@analytics/layout.js" switcher
 import Link from 'next/link'
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
       <nav>
-        <Link href="/dashboard/page-views">Page Views</Link>
-        <Link href="/dashboard/visitors">Visitors</Link>
+        <Link href="/page-views">Page Views</Link>
+        <Link href="/visitors">Visitors</Link>
       </nav>
       <div>{children}</div>
     </>

docs/02-app/02-api-reference/02-file-conventions/default.mdx

@@ -21,7 +21,7 @@ Consider the following folder structure. The `@team` slot has a `settings` page,
   height="930"
 />
 
-When navigating to `/dashboard/settings`, the `@team` slot will render the `settings` page while maintaining the currently active page for the `@analytics` slot.
+When navigating to `/settings`, the `@team` slot will render the `settings` page while maintaining the currently active page for the `@analytics` slot.
 
 On refresh, Next.js will render a `default.js` for `@analytics`. If `default.js` doesn't exist, a `404` is rendered instead.
 

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.2.0-canary.42"
+  "version": "14.2.0-canary.44"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "14.2.0-canary.42",
+  "version": "14.2.0-canary.44",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "14.2.0-canary.42",
+  "version": "14.2.0-canary.44",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "14.2.0-canary.42",
+    "@next/eslint-plugin-next": "14.2.0-canary.44",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "14.2.0-canary.42",
+  "version": "14.2.0-canary.44",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "14.2.0-canary.42",
+  "version": "14.2.0-canary.44",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"