Skip to content

Commit 73ace33

Browse files
authored
Update ESLint config from v7 to v9 (#220)
This update lets us remove all of the JSDoc rules, as they are now included in our base ESLint config.
1 parent 5f22594 commit 73ace33

4 files changed

Lines changed: 25 additions & 67 deletions

File tree

.eslintrc.js

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,6 @@ module.exports = {
2424
},
2525
],
2626
'no-param-reassign': 'off',
27-
28-
// TODO: Migrate these rules into the main ESLint config
29-
'jsdoc/check-access': 'error',
30-
'jsdoc/check-alignment': 'error',
31-
'jsdoc/check-indentation': 'error',
32-
'jsdoc/check-line-alignment': 'error',
33-
'jsdoc/check-param-names': 'error',
34-
'jsdoc/check-property-names': 'error',
35-
'jsdoc/check-syntax': 'error',
36-
'jsdoc/check-tag-names': 'error',
37-
'jsdoc/check-types': 'error',
38-
'jsdoc/check-values': 'error',
39-
'jsdoc/empty-tags': 'error',
40-
'jsdoc/implements-on-classes': 'error',
41-
'jsdoc/match-description': [
42-
'error',
43-
{ tags: { param: true, returns: true } },
44-
],
45-
'jsdoc/multiline-blocks': 'error',
46-
'jsdoc/newline-after-description': 'error',
47-
'jsdoc/no-bad-blocks': 'error',
48-
'jsdoc/no-defaults': 'error',
49-
'jsdoc/no-multi-asterisks': 'error',
50-
'jsdoc/no-types': 'error',
51-
'jsdoc/require-asterisk-prefix': 'error',
52-
'jsdoc/require-description': 'error',
53-
'jsdoc/require-hyphen-before-param-description': [
54-
'error',
55-
'always',
56-
{ tags: { returns: 'never' } },
57-
],
58-
'jsdoc/require-jsdoc': 'error',
59-
'jsdoc/require-param-name': 'error',
60-
'jsdoc/require-param': ['error', { unnamedRootBase: ['options'] }],
61-
'jsdoc/require-param-description': 'error',
62-
'jsdoc/require-property': 'error',
63-
'jsdoc/require-property-description': 'error',
64-
'jsdoc/require-property-name': 'error',
65-
'jsdoc/require-returns': 'error',
66-
'jsdoc/require-returns-check': 'error',
67-
'jsdoc/require-returns-description': 'error',
68-
'jsdoc/require-yields': 'error',
69-
'jsdoc/require-yields-check': 'error',
70-
'jsdoc/tag-lines': 'error',
7127
},
7228
ignorePatterns: ['!.eslintrc.js', 'test/*.js', 'dist'],
7329
};

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
"@gudahtt/typedoc": "^0.23.0",
5555
"@lavamoat/allow-scripts": "^1.0.6",
5656
"@metamask/auto-changelog": "^2.4.0",
57-
"@metamask/eslint-config": "^7.0.1",
58-
"@metamask/eslint-config-jest": "^7.0.0",
59-
"@metamask/eslint-config-nodejs": "^7.0.0",
60-
"@metamask/eslint-config-typescript": "^7.0.1",
57+
"@metamask/eslint-config": "^9.0.0",
58+
"@metamask/eslint-config-jest": "^9.0.0",
59+
"@metamask/eslint-config-nodejs": "^9.0.0",
60+
"@metamask/eslint-config-typescript": "^9.0.1",
6161
"@types/jest": "^26.0.24",
6262
"@types/node": "^14.14.25",
6363
"@typescript-eslint/eslint-plugin": "^4.28.2",

