diff --git a/packages/react-devtools-extensions/src/__tests__/getHookNameForLocation-test.js b/packages/react-devtools-extensions/src/__tests__/getHookNameForLocation-test.js index 469bf162b5df0..7b215fc6de787 100644 --- a/packages/react-devtools-extensions/src/__tests__/getHookNameForLocation-test.js +++ b/packages/react-devtools-extensions/src/__tests__/getHookNameForLocation-test.js @@ -8,7 +8,7 @@ */ import {parse} from '@babel/parser'; -import {generateEncodedHookMap, generateHookMap} from '../generateHookMap'; +import {generateHookMap} from '../generateHookMap'; import {getHookNameForLocation} from '../getHookNameForLocation'; function expectHookMapToEqual(actual, expected) { diff --git a/packages/react-devtools-extensions/src/__tests__/updateMockSourceMaps.js b/packages/react-devtools-extensions/src/__tests__/updateMockSourceMaps.js index e6faf915d133f..8e47140811429 100644 --- a/packages/react-devtools-extensions/src/__tests__/updateMockSourceMaps.js +++ b/packages/react-devtools-extensions/src/__tests__/updateMockSourceMaps.js @@ -14,7 +14,6 @@ const babel = require('rollup-plugin-babel'); const commonjs = require('rollup-plugin-commonjs'); const jsx = require('acorn-jsx'); const rollupResolve = require('rollup-plugin-node-resolve'); -const {SourceMapConsumer} = require('source-map'); const {encode, decode} = require('sourcemap-codec'); const {generateEncodedHookMap} = require('../generateHookMap'); const {parse} = require('@babel/parser'); diff --git a/packages/react-devtools-extensions/src/astUtils.js b/packages/react-devtools-extensions/src/astUtils.js index e2bd458d994d6..818ec578a87c5 100644 --- a/packages/react-devtools-extensions/src/astUtils.js +++ b/packages/react-devtools-extensions/src/astUtils.js @@ -406,7 +406,8 @@ export function getHookNamesMappingFromAST( // Check each reference to the variable declared by the Hook call, // and for each, we do the following: let declaredVariableName = null; - for (const referencePath of referencePaths) { + for (let i = 0; i <= referencePaths.length; i++) { + const referencePath = referencePaths[i]; if (declaredVariableName != null) { break; } diff --git a/packages/react-devtools-extensions/src/generateHookMap.js b/packages/react-devtools-extensions/src/generateHookMap.js index 3c1347e0e294e..d57bbb6063854 100644 --- a/packages/react-devtools-extensions/src/generateHookMap.js +++ b/packages/react-devtools-extensions/src/generateHookMap.js @@ -7,7 +7,6 @@ * @flow */ -import traverse, {Node, NodePath} from '@babel/traverse'; import {getHookNamesMappingFromAST} from './astUtils'; import {encode, decode} from 'sourcemap-codec'; import {File} from '@babel/types'; @@ -65,7 +64,7 @@ export function generateHookMap(sourceAST: File): HookMap { const mappings = []; let currentLine = null; - for (const {name, start} of hookNamesMapping) { + hookNamesMapping.forEach(({name, start}) => { let nameIndex = namesMap.get(name); if (nameIndex == null) { names.push(name); @@ -81,14 +80,14 @@ export function generateHookMap(sourceAST: File): HookMap { // need this restriction and can remove the -1 at the end. const entry = [start.line, start.column, nameIndex, -1]; - if (currentLine != start.line) { + if (currentLine !== start.line) { currentLine = start.line; mappings.push([entry]); } else { const current = mappings[mappings.length - 1]; current.push(entry); } - } + }); return {names, mappings}; } diff --git a/packages/react-devtools-extensions/src/getHookNameForLocation.js b/packages/react-devtools-extensions/src/getHookNameForLocation.js index 1fea8c1402135..c65c5fb5a8024 100644 --- a/packages/react-devtools-extensions/src/getHookNameForLocation.js +++ b/packages/react-devtools-extensions/src/getHookNameForLocation.js @@ -53,7 +53,7 @@ export function getHookNameForLocation( // line, and vice-versa, so if the target line doesn't match the found // line, we immediately know that it must correspond to the last mapping // entry for that line. - if (foundLineNumber != location.line) { + if (foundLineNumber !== location.line) { foundEntry = foundLine[foundLine.length - 1]; } else { foundEntry = binSearch(location, foundLine, compareColumnPositions); @@ -71,7 +71,7 @@ export function getHookNameForLocation( `Expected to find a name index in the HookMap that covers the target location at line: ${location.line}, column: ${location.column}`, ); } - const foundName = hookMap.names[foundNameIndex]; + const foundName = names[foundNameIndex]; if (foundName == null) { throw new Error( `Expected to find a name in the HookMap that covers the target location at line: ${location.line}, column: ${location.column}`, diff --git a/packages/react-devtools-extensions/src/parseHookNames/parseHookNames.js b/packages/react-devtools-extensions/src/parseHookNames/parseHookNames.js index 279125c5224e7..9386bd632001b 100644 --- a/packages/react-devtools-extensions/src/parseHookNames/parseHookNames.js +++ b/packages/react-devtools-extensions/src/parseHookNames/parseHookNames.js @@ -258,7 +258,7 @@ function extractAndLoadSourceMaps( source === 'Inline Babel script' || runtimeSourceURL.endsWith(source), ); - if (sourceIndex != -1) { + if (sourceIndex !== -1) { const hookMap = extractHookMapFromSourceMap(parsed, sourceIndex); if (hookMap != null) { hookSourceData.hookMap = hookMap; @@ -306,7 +306,7 @@ function extractAndLoadSourceMaps( const sourceIndex = parsed.sources.findIndex(source => runtimeSourceURL.endsWith(source), ); - if (sourceIndex != -1) { + if (sourceIndex !== -1) { const hookMap = extractHookMapFromSourceMap( parsed, sourceIndex,