diff --git a/extension/tsconfig.json b/extension/tsconfig.json index 90a1290b..d5d9ac98 100644 --- a/extension/tsconfig.json +++ b/extension/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../tsconfig.react.base.json", + "compilerOptions": { + "types": ["chrome"] + }, "include": ["src"] } diff --git a/packages/d3-state-visualizer/examples/tree/package.json b/packages/d3-state-visualizer/examples/tree/package.json index cff5fcdc..448fa9cd 100644 --- a/packages/d3-state-visualizer/examples/tree/package.json +++ b/packages/d3-state-visualizer/examples/tree/package.json @@ -19,8 +19,8 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts", "type-check": "tsc --noEmit" }, @@ -33,10 +33,10 @@ "@babel/preset-env": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@types/node": "^16.11.17", - "@types/webpack-dev-server": "^4.5.1", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", "fork-ts-checker-webpack-plugin": "^6.5.0", diff --git a/packages/d3-state-visualizer/examples/tree/tsconfig.webpack.json b/packages/d3-state-visualizer/examples/tree/tsconfig.webpack.json index 1d04dfd1..03285a3c 100644 --- a/packages/d3-state-visualizer/examples/tree/tsconfig.webpack.json +++ b/packages/d3-state-visualizer/examples/tree/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/map2tree/.eslintrc.js b/packages/map2tree/.eslintrc.js index e392d421..84c5da42 100644 --- a/packages/map2tree/.eslintrc.js +++ b/packages/map2tree/.eslintrc.js @@ -6,7 +6,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.json'], }, }, { @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/map2tree/jest.config.js b/packages/map2tree/jest.config.js index 8824c114..05d33807 100644 --- a/packages/map2tree/jest.config.js +++ b/packages/map2tree/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/map2tree/test/tsconfig.json b/packages/map2tree/test/tsconfig.json deleted file mode 100644 index b55532d2..00000000 --- a/packages/map2tree/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "include": ["../src", "."] -} diff --git a/packages/map2tree/tsconfig.test.json b/packages/map2tree/tsconfig.test.json new file mode 100644 index 00000000..d0d15f67 --- /dev/null +++ b/packages/map2tree/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/react-base16-styling/.eslintrc.js b/packages/react-base16-styling/.eslintrc.js index e392d421..84c5da42 100644 --- a/packages/react-base16-styling/.eslintrc.js +++ b/packages/react-base16-styling/.eslintrc.js @@ -6,7 +6,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.json'], }, }, { @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/react-base16-styling/jest.config.js b/packages/react-base16-styling/jest.config.js index 2786a53d..f0ecd734 100644 --- a/packages/react-base16-styling/jest.config.js +++ b/packages/react-base16-styling/jest.config.js @@ -1,4 +1,9 @@ module.exports = { preset: 'ts-jest', testEnvironment: 'jsdom', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/react-base16-styling/test/tsconfig.json b/packages/react-base16-styling/test/tsconfig.json deleted file mode 100644 index b55532d2..00000000 --- a/packages/react-base16-styling/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "include": ["../src", "."] -} diff --git a/packages/react-base16-styling/tsconfig.test.json b/packages/react-base16-styling/tsconfig.test.json new file mode 100644 index 00000000..d0d15f67 --- /dev/null +++ b/packages/react-base16-styling/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/react-dock/.eslintrc.js b/packages/react-dock/.eslintrc.js index 5828f5b1..e62f5871 100644 --- a/packages/react-dock/.eslintrc.js +++ b/packages/react-dock/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/react-dock/demo/package.json b/packages/react-dock/demo/package.json index ac7c145c..6a743e67 100644 --- a/packages/react-dock/demo/package.json +++ b/packages/react-dock/demo/package.json @@ -4,8 +4,8 @@ "version": "0.1.3", "license": "MIT", "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -27,10 +27,10 @@ "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", "@types/styled-components": "^5.1.19", - "@types/webpack-dev-server": "^4.5.1", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/packages/react-dock/demo/tsconfig.webpack.json b/packages/react-dock/demo/tsconfig.webpack.json index 95fbb8a6..d6950b6b 100644 --- a/packages/react-dock/demo/tsconfig.webpack.json +++ b/packages/react-dock/demo/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/react-dock/jest.config.js b/packages/react-dock/jest.config.js index 2786a53d..f0ecd734 100644 --- a/packages/react-dock/jest.config.js +++ b/packages/react-dock/jest.config.js @@ -1,4 +1,9 @@ module.exports = { preset: 'ts-jest', testEnvironment: 'jsdom', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/react-dock/test/tsconfig.json b/packages/react-dock/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/react-dock/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/react-dock/tsconfig.test.json b/packages/react-dock/tsconfig.test.json new file mode 100644 index 00000000..434e50ff --- /dev/null +++ b/packages/react-dock/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/react-json-tree/.eslintrc.js b/packages/react-json-tree/.eslintrc.js index 3bfcb789..cda9a035 100644 --- a/packages/react-json-tree/.eslintrc.js +++ b/packages/react-json-tree/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, { diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index 2b0e7b92..a05a1b47 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -33,10 +33,10 @@ "@types/node": "^16.11.17", "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", - "@types/webpack-dev-server": "^4.5.1", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/packages/react-json-tree/examples/tsconfig.webpack.json b/packages/react-json-tree/examples/tsconfig.webpack.json index 95fbb8a6..d6950b6b 100644 --- a/packages/react-json-tree/examples/tsconfig.webpack.json +++ b/packages/react-json-tree/examples/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/react-json-tree/jest.config.js b/packages/react-json-tree/jest.config.js index 8824c114..05d33807 100644 --- a/packages/react-json-tree/jest.config.js +++ b/packages/react-json-tree/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/react-json-tree/test/tsconfig.json b/packages/react-json-tree/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/react-json-tree/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/react-json-tree/tsconfig.test.json b/packages/react-json-tree/tsconfig.test.json new file mode 100644 index 00000000..434e50ff --- /dev/null +++ b/packages/react-json-tree/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-app/.eslintrc.js b/packages/redux-devtools-app/.eslintrc.js index 2bff2f8c..a8a72eb9 100644 --- a/packages/redux-devtools-app/.eslintrc.js +++ b/packages/redux-devtools-app/.eslintrc.js @@ -22,7 +22,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, { diff --git a/packages/redux-devtools-app/jest.config.js b/packages/redux-devtools-app/jest.config.js index a1f53444..2aaa8218 100644 --- a/packages/redux-devtools-app/jest.config.js +++ b/packages/redux-devtools-app/jest.config.js @@ -5,4 +5,9 @@ module.exports = { moduleNameMapper: { '\\.css$': '/test/__mocks__/styleMock.ts', }, + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 4944a535..d99d9952 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -21,12 +21,12 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --hot --env development --env platform=web --progress", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --hot --env development --env platform=web --progress", "build": "yarn run build:lib && yarn run build:web && yarn run build:umd && yarn run build:umd:min", "build:lib": "rollup -c", - "build:web": "webpack --env platform=web --progress", - "build:umd": "webpack --progress --config webpack.config.umd.ts", - "build:umd:min": "webpack --env production --progress --config webpack.config.umd.ts", + "build:web": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --env platform=web --progress", + "build:umd": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --progress --config webpack.config.umd.ts", + "build:umd:min": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --env production --progress --config webpack.config.umd.ts", "clean": "rimraf build dist umd", "test": "jest", "lint": "eslint . --ext .ts,.tsx", @@ -83,11 +83,11 @@ "@types/socketcluster-client": "^13.0.5", "@types/styled-components": "^5.1.19", "@types/testing-library__jest-dom": "^5.14.2", - "@types/webpack-dev-server": "^4.5.1", "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "css-loader": "^6.5.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools-app/test/tsconfig.json b/packages/redux-devtools-app/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/redux-devtools-app/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-app/tsconfig.demo.json b/packages/redux-devtools-app/tsconfig.demo.json index fe7c960f..8c6ab798 100644 --- a/packages/redux-devtools-app/tsconfig.demo.json +++ b/packages/redux-devtools-app/tsconfig.demo.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["webpack-env"] + }, "include": ["demo", "src"] } diff --git a/packages/redux-devtools-app/tsconfig.json b/packages/redux-devtools-app/tsconfig.json index 7b7d1492..250eb1a1 100644 --- a/packages/redux-devtools-app/tsconfig.json +++ b/packages/redux-devtools-app/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib", + "types": ["webpack-env"] }, "include": ["src"] } diff --git a/packages/redux-devtools-app/tsconfig.test.json b/packages/redux-devtools-app/tsconfig.test.json new file mode 100644 index 00000000..434e50ff --- /dev/null +++ b/packages/redux-devtools-app/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-app/tsconfig.webpack.json b/packages/redux-devtools-app/tsconfig.webpack.json index 6ab34185..d02c0a8f 100644 --- a/packages/redux-devtools-app/tsconfig.webpack.json +++ b/packages/redux-devtools-app/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts", "webpack.config.umd.ts"] } diff --git a/packages/redux-devtools-cli/.eslintrc.js b/packages/redux-devtools-cli/.eslintrc.js index 47475fe9..ca152822 100644 --- a/packages/redux-devtools-cli/.eslintrc.js +++ b/packages/redux-devtools-cli/.eslintrc.js @@ -1,16 +1,19 @@ module.exports = { - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.json'], - }, overrides: [ { - files: ['test/**/*.ts', 'test/**/*.tsx'], + files: ['*.ts'], + extends: '../../eslintrc.ts.base.json', + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, + }, + { + files: ['test/**/*.ts'], extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/redux-devtools-cli/jest.config.js b/packages/redux-devtools-cli/jest.config.js index 8824c114..05d33807 100644 --- a/packages/redux-devtools-cli/jest.config.js +++ b/packages/redux-devtools-cli/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-cli/test/tsconfig.json b/packages/redux-devtools-cli/test/tsconfig.json deleted file mode 100644 index b55532d2..00000000 --- a/packages/redux-devtools-cli/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-cli/tsconfig.test.json b/packages/redux-devtools-cli/tsconfig.test.json new file mode 100644 index 00000000..d0d15f67 --- /dev/null +++ b/packages/redux-devtools-cli/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-inspector-monitor-test-tab/.eslintrc.js b/packages/redux-devtools-inspector-monitor-test-tab/.eslintrc.js index 95ca4bfd..f285e833 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/.eslintrc.js +++ b/packages/redux-devtools-inspector-monitor-test-tab/.eslintrc.js @@ -30,7 +30,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], 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 8d3200d4..e81e9b7f 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/package.json @@ -4,8 +4,8 @@ "version": "0.1.6", "license": "MIT", "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -42,10 +42,11 @@ "@types/react-router": "^5.1.17", "@types/redux-logger": "^3.0.9", "@types/styled-components": "^5.1.19", - "@types/webpack-dev-server": "^4.5.1", + "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "css-loader": "^6.5.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.json b/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.json index 420884ce..13a7994d 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.react.base.json", "compilerOptions": { - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["webpack-env"] }, "include": ["../src", "src"] } diff --git a/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.webpack.json b/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.webpack.json index 9c463920..95f4eef7 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.webpack.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/demo/tsconfig.webpack.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.base.json", "compilerOptions": { - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["node", "webpack-dev-server"] }, "include": ["webpack.config.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 bae50f60..bf9761dc 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js +++ b/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js @@ -4,4 +4,9 @@ module.exports = { moduleNameMapper: { '\\.css$': '/test/__mocks__/styleMock.ts', }, + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-inspector-monitor-test-tab/test/tsconfig.json b/packages/redux-devtools-inspector-monitor-test-tab/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/redux-devtools-inspector-monitor-test-tab/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.test.json b/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.test.json new file mode 100644 index 00000000..434e50ff --- /dev/null +++ b/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/.eslintrc.js b/packages/redux-devtools-inspector-monitor-trace-tab/.eslintrc.js index 5828f5b1..e62f5871 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/.eslintrc.js +++ b/packages/redux-devtools-inspector-monitor-trace-tab/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/jest.config.js b/packages/redux-devtools-inspector-monitor-trace-tab/jest.config.js index 2786a53d..f0ecd734 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/jest.config.js +++ b/packages/redux-devtools-inspector-monitor-trace-tab/jest.config.js @@ -1,4 +1,9 @@ module.exports = { preset: 'ts-jest', testEnvironment: 'jsdom', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/test/tsconfig.json b/packages/redux-devtools-inspector-monitor-trace-tab/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/redux-devtools-inspector-monitor-trace-tab/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.json b/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.json index 7b7d1492..4f71c334 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib", + "types": ["chrome", "node"] }, "include": ["src"] } diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.test.json b/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.test.json new file mode 100644 index 00000000..9538d3e9 --- /dev/null +++ b/packages/redux-devtools-inspector-monitor-trace-tab/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest", "node", "chrome"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-inspector-monitor/demo/package.json b/packages/redux-devtools-inspector-monitor/demo/package.json index d66e35f3..5b471ae4 100644 --- a/packages/redux-devtools-inspector-monitor/demo/package.json +++ b/packages/redux-devtools-inspector-monitor/demo/package.json @@ -4,8 +4,8 @@ "version": "0.1.4", "license": "MIT", "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -40,10 +40,11 @@ "@types/react-redux": "^7.1.21", "@types/react-router": "^5.1.17", "@types/redux-logger": "^3.0.9", - "@types/webpack-dev-server": "^4.5.1", + "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/packages/redux-devtools-inspector-monitor/demo/tsconfig.json b/packages/redux-devtools-inspector-monitor/demo/tsconfig.json index 420884ce..d9ea6a7a 100644 --- a/packages/redux-devtools-inspector-monitor/demo/tsconfig.json +++ b/packages/redux-devtools-inspector-monitor/demo/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.react.base.json", "compilerOptions": { - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["webpack-env"] }, - "include": ["../src", "src"] + "include": ["src"] } diff --git a/packages/redux-devtools-inspector-monitor/demo/tsconfig.webpack.json b/packages/redux-devtools-inspector-monitor/demo/tsconfig.webpack.json index 9c463920..95f4eef7 100644 --- a/packages/redux-devtools-inspector-monitor/demo/tsconfig.webpack.json +++ b/packages/redux-devtools-inspector-monitor/demo/tsconfig.webpack.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.base.json", "compilerOptions": { - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["node", "webpack-dev-server"] }, "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools-instrument/.eslintrc.js b/packages/redux-devtools-instrument/.eslintrc.js index 68537a81..5a1da93e 100644 --- a/packages/redux-devtools-instrument/.eslintrc.js +++ b/packages/redux-devtools-instrument/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/redux-devtools-instrument/jest.config.js b/packages/redux-devtools-instrument/jest.config.js index 8824c114..05d33807 100644 --- a/packages/redux-devtools-instrument/jest.config.js +++ b/packages/redux-devtools-instrument/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-instrument/test/tsconfig.json b/packages/redux-devtools-instrument/test/tsconfig.json deleted file mode 100644 index b55532d2..00000000 --- a/packages/redux-devtools-instrument/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-instrument/tsconfig.json b/packages/redux-devtools-instrument/tsconfig.json index 84575cb5..95bce764 100644 --- a/packages/redux-devtools-instrument/tsconfig.json +++ b/packages/redux-devtools-instrument/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib", + "types": ["node"] }, "include": ["src"] } diff --git a/packages/redux-devtools-instrument/tsconfig.test.json b/packages/redux-devtools-instrument/tsconfig.test.json new file mode 100644 index 00000000..c9d9fe14 --- /dev/null +++ b/packages/redux-devtools-instrument/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["jest", "node"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-rtk-query-monitor/demo/package.json b/packages/redux-devtools-rtk-query-monitor/demo/package.json index 4ae42718..2106a43e 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/package.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/package.json @@ -4,8 +4,8 @@ "version": "0.1.5", "license": "MIT", "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -42,11 +42,11 @@ "@types/react-redux": "^7.1.21", "@types/react-router-dom": "^5.3.2", "@types/styled-components": "^5.1.19", - "@types/webpack-dev-server": "^4.5.1", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", "copy-webpack-plugin": "^9.1.0", + "cross-env": "^7.0.3", "css-loader": "^6.5.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json b/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json index 9c463920..95f4eef7 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.base.json", "compilerOptions": { - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["node", "webpack-dev-server"] }, "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools-serialize/.eslintrc.js b/packages/redux-devtools-serialize/.eslintrc.js index 68537a81..5a1da93e 100644 --- a/packages/redux-devtools-serialize/.eslintrc.js +++ b/packages/redux-devtools-serialize/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/redux-devtools-serialize/jest.config.js b/packages/redux-devtools-serialize/jest.config.js index 8824c114..05d33807 100644 --- a/packages/redux-devtools-serialize/jest.config.js +++ b/packages/redux-devtools-serialize/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools-serialize/test/tsconfig.json b/packages/redux-devtools-serialize/test/tsconfig.json deleted file mode 100644 index b55532d2..00000000 --- a/packages/redux-devtools-serialize/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-serialize/tsconfig.test.json b/packages/redux-devtools-serialize/tsconfig.test.json new file mode 100644 index 00000000..d0d15f67 --- /dev/null +++ b/packages/redux-devtools-serialize/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json index 02fb93bd..c58dc513 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json @@ -9,8 +9,8 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -41,10 +41,11 @@ "@types/react-dom": "^17.0.11", "@types/react-redux": "^7.1.21", "@types/styled-components": "^5.1.19", - "@types/webpack-dev-server": "^4.5.1", + "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "css-loader": "^6.5.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.json b/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.json index 0e4169ca..2813f3a3 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.react.base.json", - "include": ["."] + "compilerOptions": { + "types": ["webpack-env"] + }, + "include": ["src"] } diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.webpack.json b/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.webpack.json index 1d04dfd1..03285a3c 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.webpack.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools-ui/.eslintrc.js b/packages/redux-devtools-ui/.eslintrc.js index 725b75e7..6772ca3f 100644 --- a/packages/redux-devtools-ui/.eslintrc.js +++ b/packages/redux-devtools-ui/.eslintrc.js @@ -10,11 +10,11 @@ module.exports = { }, }, { - files: ['tests/**/*.ts', 'tests/**/*.tsx'], + files: ['test/**/*.ts', 'test/**/*.tsx'], extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./tests/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, { diff --git a/packages/redux-devtools-ui/jest.config.js b/packages/redux-devtools-ui/jest.config.js index e4f61740..bf9761dc 100644 --- a/packages/redux-devtools-ui/jest.config.js +++ b/packages/redux-devtools-ui/jest.config.js @@ -2,6 +2,11 @@ module.exports = { preset: 'ts-jest', testEnvironment: 'jsdom', moduleNameMapper: { - '\\.css$': '/tests/__mocks__/styleMock.ts', + '\\.css$': '/test/__mocks__/styleMock.ts', + }, + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, }, }; diff --git a/packages/redux-devtools-ui/tests/Button.test.tsx b/packages/redux-devtools-ui/test/Button.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Button.test.tsx rename to packages/redux-devtools-ui/test/Button.test.tsx diff --git a/packages/redux-devtools-ui/tests/Container.test.tsx b/packages/redux-devtools-ui/test/Container.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Container.test.tsx rename to packages/redux-devtools-ui/test/Container.test.tsx diff --git a/packages/redux-devtools-ui/tests/ContextMenu.test.tsx b/packages/redux-devtools-ui/test/ContextMenu.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/ContextMenu.test.tsx rename to packages/redux-devtools-ui/test/ContextMenu.test.tsx diff --git a/packages/redux-devtools-ui/tests/Dialog.test.tsx b/packages/redux-devtools-ui/test/Dialog.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Dialog.test.tsx rename to packages/redux-devtools-ui/test/Dialog.test.tsx diff --git a/packages/redux-devtools-ui/tests/Editor.test.tsx b/packages/redux-devtools-ui/test/Editor.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Editor.test.tsx rename to packages/redux-devtools-ui/test/Editor.test.tsx diff --git a/packages/redux-devtools-ui/tests/Form.test.tsx b/packages/redux-devtools-ui/test/Form.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Form.test.tsx rename to packages/redux-devtools-ui/test/Form.test.tsx diff --git a/packages/redux-devtools-ui/tests/Notification.test.tsx b/packages/redux-devtools-ui/test/Notification.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Notification.test.tsx rename to packages/redux-devtools-ui/test/Notification.test.tsx diff --git a/packages/redux-devtools-ui/tests/SegmentedControl.test.tsx b/packages/redux-devtools-ui/test/SegmentedControl.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/SegmentedControl.test.tsx rename to packages/redux-devtools-ui/test/SegmentedControl.test.tsx diff --git a/packages/redux-devtools-ui/tests/Select.test.tsx b/packages/redux-devtools-ui/test/Select.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Select.test.tsx rename to packages/redux-devtools-ui/test/Select.test.tsx diff --git a/packages/redux-devtools-ui/tests/Slider.test.tsx b/packages/redux-devtools-ui/test/Slider.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Slider.test.tsx rename to packages/redux-devtools-ui/test/Slider.test.tsx diff --git a/packages/redux-devtools-ui/tests/Tabs.test.tsx b/packages/redux-devtools-ui/test/Tabs.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Tabs.test.tsx rename to packages/redux-devtools-ui/test/Tabs.test.tsx diff --git a/packages/redux-devtools-ui/tests/Toolbar.test.tsx b/packages/redux-devtools-ui/test/Toolbar.test.tsx similarity index 100% rename from packages/redux-devtools-ui/tests/Toolbar.test.tsx rename to packages/redux-devtools-ui/test/Toolbar.test.tsx diff --git a/packages/redux-devtools-ui/tests/__mocks__/styleMock.ts b/packages/redux-devtools-ui/test/__mocks__/styleMock.ts similarity index 100% rename from packages/redux-devtools-ui/tests/__mocks__/styleMock.ts rename to packages/redux-devtools-ui/test/__mocks__/styleMock.ts diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Button.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Button.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Button.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Button.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Container.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Container.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Container.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/ContextMenu.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/ContextMenu.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/ContextMenu.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/ContextMenu.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Dialog.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Dialog.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Dialog.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Dialog.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Editor.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Editor.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Editor.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Editor.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Form.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Form.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Form.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Form.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Notification.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Notification.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Notification.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Notification.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/SegmentedControl.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/SegmentedControl.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/SegmentedControl.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/SegmentedControl.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Select.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Select.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Select.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Select.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Slider.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Slider.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Slider.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Slider.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Tabs.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Tabs.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Tabs.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Tabs.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/__snapshots__/Toolbar.test.tsx.snap b/packages/redux-devtools-ui/test/__snapshots__/Toolbar.test.tsx.snap similarity index 100% rename from packages/redux-devtools-ui/tests/__snapshots__/Toolbar.test.tsx.snap rename to packages/redux-devtools-ui/test/__snapshots__/Toolbar.test.tsx.snap diff --git a/packages/redux-devtools-ui/tests/tsconfig.json b/packages/redux-devtools-ui/tests/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/redux-devtools-ui/tests/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools-ui/tsconfig.test.json b/packages/redux-devtools-ui/tsconfig.test.json new file mode 100644 index 00000000..434e50ff --- /dev/null +++ b/packages/redux-devtools-ui/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest"] + }, + "include": ["src", "test"] +} diff --git a/packages/redux-devtools-utils/tsconfig.json b/packages/redux-devtools-utils/tsconfig.json index 7b7d1492..1834db61 100644 --- a/packages/redux-devtools-utils/tsconfig.json +++ b/packages/redux-devtools-utils/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib", + "types": ["node"] }, "include": ["src"] } diff --git a/packages/redux-devtools/.eslintrc.js b/packages/redux-devtools/.eslintrc.js index 5828f5b1..e62f5871 100644 --- a/packages/redux-devtools/.eslintrc.js +++ b/packages/redux-devtools/.eslintrc.js @@ -14,7 +14,7 @@ module.exports = { extends: '../../eslintrc.ts.react.jest.base.json', parserOptions: { tsconfigRootDir: __dirname, - project: ['./test/tsconfig.json'], + project: ['./tsconfig.test.json'], }, }, ], diff --git a/packages/redux-devtools/examples/counter/package.json b/packages/redux-devtools/examples/counter/package.json index f40b960f..371af76b 100644 --- a/packages/redux-devtools/examples/counter/package.json +++ b/packages/redux-devtools/examples/counter/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -39,11 +39,11 @@ "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", "@types/react-redux": "^7.1.21", - "@types/webpack-dev-server": "^4.5.1", "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/packages/redux-devtools/examples/counter/tsconfig.json b/packages/redux-devtools/examples/counter/tsconfig.json index 45c3bc56..2813f3a3 100644 --- a/packages/redux-devtools/examples/counter/tsconfig.json +++ b/packages/redux-devtools/examples/counter/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["webpack-env"] + }, "include": ["src"] } diff --git a/packages/redux-devtools/examples/counter/tsconfig.webpack.json b/packages/redux-devtools/examples/counter/tsconfig.webpack.json index 1d04dfd1..03285a3c 100644 --- a/packages/redux-devtools/examples/counter/tsconfig.webpack.json +++ b/packages/redux-devtools/examples/counter/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools/examples/todomvc/package.json b/packages/redux-devtools/examples/todomvc/package.json index b62ad144..acc88204 100644 --- a/packages/redux-devtools/examples/todomvc/package.json +++ b/packages/redux-devtools/examples/todomvc/package.json @@ -25,8 +25,8 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack serve --open", - "build": "webpack", + "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open", + "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit" }, @@ -53,10 +53,11 @@ "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", "@types/react-redux": "^7.1.21", - "@types/webpack-dev-server": "^4.5.1", + "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", "babel-loader": "^8.2.3", + "cross-env": "^7.0.3", "css-loader": "^6.5.1", "eslint": "^8.6.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/redux-devtools/examples/todomvc/tsconfig.json b/packages/redux-devtools/examples/todomvc/tsconfig.json index 0e4169ca..2813f3a3 100644 --- a/packages/redux-devtools/examples/todomvc/tsconfig.json +++ b/packages/redux-devtools/examples/todomvc/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.react.base.json", - "include": ["."] + "compilerOptions": { + "types": ["webpack-env"] + }, + "include": ["src"] } diff --git a/packages/redux-devtools/examples/todomvc/tsconfig.webpack.json b/packages/redux-devtools/examples/todomvc/tsconfig.webpack.json index 1d04dfd1..03285a3c 100644 --- a/packages/redux-devtools/examples/todomvc/tsconfig.webpack.json +++ b/packages/redux-devtools/examples/todomvc/tsconfig.webpack.json @@ -1,4 +1,7 @@ { "extends": "../../../../tsconfig.base.json", + "compilerOptions": { + "types": ["node", "webpack-dev-server"] + }, "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools/jest.config.js b/packages/redux-devtools/jest.config.js index 8824c114..05d33807 100644 --- a/packages/redux-devtools/jest.config.js +++ b/packages/redux-devtools/jest.config.js @@ -1,3 +1,8 @@ module.exports = { preset: 'ts-jest', + globals: { + 'ts-jest': { + tsconfig: 'tsconfig.test.json', + }, + }, }; diff --git a/packages/redux-devtools/test/tsconfig.json b/packages/redux-devtools/test/tsconfig.json deleted file mode 100644 index ca19def4..00000000 --- a/packages/redux-devtools/test/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../tsconfig.react.base.json", - "include": ["../src", "."] -} diff --git a/packages/redux-devtools/tsconfig.test.json b/packages/redux-devtools/tsconfig.test.json new file mode 100644 index 00000000..d7931079 --- /dev/null +++ b/packages/redux-devtools/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.react.base.json", + "compilerOptions": { + "types": ["jest", "node"] + }, + "include": ["src", "test"] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index d77167c6..5f6b005b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -6,6 +6,7 @@ "strict": true, "allowSyntheticDefaultImports": true, "esModuleInterop": true, - "forceConsistentCasingInFileNames": true + "forceConsistentCasingInFileNames": true, + "types": [] } } diff --git a/yarn.lock b/yarn.lock index e5d19a66..053a5539 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4535,11 +4535,11 @@ __metadata: "@types/socketcluster-client": ^13.0.5 "@types/styled-components": ^5.1.19 "@types/testing-library__jest-dom": ^5.14.2 - "@types/webpack-dev-server": ^4.5.1 "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 + cross-env: ^7.0.3 css-loader: ^6.5.1 d3-state-visualizer: ^1.5.0 eslint: ^8.6.0 @@ -6844,7 +6844,7 @@ __metadata: languageName: node linkType: hard -"@types/bonjour@npm:*, @types/bonjour@npm:^3.5.9": +"@types/bonjour@npm:^3.5.9": version: 3.5.10 resolution: "@types/bonjour@npm:3.5.10" dependencies: @@ -6913,7 +6913,7 @@ __metadata: languageName: node linkType: hard -"@types/connect-history-api-fallback@npm:*, @types/connect-history-api-fallback@npm:^1.3.5": +"@types/connect-history-api-fallback@npm:^1.3.5": version: 1.3.5 resolution: "@types/connect-history-api-fallback@npm:1.3.5" dependencies: @@ -7733,7 +7733,7 @@ __metadata: languageName: node linkType: hard -"@types/serve-index@npm:*, @types/serve-index@npm:^1.9.1": +"@types/serve-index@npm:^1.9.1": version: 1.9.1 resolution: "@types/serve-index@npm:1.9.1" dependencies: @@ -7937,34 +7937,6 @@ __metadata: languageName: node linkType: hard -"@types/webpack-dev-middleware@npm:^5.0.2": - version: 5.0.2 - resolution: "@types/webpack-dev-middleware@npm:5.0.2" - dependencies: - "@types/connect": "*" - tapable: ^2.1.1 - webpack: ^5.38.1 - checksum: fd7ff7608362a1bd01ca7f89d1f3308d21519e4271a16f672e7801b087618c9fda10a102db61a8f5fda1253d580bfc227d574feb10ee0d87d24288f19bd846a9 - languageName: node - linkType: hard - -"@types/webpack-dev-server@npm:^4.5.1": - version: 4.5.1 - resolution: "@types/webpack-dev-server@npm:4.5.1" - dependencies: - "@types/bonjour": "*" - "@types/connect-history-api-fallback": "*" - "@types/express": "*" - "@types/serve-index": "*" - "@types/serve-static": "*" - "@types/webpack-dev-middleware": ^5.0.2 - chokidar: ^3.5.1 - http-proxy-middleware: ^2.0.0 - webpack: "*" - checksum: 99066055e96e22acc699f14af128acc238eb342416a4e89a73354ae832802ad4fe570dfc1da2a749595b77148a9f12c749c555682d5198094488febfb7781af0 - languageName: node - linkType: hard - "@types/webpack-env@npm:^1.16.0, @types/webpack-env@npm:^1.16.3": version: 1.16.3 resolution: "@types/webpack-env@npm:1.16.3" @@ -11076,7 +11048,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.1, chokidar@npm:^3.5.2": +"chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": version: 3.5.2 resolution: "chokidar@npm:3.5.2" dependencies: @@ -12105,11 +12077,11 @@ __metadata: "@types/react": ^17.0.38 "@types/react-dom": ^17.0.11 "@types/react-redux": ^7.1.21 - "@types/webpack-dev-server": ^4.5.1 "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 + cross-env: ^7.0.3 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.28.0 @@ -12523,10 +12495,10 @@ __metadata: "@babel/preset-env": ^7.16.7 "@babel/preset-typescript": ^7.16.7 "@types/node": ^16.11.17 - "@types/webpack-dev-server": ^4.5.1 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 + cross-env: ^7.0.3 d3-state-visualizer: ^1.5.0 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 @@ -17023,12 +16995,13 @@ __metadata: "@types/react-redux": ^7.1.21 "@types/react-router": ^5.1.17 "@types/redux-logger": ^3.0.9 - "@types/webpack-dev-server": ^4.5.1 + "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 base16: ^1.0.0 connected-react-router: ^6.9.2 + cross-env: ^7.0.3 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.28.0 @@ -24071,10 +24044,10 @@ __metadata: "@types/react": ^17.0.38 "@types/react-dom": ^17.0.11 "@types/styled-components": ^5.1.19 - "@types/webpack-dev-server": ^4.5.1 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 + cross-env: ^7.0.3 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.28.0 @@ -24281,10 +24254,10 @@ __metadata: "@types/node": ^16.11.17 "@types/react": ^17.0.38 "@types/react-dom": ^17.0.11 - "@types/webpack-dev-server": ^4.5.1 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 + cross-env: ^7.0.3 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.28.0 @@ -25883,11 +25856,11 @@ __metadata: "@types/react-redux": ^7.1.21 "@types/react-router-dom": ^5.3.2 "@types/styled-components": ^5.1.19 - "@types/webpack-dev-server": ^4.5.1 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 copy-webpack-plugin: ^9.1.0 + cross-env: ^7.0.3 css-loader: ^6.5.1 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 @@ -26668,11 +26641,12 @@ __metadata: "@types/react-dom": ^17.0.11 "@types/react-redux": ^7.1.21 "@types/styled-components": ^5.1.19 - "@types/webpack-dev-server": ^4.5.1 + "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 classnames: ^2.3.1 + cross-env: ^7.0.3 css-loader: ^6.5.1 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 @@ -28172,11 +28146,12 @@ __metadata: "@types/react-router": ^5.1.17 "@types/redux-logger": ^3.0.9 "@types/styled-components": ^5.1.19 - "@types/webpack-dev-server": ^4.5.1 + "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 connected-react-router: ^6.9.2 + cross-env: ^7.0.3 css-loader: ^6.5.1 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 @@ -28453,11 +28428,12 @@ __metadata: "@types/react": ^17.0.38 "@types/react-dom": ^17.0.11 "@types/react-redux": ^7.1.21 - "@types/webpack-dev-server": ^4.5.1 + "@types/webpack-env": ^1.16.3 "@typescript-eslint/eslint-plugin": ^5.8.1 "@typescript-eslint/parser": ^5.8.1 babel-loader: ^8.2.3 classnames: ^2.3.1 + cross-env: ^7.0.3 css-loader: ^6.5.1 eslint: ^8.6.0 eslint-config-prettier: ^8.3.0 @@ -29940,43 +29916,6 @@ __metadata: languageName: node linkType: hard -"webpack@npm:*, webpack@npm:^5.1.0, webpack@npm:^5.38.1, webpack@npm:^5.65.0": - version: 5.65.0 - resolution: "webpack@npm:5.65.0" - dependencies: - "@types/eslint-scope": ^3.7.0 - "@types/estree": ^0.0.50 - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/wasm-edit": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.4.1 - acorn-import-assertions: ^1.7.6 - browserslist: ^4.14.5 - chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.8.3 - es-module-lexer: ^0.9.0 - eslint-scope: 5.1.1 - events: ^3.2.0 - glob-to-regexp: ^0.4.1 - graceful-fs: ^4.2.4 - json-parse-better-errors: ^1.0.2 - loader-runner: ^4.2.0 - mime-types: ^2.1.27 - neo-async: ^2.6.2 - schema-utils: ^3.1.0 - tapable: ^2.1.1 - terser-webpack-plugin: ^5.1.3 - watchpack: ^2.3.1 - webpack-sources: ^3.2.2 - peerDependenciesMeta: - webpack-cli: - optional: true - bin: - webpack: bin/webpack.js - checksum: 221ab8ccd440cb678269e86689704bbef81cf41393eb266625873e30c6980ffaa055bb1a7d14bf9fc0f5a2e6f03d15d068cbb995bc876757c01a4ca27fd2870c - languageName: node - linkType: hard - "webpack@npm:4": version: 4.46.0 resolution: "webpack@npm:4.46.0" @@ -30015,6 +29954,43 @@ __metadata: languageName: node linkType: hard +"webpack@npm:^5.1.0, webpack@npm:^5.65.0": + version: 5.65.0 + resolution: "webpack@npm:5.65.0" + dependencies: + "@types/eslint-scope": ^3.7.0 + "@types/estree": ^0.0.50 + "@webassemblyjs/ast": 1.11.1 + "@webassemblyjs/wasm-edit": 1.11.1 + "@webassemblyjs/wasm-parser": 1.11.1 + acorn: ^8.4.1 + acorn-import-assertions: ^1.7.6 + browserslist: ^4.14.5 + chrome-trace-event: ^1.0.2 + enhanced-resolve: ^5.8.3 + es-module-lexer: ^0.9.0 + eslint-scope: 5.1.1 + events: ^3.2.0 + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.2.4 + json-parse-better-errors: ^1.0.2 + loader-runner: ^4.2.0 + mime-types: ^2.1.27 + neo-async: ^2.6.2 + schema-utils: ^3.1.0 + tapable: ^2.1.1 + terser-webpack-plugin: ^5.1.3 + watchpack: ^2.3.1 + webpack-sources: ^3.2.2 + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 221ab8ccd440cb678269e86689704bbef81cf41393eb266625873e30c6980ffaa055bb1a7d14bf9fc0f5a2e6f03d15d068cbb995bc876757c01a4ca27fd2870c + languageName: node + linkType: hard + "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": version: 0.7.4 resolution: "websocket-driver@npm:0.7.4"