src/sign-typed-data.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ function sanitizeData<T extends MessageTypes>(
366366
sanitizedData[key] = data[key];
367367
}
368368
}
369+
369370
if ('types' in sanitizedData) {
370371
sanitizedData.types = { EIP712Domain: [], ...sanitizedData.types };
371372
}
@@ -400,6 +401,7 @@ function eip712Hash<T extends MessageTypes>(
400401
version,
401402
),
402403
);
404+
403405
if (sanitizedData.primaryType !== 'EIP712Domain') {
404406
parts.push(
405407
hashStruct(

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -582,25 +582,25 @@
582582
semver "^7.3.5"
583583
yargs "^17.0.1"
584584

585-
"@metamask/eslint-config-jest@^7.0.0":
586-
version "7.0.0"
587-
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-jest/-/eslint-config-jest-7.0.0.tgz#81612aaf5307c3d65bb43366000233cd0b6e9db4"
588-
integrity sha512-3IBJ985sC7Xfo8NlaUzNbfFDvt0+8YDvbC0yxDoRjPvi/o+bu7O/0SRIq0TDTOTfBZ8aMsxopq5uxVmU6ed21g==
589-
590-
"@metamask/eslint-config-nodejs@^7.0.0":
591-
version "7.0.1"
592-
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-nodejs/-/eslint-config-nodejs-7.0.1.tgz#7d3214b2c8eccfe2dbc9156b484456dce2dca91c"
593-
integrity sha512-V9C1jYuLnhZOhW9dAKB7zMDmDKS1r907rYirUMcoU4mi8ggPTP6JqT87EAEX9bsA2ZpeTYXUXf5bkfLM+BTGyA==
594-
595-
"@metamask/eslint-config-typescript@^7.0.1":
596-
version "7.0.1"
597-
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-typescript/-/eslint-config-typescript-7.0.1.tgz#e013f7f0505741b9321cab21351136f651abbba6"
598-
integrity sha512-nqWivz9XHjiHAE2Aqf/y+p8R3xDoN9ScX2i97vtTxNKjAqkzmUwAd8lEHEibRfPOYaRBQJ0x85wrof++PpLfZg==
599-
600-
"@metamask/eslint-config@^7.0.1":
601-
version "7.0.1"
602-
resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-7.0.1.tgz#eeb87baa902965ca7931c26911d7027373706f34"
603-
integrity sha512-dMZ+iyZrHdZK0D1uStTx8UN6Q6IK9YGbqPUwxgTj63M0mZOsuqs8qpGf+9Dn7uqS+8Oe9jNqejKxozjTiJvsEw==
585+
"@metamask/eslint-config-jest@^9.0.0":
586+
version "9.0.0"
587+
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-jest/-/eslint-config-jest-9.0.0.tgz#516fdf1f03f6f006b26ca790bf748e2189d19d17"
588+
integrity sha512-tImEEWNRedcIMHZ3pmXDAQ+6xS61G3IEyqKf2+1xSMEMaa94KM+vo6v3GM7YB+M1DsErzgx3g70fEYtPItU4pw==
589+
590+
"@metamask/eslint-config-nodejs@^9.0.0":
591+
version "9.0.0"
592+
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-nodejs/-/eslint-config-nodejs-9.0.0.tgz#ec737a47c04febfb921ce844362d875ca2cae9e7"
593+
integrity sha512-kPUrMPdpGeapbdG+LxysnDNzM9SlBNUvqVl1XoKnOGjo1pbZXB8hOI36PT3IlR1qa2FJumKYfgDSu7JLmOLxqQ==
594+
595+
"@metamask/eslint-config-typescript@^9.0.1":
596+
version "9.0.1"
597+
resolved "https://registry.yarnpkg.com/@metamask/eslint-config-typescript/-/eslint-config-typescript-9.0.1.tgz#900d53579ce074734ac9bf4e3f66fc20b92bd6af"
598+
integrity sha512-+W7MXCoq8Q29wvkAv0ycwKB82xMbl+LfkUoM8oWN4n7vyMDXgcgbNjY7ug+quJPZfDTJJ7fxgPmG8m4LrkEImw==
599+
600+
"@metamask/eslint-config@^9.0.0":
601+
version "9.0.0"
602+
resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f"
603+
integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A==
604604

605605
"@nodelib/fs.scandir@2.1.4":
606606
version "2.1.4"

0 commit comments

Comments
 (0)