@@ -5,16 +5,6 @@ import * as preact1 from 'preact';
55import { JSXInternal } from '../../src/jsx' ;
66import * as _Suspense from './suspense' ;
77
8- < < < << << HEAD
9- = === ===
10- interface SignalLike < T > {
11- value : T ;
12- peek ( ) : T ;
13- subscribe ( fn : ( value : T ) => void ) : ( ) => void ;
14- }
15-
16- type Signalish < T > = T | SignalLike < T > ;
17-
188declare namespace preact {
199 export interface FunctionComponent < P = { } > {
2010 (
@@ -108,7 +98,6 @@ declare namespace preact {
10898 }
10999}
110100
111- >>> >>> > Move `defaultProps ` into `preact / compat ` ( #4657 )
112101// export default React;
113102export = React ;
114103export as namespace React ;
@@ -120,7 +109,6 @@ declare namespace React {
120109 export import CreateHandle = _hooks . CreateHandle ;
121110 export import EffectCallback = _hooks . EffectCallback ;
122111 export import Inputs = _hooks . Inputs ;
123- export import PropRef = _hooks . PropRef ;
124112 export import Reducer = _hooks . Reducer ;
125113 export import Dispatch = _hooks . Dispatch ;
126114 export import SetStateAction = _hooks . StateUpdater ;
@@ -356,7 +344,7 @@ declare namespace React {
356344 }
357345
358346 export interface ForwardRefRenderFunction < T = any , P = { } > {
359- ( props : P , ref : ForwardedRef < T > ) : preact . ComponentChild ;
347+ ( props : P , ref : ForwardedRef < T > ) : preact1 . ComponentChild ;
360348 displayName ?: string ;
361349 }
362350
@@ -366,7 +354,7 @@ declare namespace React {
366354 }
367355
368356 export function forwardRef < R , P = { } > (
369- fn : ForwardFn < P , R >
357+ fn : ForwardRefRenderFunction < R , P >
370358 ) : preact1 . FunctionalComponent < PropsWithoutRef < P > & { ref ?: preact1 . Ref < R > } > ;
371359
372360 export type PropsWithoutRef < P > = Omit < P , 'ref' > ;
0 commit comments