Release Activity in Canary

rickhanlonii · rickhanlonii · commit 8311c8bee6e5 · 2025-09-03T12:32:40.000-04:00
diff --git a/fixtures/view-transition/src/components/Page.js b/fixtures/view-transition/src/components/Page.js
@@ -1,7 +1,7 @@
 import React, {
   unstable_addTransitionType as addTransitionType,
   unstable_ViewTransition as ViewTransition,
-  unstable_Activity as Activity,
+  Activity,
   useLayoutEffect,
   useEffect,
   useState,
diff --git a/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js b/packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js
@@ -199,7 +199,7 @@ describe('Store component filters', () => {
   });
 
   it('should filter Activity', async () => {
-    const Activity = React.unstable_Activity;
+    const Activity = React.Activity || React.unstable_Activity;
 
     if (Activity != null) {
       await actAsync(async () =>
diff --git a/packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js b/packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js
@@ -31,7 +31,7 @@ describe('FragmentRefs', () => {
     jest.resetModules();
     React = require('react');
     Fragment = React.Fragment;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     ReactDOMClient = require('react-dom/client');
     ReactDOM = require('react-dom');
     createPortal = ReactDOM.createPortal;
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js
@@ -113,7 +113,7 @@ describe('ReactDOMServerPartialHydration', () => {
     act = require('internal-test-utils').act;
     ReactDOMServer = require('react-dom/server');
     Scheduler = require('scheduler');
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     Suspense = React.Suspense;
     useSyncExternalStore = React.useSyncExternalStore;
     if (gate(flags => flags.enableSuspenseList)) {
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydrationActivity-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydrationActivity-test.internal.js
@@ -100,7 +100,7 @@ describe('ReactDOMServerPartialHydrationActivity', () => {
     act = require('internal-test-utils').act;
     ReactDOMServer = require('react-dom/server');
     Scheduler = require('scheduler');
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     Suspense = React.Suspense;
     useSyncExternalStore = React.useSyncExternalStore;
 
diff --git a/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydrationActivity-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydrationActivity-test.internal.js
@@ -139,7 +139,7 @@ describe('ReactDOMServerSelectiveHydrationActivity', () => {
     ReactDOMServer = require('react-dom/server');
     act = require('internal-test-utils').act;
     Scheduler = require('scheduler');
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
 
     const InternalTestUtils = require('internal-test-utils');
     assertLog = InternalTestUtils.assertLog;
diff --git a/packages/react-reconciler/src/__tests__/Activity-test.js b/packages/react-reconciler/src/__tests__/Activity-test.js
@@ -24,7 +24,7 @@ describe('Activity', () => {
     Scheduler = require('scheduler');
     act = require('internal-test-utils').act;
     LegacyHidden = React.unstable_LegacyHidden;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     useState = React.useState;
     useInsertionEffect = React.useInsertionEffect;
     useLayoutEffect = React.useLayoutEffect;
@@ -280,7 +280,7 @@ describe('Activity', () => {
 
   // @gate enableActivity
   it('nested offscreen does not call componentWillUnmount when hidden', async () => {
-    // This is a bug that appeared during production test of <unstable_Activity />.
+    // This is a bug that appeared during production test of <Activity />.
     // It is a very specific scenario with nested Offscreens. The inner offscreen
     // goes from visible to hidden in synchronous update.
     class ClassComponent extends React.Component {
diff --git a/packages/react-reconciler/src/__tests__/ActivityLegacySuspense-test.js b/packages/react-reconciler/src/__tests__/ActivityLegacySuspense-test.js
@@ -22,7 +22,7 @@ describe('Activity Suspense', () => {
     Scheduler = require('scheduler');
     act = require('internal-test-utils').act;
     LegacyHidden = React.unstable_LegacyHidden;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     Suspense = React.Suspense;
     useState = React.useState;
     useEffect = React.useEffect;
diff --git a/packages/react-reconciler/src/__tests__/ActivityStrictMode-test.js b/packages/react-reconciler/src/__tests__/ActivityStrictMode-test.js
@@ -10,7 +10,7 @@ describe('Activity StrictMode', () => {
     log = [];
 
     React = require('react');
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     ReactNoop = require('react-noop-renderer');
     act = require('internal-test-utils').act;
   });
diff --git a/packages/react-reconciler/src/__tests__/ActivitySuspense-test.js b/packages/react-reconciler/src/__tests__/ActivitySuspense-test.js
@@ -23,7 +23,7 @@ describe('Activity Suspense', () => {
     Scheduler = require('scheduler');
     act = require('internal-test-utils').act;
     LegacyHidden = React.unstable_LegacyHidden;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     Suspense = React.Suspense;
     useState = React.useState;
     useEffect = React.useEffect;
diff --git a/packages/react-reconciler/src/__tests__/ReactDeferredValue-test.js b/packages/react-reconciler/src/__tests__/ReactDeferredValue-test.js
@@ -34,7 +34,7 @@ describe('ReactDeferredValue', () => {
     useMemo = React.useMemo;
     useState = React.useState;
     Suspense = React.Suspense;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
 
     const InternalTestUtils = require('internal-test-utils');
     assertLog = InternalTestUtils.assertLog;
diff --git a/packages/react-reconciler/src/__tests__/ReactErrorStacks-test.js b/packages/react-reconciler/src/__tests__/ReactErrorStacks-test.js
@@ -28,7 +28,7 @@ describe('ReactFragment', () => {
 
     React = require('react');
     Suspense = React.Suspense;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     ViewTransition = React.unstable_ViewTransition;
     ReactNoop = require('react-noop-renderer');
     const InternalTestUtils = require('internal-test-utils');
diff --git a/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js b/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js
@@ -68,7 +68,7 @@ describe('ReactHooksWithNoopRenderer', () => {
     useTransition = React.useTransition;
     useDeferredValue = React.useDeferredValue;
     Suspense = React.Suspense;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     ContinuousEventPriority =
       require('react-reconciler/constants').ContinuousEventPriority;
     if (gate(flags => flags.enableSuspenseList)) {
diff --git a/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js b/packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js
@@ -968,7 +968,7 @@ describe('ReactLazy', () => {
 
   // @gate enableActivity
   it('throws with a useful error when wrapping Activity with lazy()', async () => {
-    const BadLazy = lazy(() => fakeImport(React.unstable_Activity));
+    const BadLazy = lazy(() => fakeImport(React.Activity));
 
     const root = ReactTestRenderer.create(
       <Suspense fallback={<Text text="Loading..." />}>
@@ -981,7 +981,7 @@ describe('ReactLazy', () => {
 
     await waitForAll(['Loading...']);
 
-    await resolveFakeImport(React.unstable_Activity);
+    await resolveFakeImport(React.Activity);
     root.update(
       <Suspense fallback={<Text text="Loading..." />}>
         <BadLazy />
diff --git a/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js b/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js
@@ -25,7 +25,7 @@ describe('ReactSiblingPrerendering', () => {
     waitForAll = require('internal-test-utils').waitForAll;
     startTransition = React.startTransition;
     Suspense = React.Suspense;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
 
     textCache = new Map();
   });
diff --git a/packages/react-reconciler/src/__tests__/ReactSuspenseyCommitPhase-test.js b/packages/react-reconciler/src/__tests__/ReactSuspenseyCommitPhase-test.js
@@ -23,7 +23,7 @@ describe('ReactSuspenseyCommitPhase', () => {
     if (gate(flags => flags.enableSuspenseList)) {
       SuspenseList = React.unstable_SuspenseList;
     }
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
     useMemo = React.useMemo;
     startTransition = React.startTransition;
     resolveSuspenseyThing = ReactNoop.resolveSuspenseyThing;
diff --git a/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js b/packages/react-reconciler/src/__tests__/ReactTransitionTracing-test.js
@@ -53,7 +53,7 @@ describe('ReactInteractionTracing', () => {
     useState = React.useState;
     startTransition = React.startTransition;
     Suspense = React.Suspense;
-    Activity = React.unstable_Activity;
+    Activity = React.Activity;
 
     getCacheForType = React.unstable_getCacheForType;
 
diff --git a/packages/react-refresh/src/__tests__/ReactFreshIntegration-test.js b/packages/react-refresh/src/__tests__/ReactFreshIntegration-test.js
@@ -308,7 +308,7 @@ describe('ReactFreshIntegration', () => {
     // @gate __DEV__ && enableActivity
     it('ignores ref for class component in hidden subtree', async () => {
       const code = `
-        import {unstable_Activity as Activity} from 'react';
+        import {Activity} from 'react';
 
         // Avoid creating a new class on Fast Refresh.
         global.A = global.A ?? class A extends React.Component {
@@ -338,7 +338,7 @@ describe('ReactFreshIntegration', () => {
     // @gate __DEV__ && enableActivity
     it('ignores ref for hoistable resource in hidden subtree', async () => {
       const code = `
-        import {unstable_Activity as Activity} from 'react';
+        import {Activity} from 'react';
 
         function hiddenRef() {
           throw new Error('Unexpected hiddenRef() invocation.');
@@ -360,7 +360,7 @@ describe('ReactFreshIntegration', () => {
     // @gate __DEV__ && enableActivity
     it('ignores ref for host component in hidden subtree', async () => {
       const code = `
-        import {unstable_Activity as Activity} from 'react';
+        import {Activity} from 'react';
 
         function hiddenRef() {
           throw new Error('Unexpected hiddenRef() invocation.');
@@ -382,7 +382,7 @@ describe('ReactFreshIntegration', () => {
     // @gate __DEV__ && enableActivity
     it('ignores ref for Activity in hidden subtree', async () => {
       const code = `
-        import {unstable_Activity as Activity} from 'react';
+        import {Activity} from 'react';
 
         function hiddenRef(value) {
           throw new Error('Unexpected hiddenRef() invocation.');
@@ -407,7 +407,7 @@ describe('ReactFreshIntegration', () => {
     it('ignores ref for Scope in hidden subtree', async () => {
       const code = `
         import {
-          unstable_Activity as Activity,
+          Activity,
           unstable_Scope as Scope,
         } from 'react';
 
@@ -433,7 +433,7 @@ describe('ReactFreshIntegration', () => {
     // @gate __DEV__ && enableActivity
     it('ignores ref for functional component in hidden subtree', async () => {
       const code = `
-        import {unstable_Activity as Activity} from 'react';
+        import {Activity} from 'react';
 
         // Avoid creating a new component on Fast Refresh.
         global.A = global.A ?? function A() {
@@ -463,7 +463,7 @@ describe('ReactFreshIntegration', () => {
       const code = `
         import {
           forwardRef,
-          unstable_Activity as Activity,
+          Activity,
         } from 'react';
 
         // Avoid creating a new component on Fast Refresh.
@@ -494,7 +494,7 @@ describe('ReactFreshIntegration', () => {
       const code = `
         import {
           memo,
-          unstable_Activity as Activity,
+          Activity,
         } from 'react';
 
         // Avoid creating a new component on Fast Refresh.
@@ -526,7 +526,7 @@ describe('ReactFreshIntegration', () => {
       const code = `
         import {
           memo,
-          unstable_Activity as Activity,
+          Activity,
         } from 'react';
 
         // Avoid creating a new component on Fast Refresh.
diff --git a/packages/react/index.development.js b/packages/react/index.development.js
@@ -44,7 +44,9 @@ export {
   cacheSignal,
   startTransition,
   unstable_LegacyHidden,
-  unstable_Activity,
+  Activity,
+  // TODO: Remove this from experimental after awhile.
+  // Activity as unstable_Activity,
   unstable_Scope,
   unstable_SuspenseList,
   unstable_TracingMarker,
diff --git a/packages/react/index.experimental.development.js b/packages/react/index.experimental.development.js
@@ -29,7 +29,9 @@ export {
   cache,
   cacheSignal,
   startTransition,
-  unstable_Activity,
+  Activity,
+  // TODO: Remove this from experimental after awhile.
+  // Activity as unstable_Activity,
   unstable_postpone,
   unstable_getCacheForType,
   unstable_SuspenseList,
@@ -62,6 +64,7 @@ export {
 
 import {useOptimistic} from './src/ReactClient';
 
+// todo: unstable_Activity
 export function experimental_useOptimistic<S, A>(
   passthrough: S,
   reducer: ?(S, A) => S,
diff --git a/packages/react/index.experimental.js b/packages/react/index.experimental.js
@@ -29,7 +29,9 @@ export {
   cache,
   cacheSignal,
   startTransition,
-  unstable_Activity,
+  Activity,
+  // TODO: Remove this from experimental after awhile.
+  // Activity as unstable_Activity,
   unstable_postpone,
   unstable_getCacheForType,
   unstable_SuspenseList,
diff --git a/packages/react/index.fb.js b/packages/react/index.fb.js
@@ -32,7 +32,9 @@ export {
   startTransition,
   StrictMode,
   Suspense,
-  unstable_Activity,
+  Activity,
+  // TODO: Remove this after updated in fb.
+  Activity as unstable_Activity,
   unstable_getCacheForType,
   unstable_LegacyHidden,
   unstable_Scope,
diff --git a/packages/react/index.js b/packages/react/index.js
@@ -44,7 +44,7 @@ export {
   cacheSignal,
   startTransition,
   unstable_LegacyHidden,
-  unstable_Activity,
+  Activity,
   unstable_Scope,
   unstable_SuspenseList,
   unstable_TracingMarker,
diff --git a/packages/react/index.stable.development.js b/packages/react/index.stable.development.js
@@ -10,6 +10,7 @@
 export {
   __CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
   __COMPILER_RUNTIME,
+  Activity,
   Children,
   Component,
   Fragment,
diff --git a/packages/react/index.stable.js b/packages/react/index.stable.js
@@ -10,6 +10,7 @@
 export {
   __CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,
   __COMPILER_RUNTIME,
+  Activity,
   Children,
   Component,
   Fragment,
diff --git a/packages/react/src/ReactClient.js b/packages/react/src/ReactClient.js
@@ -116,7 +116,7 @@ export {
   useDeferredValue,
   REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,
   REACT_LEGACY_HIDDEN_TYPE as unstable_LegacyHidden,
-  REACT_ACTIVITY_TYPE as unstable_Activity,
+  REACT_ACTIVITY_TYPE as Activity,
   getCacheForType as unstable_getCacheForType,
   useCacheRefresh as unstable_useCacheRefresh,
   use,
diff --git a/packages/react/src/ReactServer.experimental.js b/packages/react/src/ReactServer.experimental.js
@@ -82,5 +82,7 @@ export {
   // Experimental
   REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,
   REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
+  // TODO: Remove this from experimental after awhile.
   REACT_ACTIVITY_TYPE as unstable_Activity,
+  REACT_ACTIVITY_TYPE as Activity,
 };
diff --git a/scripts/jest/TestFlags.js b/scripts/jest/TestFlags.js
@@ -81,7 +81,8 @@ function getTestFlags() {
       fb: www || xplat,
 
       // These aren't flags, just a useful aliases for tests.
-      enableActivity: releaseChannel === 'experimental' || www || xplat,
+      // TODO: Clean this up.
+      enableActivity: true,
       enableSuspenseList: releaseChannel === 'experimental' || www || xplat,
       enableLegacyHidden: www,
       // TODO: Suspending the work loop during the render phase is currently
