@react-devtools-plus/kit 0.9.5 → 0.9.6

package/dist/index.cjs

@@ -1666,6 +1666,104 @@ function getV5ComponentName(props) {
 	if (typeof props.children === "function") return "children()";
 }
 /**
+* Check if a component is likely a React Router v5 Route by its props
+*/
+function isLikelyV5Route(props) {
+	if (!props) return false;
+	const hasPath = typeof props.path === "string" || props.path === void 0;
+	const hasRouteProps = props.component || props.render || props.children !== void 0;
+	const hasExactOrStrict = props.exact !== void 0 || props.strict !== void 0;
+	const hasLocation = props.location !== void 0;
+	const hasComputedMatch = props.computedMatch !== void 0;
+	return hasPath && hasRouteProps || hasExactOrStrict || hasComputedMatch || hasLocation;
+}
+/**
+* Check if a component is likely a React Router v5 Switch by its props/children
+*/
+function isLikelyV5Switch(props) {
+	if (!props || !props.children) return false;
+	const children = Array.isArray(props.children) ? props.children : [props.children];
+	for (const child of children) if (child && child.props) {
+		if (isLikelyV5Route(child.props)) return true;
+	}
+	return false;
+}
+/**
+* Check if a component is likely a React Router v5 Redirect by its props
+*/
+function isLikelyV5Redirect(props) {
+	if (!props) return false;
+	return typeof props.to === "string" || typeof props.to === "object" && props.to !== null;
+}
+/**
+* Check if a fiber node is a React Router v5 context provider
+* React Router v5 uses __RouterContext with value containing { history, location, match, staticContext }
+*/
+function isRouterContextProvider(fiber) {
+	const props = fiber.memoizedProps || fiber.pendingProps;
+	if (!(props === null || props === void 0 ? void 0 : props.value)) return false;
+	const value = props.value;
+	return !!(value.history && value.location && typeof value.match === "object");
+}
+/**
+* Check if a fiber node is a React Router v5 Route context provider
+* Route wraps children in a context provider with match info
+*/
+function isRouteContextProvider(fiber) {
+	const props = fiber.memoizedProps || fiber.pendingProps;
+	if (!(props === null || props === void 0 ? void 0 : props.value)) return false;
+	const value = props.value;
+	return !!(value.match && typeof value.match.path === "string");
+}
+/**
+* Extract routes from React Router v5 by traversing fiber tree and finding Route context providers
+* This works even when component names are minified
+*/
+function extractRoutesFromFiberV5(fiber) {
+	const routes = [];
+	const visited = /* @__PURE__ */ new WeakSet();
+	const seenPaths = /* @__PURE__ */ new Set();
+	function traverse$1(node) {
+		if (!node || visited.has(node)) return;
+		visited.add(node);
+		const props = node.memoizedProps || node.pendingProps;
+		if (isRouteContextProvider(node)) {
+			const match = props.value.match;
+			const path = match.path || match.url || "/";
+			if (!seenPaths.has(path)) {
+				seenPaths.add(path);
+				const routeInfo = {
+					path,
+					params: match.params ? Object.keys(match.params) : void 0,
+					exact: match.isExact
+				};
+				if (node.child) {
+					const childName = getDisplayName(node.child);
+					if (childName && childName !== "Anonymous" && childName.length > 1) routeInfo.element = childName;
+				}
+				routes.push(routeInfo);
+			}
+		}
+		if (props === null || props === void 0 ? void 0 : props.children) {
+			const children = Array.isArray(props.children) ? props.children : [props.children];
+			let hasRouteChildren = false;
+			for (const child of children) if (child && child.props && isLikelyV5Route(child.props)) {
+				hasRouteChildren = true;
+				const route = extractRouteFromElementV5(child);
+				if (route && !seenPaths.has(route.path)) {
+					seenPaths.add(route.path);
+					routes.push(route);
+				}
+			}
+			if (hasRouteChildren) return;
+		}
+		if (node.child) traverse$1(node.child);
+		if (node.sibling) traverse$1(node.sibling);
+	}
+	traverse$1(fiber);
+	return routes;
+}
+/**
 * Extract route info from a React Router v5 Route element (JSX props)
 */
 function extractRouteFromElementV5(element, parentPath = "") {
@@ -1678,13 +1776,16 @@ function extractRouteFromElementV5(element, parentPath = "") {
 	const childRoutes = [];
 	if (props.children && typeof props.children !== "function") {
 		const children = Array.isArray(props.children) ? props.children : [props.children];
-		for (const child of children) {
-			var _child$type3, _child$type4;
-			if (child && child.type && (child.type.name === "Route" || ((_child$type3 = child.type) === null || _child$type3 === void 0 ? void 0 : _child$type3.displayName) === "Route")) {
+		for (const child of children) if (child && child.type) {
+			var _child$type3;
+			const typeName = child.type.name || ((_child$type3 = child.type) === null || _child$type3 === void 0 ? void 0 : _child$type3.displayName);
+			const isRoute = typeName === "Route" || isLikelyV5Route(child.props);
+			const isSwitch = typeName === "Switch" || isLikelyV5Switch(child.props);
+			const isRedirect = typeName === "Redirect" || isLikelyV5Redirect(child.props);
+			if (isRoute && !isRedirect) {
 				const childRoute = extractRouteFromElementV5(child, fullPath);
 				if (childRoute) childRoutes.push(childRoute);
-			}
-			if (child && child.type && (child.type.name === "Switch" || ((_child$type4 = child.type) === null || _child$type4 === void 0 ? void 0 : _child$type4.displayName) === "Switch")) {
+			} else if (isSwitch) {
 				const switchChildren = extractRoutesFromSwitchProps(child.props, fullPath);
 				childRoutes.push(...switchChildren);
 			}
@@ -1712,15 +1813,18 @@ function extractRoutesFromSwitchProps(props, parentPath = "") {
 	const children = Array.isArray(props.children) ? props.children : [props.children];
 	for (const child of children) if (child && child.type) {
 		const typeName = child.type.name || child.type.displayName;
-		if (typeName === "Route") {
+		const isRoute = typeName === "Route" || isLikelyV5Route(child.props);
+		const isRedirect = typeName === "Redirect" || isLikelyV5Redirect(child.props);
+		if (isRoute && !isRedirect) {
 			const route = extractRouteFromElementV5(child, parentPath);
 			if (route) routes.push(route);
-		}
-		if (typeName === "Redirect") {
+		} else if (isRedirect) {
 			var _child$props, _child$props2, _child$props3;
+			const to = (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.to;
+			const toPath = typeof to === "string" ? to : (to === null || to === void 0 ? void 0 : to.pathname) || "unknown";
 			const redirectInfo = {
-				path: ((_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.from) || "*",
-				element: `Redirect → ${((_child$props2 = child.props) === null || _child$props2 === void 0 ? void 0 : _child$props2.to) || "unknown"}`,
+				path: ((_child$props2 = child.props) === null || _child$props2 === void 0 ? void 0 : _child$props2.from) || "*",
+				element: `Redirect → ${toPath}`,
 				exact: ((_child$props3 = child.props) === null || _child$props3 === void 0 ? void 0 : _child$props3.exact) === true
 			};
 			routes.push(redirectInfo);
@@ -1781,7 +1885,7 @@ function findAndExtractRoutes(fiber) {
 				return;
 			}
 		}
-		if (name === "Switch") {
+		if (name === "Switch" || isLikelyV5Switch(props)) {
 			const switchRoutes = extractRoutesFromSwitchProps(props);
 			if (switchRoutes.length > 0) {
 				routes = switchRoutes;
@@ -1796,6 +1900,7 @@ function findAndExtractRoutes(fiber) {
 		if (node.sibling) traverse$1(node.sibling);
 	}
 	traverse$1(fiber);
+	if (routes.length === 0) routes = extractRoutesFromFiberV5(fiber);
 	return routes;
 }
 /**
@@ -1903,7 +2008,10 @@ function detectRouterType(fiber) {
 		if (!node || visited.has(node)) return null;
 		visited.add(node);
 		const name = getDisplayName(node);
+		const props = node.memoizedProps || node.pendingProps;
 		if (name === "Router" || name === "BrowserRouter" || name === "HashRouter" || name === "MemoryRouter" || name === "Routes" || name === "Switch" || name === "Route") return "react-router";
+		if (isLikelyV5Switch(props) || isLikelyV5Route(props)) return "react-router";
+		if (isRouterContextProvider(node) || isRouteContextProvider(node)) return "react-router";
 		if (node.child) {
 			const result = traverse$1(node.child);
 			if (result) return result;

package/dist/index.js

@@ -1642,6 +1642,104 @@ function getV5ComponentName(props) {
 	if (typeof props.children === "function") return "children()";
 }
 /**
+* Check if a component is likely a React Router v5 Route by its props
+*/
+function isLikelyV5Route(props) {
+	if (!props) return false;
+	const hasPath = typeof props.path === "string" || props.path === void 0;
+	const hasRouteProps = props.component || props.render || props.children !== void 0;
+	const hasExactOrStrict = props.exact !== void 0 || props.strict !== void 0;
+	const hasLocation = props.location !== void 0;
+	const hasComputedMatch = props.computedMatch !== void 0;
+	return hasPath && hasRouteProps || hasExactOrStrict || hasComputedMatch || hasLocation;
+}
+/**
+* Check if a component is likely a React Router v5 Switch by its props/children
+*/
+function isLikelyV5Switch(props) {
+	if (!props || !props.children) return false;
+	const children = Array.isArray(props.children) ? props.children : [props.children];
+	for (const child of children) if (child && child.props) {
+		if (isLikelyV5Route(child.props)) return true;
+	}
+	return false;
+}
+/**
+* Check if a component is likely a React Router v5 Redirect by its props
+*/
+function isLikelyV5Redirect(props) {
+	if (!props) return false;
+	return typeof props.to === "string" || typeof props.to === "object" && props.to !== null;
+}
+/**
+* Check if a fiber node is a React Router v5 context provider
+* React Router v5 uses __RouterContext with value containing { history, location, match, staticContext }
+*/
+function isRouterContextProvider(fiber) {
+	const props = fiber.memoizedProps || fiber.pendingProps;
+	if (!(props === null || props === void 0 ? void 0 : props.value)) return false;
+	const value = props.value;
+	return !!(value.history && value.location && typeof value.match === "object");
+}
+/**
+* Check if a fiber node is a React Router v5 Route context provider
+* Route wraps children in a context provider with match info
+*/
+function isRouteContextProvider(fiber) {
+	const props = fiber.memoizedProps || fiber.pendingProps;
+	if (!(props === null || props === void 0 ? void 0 : props.value)) return false;
+	const value = props.value;
+	return !!(value.match && typeof value.match.path === "string");
+}
+/**
+* Extract routes from React Router v5 by traversing fiber tree and finding Route context providers
+* This works even when component names are minified
+*/
+function extractRoutesFromFiberV5(fiber) {
+	const routes = [];
+	const visited = /* @__PURE__ */ new WeakSet();
+	const seenPaths = /* @__PURE__ */ new Set();
+	function traverse$1(node) {
+		if (!node || visited.has(node)) return;
+		visited.add(node);
+		const props = node.memoizedProps || node.pendingProps;
+		if (isRouteContextProvider(node)) {
+			const match = props.value.match;
+			const path = match.path || match.url || "/";
+			if (!seenPaths.has(path)) {
+				seenPaths.add(path);
+				const routeInfo = {
+					path,
+					params: match.params ? Object.keys(match.params) : void 0,
+					exact: match.isExact
+				};
+				if (node.child) {
+					const childName = getDisplayName(node.child);
+					if (childName && childName !== "Anonymous" && childName.length > 1) routeInfo.element = childName;
+				}
+				routes.push(routeInfo);
+			}
+		}
+		if (props === null || props === void 0 ? void 0 : props.children) {
+			const children = Array.isArray(props.children) ? props.children : [props.children];
+			let hasRouteChildren = false;
+			for (const child of children) if (child && child.props && isLikelyV5Route(child.props)) {
+				hasRouteChildren = true;
+				const route = extractRouteFromElementV5(child);
+				if (route && !seenPaths.has(route.path)) {
+					seenPaths.add(route.path);
+					routes.push(route);
+				}
+			}
+			if (hasRouteChildren) return;
+		}
+		if (node.child) traverse$1(node.child);
+		if (node.sibling) traverse$1(node.sibling);
+	}
+	traverse$1(fiber);
+	return routes;
+}
+/**
 * Extract route info from a React Router v5 Route element (JSX props)
 */
 function extractRouteFromElementV5(element, parentPath = "") {
@@ -1654,13 +1752,16 @@ function extractRouteFromElementV5(element, parentPath = "") {
 	const childRoutes = [];
 	if (props.children && typeof props.children !== "function") {
 		const children = Array.isArray(props.children) ? props.children : [props.children];
-		for (const child of children) {
-			var _child$type3, _child$type4;
-			if (child && child.type && (child.type.name === "Route" || ((_child$type3 = child.type) === null || _child$type3 === void 0 ? void 0 : _child$type3.displayName) === "Route")) {
+		for (const child of children) if (child && child.type) {
+			var _child$type3;
+			const typeName = child.type.name || ((_child$type3 = child.type) === null || _child$type3 === void 0 ? void 0 : _child$type3.displayName);
+			const isRoute = typeName === "Route" || isLikelyV5Route(child.props);
+			const isSwitch = typeName === "Switch" || isLikelyV5Switch(child.props);
+			const isRedirect = typeName === "Redirect" || isLikelyV5Redirect(child.props);
+			if (isRoute && !isRedirect) {
 				const childRoute = extractRouteFromElementV5(child, fullPath);
 				if (childRoute) childRoutes.push(childRoute);
-			}
-			if (child && child.type && (child.type.name === "Switch" || ((_child$type4 = child.type) === null || _child$type4 === void 0 ? void 0 : _child$type4.displayName) === "Switch")) {
+			} else if (isSwitch) {
 				const switchChildren = extractRoutesFromSwitchProps(child.props, fullPath);
 				childRoutes.push(...switchChildren);
 			}
@@ -1688,15 +1789,18 @@ function extractRoutesFromSwitchProps(props, parentPath = "") {
 	const children = Array.isArray(props.children) ? props.children : [props.children];
 	for (const child of children) if (child && child.type) {
 		const typeName = child.type.name || child.type.displayName;
-		if (typeName === "Route") {
+		const isRoute = typeName === "Route" || isLikelyV5Route(child.props);
+		const isRedirect = typeName === "Redirect" || isLikelyV5Redirect(child.props);
+		if (isRoute && !isRedirect) {
 			const route = extractRouteFromElementV5(child, parentPath);
 			if (route) routes.push(route);
-		}
-		if (typeName === "Redirect") {
+		} else if (isRedirect) {
 			var _child$props, _child$props2, _child$props3;
+			const to = (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.to;
+			const toPath = typeof to === "string" ? to : (to === null || to === void 0 ? void 0 : to.pathname) || "unknown";
 			const redirectInfo = {
-				path: ((_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.from) || "*",
-				element: `Redirect → ${((_child$props2 = child.props) === null || _child$props2 === void 0 ? void 0 : _child$props2.to) || "unknown"}`,
+				path: ((_child$props2 = child.props) === null || _child$props2 === void 0 ? void 0 : _child$props2.from) || "*",
+				element: `Redirect → ${toPath}`,
 				exact: ((_child$props3 = child.props) === null || _child$props3 === void 0 ? void 0 : _child$props3.exact) === true
 			};
 			routes.push(redirectInfo);
@@ -1757,7 +1861,7 @@ function findAndExtractRoutes(fiber) {
 				return;
 			}
 		}
-		if (name === "Switch") {
+		if (name === "Switch" || isLikelyV5Switch(props)) {
 			const switchRoutes = extractRoutesFromSwitchProps(props);
 			if (switchRoutes.length > 0) {
 				routes = switchRoutes;
@@ -1772,6 +1876,7 @@ function findAndExtractRoutes(fiber) {
 		if (node.sibling) traverse$1(node.sibling);
 	}
 	traverse$1(fiber);
+	if (routes.length === 0) routes = extractRoutesFromFiberV5(fiber);
 	return routes;
 }
 /**
@@ -1879,7 +1984,10 @@ function detectRouterType(fiber) {
 		if (!node || visited.has(node)) return null;
 		visited.add(node);
 		const name = getDisplayName(node);
+		const props = node.memoizedProps || node.pendingProps;
 		if (name === "Router" || name === "BrowserRouter" || name === "HashRouter" || name === "MemoryRouter" || name === "Routes" || name === "Switch" || name === "Route") return "react-router";
+		if (isLikelyV5Switch(props) || isLikelyV5Route(props)) return "react-router";
+		if (isRouterContextProvider(node) || isRouteContextProvider(node)) return "react-router";
 		if (node.child) {
 			const result = traverse$1(node.child);
 			if (result) return result;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-devtools-plus/kit",
   "type": "module",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "author": "wzc520pyfm",
   "license": "MIT",
   "repository": {
@@ -27,7 +27,7 @@
     "mitt": "^3.0.1",
     "perfect-debounce": "^2.0.0",
     "superjson": "^2.2.2",
-    "@react-devtools-plus/shared": "^0.9.5"
+    "@react-devtools-plus/shared": "^0.9.6"
   },
   "devDependencies": {
     "@types/node": "^24.7.2",