From b4c3906381cb4ca358ce30467cdaac0c90c1ce26 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sat, 18 Sep 2021 16:37:36 -0400 Subject: [PATCH] More work --- .yarnrc.yml | 1 + extension/package.json | 29 ++++++++---- packages/react-base16-styling/package.json | 2 +- packages/redux-devtools-app/.eslintrc.js | 14 +++--- packages/redux-devtools-app/package.json | 41 ++++++++++++++--- packages/redux-devtools-cli/.eslintrc.js | 14 +++--- packages/redux-devtools-cli/package.json | 14 +++--- tsconfig.base.json | 2 +- yarn.lock | 51 +++++++++++++++++++++- 9 files changed, 128 insertions(+), 40 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index cd0486fc..e088a17d 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1 +1,2 @@ +nodeLinker: node-modules yarnPath: .yarn/releases/yarn-3.0.2.cjs diff --git a/extension/package.json b/extension/package.json index 20468c07..1bbdb4e3 100644 --- a/extension/package.json +++ b/extension/package.json @@ -11,24 +11,24 @@ }, "scripts": { "start": "webpack --config webpack/dev.config.babel.js", - "build": "npm run build:extension && npm run build:firefox", + "build": "yarn run build:extension && yarn run build:firefox", "build:extension": "rimraf build/extension && webpack --config webpack/wrap.config.babel.js && webpack --config webpack/prod.config.babel.js", "build:firefox": "webpack --config webpack/prod.firefox.config.babel.js", "build:examples": "babel-node examples/buildAll.js", - "precompress:extension": "npm run lint && npm run test:app && npm run build:extension && npm run test:chrome && npm run test:electron", - "precompress:firefox": "npm run lint && npm run build:firefox && npm run test:app", + "precompress:extension": "yarn run lint && yarn run test:app && yarn run build:extension && yarn run test:chrome && yarn run test:electron", + "precompress:firefox": "yarn run lint && yarn run build:firefox && yarn run test:app", "compress:extension": "bestzip build/extension.zip build/extension", "compress:firefox": "bestzip build/extension.zip build/extension", "docs:clean": "rimraf _book", "docs:prepare": "gitbook install", - "docs:build": "npm run docs:prepare && gitbook build", - "docs:watch": "npm run docs:prepare && gitbook serve", - "docs:publish": "npm run docs:clean && npm run docs:build && cd _book && git init && git commit --allow-empty -m 'update book' && git checkout -b gh-pages && touch .nojekyll && git add . && git commit -am 'update book' && git push git@github.com:zalmoxisus/redux-devtools-extension gh-pages --force", + "docs:build": "yarn run docs:prepare && gitbook build", + "docs:watch": "yarn run docs:prepare && gitbook serve", + "docs:publish": "yarn run docs:clean && yarn run docs:build && cd _book && git init && git commit --allow-empty -m 'update book' && git checkout -b gh-pages && touch .nojekyll && git add . && git commit -am 'update book' && git push git@github.com:zalmoxisus/redux-devtools-extension gh-pages --force", "clean": "rimraf build/ && rimraf dev/", "test:app": "cross-env BABEL_ENV=test jest test/app", "test:chrome": "jest test/chrome", "test:electron": "jest test/electron", - "test": "npm run test:app && npm run build:extension && npm run test:chrome && npm run test:electron", + "test": "yarn run test:app && yarn run build:extension && yarn run test:chrome && yarn run test:electron", "type-check": "tsc --noEmit" }, "dependencies": { @@ -52,9 +52,16 @@ "redux-persist": "^6.0.0" }, "devDependencies": { + "@babel/core": "^7.15.5", + "@babel/preset-env": "^7.15.6", + "@babel/preset-react": "^7.14.5", + "@babel/preset-typescript": "^7.15.0", "@babel/register": "^7.15.3", + "babel-loader": "^8.2.2", "bestzip": "^2.2.0", "chromedriver": "^93.0.1", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "^6.2.0", "electron": "^14.0.1", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", @@ -64,11 +71,17 @@ "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.25.1", "eslint-plugin-react-hooks": "^4.2.0", + "file-loader": "^6.2.0", + "fork-ts-checker-webpack-plugin": "^6.3.3", "gitbook-cli": "^2.3.2", "path-browserify": "^1.0.1", + "pug-html-loader": "^1.1.5", "react-transform-catch-errors": "^1.0.2", "react-transform-hmr": "^1.0.4", "selenium-webdriver": "^3.6.0", - "sinon-chrome": "^3.0.1" + "sinon-chrome": "^3.0.1", + "style-loader": "^3.2.1", + "webpack": "^5.52.1", + "webpack-cli": "^4.8.0" } } diff --git a/packages/react-base16-styling/package.json b/packages/react-base16-styling/package.json index 98756302..e55aee83 100644 --- a/packages/react-base16-styling/package.json +++ b/packages/react-base16-styling/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@types/base16": "^1.0.2", - "@types/lodash": "^4.14.172", + "@types/lodash.curry": "^4.1.6", "base16": "^1.0.0", "color": "^4.0.1", "csstype": "^3.0.9", diff --git a/packages/redux-devtools-app/.eslintrc.js b/packages/redux-devtools-app/.eslintrc.js index 0238607d..40d5bbf8 100644 --- a/packages/redux-devtools-app/.eslintrc.js +++ b/packages/redux-devtools-app/.eslintrc.js @@ -1,14 +1,10 @@ module.exports = { - extends: '../../.eslintrc', + extends: '../../eslintrc.ts.react.base.json', + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.json'], - }, - }, { files: ['demo/**/*.ts', 'demo/**/*.tsx'], extends: '../../eslintrc.ts.react.base.json', diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 164d2cd8..6838731c 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -21,7 +21,7 @@ }, "scripts": { "start": "webpack serve --hot --env development --env platform=web --progress", - "build": "npm run build:types && npm run build:js && npm run build:web && npm run build:umd && npm run build:umd:min", + "build": "yarn run build:types && yarn run build:js && yarn run build:web && yarn run build:umd && yarn run build:umd:min", "build:types": "tsc --emitDeclarationOnly", "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", "build:web": "rimraf ./build/web && webpack --env platform=web --progress", @@ -30,11 +30,9 @@ "clean": "rimraf lib", "test": "jest", "lint": "eslint . --ext .ts,.tsx", - "lint:fix": "eslint . --ext .ts,.tsx --fix", "type-check": "tsc --noEmit", - "type-check:watch": "npm run type-check -- --watch", - "preversion": "npm run type-check && npm run lint && npm run test", - "prepublishOnly": "npm run clean && npm run build" + "prepack": "yarn run clean && yarn run build", + "prepublish": "yarn run type-check && yarn run lint && yarn run test" }, "dependencies": { "@redux-devtools/chart-monitor": "^1.9.0", @@ -63,15 +61,46 @@ "styled-components": "^5.3.1" }, "devDependencies": { + "@babel/cli": "^7.15.4", + "@babel/core": "^7.15.5", + "@babel/preset-env": "^7.15.6", + "@babel/preset-react": "^7.14.5", + "@babel/preset-typescript": "^7.15.0", "@rjsf/core": "^3.1.0", + "@types/jest": "^27.0.1", "@types/json-schema": "^7.0.9", + "@types/node": "^14.17.15", "@types/socketcluster-client": "^13.0.5", + "@types/webpack": "^5.28.0", + "@types/webpack-dev-server": "^4.1.0", + "@typescript-eslint/eslint-plugin": "^4.31.1", + "@typescript-eslint/parser": "^4.31.1", + "babel-loader": "^8.2.2", + "css-loader": "^6.2.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": "^24.4.0", + "eslint-plugin-react": "^7.25.1", + "file-loader": "^6.2.0", + "fork-ts-checker-webpack-plugin": "^6.3.3", + "html-loader": "^2.1.2", + "html-webpack-plugin": "^5.3.2", + "jest": "^27.2.0", "path-browserify": "^1.0.1", "react": "^16.14.0", - "react-dom": "^16.14.0" + "react-dom": "^16.14.0", + "rimraf": "^3.0.2", + "style-loader": "^3.2.1", + "ts-jest": "^27.0.5", + "ts-node": "^10.2.1", + "typescript": "~4.3.5", + "url-loader": "^4.1.1", + "webpack": "^5.52.1", + "webpack-cli": "^4.8.0", + "webpack-dev-server": "^4.2.1" }, "peerDependencies": { "react": "^16.3.0 || ^17.0.0" diff --git a/packages/redux-devtools-cli/.eslintrc.js b/packages/redux-devtools-cli/.eslintrc.js index dbf773c0..47475fe9 100644 --- a/packages/redux-devtools-cli/.eslintrc.js +++ b/packages/redux-devtools-cli/.eslintrc.js @@ -1,14 +1,10 @@ module.exports = { - extends: '../../.eslintrc', + extends: '../../eslintrc.ts.base.json', + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, overrides: [ - { - files: ['*.ts', '*.tsx'], - extends: '../../eslintrc.ts.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.json'], - }, - }, { files: ['test/**/*.ts', 'test/**/*.tsx'], extends: '../../eslintrc.ts.jest.base.json', diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json index 31f871d3..c7e3513f 100644 --- a/packages/redux-devtools-cli/package.json +++ b/packages/redux-devtools-cli/package.json @@ -32,11 +32,9 @@ "clean": "rimraf dist", "test": "jest", "lint": "eslint . --ext .ts,.tsx", - "lint:fix": "eslint . --ext .ts,.tsx --fix", "type-check": "tsc --noEmit", - "type-check:watch": "npm run type-check -- --watch", - "preversion": "npm run type-check && npm run lint && npm run test", - "prepublishOnly": "npm run clean && npm run build" + "prepack": "yarn run clean && yarn run build", + "prepublish": "yarn run type-check && yarn run lint && yarn run test" }, "engines": { "node": ">=14.15.0" @@ -68,13 +66,19 @@ }, "devDependencies": { "@types/cross-spawn": "^6.0.2", + "@types/jest": "^27.0.1", "@types/morgan": "^1.9.3", "@types/semver": "^7.3.8", "@types/supertest": "^2.0.11", "@types/uuid": "^8.3.1", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-jest": "^24.4.0", "jest": "^27.2.0", "ncp": "^2.0.0", + "rimraf": "^3.0.2", "socketcluster-client": "^14.3.2", - "supertest": "^6.1.6" + "supertest": "^6.1.6", + "ts-jest": "^27.0.5" } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 8abbe000..c46e16be 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,6 +8,6 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true // See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/33311 - // "types": ["node", "jest", "webpack-env", "chrome"] + "types": ["node", "jest", "webpack-env", "chrome"] } } diff --git a/yarn.lock b/yarn.lock index cd7d1334..b2a3035d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4475,6 +4475,11 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/app@workspace:packages/redux-devtools-app" dependencies: + "@babel/cli": ^7.15.4 + "@babel/core": ^7.15.5 + "@babel/preset-env": ^7.15.6 + "@babel/preset-react": ^7.14.5 + "@babel/preset-typescript": ^7.15.0 "@redux-devtools/chart-monitor": ^1.9.0 "@redux-devtools/core": ^3.9.0 "@redux-devtools/inspector-monitor": ^1.0.0 @@ -4486,13 +4491,30 @@ __metadata: "@redux-devtools/ui": ^1.0.0-9 "@reduxjs/toolkit": ^1.6.1 "@rjsf/core": ^3.1.0 + "@types/jest": ^27.0.1 "@types/json-schema": ^7.0.9 + "@types/node": ^14.17.15 "@types/socketcluster-client": ^13.0.5 + "@types/webpack": ^5.28.0 + "@types/webpack-dev-server": ^4.1.0 + "@typescript-eslint/eslint-plugin": ^4.31.1 + "@typescript-eslint/parser": ^4.31.1 + babel-loader: ^8.2.2 + css-loader: ^6.2.0 d3-state-visualizer: ^1.4.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: ^24.4.0 + eslint-plugin-react: ^7.25.1 + file-loader: ^6.2.0 + fork-ts-checker-webpack-plugin: ^6.3.3 + html-loader: ^2.1.2 + html-webpack-plugin: ^5.3.2 javascript-stringify: ^2.1.0 + jest: ^27.2.0 jsan: ^3.1.13 jsondiffpatch: ^0.4.1 localforage: ^1.10.0 @@ -4506,8 +4528,17 @@ __metadata: react-redux: ^7.2.5 redux: ^4.1.1 redux-persist: ^6.0.0 + rimraf: ^3.0.2 socketcluster-client: ^14.3.2 + style-loader: ^3.2.1 styled-components: ^5.3.1 + ts-jest: ^27.0.5 + ts-node: ^10.2.1 + typescript: ~4.3.5 + url-loader: ^4.1.1 + webpack: ^5.52.1 + webpack-cli: ^4.8.0 + webpack-dev-server: ^4.2.1 peerDependencies: react: ^16.3.0 || ^17.0.0 languageName: unknown @@ -4553,6 +4584,7 @@ __metadata: dependencies: "@redux-devtools/app": ^1.0.0-8 "@types/cross-spawn": ^6.0.2 + "@types/jest": ^27.0.1 "@types/morgan": ^1.9.3 "@types/react": ^16.14.15 "@types/semver": ^7.3.8 @@ -4565,6 +4597,9 @@ __metadata: cors: ^2.8.5 cross-spawn: ^7.0.3 electron: ^14.0.1 + eslint: ^7.32.0 + eslint-config-prettier: ^8.3.0 + eslint-plugin-jest: ^24.4.0 express: ^4.17.1 getport: ^0.1.0 graphql: ^14.7.0 @@ -4577,11 +4612,13 @@ __metadata: open: ^8.2.1 react: ^16.14.0 react-dom: ^16.14.0 + rimraf: ^3.0.2 semver: ^7.3.5 socketcluster: ^14.4.2 socketcluster-client: ^14.3.2 sqlite3: ^5.0.2 supertest: ^6.1.6 + ts-jest: ^27.0.5 uuid: ^8.3.2 bin: redux-devtools: bin/redux-devtools.js @@ -24223,7 +24260,6 @@ fsevents@^1.2.7: "@types/base16": ^1.0.2 "@types/color": ^3.0.2 "@types/jest": ^27.0.1 - "@types/lodash": ^4.14.172 "@types/lodash.curry": ^4.1.6 "@typescript-eslint/eslint-plugin": ^4.31.1 "@typescript-eslint/parser": ^4.31.1 @@ -25574,7 +25610,11 @@ fsevents@^1.2.7: version: 0.0.0-use.local resolution: "remotedev-redux-devtools-extension@workspace:extension" dependencies: + "@babel/core": ^7.15.5 "@babel/polyfill": ^7.12.1 + "@babel/preset-env": ^7.15.6 + "@babel/preset-react": ^7.14.5 + "@babel/preset-typescript": ^7.15.0 "@babel/register": ^7.15.3 "@redux-devtools/app": ^1.0.0-8 "@redux-devtools/core": ^3.9.0 @@ -25583,8 +25623,11 @@ fsevents@^1.2.7: "@redux-devtools/slider-monitor": ^2.0.0-8 "@redux-devtools/utils": ^1.0.0-6 "@types/jsan": ^3.1.2 + babel-loader: ^8.2.2 bestzip: ^2.2.0 chromedriver: ^93.0.1 + copy-webpack-plugin: ^9.0.1 + css-loader: ^6.2.0 electron: ^14.0.1 enzyme: ^3.11.0 enzyme-adapter-react-16: ^1.15.6 @@ -25594,11 +25637,14 @@ fsevents@^1.2.7: eslint-plugin-jsx-a11y: ^6.4.1 eslint-plugin-react: ^7.25.1 eslint-plugin-react-hooks: ^4.2.0 + file-loader: ^6.2.0 + fork-ts-checker-webpack-plugin: ^6.3.3 gitbook-cli: ^2.3.2 jsan: ^3.1.13 localforage: ^1.10.0 lodash: ^4.17.21 path-browserify: ^1.0.1 + pug-html-loader: ^1.1.5 react: ^16.14.0 react-dom: ^16.14.0 react-icons: ^4.2.0 @@ -25610,6 +25656,9 @@ fsevents@^1.2.7: redux-persist: ^6.0.0 selenium-webdriver: ^3.6.0 sinon-chrome: ^3.0.1 + style-loader: ^3.2.1 + webpack: ^5.52.1 + webpack-cli: ^4.8.0 languageName: unknown linkType: soft