Dedupe eslint config & dependencies

vlayer-xyz · Feb 14, 2024 · 7a73438 · 7a73438
1 parent 3128df9
commit 7a73438
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 184 deletions.
diff --git a/ethereum_history_api/tests/.eslintrc.cjs → .eslintrc.cjs b/ethereum_history_api/tests/.eslintrc.cjs → .eslintrc.cjs
@@ -1,12 +1,13 @@
 module.exports = {
+  root: true,
+  ignorePatterns: ['**/.eslintrc.cjs'],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaVersion: 'latest',
     sourceType: 'module',
-    project: 'ethereum_history_api/tests/tsconfig.json'
+    project: 'ethereum_history_api/oracles/tsconfig.json'
   },
   env: {
-    browser: true,
     es2021: true
   },
   extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/ethereum_history_api/oracles/.eslintrc.cjs b/ethereum_history_api/oracles/.eslintrc.cjs
@@ -1,24 +1,5 @@
 module.exports = {
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-    project: 'ethereum_history_api/oracles/tsconfig.json'
-  },
-  env: {
-    browser: true,
-    es2021: true
-  },
-  extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
   rules: {
-    // Override specific rules
-    '@typescript-eslint/consistent-type-assertions': [
-      'error',
-      {
-        assertionStyle: 'as',
-        objectLiteralTypeAssertions: 'allow'
-      }
-    ],
     'no-restricted-imports': [
       'error',
       {
@@ -30,16 +11,5 @@ module.exports = {
         ]
       }
     ]
-  },
-  overrides: [
-    {
-      env: {
-        node: true
-      },
-      files: ['.eslintrc.{js,cjs}'],
-      parserOptions: {
-        sourceType: 'script'
-      }
-    }
-  ]
+  }
 };
diff --git a/ethereum_history_api/oracles/package.json b/ethereum_history_api/oracles/package.json
@@ -30,19 +30,10 @@
     "viem": "^2.0.0"
   },
   "devDependencies": {
-    "@types/eslint": "^8",
     "@types/json-bigint": "^1",
     "@types/lodash.isequal": "^4",
     "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "^6.18.0",
     "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.0",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-promise": "^6.0.0",
     "pino-pretty": "^10.3.1",
     "prettier": "^3.1.1",
     "tsx": "^4.7.0",

diff --git a/ethereum_history_api/tests/package.json b/ethereum_history_api/tests/package.json
@@ -18,17 +18,8 @@
     "viem": "^2.0.0"
   },
   "devDependencies": {
-    "@types/eslint": "^8",
     "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "^6.18.0",
     "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.0",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-promise": "^6.0.0",
     "prettier": "^3.1.1",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",

diff --git a/ethereum_history_api/tests/src/e2e.test.ts b/ethereum_history_api/tests/src/e2e.test.ts
@@ -44,7 +44,7 @@ describe(
       expect(deploymentTxReceipt.status).toEqual('success');
 
       assert(!!deploymentTxReceipt.contractAddress, 'Deployed contract address should not be empty');
-      return deploymentTxReceipt.contractAddress!;
+      return deploymentTxReceipt.contractAddress;
     }
 
     it('smart contract proof verification successes', async () => {

diff --git a/package.json b/package.json
@@ -14,7 +14,16 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
+    "@types/eslint": "^8",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
     "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-standard-with-typescript": "^43.0.0",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-promise": "^6.0.0",
     "prettier": "^3.2.2",
     "typescript": "^5.3.3"
   }

diff --git a/yarn.lock b/yarn.lock
@@ -3299,17 +3299,8 @@ __metadata:
   resolution: "noir-ethereum-api-e2e-tests@workspace:ethereum_history_api/tests"
   dependencies:
     "@noir-lang/noirc_abi": "npm:^0.23.0"
-    "@types/eslint": "npm:^8"
     "@types/node": "npm:^20.10.5"
-    "@typescript-eslint/eslint-plugin": "npm:^6.18.0"
-    "@typescript-eslint/parser": "npm:^6.18.0"
     eslint: "npm:^8.56.0"
-    eslint-config-prettier: "npm:^9.1.0"
-    eslint-config-standard-with-typescript: "npm:^43.0.0"
-    eslint-plugin-import: "npm:^2.25.2"
-    eslint-plugin-n: "npm:^15.0.0 || ^16.0.0 "
-    eslint-plugin-prettier: "npm:^5.1.2"
-    eslint-plugin-promise: "npm:^6.0.0"
     noir-ethereum-api-oracles: "npm:^1.0.0"
     prettier: "npm:^3.1.1"
     toml: "npm:^3.0.0"
@@ -3326,20 +3317,11 @@ __metadata:
   dependencies:
     "@noir-lang/noir_js": "npm:0.23.0"
     "@noir-lang/noirc_abi": "npm:^0.23.0"
-    "@types/eslint": "npm:^8"
     "@types/json-bigint": "npm:^1"
     "@types/lodash.isequal": "npm:^4"
     "@types/node": "npm:^20.10.5"
-    "@typescript-eslint/eslint-plugin": "npm:^6.18.0"
-    "@typescript-eslint/parser": "npm:^6.18.0"
     dotenv: "npm:^16.3.1"
     eslint: "npm:^8.56.0"
-    eslint-config-prettier: "npm:^9.1.0"
-    eslint-config-standard-with-typescript: "npm:^43.0.0"
-    eslint-plugin-import: "npm:^2.25.2"
-    eslint-plugin-n: "npm:^15.0.0 || ^16.0.0 "
-    eslint-plugin-prettier: "npm:^5.1.2"
-    eslint-plugin-promise: "npm:^6.0.0"
     fastify: "npm:^4.25.2"
     json-bigint: "npm:^1.0.0"
     json-rpc-2.0: "npm:^1.7.0"
@@ -3357,7 +3339,16 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "noir-ethereum-history-api@workspace:."
   dependencies:
+    "@types/eslint": "npm:^8"
+    "@typescript-eslint/eslint-plugin": "npm:^6.18.0"
+    "@typescript-eslint/parser": "npm:^6.18.0"
     eslint: "npm:^8.56.0"
+    eslint-config-prettier: "npm:^9.1.0"
+    eslint-config-standard-with-typescript: "npm:^43.0.0"
+    eslint-plugin-import: "npm:^2.25.2"
+    eslint-plugin-n: "npm:^15.0.0 || ^16.0.0 "
+    eslint-plugin-prettier: "npm:^5.1.2"
+    eslint-plugin-promise: "npm:^6.0.0"
     prettier: "npm:^3.2.2"
     typescript: "npm:^5.3.3"
   languageName: unknown