From 577943bfd1cc2a751a69bc84c157257f1e73749d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 04:48:25 +0000 Subject: [PATCH 01/14] chore(deps): update dependency chromedriver to v94 (#893) Co-authored-by: Renovate Bot --- extension/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extension/package.json b/extension/package.json index 49e6e59b..33e01b6d 100644 --- a/extension/package.json +++ b/extension/package.json @@ -69,7 +69,7 @@ "@types/styled-components": "^5.1.15", "babel-loader": "^8.2.3", "bestzip": "^2.2.0", - "chromedriver": "^93.0.1", + "chromedriver": "^94.0.0", "copy-webpack-plugin": "^9.0.1", "cross-env": "^7.0.3", "css-loader": "^6.4.0", diff --git a/yarn.lock b/yarn.lock index dfe57795..fe2c6775 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11018,9 +11018,9 @@ __metadata: languageName: node linkType: hard -"chromedriver@npm:^93.0.1": - version: 93.0.1 - resolution: "chromedriver@npm:93.0.1" +"chromedriver@npm:^94.0.0": + version: 94.0.0 + resolution: "chromedriver@npm:94.0.0" dependencies: "@testim/chrome-version": ^1.0.7 axios: ^0.21.2 @@ -11031,7 +11031,7 @@ __metadata: tcp-port-used: ^1.0.1 bin: chromedriver: bin/chromedriver - checksum: 91a5c29c55cf058f7f95af1141bcc4df076b1fd0e90e6b05d16adbb5aefd8ebdfc315d01da584de58f8f77c3382cab231ae494601e332de6b529523272f27997 + checksum: 1b881d3cedce97b02694877338fcd5d70f24585b1cf848b77ede6833f0cac74cdabd5e75f658985535adabc3789d67bde4e1b9a2834419b32c667db8b40b74b4 languageName: node linkType: hard @@ -25788,7 +25788,7 @@ fsevents@^1.2.7: "@types/styled-components": ^5.1.15 babel-loader: ^8.2.3 bestzip: ^2.2.0 - chromedriver: ^93.0.1 + chromedriver: ^94.0.0 copy-webpack-plugin: ^9.0.1 cross-env: ^7.0.3 css-loader: ^6.4.0 From 3dae06e2cb292d3416d87cbdddee71e737a0c09e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 14:15:09 +0000 Subject: [PATCH 02/14] chore(deps): update dependency selenium-webdriver to v4 (#909) * chore(deps): update dependency selenium-webdriver to v4 * Update Co-authored-by: Renovate Bot Co-authored-by: Nathan Bierema --- extension/package.json | 2 +- extension/test/chrome/extension.spec.js | 10 ++- extension/test/electron/devpanel.spec.js | 17 ++--- yarn.lock | 87 ++++++++++-------------- 4 files changed, 47 insertions(+), 69 deletions(-) diff --git a/extension/package.json b/extension/package.json index 33e01b6d..29bd5500 100644 --- a/extension/package.json +++ b/extension/package.json @@ -93,7 +93,7 @@ "react-transform-catch-errors": "^1.0.2", "react-transform-hmr": "^1.0.4", "rimraf": "^3.0.2", - "selenium-webdriver": "^3.6.0", + "selenium-webdriver": "^4.0.0", "sinon-chrome": "^3.0.1", "style-loader": "^3.3.0", "ts-jest": "^27.0.7", diff --git a/extension/test/chrome/extension.spec.js b/extension/test/chrome/extension.spec.js index 50bcd90d..d3082167 100644 --- a/extension/test/chrome/extension.spec.js +++ b/extension/test/chrome/extension.spec.js @@ -1,5 +1,6 @@ import { resolve } from 'path'; import webdriver from 'selenium-webdriver'; +import chrome from 'selenium-webdriver/chrome'; import chromedriver from 'chromedriver'; import { switchMonitorTests, delay } from '../utils/e2e'; @@ -17,11 +18,9 @@ describe('Chrome extension', function () { await delay(2000); driver = new webdriver.Builder() .usingServer(`http://localhost:${port}`) - .withCapabilities({ - chromeOptions: { - args: [`load-extension=${path}`], - }, - }) + .setChromeOptions( + new chrome.Options().addArguments(`load-extension=${path}`) + ) .forBrowser('chrome') .build(); }); @@ -72,7 +71,6 @@ describe('Chrome extension', function () { await driver.switchTo().window(tabs[1]); expect(await driver.getCurrentUrl()).toMatch(url); - await driver.manage().timeouts().pageLoadTimeout(5000); await driver.switchTo().window(tabs[0]); diff --git a/extension/test/electron/devpanel.spec.js b/extension/test/electron/devpanel.spec.js index e2aca5fd..1fa3e01f 100644 --- a/extension/test/electron/devpanel.spec.js +++ b/extension/test/electron/devpanel.spec.js @@ -1,5 +1,6 @@ import { join } from 'path'; import webdriver from 'selenium-webdriver'; +import chrome from 'selenium-webdriver/chrome'; import electronPath from 'electron'; import chromedriver from 'chromedriver'; import { switchMonitorTests, delay } from '../utils/e2e'; @@ -16,15 +17,13 @@ describe('DevTools panel for Electron', function () { await delay(1000); driver = new webdriver.Builder() .usingServer(`http://localhost:${port}`) - .withCapabilities({ - chromeOptions: { - binary: electronPath, - args: [`app=${join(__dirname, 'fixture')}`], - }, - }) - .forBrowser('electron') + .setChromeOptions( + new chrome.Options() + .setChromeBinaryPath(electronPath) + .addArguments(`app=${join(__dirname, 'fixture')}`) + ) + .forBrowser('chrome') .build(); - await driver.manage().timeouts().setScriptTimeout(10000); }); afterAll(async () => { @@ -48,8 +47,6 @@ describe('DevTools panel for Electron', function () { /devtools:\/\/devtools\/bundled\/devtools_app.html/ ); - await driver.manage().timeouts().pageLoadTimeout(5000); - const id = await driver.executeAsyncScript(function (callback) { let attempts = 5; function showReduxPanel() { diff --git a/yarn.lock b/yarn.lock index fe2c6775..caae0221 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19332,7 +19332,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"jszip@npm:^3.1.3": +"jszip@npm:^3.6.0": version: 3.7.1 resolution: "jszip@npm:3.7.1" dependencies: @@ -25823,7 +25823,7 @@ fsevents@^1.2.7: redux: ^4.1.1 redux-persist: ^6.0.0 rimraf: ^3.0.2 - selenium-webdriver: ^3.6.0 + selenium-webdriver: ^4.0.0 sinon-chrome: ^3.0.1 style-loader: ^3.3.0 styled-components: ^5.3.3 @@ -26412,7 +26412,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"sax@npm:>=0.6.0, sax@npm:^1.2.4": +"sax@npm:^1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe @@ -26579,15 +26579,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"selenium-webdriver@npm:^3.6.0": - version: 3.6.0 - resolution: "selenium-webdriver@npm:3.6.0" +"selenium-webdriver@npm:^4.0.0": + version: 4.0.0 + resolution: "selenium-webdriver@npm:4.0.0" dependencies: - jszip: ^3.1.3 - rimraf: ^2.5.4 - tmp: 0.0.30 - xml2js: ^0.4.17 - checksum: 5bc1045d0205c5aed1f3e3cf8047d3bb677e370e96ae4a8acd172846c07aeb40c031bee5017a7c432bec36e46c5bbce82fe3b40086b7daa4cb31dcaf69daad55 + jszip: ^3.6.0 + rimraf: ^3.0.2 + tmp: ^0.2.1 + ws: ">=7.4.6" + checksum: ac9861e9aa476bc6e5a45fba7b22c1a22478c90de3fecceb43df4e6390a6717855467222bfe775ad1b4bc504a9159a794a2a8b4370401279afb5878279ea7d9e languageName: node linkType: hard @@ -28748,15 +28748,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"tmp@npm:0.0.30": - version: 0.0.30 - resolution: "tmp@npm:0.0.30" - dependencies: - os-tmpdir: ~1.0.1 - checksum: d3e97e8e73b2d2dfff9916072004088b4737c67d11ea255d0ccc8584f252b253b60ecf04122b21848ec46ad5a92e31febc6d6a3068f6c8a20c9b0e23a802e78d - languageName: node - linkType: hard - "tmp@npm:0.0.31": version: 0.0.31 resolution: "tmp@npm:0.0.31" @@ -28775,6 +28766,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"tmp@npm:^0.2.1": + version: 0.2.1 + resolution: "tmp@npm:0.2.1" + dependencies: + rimraf: ^3.0.0 + checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e + languageName: node + linkType: hard + "tmpl@npm:1.0.x": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -30782,6 +30782,21 @@ typescript@~4.4.4: languageName: node linkType: hard +"ws@npm:>=7.4.6, ws@npm:^8.1.0": + version: 8.2.3 + resolution: "ws@npm:8.2.3" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: c869296ccb45f218ac6d32f8f614cd85b50a21fd434caf11646008eef92173be53490810c5c23aea31bc527902261fbfd7b062197eea341b26128d4be56a85e4 + languageName: node + linkType: hard + "ws@npm:^5.2.0 || ^6.0.0 || ^7.0.0, ws@npm:^7.4.6, ws@npm:^7.5.0": version: 7.5.5 resolution: "ws@npm:7.5.5" @@ -30797,21 +30812,6 @@ typescript@~4.4.4: languageName: node linkType: hard -"ws@npm:^8.1.0": - version: 8.2.3 - resolution: "ws@npm:8.2.3" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: c869296ccb45f218ac6d32f8f614cd85b50a21fd434caf11646008eef92173be53490810c5c23aea31bc527902261fbfd7b062197eea341b26128d4be56a85e4 - languageName: node - linkType: hard - "xdg-basedir@npm:^3.0.0": version: 3.0.0 resolution: "xdg-basedir@npm:3.0.0" @@ -30826,23 +30826,6 @@ typescript@~4.4.4: languageName: node linkType: hard -"xml2js@npm:^0.4.17": - version: 0.4.23 - resolution: "xml2js@npm:0.4.23" - dependencies: - sax: ">=0.6.0" - xmlbuilder: ~11.0.0 - checksum: ca0cf2dfbf6deeaae878a891c8fbc0db6fd04398087084edf143cdc83d0509ad0fe199b890f62f39c4415cf60268a27a6aed0d343f0658f8779bd7add690fa98 - languageName: node - linkType: hard - -"xmlbuilder@npm:~11.0.0": - version: 11.0.1 - resolution: "xmlbuilder@npm:11.0.1" - checksum: 7152695e16f1a9976658215abab27e55d08b1b97bca901d58b048d2b6e106b5af31efccbdecf9b07af37c8377d8e7e821b494af10b3a68b0ff4ae60331b415b0 - languageName: node - linkType: hard - "xmlchars@npm:^2.2.0": version: 2.2.0 resolution: "xmlchars@npm:2.2.0" From ada8aa0a892470423d31181de4b5ac8195e15c88 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 13:25:36 -0400 Subject: [PATCH 03/14] chore(deps): update dependency html-loader to v3 (#912) Co-authored-by: Renovate Bot --- packages/redux-devtools-app/package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 11995dd7..2c63f4f3 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -95,7 +95,7 @@ "eslint-plugin-react": "^7.26.1", "file-loader": "^6.2.0", "fork-ts-checker-webpack-plugin": "^6.4.0", - "html-loader": "^2.1.2", + "html-loader": "^3.0.0", "html-webpack-plugin": "^5.4.0", "jest": "^27.3.1", "path-browserify": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index caae0221..1bf27382 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4523,7 +4523,7 @@ __metadata: eslint-plugin-react: ^7.26.1 file-loader: ^6.2.0 fork-ts-checker-webpack-plugin: ^6.4.0 - html-loader: ^2.1.2 + html-loader: ^3.0.0 html-webpack-plugin: ^5.4.0 javascript-stringify: ^2.1.0 jest: ^27.3.1 @@ -16585,19 +16585,19 @@ fsevents@^1.2.7: languageName: node linkType: hard -"html-loader@npm:^2.1.2": - version: 2.1.2 - resolution: "html-loader@npm:2.1.2" +"html-loader@npm:^3.0.0": + version: 3.0.0 + resolution: "html-loader@npm:3.0.0" dependencies: - html-minifier-terser: ^5.1.1 + html-minifier-terser: ^6.0.2 parse5: ^6.0.1 peerDependencies: webpack: ^5.0.0 - checksum: ed0b9033121b5ee5f85c3fbc5e17208f207cc33785417c014dc942a579410089de923d9c509a2d42821f3488efe984d2b898f277469e47eabf1a37cfbc48c302 + checksum: 5e8438da51fbee925350f9ad0121c924064d054fc8675944fbd03606d3243504eb3a46ea263574bef0757b9c7f2b16702c898b9d6dd92b229d07a21dcf4a6383 languageName: node linkType: hard -"html-minifier-terser@npm:^5.0.1, html-minifier-terser@npm:^5.1.1": +"html-minifier-terser@npm:^5.0.1": version: 5.1.1 resolution: "html-minifier-terser@npm:5.1.1" dependencies: From 922b8be10a19f8df7301f2630b8c5185c346ccd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 17:42:51 +0000 Subject: [PATCH 04/14] chore(deps): update dependency stylelint to v14 (#913) Co-authored-by: Renovate Bot --- packages/redux-devtools-ui/package.json | 2 +- yarn.lock | 343 ++++-------------------- 2 files changed, 46 insertions(+), 299 deletions(-) diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index 84c3d7d4..00a055d3 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -80,7 +80,7 @@ "react-is": "^16.13.1", "rimraf": "^3.0.2", "styled-components": "^5.3.3", - "stylelint": "^13.13.1", + "stylelint": "^14.0.0", "stylelint-config-prettier": "^9.0.3", "stylelint-config-standard": "^22.0.0", "stylelint-config-styled-components": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 1bf27382..f184656b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -147,7 +147,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.15.8, @babel/core@npm:>=7.9.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.8, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5": +"@babel/core@npm:7.15.8, @babel/core@npm:^7.1.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.8, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5": version: 7.15.8 resolution: "@babel/core@npm:7.15.8" dependencies: @@ -5098,7 +5098,7 @@ __metadata: rimraf: ^3.0.2 simple-element-resize-detector: ^1.3.0 styled-components: ^5.3.3 - stylelint: ^13.13.1 + stylelint: ^14.0.0 stylelint-config-prettier: ^9.0.3 stylelint-config-standard: ^22.0.0 stylelint-config-styled-components: ^0.1.1 @@ -6241,31 +6241,6 @@ __metadata: languageName: node linkType: hard -"@stylelint/postcss-css-in-js@npm:^0.37.2": - version: 0.37.2 - resolution: "@stylelint/postcss-css-in-js@npm:0.37.2" - dependencies: - "@babel/core": ">=7.9.0" - peerDependencies: - postcss: ">=7.0.0" - postcss-syntax: ">=0.36.2" - checksum: cc9b5d1bd93b85c5e32754bf28b99031c783bd87a178542e42f84e627f00907c556d3c7839766fe47bb5a8eaa87eae89287e6cc939b9b91e1ab3e7c44acc3014 - languageName: node - linkType: hard - -"@stylelint/postcss-markdown@npm:^0.36.2": - version: 0.36.2 - resolution: "@stylelint/postcss-markdown@npm:0.36.2" - dependencies: - remark: ^13.0.0 - unist-util-find-all-after: ^3.0.2 - peerDependencies: - postcss: ">=7.0.0" - postcss-syntax: ">=0.36.2" - checksum: 5e39bca575356992c27d59fd9ca9ee38867369bdf5bb3d9e31dc074680b77b4b820d48074e5cc0337e047edd8c1e7ef18996bc83199376138f42fbc8ed0cabeb - languageName: node - linkType: hard - "@szmarczak/http-timer@npm:^1.1.2": version: 1.1.2 resolution: "@szmarczak/http-timer@npm:1.1.2" @@ -11970,7 +11945,7 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.0": +"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": version: 7.0.1 resolution: "cosmiconfig@npm:7.0.1" dependencies: @@ -12571,7 +12546,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2": version: 4.3.2 resolution: "debug@npm:4.3.2" dependencies: @@ -13106,16 +13081,6 @@ __metadata: languageName: node linkType: hard -"dom-serializer@npm:0": - version: 0.2.2 - resolution: "dom-serializer@npm:0.2.2" - dependencies: - domelementtype: ^2.0.1 - entities: ^2.0.0 - checksum: 376344893e4feccab649a14ca1a46473e9961f40fe62479ea692d4fee4d9df1c00ca8654811a79c1ca7b020096987e1ca4fb4d7f8bae32c1db800a680a0e5d5e - languageName: node - linkType: hard - "dom-serializer@npm:^1.0.1, dom-serializer@npm:^1.3.2": version: 1.3.2 resolution: "dom-serializer@npm:1.3.2" @@ -13141,13 +13106,6 @@ __metadata: languageName: node linkType: hard -"domelementtype@npm:1, domelementtype@npm:^1.3.1": - version: 1.3.1 - resolution: "domelementtype@npm:1.3.1" - checksum: 7893da40218ae2106ec6ffc146b17f203487a52f5228b032ea7aa470e41dfe03e1bd762d0ee0139e792195efda765434b04b43cddcf63207b098f6ae44b36ad6 - languageName: node - linkType: hard - "domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0": version: 2.2.0 resolution: "domelementtype@npm:2.2.0" @@ -13164,15 +13122,6 @@ __metadata: languageName: node linkType: hard -"domhandler@npm:^2.3.0": - version: 2.4.2 - resolution: "domhandler@npm:2.4.2" - dependencies: - domelementtype: 1 - checksum: 49bd70c9c784f845cd047e1dfb3611bd10891c05719acfc93f01fc726a419ed09fbe0b69f9064392d556a63fffc5a02010856cedae9368f4817146d95a97011f - languageName: node - linkType: hard - "domhandler@npm:^4.0.0, domhandler@npm:^4.2.0": version: 4.2.2 resolution: "domhandler@npm:4.2.2" @@ -13182,16 +13131,6 @@ __metadata: languageName: node linkType: hard -"domutils@npm:^1.5.1": - version: 1.7.0 - resolution: "domutils@npm:1.7.0" - dependencies: - dom-serializer: 0 - domelementtype: 1 - checksum: f60a725b1f73c1ae82f4894b691601ecc6ecb68320d87923ac3633137627c7865725af813ae5d188ad3954283853bcf46779eb50304ec5d5354044569fcefd2b - languageName: node - linkType: hard - "domutils@npm:^2.5.2, domutils@npm:^2.6.0, domutils@npm:^2.7.0": version: 2.8.0 resolution: "domutils@npm:2.8.0" @@ -13524,13 +13463,6 @@ __metadata: languageName: node linkType: hard -"entities@npm:^1.1.1": - version: 1.1.2 - resolution: "entities@npm:1.1.2" - checksum: d537b02799bdd4784ffd714d000597ed168727bddf4885da887c5a491d735739029a00794f1998abbf35f3f6aeda32ef5c15010dca1817d401903a501b6d3e05 - languageName: node - linkType: hard - "entities@npm:^2.0.0": version: 2.2.0 resolution: "entities@npm:2.2.0" @@ -14533,7 +14465,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.5": +"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.7": version: 3.2.7 resolution: "fast-glob@npm:3.2.7" dependencies: @@ -15960,17 +15892,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"gonzales-pe@npm:^4.3.0": - version: 4.3.0 - resolution: "gonzales-pe@npm:4.3.0" - dependencies: - minimist: ^1.2.5 - bin: - gonzales: bin/gonzales.js - checksum: 49d60fc49ad35639e5d55923c1516d3ec2e4de5e6e5913ec3458a479b66623e54a060d568295349b0bb9f96ee970c473ff984d4b82a5cfeaf736c55f0d6dc3b7 - languageName: node - linkType: hard - "got@npm:^6.7.1": version: 6.7.1 resolution: "got@npm:6.7.1" @@ -16679,20 +16600,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"htmlparser2@npm:^3.10.0": - version: 3.10.1 - resolution: "htmlparser2@npm:3.10.1" - dependencies: - domelementtype: ^1.3.1 - domhandler: ^2.3.0 - domutils: ^1.5.1 - entities: ^1.1.1 - inherits: ^2.0.1 - readable-stream: ^3.1.1 - checksum: 6875f7dd875aa10be17d9b130e3738cd8ed4010b1f2edaf4442c82dfafe9d9336b155870dcc39f38843cbf7fef5e4fcfdf0c4c1fd4db3a1b91a1e0ee8f6c3475 - languageName: node - linkType: hard - "htmlparser2@npm:^6.1.0": version: 6.1.0 resolution: "htmlparser2@npm:6.1.0" @@ -19471,10 +19378,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"known-css-properties@npm:^0.21.0": - version: 0.21.0 - resolution: "known-css-properties@npm:0.21.0" - checksum: 28a47943cdeb04bf1690d013e732743b855bb21ae4290afeb34fb0b251c2f75b901bb9f2c92a919fa6cdbe8186827528b47569f660143b4932b42423bf90a628 +"known-css-properties@npm:^0.23.0": + version: 0.23.0 + resolution: "known-css-properties@npm:0.23.0" + checksum: 10d6400f6b411b731b9766be730ede298c7b28e94e2aaa882a014e5975da8028f3c7bab599358d4f53e1118ab33fc7e085c2b851167c698072bac917c372236f languageName: node linkType: hard @@ -20153,13 +20060,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"longest-streak@npm:^2.0.0": - version: 2.0.4 - resolution: "longest-streak@npm:2.0.4" - checksum: 28b8234a14963002c5c71035dee13a0a11e9e9d18ffa320fdc8796ed7437399204495702ed69cd2a7087b0af041a2a8b562829b7c1e2042e73a3374d1ecf6580 - languageName: node - linkType: hard - "longest@npm:^1.0.1": version: 1.0.1 resolution: "longest@npm:1.0.1" @@ -20519,19 +20419,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mdast-util-from-markdown@npm:^0.8.0": - version: 0.8.5 - resolution: "mdast-util-from-markdown@npm:0.8.5" - dependencies: - "@types/mdast": ^3.0.0 - mdast-util-to-string: ^2.0.0 - micromark: ~2.11.0 - parse-entities: ^2.0.0 - unist-util-stringify-position: ^2.0.0 - checksum: 5a9d0d753a42db763761e874c22365d0c7c9934a5a18b5ff76a0643610108a208a041ffdb2f3d3dd1863d3d915225a4020a0aade282af0facfd0df110601eee6 - languageName: node - linkType: hard - "mdast-util-to-hast@npm:10.0.1": version: 10.0.1 resolution: "mdast-util-to-hast@npm:10.0.1" @@ -20548,20 +20435,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mdast-util-to-markdown@npm:^0.6.0": - version: 0.6.5 - resolution: "mdast-util-to-markdown@npm:0.6.5" - dependencies: - "@types/unist": ^2.0.0 - longest-streak: ^2.0.0 - mdast-util-to-string: ^2.0.0 - parse-entities: ^2.0.0 - repeat-string: ^1.0.0 - zwitch: ^1.0.0 - checksum: 7ebc47533bff6e8669f85ae124dc521ea570e9df41c0d9e4f0f43c19ef4a8c9928d741f3e4afa62fcca1927479b714582ff5fd684ef240d84ee5b75ab9d863cf - languageName: node - linkType: hard - "mdast-util-to-string@npm:^1.0.0": version: 1.1.0 resolution: "mdast-util-to-string@npm:1.1.0" @@ -20569,13 +20442,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"mdast-util-to-string@npm:^2.0.0": - version: 2.0.0 - resolution: "mdast-util-to-string@npm:2.0.0" - checksum: 0b2113ada10e002fbccb014170506dabe2f2ddacaacbe4bc1045c33f986652c5a162732a2c057c5335cdb58419e2ad23e368e5be226855d4d4e280b81c4e9ec2 - languageName: node - linkType: hard - "mdurl@npm:^1.0.0": version: 1.0.1 resolution: "mdurl@npm:1.0.1" @@ -20709,16 +20575,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"micromark@npm:~2.11.0": - version: 2.11.4 - resolution: "micromark@npm:2.11.4" - dependencies: - debug: ^4.0.0 - parse-entities: ^2.0.0 - checksum: f8a5477d394908a5d770227aea71657a76423d420227c67ea0699e659a5f62eb39d504c1f7d69ec525a6af5aaeb6a7bffcdba95614968c03d41d3851edecb0d6 - languageName: node - linkType: hard - "micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": version: 3.1.10 resolution: "micromatch@npm:3.1.10" @@ -23462,27 +23318,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss-html@npm:^0.36.0": - version: 0.36.0 - resolution: "postcss-html@npm:0.36.0" - dependencies: - htmlparser2: ^3.10.0 - peerDependencies: - postcss: ">=5.0.0" - postcss-syntax: ">=0.36.0" - checksum: 5f340df1d9e1595a6d0051cca408efa86efa77a51efe570ab4db6c463b05936f9582b143be8eedc3ba7fd3ed313f6a6838e11e31abcefc3543486b45ba3893e1 - languageName: node - linkType: hard - -"postcss-less@npm:^3.1.4": - version: 3.1.4 - resolution: "postcss-less@npm:3.1.4" - dependencies: - postcss: ^7.0.14 - checksum: f18d002e114c62bbdc71c0cfa5723d725492301b5079311a531618390dfffbe12f544c3820be5bd9b1447100508187827944b78ff86e7b31a0737347fc8b9882 - languageName: node - linkType: hard - "postcss-loader@npm:^4.2.0": version: 4.3.0 resolution: "postcss-loader@npm:4.3.0" @@ -23598,35 +23433,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss-safe-parser@npm:^4.0.2": - version: 4.0.2 - resolution: "postcss-safe-parser@npm:4.0.2" - dependencies: - postcss: ^7.0.26 - checksum: b812832c06f9fc17b74b714f9c07de80fa770a1535a103b06b679f33b8e09caf60dff1e1eca489613f4ce2bb6439cd949b7d026c843aa9b45bb50f0168b75023 +"postcss-safe-parser@npm:^6.0.0": + version: 6.0.0 + resolution: "postcss-safe-parser@npm:6.0.0" + peerDependencies: + postcss: ^8.3.3 + checksum: 06c733eaad83a3954367e7ee02ddfe3796e7a44d4299ccf9239f40964a4daac153c7d77613f32964b5a86c0c6c2f6167738f31d578b73b17cb69d0c4446f0ebe languageName: node linkType: hard -"postcss-sass@npm:^0.4.4": - version: 0.4.4 - resolution: "postcss-sass@npm:0.4.4" - dependencies: - gonzales-pe: ^4.3.0 - postcss: ^7.0.21 - checksum: d361114e5a6a6cc65db9ab71d2af2fe82df8876ce1135b6569498cbf4f3e303312edf430de925bd0d5b110f482ed55a44143da07621726cfdd07e71917390b58 - languageName: node - linkType: hard - -"postcss-scss@npm:^2.1.1": - version: 2.1.1 - resolution: "postcss-scss@npm:2.1.1" - dependencies: - postcss: ^7.0.6 - checksum: 61535f04652daed70c8ffa13589de81f4d9f607d87ccf1e2b494b0edfabc388853058229c8070f559503f4963e6dedc3690d4f587f4a034b7c23aa6fc03f251c - languageName: node - linkType: hard - -"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5": +"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.6": version: 6.0.6 resolution: "postcss-selector-parser@npm:6.0.6" dependencies: @@ -23636,15 +23452,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss-syntax@npm:^0.36.2": - version: 0.36.2 - resolution: "postcss-syntax@npm:0.36.2" - peerDependencies: - postcss: ">=5.0.0" - checksum: 812baee602910903b8b77391583721613951d87dbc8baff140879069ff98423392675c4ddfdf073418f4a699ee5d4dd020914bad07504c62f9f333211bf979b8 - languageName: node - linkType: hard - "postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0": version: 4.1.0 resolution: "postcss-value-parser@npm:4.1.0" @@ -23652,7 +23459,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"postcss@npm:^7.0.14, postcss@npm:^7.0.2, postcss@npm:^7.0.21, postcss@npm:^7.0.26, postcss@npm:^7.0.32, postcss@npm:^7.0.35, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6": +"postcss@npm:^7.0.14, postcss@npm:^7.0.26, postcss@npm:^7.0.32, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6": version: 7.0.39 resolution: "postcss@npm:7.0.39" dependencies: @@ -23673,6 +23480,17 @@ fsevents@^1.2.7: languageName: node linkType: hard +"postcss@npm:^8.3.11": + version: 8.3.11 + resolution: "postcss@npm:8.3.11" + dependencies: + nanoid: ^3.1.30 + picocolors: ^1.0.0 + source-map-js: ^0.6.2 + checksum: 1a230553d74c66aa9585c90781ed8ea75f19cefea405d2117b67fbeb24b5b5e0e17be2e0c5a07db31dd085643a13394127ab2222e940771b70498331bf20f35e + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -25713,15 +25531,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"remark-parse@npm:^9.0.0": - version: 9.0.0 - resolution: "remark-parse@npm:9.0.0" - dependencies: - mdast-util-from-markdown: ^0.8.0 - checksum: 50104880549639b7dd7ae6f1e23c214915fe9c054f02f3328abdaee3f6de6d7282bf4357c3c5b106958fe75e644a3c248c2197755df34f9955e8e028fc74868f - languageName: node - linkType: hard - "remark-slug@npm:^6.0.0": version: 6.1.0 resolution: "remark-slug@npm:6.1.0" @@ -25742,26 +25551,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"remark-stringify@npm:^9.0.0": - version: 9.0.1 - resolution: "remark-stringify@npm:9.0.1" - dependencies: - mdast-util-to-markdown: ^0.6.0 - checksum: 93f46076f4d96ab1946d13e7dd43e83088480ac6b1dfe05a65e2c2f0e33d1f52a50175199b464a81803fc0f5b3bf182037665f89720b30515eba37bec4d63d56 - languageName: node - linkType: hard - -"remark@npm:^13.0.0": - version: 13.0.0 - resolution: "remark@npm:13.0.0" - dependencies: - remark-parse: ^9.0.0 - remark-stringify: ^9.0.0 - unified: ^9.1.0 - checksum: e3432bfa1b0029680302e99a6356c08789b3e908457a71eca37ada6a58497e302f08bd5f62fbad840082a8348c181b7f6f981aaf3cd3112207583ddf793a2429 - languageName: node - linkType: hard - "remotedev-redux-devtools-extension@workspace:extension": version: 0.0.0-use.local resolution: "remotedev-redux-devtools-extension@workspace:extension" @@ -25861,7 +25650,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"repeat-string@npm:^1.0.0, repeat-string@npm:^1.5.2, repeat-string@npm:^1.5.4, repeat-string@npm:^1.6.1": +"repeat-string@npm:^1.5.2, repeat-string@npm:^1.5.4, repeat-string@npm:^1.6.1": version: 1.6.1 resolution: "repeat-string@npm:1.6.1" checksum: 1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 @@ -28096,19 +27885,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"stylelint@npm:^13.13.1": - version: 13.13.1 - resolution: "stylelint@npm:13.13.1" +"stylelint@npm:^14.0.0": + version: 14.0.0 + resolution: "stylelint@npm:14.0.0" dependencies: - "@stylelint/postcss-css-in-js": ^0.37.2 - "@stylelint/postcss-markdown": ^0.36.2 - autoprefixer: ^9.8.6 balanced-match: ^2.0.0 - chalk: ^4.1.1 - cosmiconfig: ^7.0.0 - debug: ^4.3.1 + cosmiconfig: ^7.0.1 + debug: ^4.3.2 execall: ^2.0.0 - fast-glob: ^3.2.5 + fast-glob: ^3.2.7 fastest-levenshtein: ^1.0.12 file-entry-cache: ^6.0.1 get-stdin: ^8.0.0 @@ -28119,38 +27904,32 @@ resolve@^2.0.0-next.3: ignore: ^5.1.8 import-lazy: ^4.0.0 imurmurhash: ^0.1.4 - known-css-properties: ^0.21.0 - lodash: ^4.17.21 - log-symbols: ^4.1.0 + is-plain-object: ^5.0.0 + known-css-properties: ^0.23.0 mathml-tag-names: ^2.1.3 meow: ^9.0.0 micromatch: ^4.0.4 + normalize-path: ^3.0.0 normalize-selector: ^0.2.0 - postcss: ^7.0.35 - postcss-html: ^0.36.0 - postcss-less: ^3.1.4 + picocolors: ^1.0.0 + postcss: ^8.3.11 postcss-media-query-parser: ^0.2.3 postcss-resolve-nested-selector: ^0.1.1 - postcss-safe-parser: ^4.0.2 - postcss-sass: ^0.4.4 - postcss-scss: ^2.1.1 - postcss-selector-parser: ^6.0.5 - postcss-syntax: ^0.36.2 + postcss-safe-parser: ^6.0.0 + postcss-selector-parser: ^6.0.6 postcss-value-parser: ^4.1.0 resolve-from: ^5.0.0 - slash: ^3.0.0 specificity: ^0.4.1 string-width: ^4.2.2 strip-ansi: ^6.0.0 style-search: ^0.1.0 - sugarss: ^2.0.0 svg-tags: ^1.0.0 - table: ^6.6.0 + table: ^6.7.2 v8-compile-cache: ^2.3.0 write-file-atomic: ^3.0.3 bin: stylelint: bin/stylelint.js - checksum: 9dafa8d90f139e0518753546855df149a8770cead6fc31e40fc0b1904f7698a734767b441c0ba44dd694c846491708c6127dd0e5bb6917507ffe230dd40f0b8a + checksum: 3a3258e0077ccc8347a4374bc9f38c215db269bb90d3d4e416e35c6b39be6e4856b6b76b2f602a17d152ce631fe11dfa455c13695ee6caf8e5d50f641584d10c languageName: node linkType: hard @@ -28176,15 +27955,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"sugarss@npm:^2.0.0": - version: 2.0.0 - resolution: "sugarss@npm:2.0.0" - dependencies: - postcss: ^7.0.2 - checksum: 777abf31671b67aafc5bb6dbca0853070ff9c129b7a52e90cfbe1a24ff069765e53b03767f85407386edf01c26fe2c2861aae2841f9a391751df891694137839 - languageName: node - linkType: hard - "sumchecker@npm:^3.0.1": version: 3.0.1 resolution: "sumchecker@npm:3.0.1" @@ -28307,7 +28077,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"table@npm:^6.0.9, table@npm:^6.6.0": +"table@npm:^6.0.9, table@npm:^6.7.2": version: 6.7.2 resolution: "table@npm:6.7.2" dependencies: @@ -29459,20 +29229,6 @@ typescript@~4.4.4: languageName: node linkType: hard -"unified@npm:^9.1.0": - version: 9.2.2 - resolution: "unified@npm:9.2.2" - dependencies: - bail: ^1.0.0 - extend: ^3.0.0 - is-buffer: ^2.0.0 - is-plain-obj: ^2.0.0 - trough: ^1.0.0 - vfile: ^4.0.0 - checksum: 7c24461be7de4145939739ce50d18227c5fbdf9b3bc5a29dabb1ce26dd3e8bd4a1c385865f6f825f3b49230953ee8b591f23beab3bb3643e3e9dc37aa8a089d5 - languageName: node - linkType: hard - "union-value@npm:^1.0.0": version: 1.0.1 resolution: "union-value@npm:1.0.1" @@ -29519,15 +29275,6 @@ typescript@~4.4.4: languageName: node linkType: hard -"unist-util-find-all-after@npm:^3.0.2": - version: 3.0.2 - resolution: "unist-util-find-all-after@npm:3.0.2" - dependencies: - unist-util-is: ^4.0.0 - checksum: 74b1fe81e3a980cc281b8d46a4cbc41940ece45608cae41d8021f245a73e7ed885222b80c1a2391137e04d2cda4de009416356aa7f4462d5e875c61579e33981 - languageName: node - linkType: hard - "unist-util-generated@npm:^1.0.0": version: 1.1.6 resolution: "unist-util-generated@npm:1.1.6" From 0262fe1345ec59d125c8489e65695997b6ffd6f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:05:37 +0000 Subject: [PATCH 05/14] chore(deps): update dependency stylelint-config-standard to v23 (#914) Co-authored-by: Renovate Bot --- packages/redux-devtools-ui/package.json | 2 +- yarn.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index 00a055d3..6752ab7f 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -82,7 +82,7 @@ "styled-components": "^5.3.3", "stylelint": "^14.0.0", "stylelint-config-prettier": "^9.0.3", - "stylelint-config-standard": "^22.0.0", + "stylelint-config-standard": "^23.0.0", "stylelint-config-styled-components": "^0.1.1", "stylelint-processor-styled-components": "^1.10.0", "ts-jest": "^27.0.7", diff --git a/yarn.lock b/yarn.lock index f184656b..a007020b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5100,7 +5100,7 @@ __metadata: styled-components: ^5.3.3 stylelint: ^14.0.0 stylelint-config-prettier: ^9.0.3 - stylelint-config-standard: ^22.0.0 + stylelint-config-standard: ^23.0.0 stylelint-config-styled-components: ^0.1.1 stylelint-processor-styled-components: ^1.10.0 ts-jest: ^27.0.7 @@ -27846,23 +27846,23 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"stylelint-config-recommended@npm:^5.0.0": - version: 5.0.0 - resolution: "stylelint-config-recommended@npm:5.0.0" +"stylelint-config-recommended@npm:^6.0.0": + version: 6.0.0 + resolution: "stylelint-config-recommended@npm:6.0.0" peerDependencies: - stylelint: ^13.13.0 - checksum: 574468542e9f143838feff91771a5901454d6ed89c671bc561373e0509d1414d4a856e5e251c22630c18eb02819c94137eb7a091959dc225f0d91a3eb49538c4 + stylelint: ^14.0.0 + checksum: 103b3c122253a908f91f5728d39eff6fed3866157e29a6e550da051cfc207b0d159b7434e0806126e3c3939e6528a0a1cd5a1cf00b835dd49b3a18ba4a007fa1 languageName: node linkType: hard -"stylelint-config-standard@npm:^22.0.0": - version: 22.0.0 - resolution: "stylelint-config-standard@npm:22.0.0" +"stylelint-config-standard@npm:^23.0.0": + version: 23.0.0 + resolution: "stylelint-config-standard@npm:23.0.0" dependencies: - stylelint-config-recommended: ^5.0.0 + stylelint-config-recommended: ^6.0.0 peerDependencies: - stylelint: ^13.13.0 - checksum: 57497397c56f19f8f1387d461d06089b6b6c187dcdc5bf85006b2b94f88be021afa77545d6938543ffb82be10a200a58d160ee672f1379d4af1adcb723e5f9f8 + stylelint: ^14.0.0 + checksum: 96b6292d1408d762cb18c01eaf63faf8bafd740d897b4b3c519bb50eefc356e09ea300737c78b842b27b0c2a135c1c6a3ea86d12e2f969caeb4e2f22d857eb97 languageName: node linkType: hard From 7e4cea6fa99a82640085076db84533b565659c6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:08:35 +0000 Subject: [PATCH 06/14] chore(deps): update typescript-eslint monorepo to v5 (major) (#907) * chore(deps): update typescript-eslint monorepo to v5 * Update Co-authored-by: Renovate Bot Co-authored-by: Nathan Bierema --- package.json | 4 +- .../examples/tree/package.json | 4 +- packages/d3-state-visualizer/package.json | 4 +- .../src/charts/tree/tree.ts | 6 +- packages/d3tooltip/package.json | 4 +- packages/d3tooltip/src/index.ts | 35 ++- packages/map2tree/package.json | 4 +- packages/react-base16-styling/package.json | 4 +- packages/react-base16-styling/src/index.ts | 6 +- packages/react-base16-styling/src/types.ts | 4 +- .../react-base16-styling/test/index.test.ts | 16 +- packages/react-dock/demo/package.json | 4 +- packages/react-dock/package.json | 4 +- .../react-json-tree/examples/package.json | 4 +- packages/react-json-tree/examples/src/App.tsx | 3 +- packages/react-json-tree/package.json | 4 +- .../src/createStylingFromTheme.ts | 14 +- .../src/getCollectionEntries.ts | 3 +- packages/redux-devtools-app/package.json | 4 +- .../InspectorWrapper/VisualDiffTab.tsx | 29 ++- .../src/reducers/instances.ts | 2 +- .../src/store/configureStore.ts | 2 +- .../redux-devtools-chart-monitor/package.json | 4 +- packages/redux-devtools-cli/package.json | 4 +- .../src/bin/injectServer.ts | 8 +- .../redux-devtools-cli/src/bin/openApp.ts | 2 +- .../src/bin/redux-devtools.ts | 10 +- .../redux-devtools-cli/src/db/connector.ts | 6 +- packages/redux-devtools-cli/src/options.ts | 2 +- packages/redux-devtools-cli/src/routes.ts | 19 +- packages/redux-devtools-cli/src/store.ts | 2 +- packages/redux-devtools-cli/src/worker.ts | 2 +- .../redux-devtools-dock-monitor/package.json | 4 +- .../demo/package.json | 4 +- .../package.json | 4 +- .../package.json | 4 +- .../src/openFile.ts | 2 +- .../react-error-overlay/utils/getSourceMap.ts | 9 +- .../src/react-error-overlay/utils/mapper.ts | 13 +- .../demo/package.json | 4 +- .../package.json | 4 +- .../src/tabs/getItemString.tsx | 6 +- .../redux-devtools-instrument/package.json | 4 +- .../redux-devtools-log-monitor/package.json | 4 +- .../src/LogMonitorEntry.tsx | 8 +- .../demo/package.json | 4 +- .../demo/src/features/posts/PostDetail.tsx | 2 +- .../demo/src/services/posts.ts | 2 +- .../package.json | 4 +- .../src/styles/tree.tsx | 3 +- .../redux-devtools-serialize/package.json | 4 +- .../src/helpers/index.ts | 17 +- .../test/helpers.spec.ts | 4 +- .../examples/todomvc/package.json | 4 +- .../package.json | 4 +- packages/redux-devtools-ui/package.json | 4 +- .../src/Container/styles/index.ts | 7 +- .../src/utils/createStyledComponent.ts | 6 +- .../__snapshots__/Container.test.tsx.snap | 2 +- packages/redux-devtools-utils/package.json | 4 +- packages/redux-devtools-utils/src/index.ts | 9 +- .../examples/counter/package.json | 4 +- .../counter/src/store/configureStore.dev.ts | 10 +- .../examples/todomvc/package.json | 4 +- packages/redux-devtools/package.json | 4 +- packages/redux-devtools/src/persistState.ts | 14 +- yarn.lock | 227 +++++++----------- 67 files changed, 331 insertions(+), 305 deletions(-) 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 From 492aa362fb839f54911d1c321e2412f67540a175 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 20:07:15 +0000 Subject: [PATCH 07/14] fix(deps): update dependency react-bootstrap to v2 (#910) * fix(deps): update dependency react-bootstrap to v2 * Remove Append Co-authored-by: Renovate Bot Co-authored-by: Nathan Bierema --- packages/react-dock/demo/package.json | 2 +- .../demo/package.json | 2 +- .../demo/src/DemoApp.tsx | 8 +- yarn.lock | 84 ++++++++++++------- 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/packages/react-dock/demo/package.json b/packages/react-dock/demo/package.json index 4c945602..4ad4b0fb 100644 --- a/packages/react-dock/demo/package.json +++ b/packages/react-dock/demo/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "react": "^16.14.0", - "react-bootstrap": "^1.6.4", + "react-bootstrap": "^2.0.0", "react-dock": "^0.4.0", "react-dom": "^16.14.0", "react-icons": "^4.3.1", diff --git a/packages/redux-devtools-inspector-monitor/demo/package.json b/packages/redux-devtools-inspector-monitor/demo/package.json index 42de1893..a283c482 100644 --- a/packages/redux-devtools-inspector-monitor/demo/package.json +++ b/packages/redux-devtools-inspector-monitor/demo/package.json @@ -19,7 +19,7 @@ "immutable": "^4.0.0", "lodash.shuffle": "^4.2.0", "react": "^16.14.0", - "react-bootstrap": "^1.6.4", + "react-bootstrap": "^2.0.0", "react-dom": "^16.14.0", "react-redux": "^7.2.5", "react-router": "^5.2.1", diff --git a/packages/redux-devtools-inspector-monitor/demo/src/DemoApp.tsx b/packages/redux-devtools-inspector-monitor/demo/src/DemoApp.tsx index 204b5bce..f26b4eb1 100644 --- a/packages/redux-devtools-inspector-monitor/demo/src/DemoApp.tsx +++ b/packages/redux-devtools-inspector-monitor/demo/src/DemoApp.tsx @@ -183,11 +183,9 @@ class DemoApp extends React.Component { /> ))} - - - {options.dark ? 'Light theme' : 'Dark theme'} - - + + {options.dark ? 'Light theme' : 'Dark theme'} + diff --git a/yarn.lock b/yarn.lock index 9a31bcfd..a54704f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1602,7 +1602,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.13.16, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.15.4 resolution: "@babel/runtime@npm:7.15.4" dependencies: @@ -4336,7 +4336,7 @@ __metadata: languageName: node linkType: hard -"@popperjs/core@npm:^2.5.4, @popperjs/core@npm:^2.6.0, @popperjs/core@npm:^2.8.6": +"@popperjs/core@npm:^2.10.1, @popperjs/core@npm:^2.5.4, @popperjs/core@npm:^2.6.0": version: 2.10.2 resolution: "@popperjs/core@npm:2.10.2" checksum: 43c189e3eb6d032433512d94761b54fc7cae15957ca5528008813f887a67b5760b949f30a5141b476be2ba5a6c677c91def150f603d2d3e30b5e97a5ae51474e @@ -4473,6 +4473,17 @@ __metadata: languageName: node linkType: hard +"@react-aria/ssr@npm:^3.0.1": + version: 3.1.0 + resolution: "@react-aria/ssr@npm:3.1.0" + dependencies: + "@babel/runtime": ^7.6.2 + peerDependencies: + react: ^16.8.0 || ^17.0.0-rc.1 + checksum: ae376d45dbd19e990891353a2eee10c13f3b54dbd807a2e528928983741c0ea9dbfefcc132c46c685e53440a53f7be82bd36a5c61bdfaec3c3518f02ae444e7f + languageName: node + linkType: hard + "@redux-devtools/app@^1.0.0-8, @redux-devtools/app@workspace:packages/redux-devtools-app": version: 0.0.0-use.local resolution: "@redux-devtools/app@workspace:packages/redux-devtools-app" @@ -5186,6 +5197,38 @@ __metadata: languageName: node linkType: hard +"@restart/hooks@npm:^0.4.0": + version: 0.4.1 + resolution: "@restart/hooks@npm:0.4.1" + dependencies: + dequal: ^2.0.2 + peerDependencies: + react: ">=16.8.0" + checksum: 03eb04bad534333a7718b0c1a8b4bb28bea213577bd8426ea0382ccaf6aae008ac79eebb179259d556a4f57989b7b76e41083f7b34a692fc60707c3dff450e33 + languageName: node + linkType: hard + +"@restart/ui@npm:^0.2.3": + version: 0.2.3 + resolution: "@restart/ui@npm:0.2.3" + dependencies: + "@babel/runtime": ^7.13.16 + "@popperjs/core": ^2.10.1 + "@react-aria/ssr": ^3.0.1 + "@restart/hooks": ^0.4.0 + "@types/warning": ^3.0.0 + dequal: ^2.0.2 + dom-helpers: ^5.2.0 + prop-types: ^15.7.2 + uncontrollable: ^7.2.1 + warning: ^4.0.3 + peerDependencies: + react: ">=16.14.0" + react-dom: ">=16.14.0" + checksum: 4357b273283e10372dc17ca1fec4d8c93a56ba628af7cf5f6661e5ddc34c1e56f7fc265fda738db3df38c606eb06e944ca23430aab47e41992d7e78c8d03a6ba + languageName: node + linkType: hard + "@rjsf/core@npm:^3.2.0": version: 3.2.0 resolution: "@rjsf/core@npm:3.2.0" @@ -17097,7 +17140,7 @@ fsevents@^1.2.7: immutable: ^4.0.0 lodash.shuffle: ^4.2.0 react: ^16.14.0 - react-bootstrap: ^1.6.4 + react-bootstrap: ^2.0.0 react-dom: ^16.14.0 react-redux: ^7.2.5 react-router: ^5.2.1 @@ -24199,13 +24242,14 @@ fsevents@^1.2.7: languageName: unknown linkType: soft -"react-bootstrap@npm:^1.6.4": - version: 1.6.4 - resolution: "react-bootstrap@npm:1.6.4" +"react-bootstrap@npm:^2.0.0": + version: 2.0.0 + resolution: "react-bootstrap@npm:2.0.0" dependencies: "@babel/runtime": ^7.14.0 "@restart/context": ^2.1.4 "@restart/hooks": ^0.3.26 + "@restart/ui": ^0.2.3 "@types/invariant": ^2.2.33 "@types/prop-types": ^15.7.3 "@types/react": ">=16.14.8" @@ -24216,14 +24260,13 @@ fsevents@^1.2.7: invariant: ^2.2.4 prop-types: ^15.7.2 prop-types-extra: ^1.1.0 - react-overlays: ^5.1.1 react-transition-group: ^4.4.1 uncontrollable: ^7.2.1 warning: ^4.0.3 peerDependencies: - react: ">=16.8.0" - react-dom: ">=16.8.0" - checksum: c68ecd9becbcd55328a899ee4ae246d0a0a21082ab603caf10da22f27a635088227e93ea3e3c380c883538a8e07e0b8e017868f562dcd72fa85998a830be8124 + react: ">=16.14.0" + react-dom: ">=16.14.0" + checksum: e986b2f44412f15f72b41ab8e266af7bf189c77978458d0a7b5e5c20586092b074454ba1903f55b0c9ae988206ba83c3f77374c7754453ecc8cdd81bbef69bfc languageName: node linkType: hard @@ -24339,7 +24382,7 @@ fsevents@^1.2.7: fork-ts-checker-webpack-plugin: ^6.4.0 html-webpack-plugin: ^5.4.0 react: ^16.14.0 - react-bootstrap: ^1.6.4 + react-bootstrap: ^2.0.0 react-dock: ^0.4.0 react-dom: ^16.14.0 react-icons: ^4.3.1 @@ -24601,25 +24644,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"react-overlays@npm:^5.1.1": - version: 5.1.1 - resolution: "react-overlays@npm:5.1.1" - dependencies: - "@babel/runtime": ^7.13.8 - "@popperjs/core": ^2.8.6 - "@restart/hooks": ^0.3.26 - "@types/warning": ^3.0.0 - dom-helpers: ^5.2.0 - prop-types: ^15.7.2 - uncontrollable: ^7.2.1 - warning: ^4.0.3 - peerDependencies: - react: ">=16.3.0" - react-dom: ">=16.3.0" - checksum: 8145f066ea7a70d51901561e5c883a638b12217baa523330506323f92bae515c557247aa4846b6d537fa8dd7fd1ddcea53cab6b2a1e3d216922590b5cdc94ddf - languageName: node - linkType: hard - "react-popper-tooltip@npm:^3.1.1": version: 3.1.1 resolution: "react-popper-tooltip@npm:3.1.1" From f1514f7e4a4af6d22fd01430fddf681bce9dd53d Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Thu, 21 Oct 2021 17:55:21 -0400 Subject: [PATCH 08/14] Replace enzyme with React testing library in test-tab (#915) --- .../jest.config.js | 1 - .../package.json | 6 +- .../test/TestGenerator.spec.tsx | 31 +++++---- .../__snapshots__/TestGenerator.spec.tsx.snap | 14 ++-- .../test/setup.ts | 4 -- yarn.lock | 67 +++++++++++++++++-- 6 files changed, 84 insertions(+), 39 deletions(-) delete mode 100644 packages/redux-devtools-inspector-monitor-test-tab/test/setup.ts diff --git a/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js b/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js index a1f53444..bae50f60 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js +++ b/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js @@ -1,6 +1,5 @@ module.exports = { preset: 'ts-jest', - setupFilesAfterEnv: ['/test/setup.ts'], testEnvironment: 'jsdom', moduleNameMapper: { '\\.css$': '/test/__mocks__/styleMock.ts', diff --git a/packages/redux-devtools-inspector-monitor-test-tab/package.json b/packages/redux-devtools-inspector-monitor-test-tab/package.json index 9e85b4df..d7519911 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json @@ -60,8 +60,7 @@ "@babel/preset-typescript": "^7.15.0", "@redux-devtools/core": "^3.9.0", "@redux-devtools/inspector-monitor": "^1.0.0", - "@types/enzyme": "^3.10.10", - "@types/enzyme-adapter-react-16": "^1.0.6", + "@testing-library/react": "^12.1.2", "@types/es6template": "^1.0.0", "@types/jest": "^27.0.2", "@types/jsan": "^3.1.2", @@ -70,9 +69,6 @@ "@types/simple-diff": "^1.6.1", "@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", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-jest": "^25.2.2", diff --git a/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx b/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx index 2b50f9b7..51a15ae8 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx +++ b/packages/redux-devtools-inspector-monitor-test-tab/test/TestGenerator.spec.tsx @@ -1,6 +1,5 @@ import React from 'react'; -import { render } from 'enzyme'; -import { renderToJson } from 'enzyme-to-json'; +import { render, screen } from '@testing-library/react'; import { PerformAction } from '@redux-devtools/core'; import { Action } from 'redux'; import TestGenerator from '../src/TestGenerator'; @@ -30,12 +29,12 @@ const TestGeneratorAsAny = TestGenerator as any; describe('TestGenerator component', () => { it('should show warning message when no params provided', () => { - const component = render(); - expect(renderToJson(component)).toMatchSnapshot(); + const { container } = render(); + expect(container.firstChild).toMatchSnapshot(); }); it('should be empty when no actions provided', () => { - const component = render( + const { container } = render( { useCodemirror={false} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); it("should match function template's test for first action", () => { - const component = render( + const { container } = render( { useCodemirror={false} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); it("should match string template's test for first action", () => { - const component = render( + const { container } = render( { selectedActionId={1} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); it('should generate test for the last action when selectedActionId not specified', () => { - const component = render( + const { container } = render( { useCodemirror={false} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); it('should generate test for vanilla js class', () => { - const component = render( + const { container } = render( { useCodemirror={false} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); it('should generate test for vanilla js class with string template', () => { - const component = render( + const { container } = render( { useCodemirror={false} /> ); - expect(renderToJson(component)).toMatchSnapshot(); + expect(container.firstChild).toMatchSnapshot(); }); }); diff --git a/packages/redux-devtools-inspector-monitor-test-tab/test/__snapshots__/TestGenerator.spec.tsx.snap b/packages/redux-devtools-inspector-monitor-test-tab/test/__snapshots__/TestGenerator.spec.tsx.snap index 11e98d86..99862500 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/test/__snapshots__/TestGenerator.spec.tsx.snap +++ b/packages/redux-devtools-inspector-monitor-test-tab/test/__snapshots__/TestGenerator.spec.tsx.snap @@ -2,13 +2,13 @@ exports[`TestGenerator component should be empty when no actions provided 1`] = ` + +
+ + +

+ Hint: Make it strong! +

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+ + + +
+
+
+ +
+
+ +
+ 52 +
+
+
+
+ +
+
+ +
+ `; exports[`Form renders with no button 1`] = ` - +
+
+ + Example form + +

+ A simple form example. +

+
+ + +
+
+ + +
+
+ + +
+
+ + +

+ Hint: Make it strong! +

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+ + + +
+
+
+ +
+
+ +
+ 52 +
+
+
+
+
+