From ab86a5efe8ffb35f890a967593118c52f8bd0f4c Mon Sep 17 00:00:00 2001 From: Jorge Cabiedes <57368278+jorge-cab@users.noreply.github.com> Date: Tue, 27 May 2025 08:54:30 -0700 Subject: [PATCH] Address comments --- .eslintrc.js | 2 +- .../packages/react-mcp-server/src/index.ts | 3 + .../src/tools/componentTree.ts | 6 +- .../react-devtools-core/webpack.backend.js | 1 + .../webpack.config.js | 4 +- .../react-devtools-inline/webpack.config.js | 1 + .../src/backend/fiber/renderer.js | 120 +++++++++--------- 7 files changed, 71 insertions(+), 66 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b18d8667d8..1bb4e868d0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -505,7 +505,7 @@ module.exports = { __IS_FIREFOX__: 'readonly', __IS_EDGE__: 'readonly', __IS_NATIVE__: 'readonly', - __IS_INTERNAL__: 'readonly', + __IS_INTERNAL_MCP_BUILD__: 'readonly', __IS_INTERNAL_VERSION__: 'readonly', chrome: 'readonly', }, diff --git a/compiler/packages/react-mcp-server/src/index.ts b/compiler/packages/react-mcp-server/src/index.ts index d2caaee506..f50ff32ada 100644 --- a/compiler/packages/react-mcp-server/src/index.ts +++ b/compiler/packages/react-mcp-server/src/index.ts @@ -386,6 +386,8 @@ server.tool( url: z.string().optional().default('http://localhost:3000'), }, async ({url}) => { + + try { const componentTree = await parseReactComponentTree(url); return { @@ -396,6 +398,7 @@ server.tool( }, ], }; + } }, ); diff --git a/compiler/packages/react-mcp-server/src/tools/componentTree.ts b/compiler/packages/react-mcp-server/src/tools/componentTree.ts index babd9bb147..a124066a94 100644 --- a/compiler/packages/react-mcp-server/src/tools/componentTree.ts +++ b/compiler/packages/react-mcp-server/src/tools/componentTree.ts @@ -23,12 +23,14 @@ export async function parseReactComponentTree(url: string): Promise { const componentTree = await localhostPage.evaluate(() => { return (window as any).__REACT_DEVTOOLS_GLOBAL_HOOK__.rendererInterfaces .get(1) - .getComponentTree(); + .__internal_only_getComponentTree(); }); return componentTree; } else { - throw new Error('Localhost page not found'); + throw new Error( + `Could not open the page at ${url}. Is your server running?`, + ); } } catch (error) { throw new Error('Failed extract component tree' + error); diff --git a/packages/react-devtools-core/webpack.backend.js b/packages/react-devtools-core/webpack.backend.js index 32d4fadcb5..c1312fc6d8 100644 --- a/packages/react-devtools-core/webpack.backend.js +++ b/packages/react-devtools-core/webpack.backend.js @@ -72,6 +72,7 @@ module.exports = { __IS_CHROME__: false, __IS_EDGE__: false, __IS_NATIVE__: true, + __IS_INTERNAL_MCP_BUILD__: false, 'process.env.DEVTOOLS_PACKAGE': `"react-devtools-core"`, 'process.env.DEVTOOLS_VERSION': `"${DEVTOOLS_VERSION}"`, 'process.env.GITHUB_URL': `"${GITHUB_URL}"`, diff --git a/packages/react-devtools-extensions/webpack.config.js b/packages/react-devtools-extensions/webpack.config.js index 8fc1f125d3..4a3052517c 100644 --- a/packages/react-devtools-extensions/webpack.config.js +++ b/packages/react-devtools-extensions/webpack.config.js @@ -33,7 +33,7 @@ const IS_FIREFOX = process.env.IS_FIREFOX === 'true'; const IS_EDGE = process.env.IS_EDGE === 'true'; const IS_INTERNAL_VERSION = process.env.FEATURE_FLAG_TARGET === 'extension-fb'; -const IS_INTERNAL = process.env.IS_INTERNAL === 'true'; +const IS_INTERNAL_MCP_BUILD = process.env.IS_INTERNAL_MCP_BUILD === 'true'; const featureFlagTarget = process.env.FEATURE_FLAG_TARGET || 'extension-oss'; @@ -115,7 +115,7 @@ module.exports = { __IS_FIREFOX__: IS_FIREFOX, __IS_EDGE__: IS_EDGE, __IS_NATIVE__: false, - __IS_INTERNAL__: IS_INTERNAL, + __IS_INTERNAL_MCP_BUILD__: IS_INTERNAL_MCP_BUILD, __IS_INTERNAL_VERSION__: IS_INTERNAL_VERSION, 'process.env.DEVTOOLS_PACKAGE': `"react-devtools-extensions"`, 'process.env.DEVTOOLS_VERSION': `"${DEVTOOLS_VERSION}"`, diff --git a/packages/react-devtools-inline/webpack.config.js b/packages/react-devtools-inline/webpack.config.js index 3a92dff1f2..9fa900dfa6 100644 --- a/packages/react-devtools-inline/webpack.config.js +++ b/packages/react-devtools-inline/webpack.config.js @@ -78,6 +78,7 @@ module.exports = { __IS_FIREFOX__: false, __IS_EDGE__: false, __IS_NATIVE__: false, + __IS_INTERNAL_MCP_BUILD__: false, 'process.env.DEVTOOLS_PACKAGE': `"react-devtools-inline"`, 'process.env.DEVTOOLS_VERSION': `"${DEVTOOLS_VERSION}"`, 'process.env.EDITOR_URL': EDITOR_URL != null ? `"${EDITOR_URL}"` : null, diff --git a/packages/react-devtools-shared/src/backend/fiber/renderer.js b/packages/react-devtools-shared/src/backend/fiber/renderer.js index f790ca7dc3..b8ea794d02 100644 --- a/packages/react-devtools-shared/src/backend/fiber/renderer.js +++ b/packages/react-devtools-shared/src/backend/fiber/renderer.js @@ -5859,77 +5859,75 @@ export function attach( return unresolvedSource; } - function internal_only_getComponentTree(): string { - let treeString = ''; + if (__IS_INTERNAL_MCP_BUILD__) { + function __internal_only_getComponentTree(): string { + let treeString = ''; - function buildTreeString( - instance: DevToolsInstance, - prefix: string = '', - isLastChild: boolean = true, - ): void { - if (!instance) return; + function buildTreeString( + instance: DevToolsInstance, + prefix: string = '', + isLastChild: boolean = true, + ): void { + if (!instance) return; - const name = - (instance.kind !== VIRTUAL_INSTANCE - ? getDisplayNameForFiber(instance.data) - : instance.data.name) || 'Unknown'; + const name = + (instance.kind !== VIRTUAL_INSTANCE + ? getDisplayNameForFiber(instance.data) + : instance.data.name) || 'Unknown'; - const id = instance.id !== undefined ? instance.id : 'unknown'; + const id = instance.id !== undefined ? instance.id : 'unknown'; - if (name !== 'createRoot()') { - treeString += - prefix + - (isLastChild ? '└── ' : '├── ') + - name + - ' (id: ' + - id + - ')\n'; - } + if (name !== 'createRoot()') { + treeString += + prefix + + (isLastChild ? '└── ' : '├── ') + + name + + ' (id: ' + + id + + ')\n'; + } - const childPrefix = prefix + (isLastChild ? ' ' : '│ '); + const childPrefix = prefix + (isLastChild ? ' ' : '│ '); - let childCount = 0; - let tempChild = instance.firstChild; - while (tempChild !== null) { - childCount++; - tempChild = tempChild.nextSibling; - } + let childCount = 0; + let tempChild = instance.firstChild; + while (tempChild !== null) { + childCount++; + tempChild = tempChild.nextSibling; + } - let child = instance.firstChild; - let currentChildIndex = 0; + let child = instance.firstChild; + let currentChildIndex = 0; - while (child !== null) { - currentChildIndex++; - const isLastSibling = currentChildIndex === childCount; - buildTreeString(child, childPrefix, isLastSibling); - child = child.nextSibling; - } - } - - const rootInstances: Array = []; - idToDevToolsInstanceMap.forEach(instance => { - if ( - instance.parent === null || - (instance.parent.kind === FILTERED_FIBER_INSTANCE && - instance.parent.parent === null) - ) { - rootInstances.push(instance); - } - }); - - if (rootInstances.length > 0) { - for (let i = 0; i < rootInstances.length; i++) { - const isLast = i === rootInstances.length - 1; - buildTreeString(rootInstances[i], '', isLast); - if (!isLast) { - treeString += '\n'; + while (child !== null) { + currentChildIndex++; + const isLastSibling = currentChildIndex === childCount; + buildTreeString(child, childPrefix, isLastSibling); + child = child.nextSibling; } } - } else { - treeString = 'No component tree found.'; - } - return treeString; + const rootInstances: Array = []; + idToDevToolsInstanceMap.forEach(instance => { + if (instance.parent === null || instance.parent.parent === null) { + rootInstances.push(instance); + } + }); + + if (rootInstances.length > 0) { + for (let i = 0; i < rootInstances.length; i++) { + const isLast = i === rootInstances.length - 1; + buildTreeString(rootInstances[i], '', isLast); + if (!isLast) { + treeString += '\n'; + } + } + } else { + treeString = 'No component tree found.'; + } + + return treeString; + } } return { @@ -5946,7 +5944,7 @@ export function attach( getNearestMountedDOMNode, getElementIDForHostInstance, getInstanceAndStyle, - ...(__IS_INTERNAL__ && {internal_only_getComponentTree}), + ...(__IS_INTERNAL_MCP_BUILD__ && {__internal_only_getComponentTree}), getOwnersList, getPathForElement, getProfilingData,