Skip to content

Commit 52315f2

Browse files
authored
Merge pull request #992 from wantedly/kobayang/eslint-v8
Bump eslint version to v8
2 parents 73c8f16 + ab597fc commit 52315f2

23 files changed

+1409
-1666
lines changed

.scaffdog/eslint-plugin-wantedly-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const RULE = linter.getRules().get(RULE_NAME) as Rule.RuleModule;
4646
import { RuleTester } from "eslint";
4747
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
4848
// @ts-ignore
49-
import ESLintConfigWantedly from "eslint-config-wantedly/without-react";
49+
import ESLintConfigWantedly from "eslint-config-wantedly-typescript";
5050
import { RULE, RULE_NAME } from "../{{ input }}";
5151

5252
new RuleTester({

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"@types/eslint": "^7.2.13",
88
"@types/estree": "^0.0.50",
99
"@types/graphql": "^14.5.0",
10-
"@types/jest": "^26.0.23",
11-
"jest": "^26.6.3",
10+
"@types/jest": "^27.4.0",
11+
"jest": "^27.4.7",
1212
"lerna": "^4.0.0",
1313
"lerna-changelog": "^1.0.1",
1414
"mock-fs": "^5.0.0",
1515
"pacote": "^11.3.4",
1616
"scaffdog": "^1.0.1",
17-
"ts-jest": "^26.5.6",
17+
"ts-jest": "^27.1.3",
1818
"typescript": "^4.4.0"
1919
},
2020
"workspaces": [

packages/eslint-config-wantedly-typescript/__tests__/__snapshots__/index.test.js.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ Object {
129129
"@typescript-eslint/no-inferrable-types": Array [
130130
"error",
131131
],
132+
"@typescript-eslint/no-loss-of-precision": Array [
133+
"error",
134+
],
132135
"@typescript-eslint/no-misused-new": Array [
133136
"error",
134137
],
@@ -147,6 +150,9 @@ Object {
147150
"@typescript-eslint/no-this-alias": Array [
148151
"error",
149152
],
153+
"@typescript-eslint/no-unnecessary-type-constraint": Array [
154+
"error",
155+
],
150156
"@typescript-eslint/no-unused-vars": Array [
151157
"error",
152158
Object {
@@ -522,6 +528,9 @@ Object {
522528
"no-lonely-if": Array [
523529
"warn",
524530
],
531+
"no-loss-of-precision": Array [
532+
"off",
533+
],
525534
"no-mixed-operators": Array [
526535
"warn",
527536
Object {

packages/eslint-config-wantedly-typescript/__tests__/__snapshots__/without-react.test.js.snap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ Object {
126126
"@typescript-eslint/no-inferrable-types": Array [
127127
"error",
128128
],
129+
"@typescript-eslint/no-loss-of-precision": Array [
130+
"error",
131+
],
129132
"@typescript-eslint/no-misused-new": Array [
130133
"error",
131134
],
@@ -144,6 +147,9 @@ Object {
144147
"@typescript-eslint/no-this-alias": Array [
145148
"error",
146149
],
150+
"@typescript-eslint/no-unnecessary-type-constraint": Array [
151+
"error",
152+
],
147153
"@typescript-eslint/no-unused-vars": Array [
148154
"error",
149155
Object {
@@ -519,6 +525,9 @@ Object {
519525
"no-lonely-if": Array [
520526
"warn",
521527
],
528+
"no-loss-of-precision": Array [
529+
"off",
530+
],
522531
"no-mixed-operators": Array [
523532
"warn",
524533
Object {
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/* @ts-check */
2+
3+
// temporary workaround - https://github.com/facebook/jest/issues/9771#issuecomment-871585234
4+
const resolver = require("enhanced-resolve").create.sync({
5+
conditionNames: ["require", "node", "default"],
6+
extensions: [".js", ".json", ".node", ".ts", ".tsx"],
7+
});
8+
9+
/**
10+
* @param request {unknown}
11+
* @param options {{ defaultResolver(...args: unknown[]): unknown, basedir: unknown }}
12+
* @returns {unknown}
13+
*/
14+
module.exports = function (request, options) {
15+
// list global module that must be resolved by defaultResolver here
16+
if (["fs", "http", "path"].includes(request)) {
17+
return options.defaultResolver(request, options);
18+
}
19+
return resolver(options.basedir, request);
20+
};

packages/eslint-config-wantedly-typescript/package.json

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
"version": "2.8.3",
55
"author": "Yuki Yamada <yamada@wantedly.com>",
66
"dependencies": {
7-
"@typescript-eslint/eslint-plugin": "^4.32.0",
8-
"@typescript-eslint/parser": "^4.32.0",
9-
"eslint": "^7.32.0",
7+
"@typescript-eslint/eslint-plugin": "^5.10.0",
8+
"@typescript-eslint/parser": "^5.10.0",
9+
"eslint": "^8.7.0",
1010
"eslint-config-prettier": "^8.3.0",
11-
"eslint-plugin-import": "^2.23.4",
12-
"eslint-plugin-jest": "^24.3.6",
13-
"eslint-plugin-jsx-a11y": "^6.4.1",
14-
"eslint-plugin-prettier": "^3.4.0",
15-
"eslint-plugin-react": "^7.24.0",
16-
"eslint-plugin-react-hooks": "^4.2.0",
11+
"eslint-plugin-import": "^2.25.4",
12+
"eslint-plugin-jest": "^25.7.0",
13+
"eslint-plugin-jsx-a11y": "^6.5.1",
14+
"eslint-plugin-prettier": "^4.0.0",
15+
"eslint-plugin-react": "^7.28.0",
16+
"eslint-plugin-react-hooks": "^4.3.0",
1717
"eslint-plugin-use-macros": "^2.8.3",
1818
"eslint-plugin-wantedly": "^2.8.3"
1919
},
2020
"peerDependencies": {
21-
"typescript": ">=3.3.1 <4.5.0"
21+
"typescript": ">=3.3.1 <4.6.0"
2222
},
2323
"homepage": "https://github.com/wantedly/frolint",
2424
"keywords": [
@@ -33,5 +33,11 @@
3333
"repository": "https://github.com/wantedly/frolint/tree/master/packages/eslint-config-wantedly-typescript",
3434
"scripts": {
3535
"test": "jest"
36+
},
37+
"jest": {
38+
"resolver": "./export_maps_resolver.js"
39+
},
40+
"devDependencies": {
41+
"enhanced-resolve": "^5.8.3"
3642
}
3743
}

packages/eslint-config-wantedly/__tests__/__snapshots__/index.test.js.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,9 @@ Object {
438438
"no-lonely-if": Array [
439439
"warn",
440440
],
441+
"no-loss-of-precision": Array [
442+
"error",
443+
],
441444
"no-misleading-character-class": Array [
442445
"error",
443446
],
@@ -477,6 +480,9 @@ Object {
477480
"no-new-symbol": Array [
478481
"error",
479482
],
483+
"no-nonoctal-decimal-escape": Array [
484+
"error",
485+
],
480486
"no-obj-calls": Array [
481487
"error",
482488
],
@@ -552,6 +558,9 @@ Object {
552558
"no-unsafe-negation": Array [
553559
"error",
554560
],
561+
"no-unsafe-optional-chaining": Array [
562+
"error",
563+
],
555564
"no-unused-labels": Array [
556565
"error",
557566
],
@@ -565,6 +574,9 @@ Object {
565574
"no-use-before-define": Array [
566575
"off",
567576
],
577+
"no-useless-backreference": Array [
578+
"error",
579+
],
568580
"no-useless-catch": Array [
569581
"error",
570582
],

packages/eslint-config-wantedly/__tests__/__snapshots__/without-react.test.js.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,9 @@ Object {
436436
"no-lonely-if": Array [
437437
"warn",
438438
],
439+
"no-loss-of-precision": Array [
440+
"error",
441+
],
439442
"no-misleading-character-class": Array [
440443
"error",
441444
],
@@ -475,6 +478,9 @@ Object {
475478
"no-new-symbol": Array [
476479
"error",
477480
],
481+
"no-nonoctal-decimal-escape": Array [
482+
"error",
483+
],
478484
"no-obj-calls": Array [
479485
"error",
480486
],
@@ -550,6 +556,9 @@ Object {
550556
"no-unsafe-negation": Array [
551557
"error",
552558
],
559+
"no-unsafe-optional-chaining": Array [
560+
"error",
561+
],
553562
"no-unused-labels": Array [
554563
"error",
555564
],
@@ -563,6 +572,9 @@ Object {
563572
"no-use-before-define": Array [
564573
"off",
565574
],
575+
"no-useless-backreference": Array [
576+
"error",
577+
],
566578
"no-useless-catch": Array [
567579
"error",
568580
],

packages/eslint-config-wantedly/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"author": "Yuki Yamada <yamada@wantedly.com>",
66
"dependencies": {
77
"babel-eslint": "^10.1.0",
8-
"eslint": "^7.32.0",
8+
"eslint": "^8.7.0",
99
"eslint-config-prettier": "^8.3.0",
1010
"eslint-plugin-es": "^4.1.0",
11-
"eslint-plugin-import": "^2.23.4",
12-
"eslint-plugin-jest": "^24.3.6",
13-
"eslint-plugin-jsx-a11y": "^6.4.1",
14-
"eslint-plugin-prettier": "^3.4.0",
15-
"eslint-plugin-react": "^7.24.0",
16-
"eslint-plugin-react-hooks": "^4.2.0",
11+
"eslint-plugin-import": "^2.25.4",
12+
"eslint-plugin-jest": "^25.7.0",
13+
"eslint-plugin-jsx-a11y": "^6.5.1",
14+
"eslint-plugin-prettier": "^4.0.0",
15+
"eslint-plugin-react": "^7.28.0",
16+
"eslint-plugin-react-hooks": "^4.3.0",
1717
"eslint-plugin-use-macros": "^2.8.3"
1818
},
1919
"homepage": "https://github.com/wantedly/frolint",

packages/eslint-plugin-use-macros/__tests__/GraphQLTag.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const RuleTester = require("eslint").RuleTester;
2-
const ESLintConfigWantedly = require("eslint-config-wantedly/without-react");
2+
const ESLintConfigWantedly = require("eslint-config-wantedly-typescript");
33
const GraphQLTagRule = require("../rules/GraphQLTag");
44

55
RuleTester.setDefaultConfig({

0 commit comments

Comments
 (0)