diff --git a/package.json b/package.json index 093b846b..ac3428a4 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "private": true, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/d3-state-visualizer/examples/tree/package.json b/packages/d3-state-visualizer/examples/tree/package.json index 83f9d1eb..1f5bbdf8 100644 --- a/packages/d3-state-visualizer/examples/tree/package.json +++ b/packages/d3-state-visualizer/examples/tree/package.json @@ -35,8 +35,8 @@ "@types/node": "^14.17.27", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/d3-state-visualizer/package.json b/packages/d3-state-visualizer/package.json index 7366eda2..09b93dd5 100644 --- a/packages/d3-state-visualizer/package.json +++ b/packages/d3-state-visualizer/package.json @@ -54,8 +54,8 @@ "@types/node": "^14.17.27", "@types/ramda": "^0.27.45", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/d3-state-visualizer/src/charts/tree/tree.ts b/packages/d3-state-visualizer/src/charts/tree/tree.ts index 00a548f0..a3238c66 100644 --- a/packages/d3-state-visualizer/src/charts/tree/tree.ts +++ b/packages/d3-state-visualizer/src/charts/tree/tree.ts @@ -388,12 +388,12 @@ export default function ( fill: style.text.colors.default, cursor: 'pointer', }) - .on('mouseover', function mouseover(this: any) { + .on('mouseover', function mouseover(this: EventTarget) { d3.select(this).style({ fill: style.text.colors.hover, }); }) - .on('mouseout', function mouseout(this: any) { + .on('mouseout', function mouseout(this: EventTarget) { d3.select(this).style({ fill: style.text.colors.default, }); @@ -401,7 +401,7 @@ export default function ( if (!tooltipOptions.disabled) { nodeEnter.call( - d3tooltip(d3, 'tooltip', { ...tooltipOptions, root }) + d3tooltip(d3, 'tooltip', { ...tooltipOptions, root }) .text((d, i) => getTooltipString(d, i, tooltipOptions)) .style(tooltipOptions.style) ); diff --git a/packages/d3tooltip/package.json b/packages/d3tooltip/package.json index d9003d5c..c346114d 100644 --- a/packages/d3tooltip/package.json +++ b/packages/d3tooltip/package.json @@ -47,8 +47,8 @@ "@types/node": "^14.17.27", "@types/ramda": "^0.27.45", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "d3": "^3.5.17", "eslint": "^7.32.0", diff --git a/packages/d3tooltip/src/index.ts b/packages/d3tooltip/src/index.ts index 2f093242..0077693f 100644 --- a/packages/d3tooltip/src/index.ts +++ b/packages/d3tooltip/src/index.ts @@ -20,11 +20,40 @@ const defaultOptions: Options = { root: undefined, }; +interface Tip { + (selection: Selection): void; + attr: ( + this: this, + d: + | string + | { + [key: string]: + | Primitive + | ((datum: Datum, index: number, outerIndex: number) => Primitive); + } + ) => this; + style: ( + this: this, + d: + | string + | { + [key: string]: + | Primitive + | ((datum: Datum, index: number, outerIndex: number) => Primitive); + } + | undefined + ) => this; + text: ( + this: this, + d: string | ((datum: Datum, index?: number, outerIndex?: number) => string) + ) => this; +} + export default function tooltip( d3: typeof d3Package, className = 'tooltip', options: Partial> = {} -) { +): Tip { const { left, top, offset, root } = { ...defaultOptions, ...options, @@ -74,6 +103,7 @@ export default function tooltip( } tip.attr = function setAttr( + this: typeof tip, d: | string | { @@ -96,6 +126,7 @@ export default function tooltip( }; tip.style = function setStyle( + this: typeof tip, d: | string | { @@ -103,6 +134,7 @@ export default function tooltip( | Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive); } + | undefined ) { if (is(Object, d)) { styles = { @@ -118,6 +150,7 @@ export default function tooltip( }; tip.text = function setText( + this: typeof tip, d: string | ((datum: Datum, index?: number, outerIndex?: number) => string) ) { text = functor(d); diff --git a/packages/map2tree/package.json b/packages/map2tree/package.json index f9fb8b19..993a9e4e 100755 --- a/packages/map2tree/package.json +++ b/packages/map2tree/package.json @@ -51,8 +51,8 @@ "@types/lodash": "^4.14.176", "@types/node": "^14.17.27", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/react-base16-styling/package.json b/packages/react-base16-styling/package.json index c98dc373..91e75263 100644 --- a/packages/react-base16-styling/package.json +++ b/packages/react-base16-styling/package.json @@ -51,8 +51,8 @@ "@types/color": "^3.0.2", "@types/jest": "^27.0.2", "@types/lodash.curry": "^4.1.6", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/react-base16-styling/src/index.ts b/packages/react-base16-styling/src/index.ts index 45f87a98..23a9652b 100644 --- a/packages/react-base16-styling/src/index.ts +++ b/packages/react-base16-styling/src/index.ts @@ -63,7 +63,7 @@ const mergeStyling = ( style: defaultStyling as CSS.Properties, }); case 'function': - return (styling: Styling, ...args: any[]) => + return (styling: Styling, ...args: unknown[]) => merger({ className: customStyling as string, })((defaultStyling as StylingValueFunction)(styling, ...args)); @@ -82,7 +82,7 @@ const mergeStyling = ( ...(customStyling as CSS.Properties), }; case 'function': - return (styling: Styling, ...args: any[]) => + return (styling: Styling, ...args: unknown[]) => merger({ style: customStyling as CSS.Properties, })((defaultStyling as StylingValueFunction)(styling, ...args)); @@ -143,7 +143,7 @@ const mergeStylings = ( const getStylingByKeys = ( mergedStyling: StylingConfig, keys: (string | false | undefined) | (string | false | undefined)[], - ...args: any[] + ...args: unknown[] ): Styling => { if (keys === null) { return mergedStyling as unknown as Styling; diff --git a/packages/react-base16-styling/src/types.ts b/packages/react-base16-styling/src/types.ts index 58839f8e..e4a489ee 100644 --- a/packages/react-base16-styling/src/types.ts +++ b/packages/react-base16-styling/src/types.ts @@ -8,7 +8,7 @@ export interface Styling { export type StylingValueFunction = ( styling: Styling, - ...rest: any[] + ...rest: unknown[] ) => Partial; export type StylingValue = @@ -28,5 +28,5 @@ export type Theme = string | Base16Theme | StylingConfig; export type StylingFunction = ( keys: (string | false | undefined) | (string | false | undefined)[], - ...rest: any[] + ...rest: unknown[] ) => Styling; diff --git a/packages/react-base16-styling/test/index.test.ts b/packages/react-base16-styling/test/index.test.ts index 5f765a5d..734b6f68 100644 --- a/packages/react-base16-styling/test/index.test.ts +++ b/packages/react-base16-styling/test/index.test.ts @@ -70,8 +70,8 @@ const getStylingFromBase16 = (base16: Base16Theme): StylingConfig => ({ testStyle: { color: base16.base00, }, - testFunc: ({ style }, arg: string) => ({ - className: `testClass--${arg}`, + testFunc: ({ style }, arg) => ({ + className: `testClass--${arg as string}`, style: { ...style, width: 0, @@ -84,8 +84,8 @@ const getStylingFromBase16 = (base16: Base16Theme): StylingConfig => ({ additionalStyle: { border: 0, }, - testFuncNoStyle: (_, arg: string) => ({ - className: `testClass--${arg}`, + testFuncNoStyle: (_, arg) => ({ + className: `testClass--${arg as string}`, }), }); @@ -126,15 +126,15 @@ test('createStyling (custom)', () => { let customStyling = styling({ testClass: 'customClass', testStyle: { height: 0 }, - testFunc: (styling: Styling, arg: string) => ({ - className: `${styling.className!} customClass--${arg}`, + testFunc: (styling: Styling, arg) => ({ + className: `${styling.className!} customClass--${arg as string}`, style: { ...styling.style, border: 0, }, }), - testFuncNoStyle: (styling: Styling, arg: string) => ({ - className: `${styling.className!} customClass--${arg}`, + testFuncNoStyle: (styling: Styling, arg) => ({ + className: `${styling.className!} customClass--${arg as string}`, style: { ...styling.style, border: 0, diff --git a/packages/react-dock/demo/package.json b/packages/react-dock/demo/package.json index 2fbf01d7..4c945602 100644 --- a/packages/react-dock/demo/package.json +++ b/packages/react-dock/demo/package.json @@ -29,8 +29,8 @@ "@types/styled-components": "^5.1.15", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/react-dock/package.json b/packages/react-dock/package.json index 5416ba8c..22572880 100644 --- a/packages/react-dock/package.json +++ b/packages/react-dock/package.json @@ -51,8 +51,8 @@ "@types/lodash.debounce": "^4.0.6", "@types/react": "^16.14.18", "@types/react-test-renderer": "^16.9.5", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index c1785e9a..2fe4dd6d 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -35,8 +35,8 @@ "@types/react-dom": "^16.9.14", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/react-json-tree/examples/src/App.tsx b/packages/react-json-tree/examples/src/App.tsx index 53576e9e..83ad4d07 100644 --- a/packages/react-json-tree/examples/src/App.tsx +++ b/packages/react-json-tree/examples/src/App.tsx @@ -28,7 +28,8 @@ const getValueLabelStyle: StylingValue = ({ style }, nodeType, keyPath) => ({ style: { ...style, color: - !Number.isNaN(keyPath[0]) && !(parseInt(keyPath, 10) % 2) + !Number.isNaN((keyPath as unknown[])[0]) && + !(parseInt(keyPath as string, 10) % 2) ? '#33F' : style!.color, }, diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json index 9c74ada1..95aef7fd 100644 --- a/packages/react-json-tree/package.json +++ b/packages/react-json-tree/package.json @@ -58,8 +58,8 @@ "@types/react": "^16.14.18", "@types/react-test-renderer": "^16.9.5", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/react-json-tree/src/createStylingFromTheme.ts b/packages/react-json-tree/src/createStylingFromTheme.ts index 46b3119c..492d7fd3 100644 --- a/packages/react-json-tree/src/createStylingFromTheme.ts +++ b/packages/react-json-tree/src/createStylingFromTheme.ts @@ -55,7 +55,7 @@ const getDefaultThemeStyling = (theme: Base16Theme): StylingConfig => { backgroundColor: colors.BACKGROUND_COLOR, }, - value: ({ style }, nodeType, keyPath: (string | number)[]) => ({ + value: ({ style }, nodeType, keyPath) => ({ style: { ...style, paddingTop: '0.25em', @@ -64,7 +64,7 @@ const getDefaultThemeStyling = (theme: Base16Theme): StylingConfig => { WebkitUserSelect: 'text', MozUserSelect: 'text', wordWrap: 'break-word', - paddingLeft: keyPath.length > 1 ? '2.125em' : '1.25em', + paddingLeft: (keyPath as unknown[]).length > 1 ? '2.125em' : '1.25em', textIndent: '-0.5em', wordBreak: 'break-all', }, @@ -136,18 +136,12 @@ const getDefaultThemeStyling = (theme: Base16Theme): StylingConfig => { left: '-0.4em', }, - nestedNode: ( - { style }, - keyPath: (string | number)[], - nodeType, - expanded, - expandable - ) => ({ + nestedNode: ({ style }, keyPath, nodeType, expanded, expandable) => ({ style: { ...style, position: 'relative', paddingTop: '0.25em', - marginLeft: keyPath.length > 1 ? '0.875em' : 0, + marginLeft: (keyPath as unknown[]).length > 1 ? '0.875em' : 0, paddingLeft: !expandable ? '1.125em' : 0, }, }), diff --git a/packages/react-json-tree/src/getCollectionEntries.ts b/packages/react-json-tree/src/getCollectionEntries.ts index efca5f7f..85c5403b 100644 --- a/packages/react-json-tree/src/getCollectionEntries.ts +++ b/packages/react-json-tree/src/getCollectionEntries.ts @@ -1,6 +1,7 @@ function getLength(type: string, collection: any) { if (type === 'Object') { - return Object.keys(collection).length; + // eslint-disable-next-line @typescript-eslint/ban-types + return Object.keys(collection as {}).length; } else if (type === 'Array') { return (collection as unknown[]).length; } diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 2c63f4f3..a3cb9044 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -82,8 +82,8 @@ "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", "@types/webpack-env": "^1.16.3", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "css-loader": "^6.4.0", "enzyme": "^3.11.0", diff --git a/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/VisualDiffTab.tsx b/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/VisualDiffTab.tsx index d029317e..c02d38f4 100644 --- a/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/VisualDiffTab.tsx +++ b/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/VisualDiffTab.tsx @@ -1,7 +1,8 @@ import React, { Component } from 'react'; import { Delta, formatters } from 'jsondiffpatch'; -import styled from 'styled-components'; +import styled, { ThemedStyledProps } from 'styled-components'; import { effects } from '@redux-devtools/ui'; +import { Theme } from '@redux-devtools/ui/lib/themes/default'; export const StyledContainer = styled.div` .jsondiffpatch-delta { @@ -18,7 +19,8 @@ export const StyledContainer = styled.div` padding: 2px 3px; border-radius: 3px; position: relative; - color: ${(props) => props.theme.base07}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + color: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base07}; display: inline-block; } @@ -42,20 +44,25 @@ export const StyledContainer = styled.div` .jsondiffpatch-modified .jsondiffpatch-right-value:before { vertical-align: top; padding: 2px; - color: ${(props) => props.theme.base0E}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + color: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base0E}; content: ' => '; } .jsondiffpatch-added .jsondiffpatch-value pre, .jsondiffpatch-modified .jsondiffpatch-right-value pre, .jsondiffpatch-textdiff-added { - background: ${(props) => effects.color(props.theme.base0B, 'alpha', 0.2)}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + background: ${(props: ThemedStyledProps<{}, Theme>) => + effects.color(props.theme.base0B, 'alpha', 0.2)}; } .jsondiffpatch-deleted pre, .jsondiffpatch-modified .jsondiffpatch-left-value pre, .jsondiffpatch-textdiff-deleted { - background: ${(props) => effects.color(props.theme.base08, 'alpha', 0.2)}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + background: ${(props: ThemedStyledProps<{}, Theme>) => + effects.color(props.theme.base08, 'alpha', 0.2)}; text-decoration: line-through; } @@ -122,12 +129,14 @@ export const StyledContainer = styled.div` padding: 2px 0; padding-right: 5px; vertical-align: top; - color: ${(props) => props.theme.base0D}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + color: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base0D}; } .jsondiffpatch-property-name:after { content: ': '; - color: ${(props) => props.theme.base07}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + color: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base07}; } .jsondiffpatch-child-node-type-array > .jsondiffpatch-property-name:after { @@ -163,7 +172,8 @@ export const StyledContainer = styled.div` } .jsondiffpatch-value pre:after { - color: ${(props) => props.theme.base07}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + color: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base07}; content: ','; } @@ -186,7 +196,8 @@ export const StyledContainer = styled.div` .jsondiffpatch-moved .jsondiffpatch-moved-destination { display: inline-block; - background: ${(props) => props.theme.base0A}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + background: ${(props: ThemedStyledProps<{}, Theme>) => props.theme.base0A}; } .jsondiffpatch-moved .jsondiffpatch-moved-destination:before { diff --git a/packages/redux-devtools-app/src/reducers/instances.ts b/packages/redux-devtools-app/src/reducers/instances.ts index 0a079ff9..e516c549 100644 --- a/packages/redux-devtools-app/src/reducers/instances.ts +++ b/packages/redux-devtools-app/src/reducers/instances.ts @@ -129,7 +129,7 @@ function updateState( newState = recompute( newState, request.batched ? payload : (payload as unknown as State[])[i], - action[i], + action[i] as PerformAction>, newState.nextActionId + 1, maxAge, isExcess diff --git a/packages/redux-devtools-app/src/store/configureStore.ts b/packages/redux-devtools-app/src/store/configureStore.ts index a6d24986..8d87a096 100644 --- a/packages/redux-devtools-app/src/store/configureStore.ts +++ b/packages/redux-devtools-app/src/store/configureStore.ts @@ -40,7 +40,7 @@ export default function configureStore( module.hot.accept('../reducers', () => { // eslint-disable-next-line @typescript-eslint/no-var-requires const nextReducer = require('../reducers'); // eslint-disable-line global-require - store.replaceReducer(nextReducer); + store.replaceReducer(nextReducer as Reducer); }); } } diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json index 825c693d..0973a784 100644 --- a/packages/redux-devtools-chart-monitor/package.json +++ b/packages/redux-devtools-chart-monitor/package.json @@ -51,8 +51,8 @@ "@babel/preset-typescript": "^7.15.0", "@redux-devtools/core": "^3.9.0", "@types/react": "^16.14.18", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json index 1edc2c16..cf052152 100644 --- a/packages/redux-devtools-cli/package.json +++ b/packages/redux-devtools-cli/package.json @@ -82,8 +82,8 @@ "@types/styled-components": "^5.1.15", "@types/supertest": "^2.0.11", "@types/uuid": "^8.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/redux-devtools-cli/src/bin/injectServer.ts b/packages/redux-devtools-cli/src/bin/injectServer.ts index 033655e7..91fa1c6c 100644 --- a/packages/redux-devtools-cli/src/bin/injectServer.ts +++ b/packages/redux-devtools-cli/src/bin/injectServer.ts @@ -21,7 +21,7 @@ const serverFlags: { [moduleName: string]: { [version: string]: string } } = { }, }; -function getModuleVersion(modulePath: string) { +function getModuleVersion(modulePath: string): string { return JSON.parse( fs.readFileSync(path.join(modulePath, 'package.json'), 'utf-8') ).version; @@ -41,14 +41,14 @@ function getServerFlag(moduleName: string, version: string): string { export const dir = 'local-cli/server'; export const file = 'server.js'; -export const fullPath = path.join(exports.dir, exports.file); +export const fullPath = path.join(dir, file); export function inject( modulePath: string, options: Options, moduleName: string ) { - const filePath = path.join(modulePath, exports.fullPath); + const filePath = path.join(modulePath, fullPath); if (!fs.existsSync(filePath)) return false; const serverFlag = getServerFlag(moduleName, getModuleVersion(modulePath)); @@ -85,7 +85,7 @@ export function revert( options: Options, moduleName: string ) { - const filePath = path.join(modulePath, exports.fullPath); + const filePath = path.join(modulePath, fullPath); if (!fs.existsSync(filePath)) return false; const serverFlag = getServerFlag(moduleName, getModuleVersion(modulePath)); diff --git a/packages/redux-devtools-cli/src/bin/openApp.ts b/packages/redux-devtools-cli/src/bin/openApp.ts index 84436bd9..99a9cd39 100644 --- a/packages/redux-devtools-cli/src/bin/openApp.ts +++ b/packages/redux-devtools-cli/src/bin/openApp.ts @@ -8,7 +8,7 @@ export default async function openApp(app: true | string, options: Options) { try { const port = options.port ? `--port=${options.port}` : ''; // eslint-disable-next-line @typescript-eslint/no-var-requires - spawn.sync(require('electron'), [ + spawn.sync(require('electron') as string, [ path.join(__dirname, '..', '..', 'app'), port, ]); diff --git a/packages/redux-devtools-cli/src/bin/redux-devtools.ts b/packages/redux-devtools-cli/src/bin/redux-devtools.ts index d63802e9..049d245b 100644 --- a/packages/redux-devtools-cli/src/bin/redux-devtools.ts +++ b/packages/redux-devtools-cli/src/bin/redux-devtools.ts @@ -17,8 +17,8 @@ function readFile(filePath: string) { } if (argv.protocol === 'https') { - argv.key = argv.key ? readFile(argv.key) : null; - argv.cert = argv.cert ? readFile(argv.cert) : null; + argv.key = argv.key ? readFile(argv.key as string) : null; + argv.cert = argv.cert ? readFile(argv.cert as string) : null; } function log(pass: boolean, msg: string) { @@ -76,13 +76,13 @@ function injectRN(type: string, msg: string) { if (argv.revert) { injectRN( - argv.revert, + argv.revert as string, 'Revert injection of ReduxDevTools server from React Native local server' ); } if (argv.injectserver) { injectRN( - argv.injectserver, + argv.injectserver as string, 'Inject ReduxDevTools server into React Native local server' ); } @@ -91,7 +91,7 @@ if (argv.injectserver) { server(argv).then(function (r) { if (argv.open && argv.open !== 'false') { r.on('ready', async function () { - await openApp(argv.open, options); + await openApp(argv.open as string, options); }); } }); diff --git a/packages/redux-devtools-cli/src/db/connector.ts b/packages/redux-devtools-cli/src/db/connector.ts index e162ef1e..c00c3ab1 100644 --- a/packages/redux-devtools-cli/src/db/connector.ts +++ b/packages/redux-devtools-cli/src/db/connector.ts @@ -1,11 +1,11 @@ import path from 'path'; -import knexModule from 'knex'; +import knexModule, { Config } from 'knex'; import { SCServer } from 'socketcluster-server'; export default function connector(options: SCServer.SCServerOptions) { - const dbOptions = options.dbOptions; + const dbOptions = options.dbOptions as Config; dbOptions.useNullAsDefault = true; - if (!dbOptions.migrate) { + if (!(dbOptions as any).migrate) { return knexModule(dbOptions); } diff --git a/packages/redux-devtools-cli/src/options.ts b/packages/redux-devtools-cli/src/options.ts index fed19ca5..336d166b 100644 --- a/packages/redux-devtools-cli/src/options.ts +++ b/packages/redux-devtools-cli/src/options.ts @@ -31,7 +31,7 @@ export interface Options { export default function getOptions(argv: { [arg: string]: any }): Options { let dbOptions = argv.dbOptions; if (typeof dbOptions === 'string') { - dbOptions = require(path.resolve(process.cwd(), argv.dbOptions)); + dbOptions = require(path.resolve(process.cwd(), argv.dbOptions as string)); } else if (typeof dbOptions === 'undefined') { dbOptions = require('../defaultDbOptions.json'); } diff --git a/packages/redux-devtools-cli/src/routes.ts b/packages/redux-devtools-cli/src/routes.ts index 58f3749b..2a477dd5 100644 --- a/packages/redux-devtools-cli/src/routes.ts +++ b/packages/redux-devtools-cli/src/routes.ts @@ -1,11 +1,12 @@ import path from 'path'; import express from 'express'; import morgan from 'morgan'; +import * as http from 'http'; import bodyParser from 'body-parser'; import cors from 'cors'; import { SCServer } from 'socketcluster-server'; import graphqlMiddleware from './middleware/graphql'; -import { ReportBaseFields, Store } from './store'; +import { AddData, ReportBaseFields, Store } from './store'; const app = express.Router(); @@ -27,7 +28,15 @@ function routes( if (logHTTPRequests) { if (typeof logHTTPRequests === 'object') - app.use(morgan('combined', logHTTPRequests)); + app.use( + morgan( + 'combined', + logHTTPRequests as morgan.Options< + http.IncomingMessage, + http.ServerResponse + > + ) + ); else app.use(morgan('combined')); } @@ -55,7 +64,7 @@ function routes( switch (req.body.op) { case 'get': store - .get(req.body.id) + .get(req.body.id as string) .then(function (r) { res.send(r || {}); }) @@ -66,7 +75,7 @@ function routes( break; case 'list': store - .list(req.body.query, req.body.fields) + .list(req.body.query, req.body.fields as string[]) .then(function (r) { res.send(r); }) @@ -77,7 +86,7 @@ function routes( break; default: store - .add(req.body) + .add(req.body as AddData) .then(function (r) { res.send({ id: (r as ReportBaseFields).id, diff --git a/packages/redux-devtools-cli/src/store.ts b/packages/redux-devtools-cli/src/store.ts index 01f3f61f..b4776000 100644 --- a/packages/redux-devtools-cli/src/store.ts +++ b/packages/redux-devtools-cli/src/store.ts @@ -62,7 +62,7 @@ function get(id: string): Promise { return knex(reports).where('id', id).first(); } -interface AddData { +export interface AddData { type: ReportType | null; title: string | null; description: string | null; diff --git a/packages/redux-devtools-cli/src/worker.ts b/packages/redux-devtools-cli/src/worker.ts index 4c1e3fa3..b6597e09 100644 --- a/packages/redux-devtools-cli/src/worker.ts +++ b/packages/redux-devtools-cli/src/worker.ts @@ -60,7 +60,7 @@ class Worker extends SCWorker { }); respond(null, channelToWatch); }); - socket.on('getReport', function (id, respond) { + socket.on('getReport', function (id: string, respond) { store .get(id) .then(function (data) { diff --git a/packages/redux-devtools-dock-monitor/package.json b/packages/redux-devtools-dock-monitor/package.json index 8962bfa5..cbd5b44e 100644 --- a/packages/redux-devtools-dock-monitor/package.json +++ b/packages/redux-devtools-dock-monitor/package.json @@ -52,8 +52,8 @@ "@redux-devtools/core": "^3.9.0", "@types/parse-key": "^0.2.0", "@types/react": "^16.14.18", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json b/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json index 8f742ecc..ad8847f6 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json @@ -41,8 +41,8 @@ "@types/redux-logger": "^3.0.9", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "css-loader": "^6.4.0", "eslint": "^7.32.0", diff --git a/packages/redux-devtools-inspector-monitor-test-tab/package.json b/packages/redux-devtools-inspector-monitor-test-tab/package.json index 4e6ba1c1..9e85b4df 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json @@ -68,8 +68,8 @@ "@types/object-path": "^0.11.1", "@types/react": "^16.14.18", "@types/simple-diff": "^1.6.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.6.2", diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/package.json b/packages/redux-devtools-inspector-monitor-trace-tab/package.json index d884ab7b..5359e1cb 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/package.json @@ -51,8 +51,8 @@ "@types/react": "^16.14.18", "@types/redux-devtools-themes": "^1.0.0", "@types/source-map": "0.5.2", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.6.2", diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/openFile.ts b/packages/redux-devtools-inspector-monitor-trace-tab/src/openFile.ts index a542fa40..9f8fbca0 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/openFile.ts +++ b/packages/redux-devtools-inspector-monitor-trace-tab/src/openFile.ts @@ -118,7 +118,7 @@ export default function openFile( typeof editor === 'string' && /^\w{1,30}$/.test(editor) ) { - openInEditor(editor.toLowerCase(), projectPath, stackFrame); + openInEditor(editor.toLowerCase(), projectPath as string, stackFrame); } else { if ( chrome.devtools && diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/getSourceMap.ts b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/getSourceMap.ts index d461b8ea..c198733a 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/getSourceMap.ts +++ b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/getSourceMap.ts @@ -12,7 +12,7 @@ import { RawSourceMap, SourceMapConsumer } from 'source-map'; * * This exposes methods which will be indifferent to changes made in {@link https://github.com/mozilla/source-map source-map}. */ -class SourceMap { +export class SourceMap { __source_map: SourceMapConsumer; constructor(sourceMap: SourceMapConsumer) { @@ -74,7 +74,7 @@ class SourceMap { } } -function extractSourceMapUrl( +export function extractSourceMapUrl( fileUri: string, fileContents: string ): Promise { @@ -98,7 +98,7 @@ function extractSourceMapUrl( * @param {string} fileUri The URI of the source file. * @param {string} fileContents The contents of the source file. */ -async function getSourceMap( +export async function getSourceMap( //function getSourceMap( fileUri: string, fileContents: string @@ -120,7 +120,7 @@ async function getSourceMap( const index = fileUri.lastIndexOf('/'); const url = fileUri.substring(0, index + 1) + sm; const obj = await fetch(url).then((res) => res.json()); - return new SourceMap(new SourceMapConsumer(obj)); + return new SourceMap(new SourceMapConsumer(obj as RawSourceMap)); } /* @@ -153,5 +153,4 @@ async function getSourceMap( */ } -export { extractSourceMapUrl, getSourceMap }; export default getSourceMap; diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts index 5977c742..43d35f15 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts +++ b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts @@ -6,7 +6,7 @@ */ import StackFrame from './stack-frame'; -import { getSourceMap } from './getSourceMap'; +import { getSourceMap, SourceMap } from './getSourceMap'; import { getLinesAround } from './getLinesAround'; /** @@ -18,7 +18,12 @@ async function map( frames: StackFrame[], contextLines = 3 ): Promise { - const cache: any = {}; + const cache: { + [fileName: string]: { + readonly fileSource: string; + readonly map: SourceMap; + }; + } = {}; const files: string[] = []; frames.forEach((frame) => { const { fileName } = frame; @@ -45,7 +50,7 @@ async function map( } const { source, line, column } = map.getOriginalPosition( lineNumber, - columnNumber + columnNumber! ); const originalSource = source == null ? [] : map.getSource(source) || []; return new StackFrame( @@ -58,7 +63,7 @@ async function map( source, line, column, - getLinesAround(line, contextLines, originalSource) + getLinesAround(line!, contextLines, originalSource) ); }); } diff --git a/packages/redux-devtools-inspector-monitor/demo/package.json b/packages/redux-devtools-inspector-monitor/demo/package.json index 1230680c..42de1893 100644 --- a/packages/redux-devtools-inspector-monitor/demo/package.json +++ b/packages/redux-devtools-inspector-monitor/demo/package.json @@ -42,8 +42,8 @@ "@types/redux-logger": "^3.0.9", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools-inspector-monitor/package.json b/packages/redux-devtools-inspector-monitor/package.json index dddb42f7..0781c36e 100644 --- a/packages/redux-devtools-inspector-monitor/package.json +++ b/packages/redux-devtools-inspector-monitor/package.json @@ -65,8 +65,8 @@ "@types/react": "^16.14.18", "@types/react-dragula": "^1.1.0", "@types/redux-devtools-themes": "^1.0.0", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-inspector-monitor/src/tabs/getItemString.tsx b/packages/redux-devtools-inspector-monitor/src/tabs/getItemString.tsx index 515643ea..65eb1b32 100644 --- a/packages/redux-devtools-inspector-monitor/src/tabs/getItemString.tsx +++ b/packages/redux-devtools-inspector-monitor/src/tabs/getItemString.tsx @@ -23,7 +23,8 @@ function getShortTypeString(val: any, diff: boolean | undefined) { } else if (val === undefined) { return 'undef'; } else if (typeof val === 'object') { - return Object.keys(val).length > 0 ? '{…}' : '{}'; + // eslint-disable-next-line @typescript-eslint/ban-types + return Object.keys(val as {}).length > 0 ? '{…}' : '{}'; } else if (typeof val === 'function') { return 'fn'; } else if (typeof val === 'string') { @@ -42,7 +43,8 @@ function getText( isDiff: boolean | undefined ) { if (type === 'Object') { - const keys = Object.keys(data); + // eslint-disable-next-line @typescript-eslint/ban-types + const keys = Object.keys(data as {}); if (!isWideLayout) return keys.length ? '{…}' : '{}'; const str = keys diff --git a/packages/redux-devtools-instrument/package.json b/packages/redux-devtools-instrument/package.json index f959c096..bedd9f7b 100644 --- a/packages/redux-devtools-instrument/package.json +++ b/packages/redux-devtools-instrument/package.json @@ -48,8 +48,8 @@ "@types/jest": "^27.0.2", "@types/lodash": "^4.14.176", "@types/node": "^14.17.27", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/redux-devtools-log-monitor/package.json b/packages/redux-devtools-log-monitor/package.json index 1a549f25..540a7164 100644 --- a/packages/redux-devtools-log-monitor/package.json +++ b/packages/redux-devtools-log-monitor/package.json @@ -54,8 +54,8 @@ "@babel/preset-typescript": "^7.15.0", "@redux-devtools/core": "^3.9.0", "@types/react": "^16.14.18", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx b/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx index 1d1f4b6e..7fad67ca 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx @@ -85,7 +85,11 @@ export default class LogMonitorEntry< ) => ({ style: { ...style, - backgroundColor: dataIsEqual(data, previousData, keyPath) + backgroundColor: dataIsEqual( + data, + previousData, + keyPath as (string | number)[] + ) ? 'transparent' : this.props.theme.base01, }, @@ -93,7 +97,7 @@ export default class LogMonitorEntry< const getNestedNodeStyle: StylingValue = ({ style }, keyPath) => ({ style: { ...style, - ...(keyPath.length > 1 ? {} : styles.root), + ...((keyPath as unknown[]).length > 1 ? {} : styles.root), }, }); theme = { diff --git a/packages/redux-devtools-rtk-query-monitor/demo/package.json b/packages/redux-devtools-rtk-query-monitor/demo/package.json index 2ca30310..79d5fc1d 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/package.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/package.json @@ -41,8 +41,8 @@ "@types/react-router-dom": "^5.3.1", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "copy-webpack-plugin": "^9.0.1", "css-loader": "^6.4.0", diff --git a/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx index f3b0fd58..35ed2ced 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx +++ b/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx @@ -72,7 +72,7 @@ const PostJsonDetail = ({ id }: { id: string }) => { }; export const PostDetail = () => { - const { id } = useParams<{ id: any }>(); + const { id } = useParams<{ id: string }>(); const history = useHistory(); const toast = useToast(); diff --git a/packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts index 2e099065..4f83e232 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts +++ b/packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts @@ -42,7 +42,7 @@ export const postsApi = createApi({ }), invalidatesTags: (result, error, { id }) => [{ type: 'Post', id }], }), - deletePost: build.mutation<{ success: boolean; id: number }, number>({ + deletePost: build.mutation<{ success: boolean; id: number }, string>({ query(id) { return { url: `posts/${id}`, diff --git a/packages/redux-devtools-rtk-query-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json index 7ef3acca..ed72f29c 100644 --- a/packages/redux-devtools-rtk-query-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -64,8 +64,8 @@ "@types/hex-rgba": "^1.0.1", "@types/lodash.debounce": "^4.0.6", "@types/react": "^16.14.18", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx b/packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx index 1dfe3469..fbf37ecc 100644 --- a/packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx +++ b/packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx @@ -44,7 +44,8 @@ function getText( isDiff: boolean | undefined ) { if (type === 'Object') { - const keys = Object.keys(data); + // eslint-disable-next-line @typescript-eslint/ban-types + const keys = Object.keys(data as {}); if (!previewContent) return keys.length ? '{…}' : '{}'; const str = keys diff --git a/packages/redux-devtools-serialize/package.json b/packages/redux-devtools-serialize/package.json index 14a4b9f7..b5abb59a 100644 --- a/packages/redux-devtools-serialize/package.json +++ b/packages/redux-devtools-serialize/package.json @@ -39,8 +39,8 @@ "@babel/preset-typescript": "^7.15.0", "@types/jest": "^27.0.2", "@types/jsan": "^3.1.2", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/redux-devtools-serialize/src/helpers/index.ts b/packages/redux-devtools-serialize/src/helpers/index.ts index 99076e3b..f1412596 100644 --- a/packages/redux-devtools-serialize/src/helpers/index.ts +++ b/packages/redux-devtools-serialize/src/helpers/index.ts @@ -35,13 +35,26 @@ export function extract(data: unknown, type: string): SerializedData { }; } +export function refer(data: unknown, type: string): SerializedData; export function refer( data: { [key in K]: () => unknown }, type: string, - transformMethod: K | false, + transformMethod?: K | false, + refs?: (new (data: any) => unknown)[] | null +): SerializedData; +export function refer( + data: any, + type: string, + transformMethod?: 'toString' | false, + refs?: (new (data: any) => unknown)[] | null +): SerializedData; +export function refer( + data: { [key in K]: () => unknown } | unknown, + type: string, + transformMethod?: K | false, refs?: (new (data: any) => unknown)[] | null ): SerializedData { - const r = mark(data, type, transformMethod); + const r = mark(data as { [key in K]: () => unknown }, type, transformMethod); if (!refs) return r; for (let i = 0; i < refs.length; i++) { const ref = refs[i]; diff --git a/packages/redux-devtools-serialize/test/helpers.spec.ts b/packages/redux-devtools-serialize/test/helpers.spec.ts index 62af59a3..b830242d 100644 --- a/packages/redux-devtools-serialize/test/helpers.spec.ts +++ b/packages/redux-devtools-serialize/test/helpers.spec.ts @@ -16,7 +16,9 @@ describe('Helpers', function () { const TestClass = function (data: unknown) { return data; }; - const testInstance = new (TestClass as any)({ testData: 'test' }); + const testInstance = new (TestClass as any)({ + testData: 'test', + }) as unknown; expect( refer(testInstance, 'testType', false, [TestClass as any]) ).toMatchSnapshot(); diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json index 3f3b2f34..4590413a 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json @@ -40,8 +40,8 @@ "@types/react-redux": "^7.1.20", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "css-loader": "^6.4.0", "eslint": "^7.32.0", diff --git a/packages/redux-devtools-slider-monitor/package.json b/packages/redux-devtools-slider-monitor/package.json index 5baa5bab..bc04c80d 100644 --- a/packages/redux-devtools-slider-monitor/package.json +++ b/packages/redux-devtools-slider-monitor/package.json @@ -43,8 +43,8 @@ "@babel/preset-typescript": "^7.15.0", "@redux-devtools/core": "^3.9.0", "@types/react": "^16.14.18", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.26.1", diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index 6752ab7f..f50eb088 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -64,8 +64,8 @@ "@types/jest": "^27.0.2", "@types/react": "^16.14.18", "@types/styled-components": "^5.1.15", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "csstype": "^3.0.9", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", diff --git a/packages/redux-devtools-ui/src/Container/styles/index.ts b/packages/redux-devtools-ui/src/Container/styles/index.ts index d8be6617..65c548d0 100644 --- a/packages/redux-devtools-ui/src/Container/styles/index.ts +++ b/packages/redux-devtools-ui/src/Container/styles/index.ts @@ -1,5 +1,6 @@ -import styled from 'styled-components'; +import styled, { ThemedStyledProps } from 'styled-components'; import color from '../../utils/color'; +import { Theme } from '../../themes/default'; export const MainContainerWrapper = styled.div` display: flex; @@ -7,7 +8,9 @@ export const MainContainerWrapper = styled.div` width: 100%; flex-flow: column nowrap; overflow: auto; - background-color: ${(props) => color(props.theme.base00, 'lighten', 0.03)}; + ${/* eslint-disable-next-line @typescript-eslint/ban-types */ ''} + background-color: ${(props: ThemedStyledProps<{}, Theme>) => + color(props.theme.base00, 'lighten', 0.03)}; color: ${(props) => props.theme.base07}; font-size: 12px; diff --git a/packages/redux-devtools-ui/src/utils/createStyledComponent.ts b/packages/redux-devtools-ui/src/utils/createStyledComponent.ts index fc77eac9..d92d6574 100644 --- a/packages/redux-devtools-ui/src/utils/createStyledComponent.ts +++ b/packages/redux-devtools-ui/src/utils/createStyledComponent.ts @@ -65,15 +65,15 @@ export default function createStyledComponent< ): StyledComponent { return (styled as ThemedStyledInterface)((component || 'div') as C)` ${(props: ThemedStyledProps & O, Theme>) => - isThemeFromProvider(props.theme) - ? getStyle(styles, props.theme.type) + isThemeFromProvider(props.theme as Theme | Base16Theme) + ? getStyle(styles, props.theme.type as string) : // used outside of container (theme provider) getStyle( styles, 'default' )({ ...props, - theme: getDefaultTheme(props.theme), + theme: getDefaultTheme(props.theme as Base16Theme), })} ` as StyledComponent; } diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap b/packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap index b1de63ba..78ccdb1d 100644 --- a/packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap +++ b/packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap @@ -2,7 +2,7 @@ exports[`Container renders correctly 1`] = `
Text
diff --git a/packages/redux-devtools-utils/package.json b/packages/redux-devtools-utils/package.json index 75fdf53b..901f195f 100644 --- a/packages/redux-devtools-utils/package.json +++ b/packages/redux-devtools-utils/package.json @@ -48,8 +48,8 @@ "@types/jsan": "^3.1.2", "@types/lodash": "^4.14.176", "@types/node": "^14.17.27", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "rimraf": "^3.0.2", diff --git a/packages/redux-devtools-utils/src/index.ts b/packages/redux-devtools-utils/src/index.ts index b4af6b8a..9e1f00ee 100644 --- a/packages/redux-devtools-utils/src/index.ts +++ b/packages/redux-devtools-utils/src/index.ts @@ -71,14 +71,15 @@ export function getActionsArray(actionCreators: { return flatTree(actionCreators); } -// eslint-disable-next-line @typescript-eslint/no-implied-eval -const interpretArg = (arg: string) => new Function('return ' + arg)(); +const interpretArg = (arg: string): unknown => + // eslint-disable-next-line @typescript-eslint/no-implied-eval + new Function('return ' + arg)(); -function evalArgs(inArgs: string[], restArgs: string) { +function evalArgs(inArgs: string[], restArgs: string): unknown[] { const args = inArgs.map(interpretArg); if (!restArgs) return args; const rest = interpretArg(restArgs); - if (Array.isArray(rest)) return args.concat(...rest); + if (Array.isArray(rest)) return args.concat(...(rest as unknown[])); throw new Error('rest must be an array'); } diff --git a/packages/redux-devtools/examples/counter/package.json b/packages/redux-devtools/examples/counter/package.json index 04597034..577d8110 100644 --- a/packages/redux-devtools/examples/counter/package.json +++ b/packages/redux-devtools/examples/counter/package.json @@ -42,8 +42,8 @@ "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", "@types/webpack-env": "^1.16.3", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts b/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts index 15d7cfc2..5e1d12d3 100644 --- a/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts +++ b/packages/redux-devtools/examples/counter/src/store/configureStore.dev.ts @@ -1,4 +1,10 @@ -import { createStore, applyMiddleware, compose, PreloadedState } from 'redux'; +import { + createStore, + applyMiddleware, + compose, + PreloadedState, + Reducer, +} from 'redux'; import { persistState } from '@redux-devtools/core'; import thunk from 'redux-thunk'; import rootReducer, { CounterState } from '../reducers'; @@ -23,7 +29,7 @@ export default function configureStore( if (module.hot) { module.hot.accept('../reducers', () => // eslint-disable-next-line @typescript-eslint/no-var-requires - store.replaceReducer(require('../reducers').default) + store.replaceReducer(require('../reducers').default as Reducer) ); } diff --git a/packages/redux-devtools/examples/todomvc/package.json b/packages/redux-devtools/examples/todomvc/package.json index 9654f3b4..dcc74d52 100644 --- a/packages/redux-devtools/examples/todomvc/package.json +++ b/packages/redux-devtools/examples/todomvc/package.json @@ -55,8 +55,8 @@ "@types/react-redux": "^7.1.20", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.3.1", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "babel-loader": "^8.2.3", "css-loader": "^6.4.0", "eslint": "^7.32.0", diff --git a/packages/redux-devtools/package.json b/packages/redux-devtools/package.json index 92b25309..32f8a0ae 100644 --- a/packages/redux-devtools/package.json +++ b/packages/redux-devtools/package.json @@ -54,8 +54,8 @@ "@types/node": "^14.17.27", "@types/react": "^16.14.18", "@types/react-redux": "^7.1.20", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", + "@typescript-eslint/eslint-plugin": "^5.1.0", + "@typescript-eslint/parser": "^5.1.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/redux-devtools/src/persistState.ts b/packages/redux-devtools/src/persistState.ts index dd0c1fd2..2a73babc 100644 --- a/packages/redux-devtools/src/persistState.ts +++ b/packages/redux-devtools/src/persistState.ts @@ -36,9 +36,9 @@ export default function persistState< } return (next) => - >( - reducer: Reducer, - initialState?: PreloadedState + >( + reducer: Reducer, + initialState?: PreloadedState ) => { const key = `redux-dev-session-${sessionId}`; @@ -46,7 +46,9 @@ export default function persistState< try { const json = localStorage.getItem(key); if (json) { - finalInitialState = deserialize(JSON.parse(json)) || initialState; + finalInitialState = + deserialize(JSON.parse(json) as LiftedState) || + initialState; next(reducer, initialState); } } catch (e) { @@ -60,12 +62,12 @@ export default function persistState< const store = next( reducer, - finalInitialState as PreloadedState | undefined + finalInitialState as PreloadedState | undefined ); return { ...store, - dispatch(action: T) { + dispatch(action: T) { store.dispatch(action); try { diff --git a/yarn.lock b/yarn.lock index a007020b..9a31bcfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4509,8 +4509,8 @@ __metadata: "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 "@types/webpack-env": ^1.16.3 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 css-loader: ^6.4.0 d3-state-visualizer: ^1.4.0 @@ -4572,8 +4572,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/redux-devtools-themes": ^1.0.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 d3-state-visualizer: ^1.4.0 deepmerge: ^4.2.2 eslint: ^7.32.0 @@ -4614,8 +4614,8 @@ __metadata: "@types/styled-components": ^5.1.15 "@types/supertest": ^2.0.11 "@types/uuid": ^8.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 apollo-server: ^2.25.2 apollo-server-express: ^2.25.2 body-parser: ^1.19.0 @@ -4670,8 +4670,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/react-redux": ^7.1.20 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-jest: ^25.2.2 @@ -4706,8 +4706,8 @@ __metadata: "@types/parse-key": ^0.2.0 "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.26.1 @@ -4749,8 +4749,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/simple-diff": ^1.6.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 enzyme: ^3.11.0 enzyme-adapter-react-16: ^1.15.6 enzyme-to-json: ^3.6.2 @@ -4803,8 +4803,8 @@ __metadata: "@types/react": ^16.14.18 "@types/redux-devtools-themes": ^1.0.0 "@types/source-map": 0.5.2 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 anser: ^2.1.0 enzyme: ^3.11.0 enzyme-adapter-react-16: ^1.15.6 @@ -4854,8 +4854,8 @@ __metadata: "@types/react": ^16.14.18 "@types/react-dragula": ^1.1.0 "@types/redux-devtools-themes": ^1.0.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 dateformat: ^4.6.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -4895,8 +4895,8 @@ __metadata: "@types/jest": ^27.0.2 "@types/lodash": ^4.14.176 "@types/node": ^14.17.27 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-jest: ^25.2.2 @@ -4926,8 +4926,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/redux-devtools-themes": ^1.0.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.26.1 @@ -4964,8 +4964,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/redux-devtools-themes": ^1.0.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.26.1 @@ -5001,8 +5001,8 @@ __metadata: "@babel/preset-typescript": ^7.15.0 "@types/jest": ^27.0.2 "@types/jsan": ^3.1.2 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-jest: ^25.2.2 @@ -5031,8 +5031,8 @@ __metadata: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/redux-devtools-themes": ^1.0.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.26.1 @@ -5074,8 +5074,8 @@ __metadata: "@types/redux-devtools-themes": ^1.0.0 "@types/simple-element-resize-detector": ^1.3.0 "@types/styled-components": ^5.1.15 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 base16: ^1.0.0 codemirror: ^5.63.3 color: ^3.2.1 @@ -5127,8 +5127,8 @@ __metadata: "@types/jsan": ^3.1.2 "@types/lodash": ^4.14.176 "@types/node": ^14.17.27 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 get-params: ^0.1.2 @@ -7717,45 +7717,29 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0" +"@typescript-eslint/eslint-plugin@npm:^5.1.0": + version: 5.1.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.1.0" dependencies: - "@typescript-eslint/experimental-utils": 4.33.0 - "@typescript-eslint/scope-manager": 4.33.0 - debug: ^4.3.1 + "@typescript-eslint/experimental-utils": 5.1.0 + "@typescript-eslint/scope-manager": 5.1.0 + debug: ^4.3.2 functional-red-black-tree: ^1.0.1 ignore: ^5.1.8 - regexpp: ^3.1.0 + regexpp: ^3.2.0 semver: ^7.3.5 tsutils: ^3.21.0 peerDependencies: - "@typescript-eslint/parser": ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + "@typescript-eslint/parser": ^5.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: d74855d0a5ffe0b2f362ec02fcd9301d39a53fb4155b9bd0cb15a0a31d065143129ebf98df9d86af4b6f74de1d423a4c0d8c0095520844068117453afda5bc4f + checksum: dd27bec00920600c79047bac2ec061712a0134dd6bc27254a5829031271cc91518609a073c09338c0ff8ccc34a48df13c0d45a071d9b09e9f3d80be9e6e1f2e3 languageName: node linkType: hard -"@typescript-eslint/experimental-utils@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/experimental-utils@npm:4.33.0" - dependencies: - "@types/json-schema": ^7.0.7 - "@typescript-eslint/scope-manager": 4.33.0 - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/typescript-estree": 4.33.0 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 - peerDependencies: - eslint: "*" - checksum: f859800ada0884f92db6856f24efcb1d073ac9883ddc2b1aa9339f392215487895bed8447ebce3741e8141bb32e545244abef62b73193ba9a8a0527c523aabae - languageName: node - linkType: hard - -"@typescript-eslint/experimental-utils@npm:^5.0.0": +"@typescript-eslint/experimental-utils@npm:5.1.0, @typescript-eslint/experimental-utils@npm:^5.0.0": version: 5.1.0 resolution: "@typescript-eslint/experimental-utils@npm:5.1.0" dependencies: @@ -7771,30 +7755,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/parser@npm:4.33.0" +"@typescript-eslint/parser@npm:^5.1.0": + version: 5.1.0 + resolution: "@typescript-eslint/parser@npm:5.1.0" dependencies: - "@typescript-eslint/scope-manager": 4.33.0 - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/typescript-estree": 4.33.0 - debug: ^4.3.1 + "@typescript-eslint/scope-manager": 5.1.0 + "@typescript-eslint/types": 5.1.0 + "@typescript-eslint/typescript-estree": 5.1.0 + debug: ^4.3.2 peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 102457eae1acd516211098fea081c8a2ed728522bbda7f5a557b6ef23d88970514f9a0f6285d53fca134d3d4d7d17822b5d5e12438d5918df4d1f89cc9e67d57 - languageName: node - linkType: hard - -"@typescript-eslint/scope-manager@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/scope-manager@npm:4.33.0" - dependencies: - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/visitor-keys": 4.33.0 - checksum: 9a25fb7ba7c725ea7227a24d315b0f6aacbad002e2549a049edf723c1d3615c22f5c301f0d7d615b377f2cdf2f3519d97e79af0c459de6ef8d2aaf0906dff13e + checksum: c9479ae0333171e0583dc77b2e8d18ac0bf7955b2c7c11337b16d8f5d57147e534b2616c7ea500e1e48b93193408fc8b8bbb0b81dcb8691eb20a1801980999de languageName: node linkType: hard @@ -7808,13 +7782,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/types@npm:4.33.0" - checksum: 3baae1ca35872421b4eb60f5d3f3f32dc1d513f2ae0a67dee28c7d159fd7a43ed0d11a8a5a0f0c2d38507ffa036fc7c511cb0f18a5e8ac524b3ebde77390ec53 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.1.0": version: 5.1.0 resolution: "@typescript-eslint/types@npm:5.1.0" @@ -7822,24 +7789,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/typescript-estree@npm:4.33.0" - dependencies: - "@typescript-eslint/types": 4.33.0 - "@typescript-eslint/visitor-keys": 4.33.0 - debug: ^4.3.1 - globby: ^11.0.3 - is-glob: ^4.0.1 - semver: ^7.3.5 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 2566984390c76bd95f43240057215c068c69769e406e27aba41e9f21fd300074d6772e4983fa58fe61e80eb5550af1548d2e31e80550d92ba1d051bb00fe6f5c - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.1.0": version: 5.1.0 resolution: "@typescript-eslint/typescript-estree@npm:5.1.0" @@ -7858,16 +7807,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:4.33.0": - version: 4.33.0 - resolution: "@typescript-eslint/visitor-keys@npm:4.33.0" - dependencies: - "@typescript-eslint/types": 4.33.0 - eslint-visitor-keys: ^2.0.0 - checksum: 59953e474ad4610c1aa23b2b1a964445e2c6201521da6367752f37939d854352bbfced5c04ea539274065e012b1337ba3ffa49c2647a240a4e87155378ba9873 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.1.0": version: 5.1.0 resolution: "@typescript-eslint/visitor-keys@npm:5.1.0" @@ -11977,8 +11916,8 @@ __metadata: "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 "@types/webpack-env": ^1.16.3 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -12389,8 +12328,8 @@ __metadata: "@types/node": ^14.17.27 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 d3-state-visualizer: ^1.4.0 eslint: ^7.32.0 @@ -12418,8 +12357,8 @@ __metadata: "@types/node": ^14.17.27 "@types/ramda": ^0.27.45 "@types/webpack": ^5.28.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 d3: ^3.5.17 d3tooltip: ^1.3.0 @@ -12455,8 +12394,8 @@ __metadata: "@types/node": ^14.17.27 "@types/ramda": ^0.27.45 "@types/webpack": ^5.28.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 d3: ^3.5.17 eslint: ^7.32.0 @@ -17144,8 +17083,8 @@ fsevents@^1.2.7: "@types/redux-logger": ^3.0.9 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 base16: ^1.0.0 connected-react-router: ^6.9.1 @@ -20317,8 +20256,8 @@ fsevents@^1.2.7: "@types/lodash": ^4.14.176 "@types/node": ^14.17.27 "@types/webpack": ^5.28.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -24244,8 +24183,8 @@ fsevents@^1.2.7: "@types/jest": ^27.0.2 "@types/lodash": ^4.14.176 "@types/lodash.curry": ^4.1.6 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 base16: ^1.0.0 color: ^3.2.1 csstype: ^3.0.9 @@ -24391,8 +24330,8 @@ fsevents@^1.2.7: "@types/styled-components": ^5.1.15 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -24429,8 +24368,8 @@ fsevents@^1.2.7: "@types/prop-types": ^15.7.4 "@types/react": ^16.14.18 "@types/react-test-renderer": ^16.9.5 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-jest: ^25.2.2 @@ -24595,8 +24534,8 @@ fsevents@^1.2.7: "@types/react-dom": ^16.9.14 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -24631,8 +24570,8 @@ fsevents@^1.2.7: "@types/react": ^16.14.18 "@types/react-test-renderer": ^16.9.5 "@types/webpack": ^5.28.0 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 @@ -25406,7 +25345,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"regexpp@npm:^3.1.0": +"regexpp@npm:^3.1.0, regexpp@npm:^3.2.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8 @@ -26011,8 +25950,8 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-jest: ^25.2.2 @@ -26067,8 +26006,8 @@ resolve@^2.0.0-next.3: "@types/react-router-dom": ^5.3.1 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 copy-webpack-plugin: ^9.0.1 css-loader: ^6.4.0 @@ -26845,8 +26784,8 @@ resolve@^2.0.0-next.3: "@types/react-redux": ^7.1.20 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 classnames: ^2.3.1 css-loader: ^6.4.0 @@ -28374,8 +28313,8 @@ resolve@^2.0.0-next.3: "@types/redux-logger": ^3.0.9 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 connected-react-router: ^6.9.1 css-loader: ^6.4.0 @@ -28653,8 +28592,8 @@ resolve@^2.0.0-next.3: "@types/react-redux": ^7.1.20 "@types/webpack": ^5.28.0 "@types/webpack-dev-server": ^4.3.1 - "@typescript-eslint/eslint-plugin": ^4.33.0 - "@typescript-eslint/parser": ^4.33.0 + "@typescript-eslint/eslint-plugin": ^5.1.0 + "@typescript-eslint/parser": ^5.1.0 babel-loader: ^8.2.3 classnames: ^2.3.1 css-loader: ^6.4.0