Skip to content

Commit f76d1b4

Browse files
trivikrtrivikr
authored
chore(deps-dev): use eslint-plugin-import (#476)
1 parent 17b3440 commit f76d1b4

File tree

9 files changed

+162
-22
lines changed

9 files changed

+162
-22
lines changed

‎.eslintrc.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
{
22
"root": true,
33
"parser": "@typescript-eslint/parser",
4-
"plugins": ["@typescript-eslint", "simple-import-sort"],
5-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
4+
"plugins": ["@typescript-eslint"],
5+
"extends": [
6+
"eslint:recommended",
7+
"plugin:import/recommended",
8+
"plugin:@typescript-eslint/recommended"
9+
],
610
"rules": {
7-
"simple-import-sort/imports": "error",
8-
"simple-import-sort/exports": "error",
11+
"import/order": "error",
12+
"import/first": "error",
13+
"import/no-mutable-exports": "error",
14+
"import/no-unresolved": "off",
915
"@typescript-eslint/array-type": ["error", { "default": "array" }],
1016
"@typescript-eslint/naming-convention": [
1117
"error",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@typescript-eslint/parser": "^5.55.0",
5151
"aws-sdk": "2.1319.0",
5252
"eslint": "^8.36.0",
53-
"eslint-plugin-simple-import-sort": "^10.0.0",
53+
"eslint-plugin-import": "^2.27.5",
5454
"lint-staged": "^13.0.3",
5555
"prettier": "2.8.3",
5656
"simple-git-hooks": "^2.8.1",

‎src/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2525
// @ts-nocheck
26-
import Runner from "jscodeshift/dist/Runner";
2726
import path from "path";
27+
import Runner from "jscodeshift/dist/Runner";
2828

2929
import {
3030
getHelpParagraph,

‎src/transforms/v2-to-v3/apis/removePromiseForCallExpression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ASTPath, CallExpression, JSCodeshift, MemberExpression } from "jscodeshift";
21
import { emitWarning } from "process";
2+
import { ASTPath, CallExpression, JSCodeshift, MemberExpression } from "jscodeshift";
33

44
export const removePromiseForCallExpression = (
55
j: JSCodeshift,

‎src/transforms/v2-to-v3/client-names/getClientNamesRecordFromImport.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Collection, Identifier, ImportSpecifier, JSCodeshift } from "jscodeshift";
22

33
import { CLIENT_NAMES, PACKAGE_NAME } from "../config";
4-
import { getImportEqualsDeclarationType } from "../modules";
5-
import { getImportSpecifiers } from "../modules";
4+
import { getImportEqualsDeclarationType, getImportSpecifiers } from "../modules";
65
import { getClientDeepImportPath } from "../utils";
76

87
export const getClientNamesRecordFromImport = (

‎src/transforms/v2-to-v3/modules/getImportSpecifiers.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
import { Collection, JSCodeshift } from "jscodeshift";
2-
import { ImportDefaultSpecifier, ImportNamespaceSpecifier, ImportSpecifier } from "jscodeshift";
1+
import {
2+
Collection,
3+
JSCodeshift,
4+
ImportDefaultSpecifier,
5+
ImportNamespaceSpecifier,
6+
ImportSpecifier,
7+
} from "jscodeshift";
38

49
export const getImportSpecifiers = (
510
j: JSCodeshift,

‎src/transforms/v2-to-v3/transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { readdirSync } from "fs";
22
import { readFile } from "fs/promises";
3-
import jscodeshift from "jscodeshift";
43
import { join } from "path";
4+
import jscodeshift from "jscodeshift";
55
import { describe, expect, it } from "vitest";
66

77
import transform from "./transformer";

‎src/utils/getJsCodeshiftParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// @ts-nocheck
66

77
import { readFileSync } from "fs";
8-
import argsParser from "jscodeshift/dist/argsParser";
98
import { dirname, join } from "path";
9+
import argsParser from "jscodeshift/dist/argsParser";
1010

1111
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
1212
// @ts-ignore: package.json will be imported from dist folders

‎yarn.lock

Lines changed: 139 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,13 @@ __metadata:
13151315
languageName: node
13161316
linkType: hard
13171317

1318+
"@types/json5@npm:^0.0.29":
1319+
version: 0.0.29
1320+
resolution: "@types/json5@npm:0.0.29"
1321+
checksum: e60b153664572116dfea673c5bda7778dbff150498f44f998e34b5886d8afc47f16799280e4b6e241c0472aef1bc36add771c569c68fc5125fc2ae519a3eb9ac
1322+
languageName: node
1323+
linkType: hard
1324+
13181325
"@types/minimist@npm:^1.2.0":
13191326
version: 1.2.2
13201327
resolution: "@types/minimist@npm:1.2.2"
@@ -1698,14 +1705,27 @@ __metadata:
16981705
languageName: node
16991706
linkType: hard
17001707

1708+
"array-includes@npm:^3.1.6":
1709+
version: 3.1.6
1710+
resolution: "array-includes@npm:3.1.6"
1711+
dependencies:
1712+
call-bind: ^1.0.2
1713+
define-properties: ^1.1.4
1714+
es-abstract: ^1.20.4
1715+
get-intrinsic: ^1.1.3
1716+
is-string: ^1.0.7
1717+
checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5
1718+
languageName: node
1719+
linkType: hard
1720+
17011721
"array-union@npm:^2.1.0":
17021722
version: 2.1.0
17031723
resolution: "array-union@npm:2.1.0"
17041724
checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
17051725
languageName: node
17061726
linkType: hard
17071727

1708-
"array.prototype.flat@npm:^1.2.3":
1728+
"array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.3.1":
17091729
version: 1.3.1
17101730
resolution: "array.prototype.flat@npm:1.3.1"
17111731
dependencies:
@@ -1717,6 +1737,18 @@ __metadata:
17171737
languageName: node
17181738
linkType: hard
17191739

1740+
"array.prototype.flatmap@npm:^1.3.1":
1741+
version: 1.3.1
1742+
resolution: "array.prototype.flatmap@npm:1.3.1"
1743+
dependencies:
1744+
call-bind: ^1.0.2
1745+
define-properties: ^1.1.4
1746+
es-abstract: ^1.20.4
1747+
es-shim-unscopables: ^1.0.0
1748+
checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987
1749+
languageName: node
1750+
linkType: hard
1751+
17201752
"arrify@npm:^1.0.1":
17211753
version: 1.0.1
17221754
resolution: "arrify@npm:1.0.1"
@@ -1775,7 +1807,7 @@ __metadata:
17751807
"@typescript-eslint/parser": ^5.55.0
17761808
aws-sdk: 2.1319.0
17771809
eslint: ^8.36.0
1778-
eslint-plugin-simple-import-sort: ^10.0.0
1810+
eslint-plugin-import: ^2.27.5
17791811
jscodeshift: 0.14.0
17801812
lint-staged: ^13.0.3
17811813
prettier: 2.8.3
@@ -2272,6 +2304,15 @@ __metadata:
22722304
languageName: node
22732305
linkType: hard
22742306

2307+
"debug@npm:^3.2.7":
2308+
version: 3.2.7
2309+
resolution: "debug@npm:3.2.7"
2310+
dependencies:
2311+
ms: ^2.1.1
2312+
checksum: b3d8c5940799914d30314b7c3304a43305fd0715581a919dacb8b3176d024a782062368405b47491516d2091d6462d4d11f2f4974a405048094f8bfebfa3071c
2313+
languageName: node
2314+
linkType: hard
2315+
22752316
"decamelize-keys@npm:^1.1.0":
22762317
version: 1.1.1
22772318
resolution: "decamelize-keys@npm:1.1.1"
@@ -2361,6 +2402,15 @@ __metadata:
23612402
languageName: node
23622403
linkType: hard
23632404

2405+
"doctrine@npm:^2.1.0":
2406+
version: 2.1.0
2407+
resolution: "doctrine@npm:2.1.0"
2408+
dependencies:
2409+
esutils: ^2.0.2
2410+
checksum: a45e277f7feaed309fe658ace1ff286c6e2002ac515af0aaf37145b8baa96e49899638c7cd47dccf84c3d32abfc113246625b3ac8f552d1046072adee13b0dc8
2411+
languageName: node
2412+
linkType: hard
2413+
23642414
"doctrine@npm:^3.0.0":
23652415
version: 3.0.0
23662416
resolution: "doctrine@npm:3.0.0"
@@ -2686,12 +2736,51 @@ __metadata:
26862736
languageName: node
26872737
linkType: hard
26882738

2689-
"eslint-plugin-simple-import-sort@npm:^10.0.0":
2690-
version: 10.0.0
2691-
resolution: "eslint-plugin-simple-import-sort@npm:10.0.0"
2739+
"eslint-import-resolver-node@npm:^0.3.7":
2740+
version: 0.3.7
2741+
resolution: "eslint-import-resolver-node@npm:0.3.7"
2742+
dependencies:
2743+
debug: ^3.2.7
2744+
is-core-module: ^2.11.0
2745+
resolve: ^1.22.1
2746+
checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e
2747+
languageName: node
2748+
linkType: hard
2749+
2750+
"eslint-module-utils@npm:^2.7.4":
2751+
version: 2.7.4
2752+
resolution: "eslint-module-utils@npm:2.7.4"
2753+
dependencies:
2754+
debug: ^3.2.7
2755+
peerDependenciesMeta:
2756+
eslint:
2757+
optional: true
2758+
checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7
2759+
languageName: node
2760+
linkType: hard
2761+
2762+
"eslint-plugin-import@npm:^2.27.5":
2763+
version: 2.27.5
2764+
resolution: "eslint-plugin-import@npm:2.27.5"
2765+
dependencies:
2766+
array-includes: ^3.1.6
2767+
array.prototype.flat: ^1.3.1
2768+
array.prototype.flatmap: ^1.3.1
2769+
debug: ^3.2.7
2770+
doctrine: ^2.1.0
2771+
eslint-import-resolver-node: ^0.3.7
2772+
eslint-module-utils: ^2.7.4
2773+
has: ^1.0.3
2774+
is-core-module: ^2.11.0
2775+
is-glob: ^4.0.3
2776+
minimatch: ^3.1.2
2777+
object.values: ^1.1.6
2778+
resolve: ^1.22.1
2779+
semver: ^6.3.0
2780+
tsconfig-paths: ^3.14.1
26922781
peerDependencies:
2693-
eslint: ">=5.0.0"
2694-
checksum: 23221ff63f80f9c52da807d388ee8a51bc36a3b73345f60ec886e7973c28d75eb1d1e47f7f2916a7c1f94a1b5037b1450356a64a8fbd58096fd6bee57c6e3e48
2782+
eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
2783+
checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d
26952784
languageName: node
26962785
linkType: hard
26972786

@@ -3584,7 +3673,7 @@ __metadata:
35843673
languageName: node
35853674
linkType: hard
35863675

3587-
"is-core-module@npm:^2.9.0":
3676+
"is-core-module@npm:^2.11.0, is-core-module@npm:^2.9.0":
35883677
version: 2.11.0
35893678
resolution: "is-core-module@npm:2.11.0"
35903679
dependencies:
@@ -3902,6 +3991,17 @@ __metadata:
39023991
languageName: node
39033992
linkType: hard
39043993

3994+
"json5@npm:^1.0.2":
3995+
version: 1.0.2
3996+
resolution: "json5@npm:1.0.2"
3997+
dependencies:
3998+
minimist: ^1.2.0
3999+
bin:
4000+
json5: lib/cli.js
4001+
checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
4002+
languageName: node
4003+
linkType: hard
4004+
39054005
"json5@npm:^2.2.2":
39064006
version: 2.2.3
39074007
resolution: "json5@npm:2.2.3"
@@ -4270,6 +4370,13 @@ __metadata:
42704370
languageName: node
42714371
linkType: hard
42724372

4373+
"minimist@npm:^1.2.0, minimist@npm:^1.2.6":
4374+
version: 1.2.8
4375+
resolution: "minimist@npm:1.2.8"
4376+
checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
4377+
languageName: node
4378+
linkType: hard
4379+
42734380
"minipass-collect@npm:^1.0.2":
42744381
version: 1.0.2
42754382
resolution: "minipass-collect@npm:1.0.2"
@@ -4382,7 +4489,7 @@ __metadata:
43824489
languageName: node
43834490
linkType: hard
43844491

4385-
"ms@npm:^2.0.0":
4492+
"ms@npm:^2.0.0, ms@npm:^2.1.1":
43864493
version: 2.1.3
43874494
resolution: "ms@npm:2.1.3"
43884495
checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -4539,6 +4646,17 @@ __metadata:
45394646
languageName: node
45404647
linkType: hard
45414648

4649+
"object.values@npm:^1.1.6":
4650+
version: 1.1.6
4651+
resolution: "object.values@npm:1.1.6"
4652+
dependencies:
4653+
call-bind: ^1.0.2
4654+
define-properties: ^1.1.4
4655+
es-abstract: ^1.20.4
4656+
checksum: f6fff9fd817c24cfd8107f50fb33061d81cd11bacc4e3dbb3852e9ff7692fde4dbce823d4333ea27cd9637ef1b6690df5fbb61f1ed314fa2959598dc3ae23d8e
4657+
languageName: node
4658+
linkType: hard
4659+
45424660
"once@npm:^1.3.0":
45434661
version: 1.4.0
45444662
resolution: "once@npm:1.4.0"
@@ -5771,6 +5889,18 @@ __metadata:
57715889
languageName: node
57725890
linkType: hard
57735891

5892+
"tsconfig-paths@npm:^3.14.1":
5893+
version: 3.14.2
5894+
resolution: "tsconfig-paths@npm:3.14.2"
5895+
dependencies:
5896+
"@types/json5": ^0.0.29
5897+
json5: ^1.0.2
5898+
minimist: ^1.2.6
5899+
strip-bom: ^3.0.0
5900+
checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447
5901+
languageName: node
5902+
linkType: hard
5903+
57745904
"tslib@npm:^1.8.1":
57755905
version: 1.14.1
57765906
resolution: "tslib@npm:1.14.1"

0 commit comments

Comments
 (0)