Move lint:diff to root package.json

ethereumjs · Nov 13, 2024 · f434ac3 · f434ac3
1 parent 5f04719
commit f434ac3
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 139 deletions.
diff --git a/.githooks/pre-push b/.githooks/pre-push
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-npm run lint:diff --workspaces
+npm run lint:diff
diff --git a/config/cli/lint-diff.sh b/config/cli/lint-diff.sh
@@ -2,9 +2,9 @@
 REMOTE=$(git rev-parse --symbolic-full-name --abbrev-ref @{u})
 
 if [ -z "$REMOTE" ]; then
-    FILESCHANGED=". --ext .js,.jsx,.ts,.tsx"
+    FILESCHANGED=". --ext .js,.ts"
 else
-    FILESCHANGED=$(git diff --diff-filter=d --name-only --relative $REMOTE | grep -E '\.(js|jsx|ts|tsx)')
+    FILESCHANGED=$(git diff --diff-filter=d --name-only --relative $REMOTE | grep -E '\.(js|ts)')
 fi
 
 echo $FILESCHANGED
@@ -25,8 +25,8 @@ dim() {
     echo "${DIM}$1${NOCOLOR}"
 }
 
-dim "> eslint --format codeframe --config ./.eslintrc.cjs . \\ "
-dim "\t --ext .js,.jsx,.ts,.tsx \\ "
+dim "> eslint --format codeframe --config ./config/eslint.cjs . \\ "
+dim "\t --ext .js,.ts \\ "
 
 blue "[Lint]${NOCOLOR} checking..."
 
@@ -35,7 +35,7 @@ if [ -z "$FILESCHANGED" ]; then
     exit
 fi
 
-eslint --format codeframe --config ./.eslintrc.cjs $FILESCHANGED
+eslint --format codeframe --config ./config/eslint.cjs $FILESCHANGED
 
 RETURN_CODE=$?
 

