♻️ Use New eslint Flat Configuration File eslint.config.js (#205)

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Feb 13, 2024 · bae6869 · bae6869
1 parent c20ec09
commit bae6869
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 28 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,31 @@
+const eslint = require("@eslint/js");
+const eslintConfigPrettier = require("eslint-config-prettier");
+
+module.exports = [
+  eslint.configs.recommended,
+  eslintConfigPrettier,
+  {
+    files: ["**/*.js"],
+    languageOptions: {
+      sourceType: "commonjs",
+      ecmaVersion: "latest",
+    },
+  },
+  {
+    ignores: [
+      "node_modules/**",
+      "lib/murky/**",
+      "lib/solady/**",
+      "lib/solmate/**",
+      "lib/prb-test/**",
+      "lib/forge-std/**",
+      "lib/create-util/**",
+      "lib/erc4626-tests/**",
+      "lib/solidity-bytes-utils/**",
+      "lib/openzeppelin-contracts/**",
+      "cache/**",
+      "out/**",
+      "dist/**",
+    ],
+  },
+];
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/package.json b/package.json
@@ -26,8 +26,8 @@
     "prettier:fix": "npx prettier -w \"**/*.{md,sol,js,json,yml,yaml}\"",
     "solhint:check": "npx solhint \"**/*.sol\"",
     "solhint:fix": "npx solhint \"**/*.sol\" --fix",
-    "lint:check": "pnpm prettier:check && pnpm solhint:check && npx eslint --ext .js .",
-    "lint:fix": "pnpm prettier:fix && pnpm solhint:fix && npx eslint --ext .js . --fix"
+    "lint:check": "pnpm prettier:check && pnpm solhint:check && npx eslint .",
+    "lint:fix": "pnpm prettier:fix && pnpm solhint:fix && npx eslint . --fix"
   },
   "files": [
     "src/**/*.vy",
@@ -36,6 +36,7 @@
     "CHANGELOG.md"
   ],
   "devDependencies": {
+    "@eslint/js": "^8.56.0",
     "@openzeppelin/merkle-tree": "^1.0.6",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+0 −6		.eslintignore
+0 −15		.eslintrc.js
+1 −1		.github/workflows/checks.yml
+1 −1		.github/workflows/test-contracts.yml
+37 −0		eslint.config.js
+7 −7		package.json
+202 −180		pnpm-lock.yaml
+3 −1		tsconfig.json
+0 −5		.changeset/angry-dodos-grow.md
+0 −5		.changeset/brown-cooks-dress.md
+1 −1		.changeset/dirty-cobras-smile.md
+5 −0		.changeset/wise-bobcats-speak.md
+1 −1		contracts/access/manager/AccessManaged.sol
+51 −0		contracts/finance/VestingWalletCliff.sol
+36 −0		contracts/mocks/ArraysMock.sol
+141 −29		contracts/utils/Arrays.sol
+1 −1		hardhat.config.js
+2 −8		scripts/helpers.js
+1 −3		test/finance/VestingWallet.test.js
+107 −0		test/finance/VestingWalletCliff.test.js
+1 −3		test/helpers/iterate.js
+0 −3		test/helpers/random.js
+73 −55		test/utils/Arrays.test.js
+2 −2		test/utils/math/Math.test.js
+1 −7		test/utils/structs/DoubleEndedQueue.test.js
+3 −3		test/utils/structs/EnumerableMap.test.js
+2 −2		test/utils/structs/EnumerableSet.test.js