{"body":"","patch":"diff --git a\/packages\/react-devtools-extensions\/src\/__tests__\/parseHookNames-test.js b\/packages\/react-devtools-extensions\/src\/__tests__\/parseHookNames-test.js\nindex 81db5ab7a0..0b10ffee2b 100644\n--- a\/packages\/react-devtools-extensions\/src\/__tests__\/parseHookNames-test.js\n+++ b\/packages\/react-devtools-extensions\/src\/__tests__\/parseHookNames-test.js\n@@ -23,11 +23,6 @@ describe('parseHookNames', () => {\n console.trace('source-map-support');\n });\n \n- const {\n- overrideFeatureFlags,\n- } = require('react-devtools-shared\/src\/__tests__\/utils');\n- overrideFeatureFlags({enableHookNameParsing: true});\n-\n fetchMock = require('jest-fetch-mock');\n fetchMock.enableMocks();\n \ndiff --git a\/packages\/react-devtools-extensions\/src\/parseHookNames.js b\/packages\/react-devtools-extensions\/src\/parseHookNames.js\nindex 9b029b3225..73745c6be3 100644\n--- a\/packages\/react-devtools-extensions\/src\/parseHookNames.js\n+++ b\/packages\/react-devtools-extensions\/src\/parseHookNames.js\n@@ -10,7 +10,6 @@\n *\/\n \n import {parse} from '@babel\/parser';\n-import {enableHookNameParsing} from 'react-devtools-feature-flags';\n import LRU from 'lru-cache';\n import {SourceMapConsumer} from 'source-map';\n import {getHookName} from '.\/astUtils';\n@@ -105,10 +104,6 @@ const originalURLToMetadataCache: LRUCache<\n export async function parseHookNames(\n hooksTree: HooksTree,\n ): Thenable {\n- if (!enableHookNameParsing) {\n- return Promise.resolve(null);\n- }\n-\n const hooksList: Array = [];\n flattenHooksList(hooksTree, hooksList);\n \ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\nindex 67598900ec..886a54ceee 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n@@ -157,6 +157,12 @@ describe('InspectedElement', () => {\n \"events\": undefined,\n \"hooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1041,6 +1047,12 @@ describe('InspectedElement', () => {\n expect(inspectedElement.hooks).toMatchInlineSnapshot(`\n Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1062,6 +1074,12 @@ describe('InspectedElement', () => {\n expect(inspectedElement.hooks).toMatchInlineSnapshot(`\n Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1547,6 +1565,12 @@ describe('InspectedElement', () => {\n \"events\": undefined,\n \"hooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": null,\n \"isStateEditable\": false,\n \"name\": \"Context\",\n@@ -1799,11 +1823,23 @@ describe('InspectedElement', () => {\n expect(hooks).toMatchInlineSnapshot(`\n Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"DisplayedComplexValue\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": null,\n \"isStateEditable\": false,\n \"name\": \"DebuggableHook\",\n \"subHooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"useDebuggableHook\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1877,6 +1913,12 @@ describe('InspectedElement', () => {\n Object {\n \"hooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1910,6 +1952,12 @@ describe('InspectedElement', () => {\n Object {\n \"hooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -1943,6 +1991,12 @@ describe('InspectedElement', () => {\n Object {\n \"hooks\": Array [\n Object {\n+ \"hookSource\": Object {\n+ \"columnNumber\": \"removed by Jest serializer\",\n+ \"fileName\": \"react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\",\n+ \"functionName\": \"Example\",\n+ \"lineNumber\": \"removed by Jest serializer\",\n+ },\n \"id\": 0,\n \"isStateEditable\": true,\n \"name\": \"State\",\n@@ -2490,9 +2544,18 @@ describe('InspectedElement', () => {\n targetErrorBoundaryID,\n );\n \n+ \/\/ Suppress expected error and warning.\n+ const originalError = console.error;\n+ const originalWarn = console.warn;\n+ console.error = () => {};\n+ console.warn = () => {};\n+\n \/\/ now force error state on \n await toggleError(true);\n \n+ console.error = originalError;\n+ console.warn = originalWarn;\n+\n \/\/ we are in error state now, won't show up\n withErrorsOrWarningsIgnored(['Invalid index'], () => {\n expect(store.getElementIDAtIndex(1)).toBe(null);\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/renderer.js b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\nindex 23b00097ce..ee772fda86 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n@@ -80,10 +80,7 @@ import {\n MEMO_SYMBOL_STRING,\n } from '.\/ReactSymbols';\n import {format} from '.\/utils';\n-import {\n- enableHookNameParsing,\n- enableProfilerChangedHookIndices,\n-} from 'react-devtools-feature-flags';\n+import {enableProfilerChangedHookIndices} from 'react-devtools-feature-flags';\n import is from 'shared\/objectIs';\n import isArray from 'shared\/isArray';\n \n@@ -3112,7 +3109,7 @@ export function attach(\n hooks = inspectHooksOfFiber(\n fiber,\n (renderer.currentDispatcherRef: any),\n- enableHookNameParsing, \/\/ Include source location info for hooks\n+ true, \/\/ Include source location info for hooks\n );\n } finally {\n \/\/ Restore original console functionality.\ndiff --git a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.default.js b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.default.js\nindex e310e26f43..b9d3ba23e5 100644\n--- a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.default.js\n+++ b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.default.js\n@@ -13,6 +13,5 @@\n * It should always be imported from \"react-devtools-feature-flags\".\n ************************************************************************\/\n \n-export const enableHookNameParsing = false;\n export const enableProfilerChangedHookIndices = false;\n export const isInternalFacebookBuild = false;\ndiff --git a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-fb.js b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-fb.js\nindex c6c319cd6d..104cf26309 100644\n--- a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-fb.js\n+++ b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-fb.js\n@@ -13,7 +13,6 @@\n * It should always be imported from \"react-devtools-feature-flags\".\n ************************************************************************\/\n \n-export const enableHookNameParsing = true;\n export const enableProfilerChangedHookIndices = true;\n export const isInternalFacebookBuild = true;\n \ndiff --git a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-oss.js b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-oss.js\nindex 7201754f4f..4d1b1472bb 100644\n--- a\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-oss.js\n+++ b\/packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-oss.js\n@@ -13,7 +13,6 @@\n * It should always be imported from \"react-devtools-feature-flags\".\n ************************************************************************\/\n \n-export const enableHookNameParsing = false;\n export const enableProfilerChangedHookIndices = false;\n export const isInternalFacebookBuild = false;\n \ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementContext.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementContext.js\nindex 9dd594c1ef..e7b15b3f3d 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementContext.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementContext.js\n@@ -18,7 +18,6 @@ import {\n useMemo,\n useState,\n } from 'react';\n-import {enableHookNameParsing} from 'react-devtools-feature-flags';\n import {TreeStateContext} from '.\/TreeContext';\n import {BridgeContext, StoreContext} from '..\/context';\n import {\n@@ -117,19 +116,17 @@ export function InspectedElementContextController({children}: Props) {\n if (!elementHasChanged && element !== null) {\n inspectedElement = inspectElement(element, state.path, store, bridge);\n \n- if (enableHookNameParsing) {\n- if (parseHookNames || alreadyLoadedHookNames) {\n- if (\n- inspectedElement !== null &&\n- inspectedElement.hooks !== null &&\n- loadHookNamesFunction !== null\n- ) {\n- hookNames = loadHookNames(\n- element,\n- inspectedElement.hooks,\n- loadHookNamesFunction,\n- );\n- }\n+ if (parseHookNames || alreadyLoadedHookNames) {\n+ if (\n+ inspectedElement !== null &&\n+ inspectedElement.hooks !== null &&\n+ loadHookNamesFunction !== null\n+ ) {\n+ hookNames = loadHookNames(\n+ element,\n+ inspectedElement.hooks,\n+ loadHookNamesFunction,\n+ );\n }\n }\n }\n@@ -155,20 +152,18 @@ export function InspectedElementContextController({children}: Props) {\n );\n \n useEffect(() => {\n- if (enableHookNameParsing) {\n- if (typeof purgeCachedMetadata === 'function') {\n- \/\/ When Fast Refresh updates a component, any cached AST metadata may be invalid.\n- const fastRefreshScheduled = () => {\n- startTransition(() => {\n- clearHookNamesCache();\n- purgeCachedMetadata();\n- refresh();\n- });\n- };\n- bridge.addListener('fastRefreshScheduled', fastRefreshScheduled);\n- return () =>\n- bridge.removeListener('fastRefreshScheduled', fastRefreshScheduled);\n- }\n+ if (typeof purgeCachedMetadata === 'function') {\n+ \/\/ When Fast Refresh updates a component, any cached AST metadata may be invalid.\n+ const fastRefreshScheduled = () => {\n+ startTransition(() => {\n+ clearHookNamesCache();\n+ purgeCachedMetadata();\n+ refresh();\n+ });\n+ };\n+ bridge.addListener('fastRefreshScheduled', fastRefreshScheduled);\n+ return () =>\n+ bridge.removeListener('fastRefreshScheduled', fastRefreshScheduled);\n }\n }, [bridge]);\n \ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementHooksTree.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementHooksTree.js\nindex f595fdb547..a7ea9178db 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementHooksTree.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementHooksTree.js\n@@ -22,10 +22,7 @@ import styles from '.\/InspectedElementHooksTree.css';\n import useContextMenu from '..\/..\/ContextMenu\/useContextMenu';\n import {meta} from '..\/..\/..\/hydration';\n import {getHookSourceLocationKey} from 'react-devtools-shared\/src\/hookNamesCache';\n-import {\n- enableHookNameParsing,\n- enableProfilerChangedHookIndices,\n-} from 'react-devtools-feature-flags';\n+import {enableProfilerChangedHookIndices} from 'react-devtools-feature-flags';\n \n import type {InspectedElement} from '.\/types';\n import type {HooksNode, HooksTree} from 'react-debug-tools\/src\/ReactDebugHooks';\n@@ -85,7 +82,7 @@ export function InspectedElementHooksTree({\n

hooks<\/div>\n- {enableHookNameParsing && (!parseHookNames || hookParsingFailed) && (\n+ {(!parseHookNames || hookParsingFailed) && (\n \n \n- {enableHookNameParsing && (\n- \n- {' '}\n- Always parse hook names from source{' '}\n- (may be slow)<\/span>\n- <\/label>\n- )}\n+ \n+ {' '}\n+ Always parse hook names from source{' '}\n+ (may be slow)<\/span>\n+ <\/label>\n \n

Hide components where...<\/div>\n \ndiff --git a\/packages\/react-devtools-shared\/src\/hookNamesCache.js b\/packages\/react-devtools-shared\/src\/hookNamesCache.js\nindex f673cff59e..f385c72428 100644\n--- a\/packages\/react-devtools-shared\/src\/hookNamesCache.js\n+++ b\/packages\/react-devtools-shared\/src\/hookNamesCache.js\n@@ -7,7 +7,6 @@\n * @flow\n *\/\n \n-import {enableHookNameParsing} from 'react-devtools-feature-flags';\n import {__DEBUG__} from 'react-devtools-shared\/src\/constants';\n \n import type {HooksTree} from 'react-debug-tools\/src\/ReactDebugHooks';\n@@ -70,10 +69,6 @@ export function loadHookNames(\n hooksTree: HooksTree,\n loadHookNamesFunction: (hookLog: HooksTree) => Thenable,\n ): HookNames | null {\n- if (!enableHookNameParsing) {\n- return null;\n- }\n-\n let record = map.get(element);\n \n if (__DEBUG__) {\n","files":[{"status":"M","path":"packages\/react-devtools-extensions\/src\/__tests__\/parseHookNames-test.js"},{"status":"M","path":"packages\/react-devtools-extensions\/src\/parseHookNames.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/backend\/renderer.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.default.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-fb.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/config\/DevToolsFeatureFlags.extension-oss.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementContext.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/Components\/InspectedElementHooksTree.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/Settings\/ComponentsSettings.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/hookNamesCache.js"}],"parents":["e26cb8f86db0936e14682c39e2d26373fa6f433d"],"commit":{"authoredAt":"2021-07-16T00:14:20-04:00","shortRevision":"6840c98c32","subject":"Remove named hooks feature flag (#21894)","revision":"6840c98c3246b749549beae2a62150f509ba4111","authorEmail":"bvaughn@fb.com","authorName":"Brian Vaughn"}}

dillon1000/react

Files changed