Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ Use New eslint Flat Configuration File eslint.config.js #81

Merged
merged 5 commits into from
Feb 15, 2024
Merged

♻️ Use New eslint Flat Configuration File eslint.config.js #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ffdf24
♻️ Use `eslint` Flat Configuration File `eslint.config.js`
pcaversaccio Feb 14, 2024
c186de0
♻️ chore
pcaversaccio Feb 14, 2024
0e5fa97
🔁 Bump `ethers`
pcaversaccio Feb 14, 2024
9c02f3d
♻️ chore
pcaversaccio Feb 14, 2024
c859f73
🔁 Update `@types/node`
pcaversaccio Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .eslintignore
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .eslintrc.js
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const eslint = require("@eslint/js");
const tseslint = require("typescript-eslint");
const eslintConfigPrettier = require("eslint-config-prettier");
/* eslint-enable @typescript-eslint/no-var-requires */

module.exports = tseslint.config(
{
files: ["**/*.{js,ts}"],
extends: [
eslint.configs.recommended,
...tseslint.configs.recommended,
...tseslint.configs.stylistic,
eslintConfigPrettier,
],
plugins: {
"@typescript-eslint": tseslint.plugin,
},
languageOptions: {
ecmaVersion: "latest",
parser: tseslint.parser,
parserOptions: {
project: true,
},
},
},
{
ignores: [
"node_modules/**",
"interface/**",
"lib/**",
"cache/**",
"typechain-types/**",
"artifacts/**",
"forge-artifacts/**",
"coverage/**",
"bin/**",
"out/**",
],
},
);
4 changes: 0 additions & 4 deletions interface/.eslintignore
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions interface/.eslintrc.json
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions interface/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const eslint = require("@eslint/js");
const tseslint = require("typescript-eslint");
const next = require("@next/eslint-plugin-next");
const react = require("eslint-plugin-react");
const reactHooks = require("eslint-plugin-react-hooks");
const eslintConfigPrettier = require("eslint-config-prettier");
/* eslint-enable @typescript-eslint/no-var-requires */

module.exports = tseslint.config(
{
files: ["**/*.{js,ts,tsx}"],
extends: [
eslint.configs.recommended,
...tseslint.configs.recommended,
...tseslint.configs.stylistic,
eslintConfigPrettier,
],
plugins: {
"@typescript-eslint": tseslint.plugin,
"@next/next": next,
react: react,
"react-hooks": reactHooks,
},
rules: {
...next.configs.recommended.rules,
...react.configs["jsx-runtime"].rules,
...reactHooks.configs.recommended.rules,
},
languageOptions: {
ecmaVersion: "latest",
parser: tseslint.parser,
parserOptions: {
project: true,
},
},
},
{
ignores: ["node_modules/**", ".next/**", "next-env.d.ts", "dist/**"],
},
);
13 changes: 9 additions & 4 deletions interface/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"start": "pnpm build && npx next start",
"prettier:check": "npx prettier -c \"**/*.{js,ts,tsx,css,md,json,yml,yaml}\"",
"prettier:fix": "npx prettier -w \"**/*.{js,ts,tsx,css,md,json,yml,yaml}\"",
"lint:check": "pnpm prettier:check && npx next lint",
"lint:fix": "pnpm prettier:fix && npx next lint --fix"
"lint:check": "pnpm prettier:check && npx eslint .",
"lint:fix": "pnpm prettier:fix && npx eslint . --fix"
},
"dependencies": {
"@headlessui/react": "^1.7.18",
Expand All @@ -40,18 +40,23 @@
"sharp": "^0.33.2"
},
"devDependencies": {
"@eslint/js": "^8.56.0",
"@next/eslint-plugin-next": "^14.1.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/node": "^20.11.17",
"@types/node": "^20.11.18",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"autoprefixer": "^10.4.17",
"eslint": "^8.56.0",
"eslint-config-next": "^14.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"next-seo": "^6.4.0",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.11",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3"
"typescript": "^5.3.3",
"typescript-eslint": "^7.0.1"
}
}
3 changes: 2 additions & 1 deletion interface/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@/*": ["./src/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"include": ["**/*.js", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"files": ["next-env.d.ts", "eslint.config.js"],
"exclude": ["node_modules"]
}
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 3 files
+1 −1 src/StdJson.sol
+51 −33 src/mocks/MockERC20.sol
+46 −32 src/mocks/MockERC721.sol
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts updated 23 files
+0 −5 .changeset/angry-dodos-grow.md
+0 −5 .changeset/brown-cooks-dress.md
+1 −1 .changeset/dirty-cobras-smile.md
+1 −1 .changeset/shiny-poets-whisper.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
+52 −6 contracts/utils/math/Math.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
+23 −0 test/helpers/math.js
+0 −3 test/helpers/random.js
+73 −55 test/utils/Arrays.test.js
+27 −0 test/utils/math/Math.t.sol
+79 −31 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
11 changes: 5 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,25 +109,24 @@
"prettier:fix:interface": "cd interface && pnpm prettier:fix",
"solhint:check": "npx solhint -c src/.solhint.json \"src/**/*.sol\" && npx solhint -c test/.solhint-tests.json \"test/**/*.sol\"",
"solhint:fix": "npx solhint -c src/.solhint.json \"src/**/*.sol\" --fix && npx solhint -c test/.solhint-tests.json \"test/**/*.sol\" --fix",
"lint:check": "pnpm prettier:check && pnpm solhint:check && npx eslint \"**/*.{js,ts}\"",
"lint:check": "pnpm prettier:check && pnpm solhint:check && npx eslint .",
"lint:check:interface": "cd interface && pnpm lint:check",
"lint:fix": "pnpm prettier:fix && pnpm solhint:fix && npx eslint \"**/*.{js,ts}\" --fix",
"lint:fix": "pnpm prettier:fix && pnpm solhint:fix && npx eslint . --fix",
"lint:fix:interface": "cd interface && pnpm lint:fix",
"dev:interface": "cd interface && pnpm dev",
"build:interface": "cd interface && pnpm build",
"start:interface": "cd interface && pnpm start"
},
"devDependencies": {
"@eslint/js": "^8.56.0",
"@nomicfoundation/hardhat-ethers": "^3.0.5",
"@nomicfoundation/hardhat-verify": "^2.0.4",
"@typechain/ethers-v6": "^0.5.1",
"@typechain/hardhat": "^9.1.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"ethers": "^6.11.0",
"hardhat": "^2.19.5",
"ethers": "^6.11.1",
"hardhat": "^2.20.0",
"hardhat-abi-exporter": "^2.10.1",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-gas-reporter": "^1.0.10",
Expand Down
Loading
Loading