;
-
const store = createStore(rootReducer, applyMiddleware(exportState, api));
describe('App container', () => {
- beforeAll(() => {
- wrapper = mount(
+ it("should render inspector monitor's wrapper", () => {
+ render(
);
- });
-
- /*
- it('should render the App', () => {
- expect(mountToJson(wrapper)).toMatchSnapshot();
- });
-*/
-
- it("should render inspector monitor's wrapper", () => {
- expect(wrapper.find('DevtoolsInspector').html()).toBeDefined();
+ expect(screen.getByTestId('inspector')).toBeDefined();
});
it('should contain an empty action list', () => {
+ render(
+
+
+
+ );
+ const actionList = screen.getByTestId('actionList');
expect(
- wrapper
- .find('ActionList')
- .findWhere((n) => {
- const { className } = n.props();
- return className && className.startsWith('actionListRows-');
- })
- .html()
- ).toMatch(/<\/div>/);
+ within(actionList).getByTestId('actionListRows')
+ ).toBeEmptyDOMElement();
});
});
diff --git a/packages/redux-devtools-app/test/setup.ts b/packages/redux-devtools-app/test/setup.ts
index fc7b0dce..7b0828bf 100644
--- a/packages/redux-devtools-app/test/setup.ts
+++ b/packages/redux-devtools-app/test/setup.ts
@@ -1,4 +1 @@
-import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-
-Enzyme.configure({ adapter: new Adapter() });
+import '@testing-library/jest-dom';
diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json
index 825c693d..a690002c 100644
--- a/packages/redux-devtools-chart-monitor/package.json
+++ b/packages/redux-devtools-chart-monitor/package.json
@@ -50,13 +50,13 @@
"@babel/preset-react": "^7.14.5",
"@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",
+ "@types/react": "^17.0.32",
+ "@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",
- "react": "^16.14.0",
+ "react": "^17.0.2",
"redux": "^4.1.1",
"rimraf": "^3.0.2",
"typescript": "~4.4.4"
diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json
index 6271ee5e..e1e0eccf 100644
--- a/packages/redux-devtools-cli/package.json
+++ b/packages/redux-devtools-cli/package.json
@@ -41,7 +41,7 @@
},
"dependencies": {
"@redux-devtools/app": "^1.0.0-8",
- "@types/react": "^16.14.18",
+ "@types/react": "^17.0.32",
"apollo-server": "^2.25.2",
"apollo-server-express": "^2.25.2",
"body-parser": "^1.19.0",
@@ -56,10 +56,10 @@
"lodash": "^4.17.21",
"minimist": "^1.2.5",
"morgan": "^1.10.0",
- "open": "^8.3.0",
- "react": "^16.14.0",
- "react-dom": "^16.14.0",
- "react-is": "^16.13.1",
+ "open": "^8.4.0",
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2",
+ "react-is": "^17.0.2",
"semver": "^7.3.5",
"socketcluster": "^14.4.2",
"sqlite3": "^5.0.2",
@@ -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..bda99bdb 100644
--- a/packages/redux-devtools-dock-monitor/package.json
+++ b/packages/redux-devtools-dock-monitor/package.json
@@ -51,13 +51,13 @@
"@babel/preset-typescript": "^7.15.0",
"@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",
+ "@types/react": "^17.0.32",
+ "@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",
- "react": "^16.14.0",
+ "react": "^17.0.2",
"redux": "^4.1.1",
"rimraf": "^3.0.2",
"typescript": "~4.4.4"
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..53b7b2d6 100644
--- a/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json
+++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json
@@ -19,8 +19,8 @@
"history": "^4.10.1",
"immutable": "^4.0.0",
"lodash.shuffle": "^4.2.0",
- "react": "^16.14.0",
- "react-dom": "^16.14.0",
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2",
"react-redux": "^7.2.5",
"react-router": "^5.2.1",
"redux": "^4.1.1",
@@ -33,16 +33,16 @@
"@babel/preset-typescript": "^7.15.0",
"@types/history": "^4.7.9",
"@types/lodash.shuffle": "^4.2.6",
- "@types/node": "^14.17.27",
- "@types/react": "^16.14.18",
- "@types/react-dom": "^16.9.14",
+ "@types/node": "^14.17.29",
+ "@types/react": "^17.0.32",
+ "@types/react-dom": "^17.0.10",
"@types/react-redux": "^7.1.20",
"@types/react-router": "^5.1.17",
"@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",
@@ -50,8 +50,8 @@
"eslint-plugin-react": "^7.26.1",
"fork-ts-checker-webpack-plugin": "^6.4.0",
"html-webpack-plugin": "^5.4.0",
- "style-loader": "^3.3.0",
- "ts-node": "^10.3.0",
+ "style-loader": "^3.3.1",
+ "ts-node": "^10.4.0",
"typescript": "~4.4.4",
"webpack": "^5.59.1",
"webpack-cli": "^4.9.1",
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 4e6ba1c1..a33289a8 100644
--- a/packages/redux-devtools-inspector-monitor-test-tab/package.json
+++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json
@@ -60,26 +60,22 @@
"@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",
"@types/object-path": "^0.11.1",
- "@types/react": "^16.14.18",
+ "@types/react": "^17.0.32",
"@types/simple-diff": "^1.6.1",
- "@typescript-eslint/eslint-plugin": "^4.33.0",
- "@typescript-eslint/parser": "^4.33.0",
- "enzyme": "^3.11.0",
- "enzyme-adapter-react-16": "^1.15.6",
- "enzyme-to-json": "^3.6.2",
+ "@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",
"eslint-plugin-react": "^7.26.1",
"jest": "^27.3.1",
- "react": "^16.14.0",
- "react-dom": "^16.14.0",
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2",
"redux": "^4.1.1",
"rimraf": "^3.0.2",
"ts-jest": "^27.0.7",
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..7bad8807 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 } 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`] = `
`;
exports[`TestGenerator component should generate test for the last action when selectedActionId not specified 1`] = `
+
+
+
+
+
+
+
+