{"commit":{"subject":"lint: enable reportUnusedDisableDirectives and remove unused suppressions (#28721)","authorEmail":"jkassens@meta.com","revision":"b565373afd0cc1988497e1107106e851e8cfb261","authorName":"Jan Kassens","shortRevision":"b565373afd","authoredAt":"2024-06-21T12:24:32-04:00"},"body":"This enables linting against unused suppressions and removes the ones\r\nthat were unused.","parents":["3563387fe3427924304cdb1a45e73f2b564c51e1"],"patch":"diff --git a\/.eslintrc.js b\/.eslintrc.js\nindex c92fc4739e..1d45d68055 100644\n--- a\/.eslintrc.js\n+++ b\/.eslintrc.js\n@@ -17,6 +17,8 @@ module.exports = {\n \/\/ Stop ESLint from looking for a configuration file in parent folders\n root: true,\n \n+ reportUnusedDisableDirectives: true,\n+\n plugins: [\n 'babel',\n 'ft-flow',\ndiff --git a\/packages\/react-client\/src\/ReactFlightClient.js b\/packages\/react-client\/src\/ReactFlightClient.js\nindex e1d43db1ec..866805b557 100644\n--- a\/packages\/react-client\/src\/ReactFlightClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightClient.js\n@@ -1839,7 +1839,6 @@ function resolveHint(\n dispatchHint(code, hintModel);\n }\n \n-\/\/ eslint-disable-next-line react-internal\/no-production-logging\n const supportsCreateTask =\n __DEV__ && enableOwnerStacks && !!(console: any).createTask;\n \n@@ -1977,7 +1976,6 @@ function initializeFakeTask(\n ? null\n : initializeFakeTask(response, componentInfo.owner);\n \n- \/\/ eslint-disable-next-line react-internal\/no-production-logging\n const createTaskFn = (console: any).createTask.bind(\n console,\n getServerComponentTaskName(componentInfo),\ndiff --git a\/packages\/react-client\/src\/ReactFlightReplyClient.js b\/packages\/react-client\/src\/ReactFlightReplyClient.js\nindex e5f7a559e7..ff80f4b310 100644\n--- a\/packages\/react-client\/src\/ReactFlightReplyClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightReplyClient.js\n@@ -227,14 +227,11 @@ export function processReply(\n function progress(entry: {done: boolean, value: ReactServerValue, ...}) {\n if (entry.done) {\n const blobId = nextPartId++;\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + blobId, new Blob(buffer));\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(\n formFieldPrefix + streamId,\n '\"$o' + blobId.toString(16) + '\"',\n );\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + streamId, 'C'); \/\/ Close signal\n pendingParts--;\n if (pendingParts === 0) {\n@@ -262,7 +259,6 @@ export function processReply(\n \n function progress(entry: {done: boolean, value: ReactServerValue, ...}) {\n if (entry.done) {\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + streamId, 'C'); \/\/ Close signal\n pendingParts--;\n if (pendingParts === 0) {\n@@ -272,7 +268,6 @@ export function processReply(\n try {\n \/\/ $FlowFixMe[incompatible-type]: While plain JSON can return undefined we never do here.\n const partJSON: string = JSON.stringify(entry.value, resolveToJSON);\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + streamId, partJSON);\n reader.read().then(progress, reject);\n } catch (x) {\n@@ -326,7 +321,6 @@ export function processReply(\n ) {\n if (entry.done) {\n if (entry.value === undefined) {\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + streamId, 'C'); \/\/ Close signal\n } else {\n \/\/ Unlike streams, the last value may not be undefined. If it's not\n@@ -348,7 +342,6 @@ export function processReply(\n try {\n \/\/ $FlowFixMe[incompatible-type]: While plain JSON can return undefined we never do here.\n const partJSON: string = JSON.stringify(entry.value, resolveToJSON);\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + streamId, partJSON);\n iterator.next().then(progress, reject);\n } catch (x) {\n@@ -441,7 +434,6 @@ export function processReply(\n const partJSON = serializeModel(resolvedModel, lazyId);\n \/\/ $FlowFixMe[incompatible-type] We know it's not null because we assigned it above.\n const data: FormData = formData;\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + lazyId, partJSON);\n return serializeByValueID(lazyId);\n } catch (x) {\n@@ -461,7 +453,6 @@ export function processReply(\n const partJSON = serializeModel(value, lazyId);\n \/\/ $FlowFixMe[incompatible-type] We know it's not null because we assigned it above.\n const data: FormData = formData;\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + lazyId, partJSON);\n pendingParts--;\n if (pendingParts === 0) {\n@@ -502,7 +493,6 @@ export function processReply(\n const partJSON = serializeModel(partValue, promiseId);\n \/\/ $FlowFixMe[incompatible-type] We know it's not null because we assigned it above.\n const data: FormData = formData;\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n data.append(formFieldPrefix + promiseId, partJSON);\n pendingParts--;\n if (pendingParts === 0) {\n@@ -784,7 +774,6 @@ export function processReply(\n }\n \/\/ The reference to this function came from the same client so we can pass it back.\n const refId = nextPartId++;\n- \/\/ eslint-disable-next-line react-internal\/safe-string-coercion\n formData.set(formFieldPrefix + refId, metaDataJSON);\n return serializeServerReferenceID(refId);\n }\ndiff --git a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\nindex 3add5988aa..88694f5932 100644\n--- a\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\n+++ b\/packages\/react-client\/src\/forks\/ReactFlightClientConfig.custom.js\n@@ -42,7 +42,7 @@ export const usedWithSSR = true;\n \n export opaque type Source = mixed;\n \n-export opaque type StringDecoder = mixed; \/\/ eslint-disable-line no-undef\n+export opaque type StringDecoder = mixed;\n \n export const createStringDecoder = $$$config.createStringDecoder;\n export const readPartialStringChunk = $$$config.readPartialStringChunk;\ndiff --git a\/packages\/react-devtools-extensions\/flow-typed\/jest.js b\/packages\/react-devtools-extensions\/flow-typed\/jest.js\nindex cdbe32bee7..66c8f0d41f 100644\n--- a\/packages\/react-devtools-extensions\/flow-typed\/jest.js\n+++ b\/packages\/react-devtools-extensions\/flow-typed\/jest.js\n@@ -146,13 +146,11 @@ type JestPromiseType = {\n * Use rejects to unwrap the reason of a rejected promise so any other\n * matcher can be chained. If the promise is fulfilled the assertion fails.\n *\/\n- \/\/ eslint-disable-next-line no-use-before-define\n rejects: JestExpectType,\n \/**\n * Use resolves to unwrap the value of a fulfilled promise so any other\n * matcher can be chained. If the promise is rejected the assertion fails.\n *\/\n- \/\/ eslint-disable-next-line no-use-before-define\n resolves: JestExpectType,\n };\n \n@@ -1098,10 +1096,8 @@ type JestPrettyFormatColors = {\n };\n \n type JestPrettyFormatIndent = string => string;\n-\/\/ eslint-disable-next-line no-unused-vars\n type JestPrettyFormatRefs = Array;\n type JestPrettyFormatPrint = any => string;\n-\/\/ eslint-disable-next-line no-unused-vars\n type JestPrettyFormatStringOrNull = string | null;\n \n type JestPrettyFormatOptions = {\n@@ -1112,7 +1108,6 @@ type JestPrettyFormatOptions = {\n indent: number,\n maxDepth: number,\n min: boolean,\n- \/\/ eslint-disable-next-line no-use-before-define\n plugins: JestPrettyFormatPlugins,\n printFunctionName: boolean,\n spacing: string,\ndiff --git a\/packages\/react-devtools-extensions\/flow-typed\/npm\/react-test-renderer_v16.x.x.js b\/packages\/react-devtools-extensions\/flow-typed\/npm\/react-test-renderer_v16.x.x.js\nindex f706d830eb..c9a96b1d4b 100644\n--- a\/packages\/react-devtools-extensions\/flow-typed\/npm\/react-test-renderer_v16.x.x.js\n+++ b\/packages\/react-devtools-extensions\/flow-typed\/npm\/react-test-renderer_v16.x.x.js\n@@ -52,7 +52,6 @@ type TestRendererOptions = {\n };\n \n declare module 'react-test-renderer' {\n- \/\/ eslint-disable-next-line no-inner-declarations\n declare export type ReactTestRenderer = {\n toJSON(): null | ReactTestRendererJSON,\n toTree(): null | ReactTestRendererTree,\ndiff --git a\/packages\/react-devtools-inline\/__tests__\/__e2e__\/utils.js b\/packages\/react-devtools-inline\/__tests__\/__e2e__\/utils.js\nindex 1e0efabb15..5f0505b71e 100644\n--- a\/packages\/react-devtools-inline\/__tests__\/__e2e__\/utils.js\n+++ b\/packages\/react-devtools-inline\/__tests__\/__e2e__\/utils.js\n@@ -7,7 +7,6 @@ const config = require('..\/..\/playwright.config');\n const {test} = require('@playwright\/test');\n \n function runOnlyForReactRange(range) {\n- \/\/ eslint-disable-next-line jest\/no-disabled-tests\n test.skip(\n !semver.satisfies(config.use.react_version, range),\n `This test requires a React version of ${range} to run. ` +\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\nindex a49f2d464b..ba6bd0ad09 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n@@ -665,7 +665,6 @@ describe('InspectedElement', () => {\n anonymous_fn={instance.anonymousFunction}\n array_buffer={arrayBuffer}\n array_of_arrays={arrayOfArrays}\n- \/\/ eslint-disable-next-line no-undef\n big_int={BigInt(123)}\n bound_fn={exampleFunction.bind(this)}\n data_view={dataView}\n@@ -1876,7 +1875,7 @@ describe('InspectedElement', () => {\n xyz: 1,\n },\n });\n- const bigInt = BigInt(123); \/\/ eslint-disable-line no-undef\n+ const bigInt = BigInt(123);\n \n await utils.actAsync(() =>\n render(\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\nindex f05c832c56..243759e5b0 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\n@@ -185,7 +185,6 @@ describe('InspectedElementContext', () => {\n anonymous_fn: instance.anonymousFunction,\n array_buffer: arrayBuffer,\n array_of_arrays: arrayOfArrays,\n- \/\/ eslint-disable-next-line no-undef\n big_int: BigInt(123),\n bound_fn: exampleFunction.bind(this),\n data_view: dataView,\n@@ -888,7 +887,7 @@ describe('InspectedElementContext', () => {\n xyz: 1,\n },\n });\n- const bigInt = BigInt(123); \/\/ eslint-disable-line no-undef\n+ const bigInt = BigInt(123);\n \n act(() =>\n ReactDOM.render(\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/DevToolsConsolePatching.js b\/packages\/react-devtools-shared\/src\/backend\/DevToolsConsolePatching.js\nindex bc133590f8..71ede68925 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/DevToolsConsolePatching.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/DevToolsConsolePatching.js\n@@ -30,7 +30,6 @@ disabledLog.__reactDisabledLog = true;\n \n export function disableLogs(): void {\n if (disabledDepth === 0) {\n- \/* eslint-disable react-internal\/no-production-logging *\/\n prevLog = console.log;\n prevInfo = console.info;\n prevWarn = console.warn;\n@@ -63,7 +62,6 @@ export function disableLogs(): void {\n export function reenableLogs(): void {\n disabledDepth--;\n if (disabledDepth === 0) {\n- \/* eslint-disable react-internal\/no-production-logging *\/\n const props = {\n configurable: true,\n enumerable: true,\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/renderer.js b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\nindex fa2b098a81..4ec7de9529 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/renderer.js\n@@ -1604,7 +1604,6 @@ export function attach(\n return changedKeys;\n }\n \n- \/\/ eslint-disable-next-line no-unused-vars\n function didFiberRender(prevFiber: Fiber, nextFiber: Fiber): boolean {\n switch (nextFiber.tag) {\n case ClassComponent:\ndiff --git a\/packages\/react-devtools-shell\/src\/app\/InspectableElements\/UnserializableProps.js b\/packages\/react-devtools-shell\/src\/app\/InspectableElements\/UnserializableProps.js\nindex 906683c097..2c279a1bdb 100644\n--- a\/packages\/react-devtools-shell\/src\/app\/InspectableElements\/UnserializableProps.js\n+++ b\/packages\/react-devtools-shell\/src\/app\/InspectableElements\/UnserializableProps.js\n@@ -31,7 +31,7 @@ const immutable = Immutable.fromJS({\n xyz: 1,\n },\n });\n-const bigInt = BigInt(123); \/\/ eslint-disable-line no-undef\n+const bigInt = BigInt(123);\n \n class Foo {\n flag = false;\ndiff --git a\/packages\/react-devtools\/app.js b\/packages\/react-devtools\/app.js\nindex 3912a80ef0..c427852b40 100644\n--- a\/packages\/react-devtools\/app.js\n+++ b\/packages\/react-devtools\/app.js\n@@ -46,7 +46,7 @@ app.on('ready', function () {\n });\n \n \/\/ and load the index.html of the app.\n- mainWindow.loadURL('file:\/\/' + __dirname + '\/app.html'); \/\/ eslint-disable-line no-path-concat\n+ mainWindow.loadURL('file:\/\/' + __dirname + '\/app.html');\n \/\/ $FlowFixMe[incompatible-use] found when upgrading Flow\n mainWindow.webContents.executeJavaScript(\n \/\/ We use this so that RN can keep relative JSX __source filenames\ndiff --git a\/packages\/react-dom-bindings\/src\/client\/DOMPropertyOperations.js b\/packages\/react-dom-bindings\/src\/client\/DOMPropertyOperations.js\nindex 867eeba4a0..1d5211e451 100644\n--- a\/packages\/react-dom-bindings\/src\/client\/DOMPropertyOperations.js\n+++ b\/packages\/react-dom-bindings\/src\/client\/DOMPropertyOperations.js\n@@ -30,7 +30,7 @@ export function getValueForAttribute(\n \/\/ shouldRemoveAttribute\n switch (typeof expected) {\n case 'function':\n- case 'symbol': \/\/ eslint-disable-line\n+ case 'symbol':\n return expected;\n case 'boolean': {\n const prefix = name.toLowerCase().slice(0, 5);\n@@ -109,7 +109,7 @@ export function setValueForAttribute(\n switch (typeof value) {\n case 'undefined':\n case 'function':\n- case 'symbol': \/\/ eslint-disable-line\n+ case 'symbol':\n node.removeAttribute(name);\n return;\n case 'boolean': {\ndiff --git a\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js b\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\nindex 03fcee8841..3d5c730e42 100644\n--- a\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\n+++ b\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\n@@ -443,7 +443,7 @@ export function createInstance(\n didWarnScriptTags = true;\n }\n }\n- div.innerHTML = '

dillon1000/react

Files changed