Merge branch 'main' into support-alternate-content-doc

JoviDeCroock · web-flow · commit af1bd0f36622 · 2025-07-26T11:43:43.000+02:00
diff --git a/compat/src/index.d.ts b/compat/src/index.d.ts
@@ -27,7 +27,7 @@ declare namespace preact {
 		getDerivedStateFromError?(error: any): Partial<S> | null;
 	}
 
-	// eslint-disablex-next-line @typescript-eslint/no-unsafe-declaration-merging
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 	export interface Component<P = {}, S = {}> {
 		componentWillMount?(): void;
 		componentDidMount?(): void;
diff --git a/debug/src/component-stack.js b/debug/src/component-stack.js
@@ -40,10 +40,12 @@ let renderStack = [];
  * ```
  *
  * Note: A `vnode` may be hoisted to the root scope due to compiler
- * optimiztions. In these cases the `_owner` will be different.
+ * optimiztions. In these cases the owner will be different.
  */
 let ownerStack = [];
 
+const ownerMap = new WeakMap();
+
 /**
  * Get the currently rendered `vnode`
  * @returns {import('./internal').VNode | null}
@@ -76,9 +78,8 @@ function isPossibleOwner(vnode) {
 export function getOwnerStack(vnode) {
 	const stack = [vnode];
 	let next = vnode;
-	while (next._owner != null) {
-		stack.push(next._owner);
-		next = next._owner;
+	while ((next = ownerMap.get(next)) != null) {
+		stack.push(next);
 	}
 
 	return stack.reduce((acc, owner) => {
@@ -131,8 +132,7 @@ export function setupComponentStack() {
 	};
 
 	options.vnode = vnode => {
-		vnode._owner =
-			ownerStack.length > 0 ? ownerStack[ownerStack.length - 1] : null;
+		ownerMap.set(vnode, ownerStack.length > 0 ? ownerStack[ownerStack.length - 1] : null);
 		if (oldVNode) oldVNode(vnode);
 	};
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ declare namespace preact {`
`27`	`27`	`getDerivedStateFromError?(error: any): Partial<S> \| null;`
`28`	`28`	`}`
`29`	`29`
`30`		`- // eslint-disablex-next-line @typescript-eslint/no-unsafe-declaration-merging`
	`30`	`+ // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging`
`31`	`31`	`export interface Component<P = {}, S = {}> {`
`32`	`32`	`componentWillMount?(): void;`
`33`	`33`	`componentDidMount?(): void;`