Use <Activity> from Canary

Author: eps1lon

crates/next-core/src/next_config.rs

@@ -1693,11 +1693,6 @@ impl NextConfig {
         Vc::cell(self.experimental.taint.unwrap_or(false))
     }
 
-    #[turbo_tasks::function]
-    pub fn enable_router_bfcache(&self) -> Vc<bool> {
-        Vc::cell(self.experimental.router_bfcache.unwrap_or(false))
-    }
-
     #[turbo_tasks::function]
     pub fn enable_view_transition(&self) -> Vc<bool> {
         Vc::cell(self.experimental.view_transition.unwrap_or(false))

crates/next-core/src/next_import_map.rs

@@ -129,7 +129,6 @@ pub async fn get_next_client_import_map(
             let react_flavor = if *next_config.enable_ppr().await?
                 || *next_config.enable_taint().await?
                 || *next_config.enable_view_transition().await?
-                || *next_config.enable_router_bfcache().await?
             {
                 "-experimental"
             } else {
@@ -833,9 +832,8 @@ async fn apply_vendored_react_aliases_server(
 ) -> Result<()> {
     let ppr = *next_config.enable_ppr().await?;
     let taint = *next_config.enable_taint().await?;
-    let router_bfcache = *next_config.enable_router_bfcache().await?;
     let view_transition = *next_config.enable_view_transition().await?;
-    let react_channel = if ppr || taint || view_transition || router_bfcache {
+    let react_channel = if ppr || taint || view_transition {
         "-experimental"
     } else {
         ""

package.json

@@ -144,7 +144,7 @@
     "@types/jest": "29.5.5",
     "@types/node": "20.17.6",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "19.1.10",
+    "@types/react": "19.1.13",
     "@types/react-dom": "19.1.7",
     "@types/relay-runtime": "14.1.13",
     "@types/string-hash": "1.1.1",
@@ -300,7 +300,7 @@
       "@babel/parser": "7.27.0",
       "@babel/types": "7.27.0",
       "@babel/traverse": "7.27.0",
-      "@types/react": "19.1.10",
+      "@types/react": "19.1.13",
       "@types/react-dom": "19.1.7",
       "@types/retry": "0.12.0",
       "jest-snapshot": "30.0.0-alpha.6",

packages/next/src/client/components/layout-router.tsx

@@ -16,6 +16,7 @@ import {
 } from './router-reducer/router-reducer-types'
 
 import React, {
+  Activity,
   useContext,
   use,
   startTransition,
@@ -42,10 +43,6 @@ import { dispatchAppRouterAction } from './use-action-queue'
 import { useRouterBFCache, type RouterBFCacheEntry } from './bfcache'
 import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths'
 
-const Activity = process.env.__NEXT_ROUTER_BF_CACHE
-  ? (require('react') as typeof import('react')).unstable_Activity
-  : null!
-
 /**
  * Add refetch marker to router state at the point of the current layout segment.
  * This ensures the response returned is not further down than the current layout segment.

packages/next/src/lib/needs-experimental-react.ts

@@ -1,7 +1,6 @@
 import type { NextConfig } from '../server/config-shared'
 
 export function needsExperimentalReact(config: NextConfig) {
-  const { ppr, taint, viewTransition, routerBFCache } =
-    config.experimental || {}
-  return Boolean(ppr || taint || viewTransition || routerBFCache)
+  const { ppr, taint, viewTransition } = config.experimental || {}
+  return Boolean(ppr || taint || viewTransition)
 }