@remix-run/ui 0.4.0 → 0.5.0

package/dist/runtime/to-vnode.js

@@ -1,11 +1,13 @@
-import { Fragment } from "./component.js";
-import { invariant } from "./invariant.js";
-import { isEmptyChild, isPrimitiveChild, normalizeChildren } from "./core/children.js";
-import { isRemixElement, NON_RENDER_NODE, TEXT_NODE } from "./vnode.js";
-function flatMapChildrenToVNodes(node) {
-    if (!('children' in node.props))
+import { Fragment } from './component.js';
+import { Frame } from './component.js';
+import { invariant } from './invariant.js';
+import { isEmptyChild, isPrimitiveChild, isRemixNode, normalizeChildren } from './core/children.js';
+import { isMixinDescriptor } from './mixins/mixin.js';
+import { isRemixElement, NON_RENDER_NODE, TEXT_NODE, } from './vnode.js';
+function flatMapChildrenToVNodes(props) {
+    let children = props.children;
+    if (children === undefined)
         return [];
-    let children = node.props.children;
     if (!Array.isArray(children))
         return [toVNode(children)];
     let vnodes = [];
@@ -13,30 +15,76 @@ function flatMapChildrenToVNodes(node) {
     return vnodes;
 }
 function flattenChildrenToVNodes(nodes, out) {
-    for (let child of normalizeChildren(nodes)) {
-        out.push(toVNode(child));
+    let children = normalizeChildren(nodes);
+    for (let i = 0; i < children.length; i++) {
+        out.push(toVNode(children[i]));
     }
 }
 export function toVNode(node) {
     if (isEmptyChild(node)) {
-        return { type: NON_RENDER_NODE };
+        return { kind: 'empty', type: NON_RENDER_NODE };
     }
     if (isPrimitiveChild(node)) {
-        return { type: TEXT_NODE, _text: String(node) };
+        return { kind: 'text', type: TEXT_NODE, _text: String(node) };
+    }
+    if (isRemixElement(node)) {
+        if (node.type === Fragment) {
+            let props = parseHostProps(node.props);
+            return {
+                kind: 'fragment',
+                type: Fragment,
+                key: node.key,
+                _children: flatMapChildrenToVNodes(props),
+            };
+        }
+        if (node.type === Frame) {
+            invariant(isFrameProps(node.props), '<Frame /> requires a src prop');
+            return { kind: 'frame', type: Frame, key: node.key, props: node.props };
+        }
+        if (typeof node.type === 'string') {
+            let props = parseHostProps(node.props);
+            // When innerHTML is set, ignore children
+            let children = props.innerHTML != null ? [] : flatMapChildrenToVNodes(props);
+            return {
+                kind: 'host',
+                type: node.type,
+                key: node.key,
+                props,
+                _children: children,
+            };
+        }
+        invariant(isElementFunction(node.type), 'Expected component element type');
+        return { kind: 'component', type: node.type, key: node.key, props: node.props };
     }
     if (Array.isArray(node)) {
         let children = [];
         flattenChildrenToVNodes(node, children);
-        return { type: Fragment, _children: children };
-    }
-    if (node.type === Fragment) {
-        return { type: Fragment, key: node.key, _children: flatMapChildrenToVNodes(node) };
-    }
-    if (isRemixElement(node)) {
-        // When innerHTML is set, ignore children
-        let children = node.props.innerHTML != null ? [] : flatMapChildrenToVNodes(node);
-        return { type: node.type, key: node.key, props: node.props, _children: children };
+        return { kind: 'fragment', type: Fragment, _children: children };
     }
     invariant(false, 'Unexpected RemixNode');
 }
+function isFrameProps(props) {
+    return typeof props.src === 'string' && props.src.length > 0;
+}
+function parseHostProps(props) {
+    let children = props.children;
+    invariant(children === undefined || isRemixNode(children), 'Invalid host children');
+    let innerHTML = props.innerHTML;
+    invariant(innerHTML === undefined || typeof innerHTML === 'string', 'Invalid innerHTML prop');
+    let mix = props.mix;
+    invariant(mix === undefined || isRuntimeMixValue(mix), 'Invalid mix prop');
+    return props;
+}
+function isRuntimeMixValue(value) {
+    if (!Array.isArray(value))
+        return isMixinDescriptor(value);
+    for (let descriptor of value) {
+        if (!isMixinDescriptor(descriptor))
+            return false;
+    }
+    return true;
+}
+function isElementFunction(value) {
+    return typeof value === 'function';
+}
 //# sourceMappingURL=to-vnode.js.map

package/dist/runtime/to-vnode.js.map

@@ -1 +1 @@
-{"version":3,"file":"to-vnode.js","sourceRoot":"","sources":["../../src/runtime/to-vnode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtF,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAc,MAAM,YAAY,CAAA;AAEnF,SAAS,uBAAuB,CAAC,IAAkB;IACjD,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IAC1C,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IACxD,IAAI,MAAM,GAAY,EAAE,CAAA;IACxB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACzC,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAkB,EAAE,GAAY;IAC/D,KAAK,IAAI,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,IAAe;IACrC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;IAClC,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;IACjD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,QAAQ,GAAY,EAAE,CAAA;QAC1B,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAA;IAChD,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAA;IACpF,CAAC;IAED,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,yCAAyC;QACzC,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAA;QAChF,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAA;IACnF,CAAC;IAED,SAAS,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAA;AAC1C,CAAC"}
+{"version":3,"file":"to-vnode.js","sourceRoot":"","sources":["../../src/runtime/to-vnode.ts"],"names":[],"mappings":"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"}

package/dist/runtime/vdom.d.ts

@@ -1,5 +1,6 @@
-import type { FrameContent, FrameHandle } from './component.ts';
+import type { FrameHandle } from './component.ts';
 import type { RemixNode } from './jsx.ts';
+import { type ResolveFrame } from './frame.ts';
 import { type ComponentErrorEvent } from './error-event.ts';
 import { createScheduler, type Scheduler } from './scheduler.ts';
 import { diffVNodes } from './reconcile.ts';
@@ -18,6 +19,7 @@ export type VirtualRootEventMap = {
  */
 export type VirtualRoot = TypedEventTarget<VirtualRootEventMap> & {
     render: (element: RemixNode) => void;
+    reconcile: () => void;
     dispose: () => void;
     flush: () => void;
 };
@@ -30,7 +32,7 @@ export type VirtualRootOptions = {
     styleManager?: StyleManager;
     frameInit?: {
         src?: string;
-        resolveFrame: (src: string, signal?: AbortSignal, target?: string) => Promise<FrameContent> | FrameContent;
+        resolveFrame: ResolveFrame;
         loadModule?: (moduleUrl: string, exportName: string) => Promise<Function> | Function;
     };
 };

package/dist/runtime/vdom.js

@@ -1,12 +1,14 @@
-import { createFrameHandle } from "./component.js";
-import { invariant } from "./invariant.js";
-import { createComponentErrorEvent, getComponentError, } from "./error-event.js";
-import { createScheduler } from "./scheduler.js";
-import { diffVNodes, remove as removeVNode } from "./reconcile.js";
-import { toVNode } from "./to-vnode.js";
-import { TypedEventTarget } from "./typed-event-target.js";
-import { ROOT_VNODE } from "./vnode.js";
-import { resetStyleState, defaultStyleManager } from "./diff-props.js";
+import { createFrameHandle } from './component.js';
+import { invariant } from './invariant.js';
+import { createFrameRuntime } from './frame.js';
+import { createComponentErrorEvent, getComponentError, } from './error-event.js';
+import { createScheduler } from './scheduler.js';
+import { diffVNodes, remove as removeVNode } from './reconcile.js';
+import { toVNode } from './to-vnode.js';
+import { TypedEventTarget } from './typed-event-target.js';
+import { ROOT_VNODE } from './vnode.js';
+import { resetStyleState, defaultStyleManager } from './diff-props.js';
+import { registerRoot, unregisterRoot } from './refresh.js';
 export { createScheduler };
 export { diffVNodes, toVNode };
 export { resetStyleState };
@@ -29,6 +31,7 @@ function getHydrationComponentIdFromRangeStart(start) {
 export function createRangeRoot(boundaries, options = {}) {
     let [start, end] = boundaries;
     let vroot = null;
+    let currentElement;
     let styles = options.styleManager ?? defaultStyleManager;
     let container = end.parentNode;
     invariant(container, 'Expected parent node');
@@ -46,6 +49,12 @@ export function createRangeRoot(boundaries, options = {}) {
             scheduler,
             styleManager: styles,
         });
+    let context = {
+        frame: frameStub,
+        scheduler,
+        styles,
+        rootTarget: eventTarget,
+    };
     let isErrorForwardingAttached = false;
     function forwardDomError(event) {
         eventTarget.dispatchEvent(createComponentErrorEvent(getComponentError(event)));
@@ -63,12 +72,15 @@ export function createRangeRoot(boundaries, options = {}) {
         isErrorForwardingAttached = false;
     }
     attachDomErrorForwarding();
-    return Object.assign(eventTarget, {
+    let root = Object.assign(eventTarget, {
         render(element) {
             attachDomErrorForwarding();
+            currentElement = element;
             let vnode = toVNode(element);
             let vParent = {
+                kind: 'root',
                 type: ROOT_VNODE,
+                _children: [],
                 _svg: false,
                 _rangeStart: start,
                 _rangeEnd: end,
@@ -76,26 +88,37 @@ export function createRangeRoot(boundaries, options = {}) {
             };
             scheduler.enqueueWork([
                 () => {
-                    diffVNodes(vroot, vnode, parent, frameStub, scheduler, styles, vParent, eventTarget, end, hydrationCursor);
-                    vroot = vnode;
+                    let cursor = hydrationCursor === null ? undefined : { current: hydrationCursor };
+                    let committed = diffVNodes(vroot, vnode, parent, vParent, context, end, cursor);
+                    vParent._children = [committed];
+                    vroot = committed;
                     hydrationCursor = null;
                 },
             ]);
             scheduler.dequeue();
         },
+        reconcile() {
+            if (currentElement === undefined)
+                return;
+            root.render(currentElement);
+        },
         dispose() {
             detachDomErrorForwarding();
+            unregisterRoot(root);
+            currentElement = undefined;
             if (!vroot)
                 return;
             let current = vroot;
             vroot = null;
-            scheduler.enqueueWork([() => removeVNode(current, parent, scheduler, styles)]);
+            scheduler.enqueueWork([() => removeVNode(current, parent, context)]);
             scheduler.dequeue();
         },
         flush() {
             scheduler.dequeue();
         },
     });
+    registerRoot(root);
+    return root;
 }
 /**
  * Creates a virtual root for a host container element.
@@ -106,9 +129,13 @@ export function createRangeRoot(boundaries, options = {}) {
  */
 export function createRoot(container, options = {}) {
     let vroot = null;
+    let currentElement;
     let styles = options.styleManager ?? defaultStyleManager;
     if (container.innerHTML.trim() !== '') {
-        styles.replaceServerStyles(container);
+        // Adopt additively: multiple roots hydrating separate islands may share
+        // the default style manager, and adopting a later island must not release
+        // the server styles an earlier island still depends on.
+        styles.adoptServerStyles(container);
     }
     let hydrationCursor = container.innerHTML.trim() !== '' ? container.firstChild : undefined;
     let eventTarget = new TypedEventTarget();
@@ -122,6 +149,12 @@ export function createRoot(container, options = {}) {
             scheduler,
             styleManager: styles,
         });
+    let context = {
+        frame: frameStub,
+        scheduler,
+        styles,
+        rootTarget: eventTarget,
+    };
     let isErrorForwardingAttached = false;
     function forwardDomError(event) {
         eventTarget.dispatchEvent(createComponentErrorEvent(getComponentError(event)));
@@ -139,63 +172,75 @@ export function createRoot(container, options = {}) {
         isErrorForwardingAttached = false;
     }
     attachDomErrorForwarding();
-    return Object.assign(eventTarget, {
+    let root = Object.assign(eventTarget, {
         render(element) {
             attachDomErrorForwarding();
+            currentElement = element;
             let vnode = toVNode(element);
-            let vParent = { type: ROOT_VNODE, _svg: false };
+            let vParent = {
+                kind: 'root',
+                type: ROOT_VNODE,
+                _children: [],
+                _svg: false,
+            };
             scheduler.enqueueWork([
                 () => {
-                    diffVNodes(vroot, vnode, container, frameStub, scheduler, styles, vParent, eventTarget, undefined, hydrationCursor);
-                    vroot = vnode;
+                    let cursor = hydrationCursor === undefined ? undefined : { current: hydrationCursor };
+                    let committed = diffVNodes(vroot, vnode, container, vParent, context, undefined, cursor);
+                    vParent._children = [committed];
+                    vroot = committed;
                     hydrationCursor = undefined;
                 },
             ]);
             scheduler.dequeue();
         },
+        reconcile() {
+            if (currentElement === undefined)
+                return;
+            root.render(currentElement);
+        },
         dispose() {
             detachDomErrorForwarding();
+            unregisterRoot(root);
+            currentElement = undefined;
             if (!vroot)
                 return;
             let current = vroot;
             vroot = null;
-            scheduler.enqueueWork([() => removeVNode(current, container, scheduler, styles)]);
+            scheduler.enqueueWork([() => removeVNode(current, container, context)]);
             scheduler.dequeue();
         },
         flush() {
             scheduler.dequeue();
         },
     });
+    registerRoot(root);
+    return root;
 }
 function createRootFrameHandle(init) {
     let resolveFrame = init.resolveFrame ??
         (() => {
             throw new Error('Cannot render <Frame /> without frame runtime. Use run() or pass frameInit to createRoot/createRangeRoot.');
         });
-    let frame = createFrameHandle({
-        src: init.src ?? '/',
-        $runtime: {
-            canResolveFrames: !!init.resolveFrame,
-            topFrame: undefined,
-            loadModule: init.loadModule ??
-                (() => {
-                    throw new Error('loadModule is required to hydrate client entries inside <Frame />');
-                }),
-            resolveFrame,
-            errorTarget: init.errorTarget,
-            pendingClientEntries: new Map(),
-            scheduler: init.scheduler,
-            styleManager: init.styleManager,
-            data: {},
-            moduleCache: new Map(),
-            moduleLoads: new Map(),
-            frameInstances: new WeakMap(),
-            namedFrames: new Map(),
-        },
+    let runtime = createFrameRuntime({
+        topFrame: undefined,
+        loadModule: init.loadModule ??
+            (() => {
+                throw new Error('loadModule is required to hydrate client entries inside <Frame />');
+            }),
+        resolveFrame,
+        errorTarget: init.errorTarget,
+        pendingClientEntries: new Map(),
+        scheduler: init.scheduler,
+        styleManager: init.styleManager,
+        moduleCache: new Map(),
+        moduleLoads: new Map(),
+        frameInstances: new WeakMap(),
+        namedFrames: new Map(),
     });
-    let runtime = frame.$runtime;
-    if (runtime)
-        runtime.topFrame = frame;
+    runtime.canResolveFrames = !!init.resolveFrame;
+    let frame = createFrameHandle({ src: init.src ?? '/', $runtime: runtime });
+    runtime.topFrame = frame;
     return frame;
 }
 //# sourceMappingURL=vdom.js.map

package/dist/runtime/vdom.js.map

@@ -1 +1 @@
-{"version":3,"file":"vdom.js","sourceRoot":"","sources":["../../src/runtime/vdom.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vdom.js","sourceRoot":"","sources":["../../src/runtime/vdom.ts"],"names":[],"mappings":"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"}

package/dist/runtime/vnode.d.ts

@@ -1,85 +1,156 @@
-import type { ComponentHandle, Component } from './component.ts';
-import { Fragment, Frame } from './component.ts';
+import type { ComponentHandle, Fragment, Frame, FrameHandle, FrameProps } from './component.ts';
 import { isRemixElement } from './core/vnode.ts';
-import type { ElementProps, RemixNode } from './jsx.ts';
+import type { Frame as FrameInstance } from './frame.ts';
+import type { RemixNode } from './jsx.ts';
+import type { ElementFunction } from './element-function.ts';
+import type { Key } from './key.ts';
+import type { MixinRuntimeState, MixinRuntimeValue } from './mixins/mixin.ts';
+import type { OnMixinDescriptor } from './mixins/on-mixin.ts';
+import type { Scheduler } from './scheduler.ts';
+import type { StyleManager } from '../style/index.ts';
 export { isRemixElement };
 export declare const TEXT_NODE: unique symbol;
 export declare const NON_RENDER_NODE: unique symbol;
 export declare const ROOT_VNODE: unique symbol;
-export type VNodeType = typeof ROOT_VNODE | string | Function | typeof TEXT_NODE | typeof NON_RENDER_NODE | typeof Fragment | typeof Frame;
-export type VNode<T extends VNodeType = VNodeType> = {
-    type: T;
-    props?: ElementProps;
-    _mixedProps?: ElementProps;
-    key?: string;
-    _parent?: VNode;
-    _children?: VNode[];
-    _dom?: unknown;
-    _controller?: AbortController;
-    _mixState?: unknown;
-    _directEventDescriptors?: unknown;
-    _directEventState?: unknown;
-    _controlledState?: unknown;
-    _svg?: boolean;
-    _rangeStart?: Node;
-    _rangeEnd?: Node;
-    _pendingHydrationComponentId?: string;
-    _frameInstance?: unknown;
-    _frameFallbackRoot?: {
-        render: (element: RemixNode) => void;
-        dispose: () => void;
-    };
-    _frameResolveToken?: number;
-    _frameResolveController?: AbortController;
-    _frameResolved?: boolean;
-    _text?: string;
-    _handle?: ComponentHandle;
-    _id?: string;
-    _content?: VNode;
-    _persistedByMixins?: boolean;
-    _persistedParentByMixins?: ParentNode;
-    _persistedRemovalToken?: number;
-};
-export type FragmentNode = VNode & {
-    type: typeof Fragment;
-    _children: VNode[];
-};
-export type TextNode = VNode & {
-    type: typeof TEXT_NODE;
+export type VNodeKind = 'root' | 'empty' | 'text' | 'fragment' | 'host' | 'component' | 'frame';
+export type RuntimeElementProps = {
+    [name: string]: unknown;
+};
+export type RuntimeHostProps = RuntimeElementProps & {
+    children?: RemixNode;
+    innerHTML?: string;
+    mix?: MixinRuntimeValue;
+};
+type InputNodeBase<kind extends VNodeKind, type> = {
+    kind: kind;
+    type: type;
+    key?: Key;
+    _parent?: never;
+};
+export type NonRenderNode = InputNodeBase<'empty', typeof NON_RENDER_NODE>;
+export type TextNode = InputNodeBase<'text', typeof TEXT_NODE> & {
     _text: string;
 };
-export type NonRenderNode = VNode & {
-    type: typeof NON_RENDER_NODE;
+export type FragmentNode = InputNodeBase<'fragment', typeof Fragment> & {
+    _children: VNodeInput[];
 };
-export type CommittedTextNode = TextNode & {
+export type HostNode = InputNodeBase<'host', string> & {
+    props: RuntimeHostProps;
+    _children: VNodeInput[];
+};
+export type ComponentNode = InputNodeBase<'component', ElementFunction> & {
+    props: RuntimeElementProps;
+};
+export type FrameNode = InputNodeBase<'frame', typeof Frame> & {
+    props: RuntimeElementProps & FrameProps;
+};
+export type VNodeInput = NonRenderNode | TextNode | FragmentNode | HostNode | ComponentNode | FrameNode;
+type MountedNodeBase = {
+    _parent: VNodeParent;
+    _svg: boolean;
+};
+type CommittedNodeBase<kind extends VNodeKind, type> = {
+    kind: kind;
+    type: type;
+    key?: Key;
+} & MountedNodeBase;
+export type CommittedNonRenderNode = CommittedNodeBase<'empty', typeof NON_RENDER_NODE>;
+export type CommittedTextNode = CommittedNodeBase<'text', typeof TEXT_NODE> & {
+    _text: string;
     _dom: Text;
 };
-export type HostNode = VNode & {
+export type ControlledReflectionState = {
+    disposed: boolean;
+    listenersAttached: boolean;
+    pendingRestoreVersion: number;
+    managesValue: boolean;
+    managesChecked: boolean;
+    hasControlledValue: boolean;
+    controlledValue: unknown;
+    hasControlledChecked: boolean;
+    controlledChecked: unknown;
+    onInput(): void;
+    onChange(): void;
+};
+export type DirectEventBinding = {
     type: string;
-    props: ElementProps;
-    _children: VNode[];
+    handler: (event: Event, signal: AbortSignal) => void | Promise<void>;
+    capture: boolean;
+    stableHandler: ((event: Event) => void) | null;
+    reentry: AbortController | null;
+};
+export type DirectEventState = {
+    bindings: DirectEventBinding[];
+};
+export type HostPersistenceState = {
+    parent: ParentNode;
+    token: number;
 };
-export type CommittedHostNode = HostNode & {
+export type CommittedHostNode = CommittedNodeBase<'host', string> & {
+    props: RuntimeHostProps;
+    _children: CommittedVNode[];
     _dom: Element;
-    _controller?: AbortController;
+    _mixedProps: RuntimeHostProps;
+    _mixState?: MixinRuntimeState;
+    _directEventDescriptors?: OnMixinDescriptor[];
+    _directEventState?: DirectEventState;
+    _controlledState?: ControlledReflectionState;
+    _persistence?: HostPersistenceState;
 };
-export type ComponentNode = VNode & {
-    type: Function;
-    props: ElementProps;
-    _handle: ComponentHandle;
+export type CommittedFragmentNode = CommittedNodeBase<'fragment', typeof Fragment> & {
+    _children: CommittedVNode[];
 };
-export type CommittedComponentNode = VNode & {
-    type: Function;
-    props: ElementProps;
-    _content: VNode;
+export type MountingComponentNode = CommittedNodeBase<'component', ElementFunction> & {
+    props: RuntimeElementProps;
     _handle: ComponentHandle;
+    _context: ReconcileContext;
+};
+export type CommittedComponentNode = MountingComponentNode & {
+    _content: CommittedVNode;
+};
+export interface FrameFallbackRoot {
+    render(element: RemixNode): void;
+    dispose(): void;
+}
+export type FrameMountState = {
+    instance: FrameInstance;
+    fallbackRoot?: FrameFallbackRoot;
+    resolveToken: number;
+    resolveController?: AbortController;
+    resolved: boolean;
+};
+export type CommittedFrameNode = CommittedNodeBase<'frame', typeof Frame> & {
+    props: RuntimeElementProps & FrameProps;
+    _rangeStart: Comment;
+    _rangeEnd: Comment;
+    _state: FrameMountState;
+};
+export type CommittedVNode = CommittedNonRenderNode | CommittedTextNode | CommittedFragmentNode | CommittedHostNode | CommittedComponentNode | CommittedFrameNode;
+export type RootVNode = {
+    kind: 'root';
+    type: typeof ROOT_VNODE;
+    _children: CommittedVNode[];
+    _svg: boolean;
+    _rangeStart?: Node;
+    _rangeEnd?: Node;
+    _pendingHydrationComponentId?: string;
 };
-export declare function isFragmentNode(node: VNode): node is FragmentNode;
-export declare function isTextNode(node: VNode): node is TextNode;
-export declare function isNonRenderNode(node: VNode): node is NonRenderNode;
-export declare function isCommittedTextNode(node: VNode): node is CommittedTextNode;
-export declare function isHostNode(node: VNode): node is HostNode;
-export declare function isCommittedHostNode(node: VNode): node is CommittedHostNode;
-export declare function isComponentNode(node: VNode): node is ComponentNode;
+export interface ReconcileContext {
+    frame: FrameHandle;
+    scheduler: Scheduler;
+    styles: StyleManager;
+    rootTarget: EventTarget;
+}
+export type VNodeParent = RootVNode | CommittedFragmentNode | CommittedHostNode | MountingComponentNode | CommittedComponentNode;
+export type VNode = VNodeInput | CommittedVNode | RootVNode | MountingComponentNode;
+export declare function isFragmentNode(node: VNode): node is FragmentNode | CommittedFragmentNode;
+export declare function isTextNode(node: VNode): node is TextNode | CommittedTextNode;
+export declare function isNonRenderNode(node: VNode): node is NonRenderNode | CommittedNonRenderNode;
+export declare function isCommittedTextNode(node: CommittedVNode): node is CommittedTextNode;
+export declare function isHostNode(node: VNode): node is HostNode | CommittedHostNode;
+export declare function isCommittedHostNode(node: CommittedVNode): node is CommittedHostNode;
+export declare function isComponentNode(node: VNode): node is ComponentNode | MountingComponentNode | CommittedComponentNode;
 export declare function isCommittedComponentNode(node: VNode): node is CommittedComponentNode;
-export declare function findContextFromAncestry(node: VNode, type: Component): unknown;
+export declare function isFrameNode(node: VNode): node is FrameNode | CommittedFrameNode;
+export declare function isCommittedFrameNode(node: CommittedVNode): node is CommittedFrameNode;
+export declare function findContextFromAncestry(node: VNodeParent, type: ElementFunction): unknown;