diff --git a/config/cli/lint-fix.sh b/config/cli/lint-fix.sh
diff --git a/config/cli/lint.sh b/config/cli/lint.sh
diff --git a/config/eslint.cjs b/config/eslint.cjs
@@ -32,6 +32,8 @@ module.exports = {
     'devnets',
     'eslint',
     'lint-staged.config.js',
+    'tsconfig.lint.json',
+    'package.json',
   ],
   extends: [
     'typestrict',

diff --git a/config/tsconfig.lint.json b/config/tsconfig.lint.json
@@ -1,26 +1,12 @@
 {
   "extends": "./tsconfig.json",
   "include": [
-    "../packages/block/**/*.ts",
-    "../packages/blockchain/**/*.ts",
-    "../packages/client/**/*.ts",
-    "../packages/common/**/*.ts",
-    "../packages/devp2p/**/*.ts",
-    "../packages/ethash/**/*.ts",
-    "../packages/evm/**/*.ts",
-    "../packages/genesis/**/*.ts",
-    "../packages/mpt/**/*.ts",
-    "../packages/mpt/examples/**/*",
-    "../packages/rlp/**/*.ts",
-    "../packages/statemanager/**/*.ts",
-    "../packages/tx/**/*.ts",
-    "../packages/util/**/*.ts",
-    "../packages/verkle/**/*.ts",
-    "../packages/vm/**/*.ts",
-    "../packages/wallet/**/*.ts",
-    "../packages/ethereum-tests/**/*.js"
+    "../packages/**/*.ts",
+    "../packages/**/*.js",
+    "../packages/ethereum-tests/**/*.js",
+    "package.json"
   ],
-  "exclude": ["../packages/client/devnets", "../packages/client/archive", "**/ethereum-tests/**/*"],
+  "exclude": ["../packages/client/devnets", "../packages/client/archive", "**/ethereum-tests/**/*", "package.json"],
   "compilerOptions": {
     "noEmit": true
   }

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "examples:build": "npm run examples:build --workspaces --if-present",
     "lint": "eslint --format codeframe --config ./config/eslint.cjs . --ext .js,.ts",
     "lint:fix": "eslint --fix --config ./config/eslint.cjs . --ext .js,.ts",
+    "lint:diff": "./config/cli/lint-diff.sh",
     "test": "npm run test --workspaces --if-present",
     "test:node": "npm run test:node --workspaces --if-present",
     "test:browser": "npm run test:browser --workspaces --if-present",

diff --git a/packages/block/package.json b/packages/block/package.json
@@ -31,9 +31,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- block",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=../../config/vitest.config.browser.mts",

diff --git a/packages/blockchain/package.json b/packages/blockchain/package.json
@@ -31,9 +31,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- blockchain",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=./vitest.config.browser.mts",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -34,9 +34,6 @@
     "coverage": "npx vitest --coverage --coverage.include=src --coverage.reporter=lcov run test/* -c=./vitest.config.unit.ts",
     "docs:build": "typedoc --options typedoc.cjs --tsconfig tsconfig.prod.cjs.json",
     "examples": "tsx ../../scripts/examples-runner.ts -- client",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "preinstall": "npm run binWorkaround",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:unit && npm run test:integration",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -44,9 +44,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- common",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=../../config/vitest.config.browser.mts",

diff --git a/packages/devp2p/package.json b/packages/devp2p/package.json
@@ -47,9 +47,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- devp2p",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "vitest run",
     "test:node": "npm run test",

diff --git a/packages/ethash/package.json b/packages/ethash/package.json
@@ -31,9 +31,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- ethash",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npx vitest run",
     "tsc": "../../config/cli/ts-compile.sh"

diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -34,9 +34,6 @@
     "examples": "tsx ../../scripts/examples-runner.ts -- evm",
     "examples:build": "npx embedme README.md",
     "formatTest": "node ./scripts/formatTest",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "profiling": "0x ./benchmarks/run.js profiling",
     "test": "npm run test:node && npm run test:browser",

diff --git a/packages/genesis/package.json b/packages/genesis/package.json
@@ -43,9 +43,6 @@
     "examples": "tsx ../../scripts/examples-runner.ts -- genesis",
     "examples:build": "npx embedme README.md",
     "docs:build": "typedoc --options typedoc.cjs",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node",
     "test:browser": "npx vitest run --config=../../config/vitest.config.browser.mts",

diff --git a/packages/mpt/package.json b/packages/mpt/package.json
@@ -33,9 +33,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- mpt",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "profiling": "tsc --target ES5 benchmarks/random.ts && 0x benchmarks/random.js",
     "test": "npm run test:node && npm run test:browser",

diff --git a/packages/rlp/package.json b/packages/rlp/package.json
@@ -43,9 +43,6 @@
     "coverage": "npx vitest --coverage --coverage.include=src run",
     "examples": "tsx ../../scripts/examples-runner.ts -- rlp",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=./vitest.config.browser.mts",

diff --git a/packages/statemanager/package.json b/packages/statemanager/package.json
@@ -32,9 +32,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- statemanager",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh && npm run test:node",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=./vitest.config.browser.mts",

diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -38,9 +38,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- tx",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=./vitest.config.browser.mts",

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -75,9 +75,6 @@
     "docs:build": "npx typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- util",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=../../config/vitest.config.browser.mts",

diff --git a/packages/verkle/package.json b/packages/verkle/package.json
@@ -37,9 +37,6 @@
     "docs:build": "typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- verkle",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node",
     "test:node": "npx vitest run",

diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -36,9 +36,6 @@
     "examples": "tsx ../../scripts/examples-runner.ts -- vm",
     "examples:build": "npx embedme README.md",
     "formatTest": "node ./scripts/formatTest",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh && npm run test:buildIntegrity",
     "profiling": "0x ./benchmarks/run.js profiling",
     "test": "echo \"[INFO] Generic test cmd not used. See package.json for more specific test run cmds.\"",

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -31,9 +31,6 @@
     "docs:build": "npx typedoc --options typedoc.cjs",
     "examples": "tsx ../../scripts/examples-runner.ts -- wallet",
     "examples:build": "npx embedme README.md",
-    "lint": "../../config/cli/lint.sh",
-    "lint:diff": "../../config/cli/lint-diff.sh",
-    "lint:fix": "../../config/cli/lint-fix.sh",
     "prepublishOnly": "../../config/cli/prepublish.sh",
     "test": "npm run test:node && npm run test:browser",
     "test:browser": "npx vitest run --config=../../config/vitest.config.browser.mts",