Skip to content

Commit b236afa

Browse files
committed
rebase
1 parent 8c10050 commit b236afa

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

integrations/react/src/__internal__/ActivityComponentType.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

integrations/react/src/future/ActivityComponentType.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import type {
22
InferActivityParams,
33
RegisteredActivityName,
44
} from "@stackflow/config";
5-
import type { ActivityComponentType as ActivityComponentTypeInternal } from "../__internal__/ActivityComponentType";
5+
import type { MonolithicActivityComponentType } from "../__internal__/MonolithicActivityComponentType";
6+
import type { StructuredActivityComponentType } from "../__internal__/StructuredActivityComponentType";
67

78
export type ActivityComponentType<ActivityName extends RegisteredActivityName> =
8-
ActivityComponentTypeInternal<InferActivityParams<ActivityName>>;
9+
| MonolithicActivityComponentType<InferActivityParams<ActivityName>>
10+
| StructuredActivityComponentType<InferActivityParams<ActivityName>>;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import type {
2+
InferActivityParams,
3+
RegisteredActivityName,
4+
} from "@stackflow/config";
5+
import type { StaticActivityComponentType } from "../__internal__/StaticActivityComponentType";
6+
7+
export type ActivityComponentType<ActivityName extends RegisteredActivityName> =
8+
StaticActivityComponentType<InferActivityParams<ActivityName>>;

0 commit comments

Comments
 (0)