diff --git a/.pnp.cjs b/.pnp.cjs index 18795b871..71c2a2a99 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -112,7 +112,7 @@ const RAW_RUNTIME_STATE = ["eslint", "npm:8.18.0"],\ ["eslint-config-prettier", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:8.5.0"],\ ["eslint-import-resolver-node", "npm:0.3.6"],\ - ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.7.1"],\ + ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:3.6.1"],\ ["eslint-plugin-import", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.26.0"],\ ["eslint-plugin-prettier", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:4.0.0"],\ ["eslint-plugin-react", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:7.30.1"],\ @@ -272,7 +272,7 @@ const RAW_RUNTIME_STATE = ["eslint", "npm:8.18.0"],\ ["eslint-config-prettier", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:8.5.0"],\ ["eslint-import-resolver-node", "npm:0.3.6"],\ - ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.7.1"],\ + ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:3.6.1"],\ ["eslint-plugin-import", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.26.0"],\ ["eslint-plugin-prettier", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:4.0.0"],\ ["eslint-plugin-react", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:7.30.1"],\ @@ -10844,26 +10844,28 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["eslint-import-resolver-typescript", [\ - ["npm:2.7.1", {\ - "packageLocation": "./.yarn/cache/eslint-import-resolver-typescript-npm-2.7.1-2dfe313e23-4a68844039.zip/node_modules/eslint-import-resolver-typescript/",\ + ["npm:3.6.1", {\ + "packageLocation": "./.yarn/cache/eslint-import-resolver-typescript-npm-3.6.1-994bbf65fc-261df24721.zip/node_modules/eslint-import-resolver-typescript/",\ "packageDependencies": [\ - ["eslint-import-resolver-typescript", "npm:2.7.1"]\ + ["eslint-import-resolver-typescript", "npm:3.6.1"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.7.1", {\ - "packageLocation": "./.yarn/__virtual__/eslint-import-resolver-typescript-virtual-7995fb732c/0/cache/eslint-import-resolver-typescript-npm-2.7.1-2dfe313e23-4a68844039.zip/node_modules/eslint-import-resolver-typescript/",\ + ["virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:3.6.1", {\ + "packageLocation": "./.yarn/__virtual__/eslint-import-resolver-typescript-virtual-336e73f577/0/cache/eslint-import-resolver-typescript-npm-3.6.1-994bbf65fc-261df24721.zip/node_modules/eslint-import-resolver-typescript/",\ "packageDependencies": [\ - ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.7.1"],\ + ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:3.6.1"],\ ["@types/eslint", null],\ ["@types/eslint-plugin-import", null],\ ["debug", "virtual:428f325a939c2653ad822eb3d75efb02ac311523dd0d4f9645afc39ea00bd86eceac35a9d59c9b6977d76b670a4ef0ae057ea572338a44729aa592711a8c05a3#npm:4.3.5"],\ + ["enhanced-resolve", "npm:5.17.0"],\ ["eslint", "npm:8.18.0"],\ + ["eslint-module-utils", "virtual:336e73f577c36460a3f374d1eef3b22470ced5bcc4e4f5abab644f4accb2ecd4c5ee4a7330a59a5b60c19f510f9d5c9dc61c31a8c49d388834ef00a85331fb56#npm:2.8.1"],\ ["eslint-plugin-import", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:2.26.0"],\ - ["glob", "npm:7.2.3"],\ - ["is-glob", "npm:4.0.3"],\ - ["resolve", "patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d"],\ - ["tsconfig-paths", "npm:3.15.0"]\ + ["fast-glob", "npm:3.3.2"],\ + ["get-tsconfig", "npm:4.7.5"],\ + ["is-core-module", "npm:2.14.0"],\ + ["is-glob", "npm:4.0.3"]\ ],\ "packagePeers": [\ "@types/eslint-plugin-import",\ @@ -10882,6 +10884,36 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ + ["virtual:336e73f577c36460a3f374d1eef3b22470ced5bcc4e4f5abab644f4accb2ecd4c5ee4a7330a59a5b60c19f510f9d5c9dc61c31a8c49d388834ef00a85331fb56#npm:2.8.1", {\ + "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-8cc995dc10/0/cache/eslint-module-utils-npm-2.8.1-c9aeb3ec2c-3e7892c0a9.zip/node_modules/eslint-module-utils/",\ + "packageDependencies": [\ + ["eslint-module-utils", "virtual:336e73f577c36460a3f374d1eef3b22470ced5bcc4e4f5abab644f4accb2ecd4c5ee4a7330a59a5b60c19f510f9d5c9dc61c31a8c49d388834ef00a85331fb56#npm:2.8.1"],\ + ["@types/eslint", null],\ + ["@types/eslint-import-resolver-node", null],\ + ["@types/eslint-import-resolver-typescript", null],\ + ["@types/eslint-import-resolver-webpack", null],\ + ["@types/typescript-eslint__parser", null],\ + ["@typescript-eslint/parser", null],\ + ["debug", "virtual:d9426786c635bc4b52511d6cc4b56156f50d780a698c0e20fc6caf10d3be51cbf176e79cff882f4d42a23ff4d0f89fe94222849578214e7fbae0f2754c82af02#npm:3.2.7"],\ + ["eslint", "npm:8.18.0"],\ + ["eslint-import-resolver-node", null],\ + ["eslint-import-resolver-typescript", "virtual:f84dba857fa10247bbb4af28a825f1d91a188c858b2b2b1b4a2d3cfedf850e14647ec99dabfb1535752c99ec0ff164e2ec4fb4c32c822be66b30b3cfa4630990#npm:3.6.1"],\ + ["eslint-import-resolver-webpack", null]\ + ],\ + "packagePeers": [\ + "@types/eslint-import-resolver-node",\ + "@types/eslint-import-resolver-typescript",\ + "@types/eslint-import-resolver-webpack",\ + "@types/eslint",\ + "@types/typescript-eslint__parser",\ + "@typescript-eslint/parser",\ + "eslint-import-resolver-node",\ + "eslint-import-resolver-typescript",\ + "eslint-import-resolver-webpack",\ + "eslint"\ + ],\ + "linkType": "HARD"\ + }],\ ["virtual:6734cab2dcc971707730bcfb67a3c4e9fb4e60774e7244ca185eb3140e9795135291732e484c906ccff45b41cdee276b1f788f5f3c6d106234a42ca5fc222d99#npm:2.8.1", {\ "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-d10f1667ec/0/cache/eslint-module-utils-npm-2.8.1-c9aeb3ec2c-3e7892c0a9.zip/node_modules/eslint-module-utils/",\ "packageDependencies": [\ @@ -12263,6 +12295,16 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["get-tsconfig", [\ + ["npm:4.7.5", {\ + "packageLocation": "./.yarn/cache/get-tsconfig-npm-4.7.5-0e53a23e62-de7de5e497.zip/node_modules/get-tsconfig/",\ + "packageDependencies": [\ + ["get-tsconfig", "npm:4.7.5"],\ + ["resolve-pkg-maps", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["get-value", [\ ["npm:2.0.6", {\ "packageLocation": "./.yarn/cache/get-value-npm-2.0.6-03cd422e0a-5c3b99cb53.zip/node_modules/get-value/",\ @@ -17874,6 +17916,15 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["resolve-pkg-maps", [\ + ["npm:1.0.0", {\ + "packageLocation": "./.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-0763150adf.zip/node_modules/resolve-pkg-maps/",\ + "packageDependencies": [\ + ["resolve-pkg-maps", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["resolve-protobuf-schema", [\ ["npm:2.1.0", {\ "packageLocation": "./.yarn/cache/resolve-protobuf-schema-npm-2.1.0-56c0d37a08-88fffab2a3.zip/node_modules/resolve-protobuf-schema/",\ diff --git a/.yarn/cache/@next-swc-win32-x64-msvc-npm-12.3.4-54d10742b1-10.zip b/.yarn/cache/@next-swc-linux-x64-gnu-npm-12.3.4-97054948a9-10.zip similarity index 63% rename from .yarn/cache/@next-swc-win32-x64-msvc-npm-12.3.4-54d10742b1-10.zip rename to .yarn/cache/@next-swc-linux-x64-gnu-npm-12.3.4-97054948a9-10.zip index 16d8449c8..aa9005d2b 100644 Binary files a/.yarn/cache/@next-swc-win32-x64-msvc-npm-12.3.4-54d10742b1-10.zip and b/.yarn/cache/@next-swc-linux-x64-gnu-npm-12.3.4-97054948a9-10.zip differ diff --git a/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.2.205-ff0a0ff4f5-10.zip b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.2.205-eaec8f379f-10.zip similarity index 67% rename from .yarn/cache/@swc-core-win32-x64-msvc-npm-1.2.205-ff0a0ff4f5-10.zip rename to .yarn/cache/@swc-core-linux-x64-gnu-npm-1.2.205-eaec8f379f-10.zip index 5c74ea4ff..c5ebf2a7f 100644 Binary files a/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.2.205-ff0a0ff4f5-10.zip and b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.2.205-eaec8f379f-10.zip differ diff --git a/.yarn/cache/eslint-import-resolver-typescript-npm-2.7.1-2dfe313e23-4a68844039.zip b/.yarn/cache/eslint-import-resolver-typescript-npm-2.7.1-2dfe313e23-4a68844039.zip deleted file mode 100644 index 6e782b8a5..000000000 Binary files a/.yarn/cache/eslint-import-resolver-typescript-npm-2.7.1-2dfe313e23-4a68844039.zip and /dev/null differ diff --git a/.yarn/cache/eslint-import-resolver-typescript-npm-3.6.1-994bbf65fc-261df24721.zip b/.yarn/cache/eslint-import-resolver-typescript-npm-3.6.1-994bbf65fc-261df24721.zip new file mode 100644 index 000000000..07ab184ab Binary files /dev/null and b/.yarn/cache/eslint-import-resolver-typescript-npm-3.6.1-994bbf65fc-261df24721.zip differ diff --git a/.yarn/cache/get-tsconfig-npm-4.7.5-0e53a23e62-de7de5e497.zip b/.yarn/cache/get-tsconfig-npm-4.7.5-0e53a23e62-de7de5e497.zip new file mode 100644 index 000000000..aebad49e2 Binary files /dev/null and b/.yarn/cache/get-tsconfig-npm-4.7.5-0e53a23e62-de7de5e497.zip differ diff --git a/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-0763150adf.zip b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-0763150adf.zip new file mode 100644 index 000000000..8e3561c41 Binary files /dev/null and b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-0763150adf.zip differ diff --git a/package.json b/package.json index 6b39559e6..2c61688f9 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "eslint": "8.18.0", "eslint-config-prettier": "8.5.0", "eslint-import-resolver-node": "0.3.6", - "eslint-import-resolver-typescript": "2.7.1", + "eslint-import-resolver-typescript": "3.6.1", "eslint-plugin-import": "2.26.0", "eslint-plugin-prettier": "4.0.0", "eslint-plugin-react": "7.30.1", diff --git a/yarn.lock b/yarn.lock index 313a95812..3acd380c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -94,7 +94,7 @@ __metadata: eslint: "npm:8.18.0" eslint-config-prettier: "npm:8.5.0" eslint-import-resolver-node: "npm:0.3.6" - eslint-import-resolver-typescript: "npm:2.7.1" + eslint-import-resolver-typescript: "npm:3.6.1" eslint-plugin-import: "npm:2.26.0" eslint-plugin-prettier: "npm:4.0.0" eslint-plugin-react: "npm:7.30.1" @@ -7637,7 +7637,7 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.17.0, enhanced-resolve@npm:^5.9.3": +"enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.17.0, enhanced-resolve@npm:^5.9.3": version: 5.17.0 resolution: "enhanced-resolve@npm:5.17.0" dependencies: @@ -7908,23 +7908,25 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-typescript@npm:2.7.1": - version: 2.7.1 - resolution: "eslint-import-resolver-typescript@npm:2.7.1" +"eslint-import-resolver-typescript@npm:3.6.1": + version: 3.6.1 + resolution: "eslint-import-resolver-typescript@npm:3.6.1" dependencies: debug: "npm:^4.3.4" - glob: "npm:^7.2.0" + enhanced-resolve: "npm:^5.12.0" + eslint-module-utils: "npm:^2.7.4" + fast-glob: "npm:^3.3.1" + get-tsconfig: "npm:^4.5.0" + is-core-module: "npm:^2.11.0" is-glob: "npm:^4.0.3" - resolve: "npm:^1.22.0" - tsconfig-paths: "npm:^3.14.1" peerDependencies: eslint: "*" eslint-plugin-import: "*" - checksum: 10/4a688440395673492b2e28347ba2173542dcec0bc597065469191be213e30f65b316697a950abf492f4191365626fb13231080c6ca326044df087f57d163e6c6 + checksum: 10/261df24721a7c5e37ee598b63e7e12c54e3d20c9ae5de6dbc132cecced023cb967c481007eef73252da108ac7eabb2e859853ff2e2d5776699a2954466ca716f languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.3": +"eslint-module-utils@npm:^2.7.3, eslint-module-utils@npm:^2.7.4": version: 2.8.1 resolution: "eslint-module-utils@npm:2.8.1" dependencies: @@ -8481,7 +8483,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -9145,6 +9147,15 @@ __metadata: languageName: node linkType: hard +"get-tsconfig@npm:^4.5.0": + version: 4.7.5 + resolution: "get-tsconfig@npm:4.7.5" + dependencies: + resolve-pkg-maps: "npm:^1.0.0" + checksum: 10/de7de5e4978354e8e6d9985baf40ea32f908a13560f793bc989930c229cc8d5c3f7b6b2896d8e43eb1a9b4e9e30018ef4b506752fd2a4b4d0dfee4af6841b119 + languageName: node + linkType: hard + "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -9249,7 +9260,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.2.0": +"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -9990,7 +10001,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0, is-core-module@npm:^2.8.1": +"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.8.1": version: 2.14.0 resolution: "is-core-module@npm:2.14.0" dependencies: @@ -14054,6 +14065,13 @@ __metadata: languageName: node linkType: hard +"resolve-pkg-maps@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-pkg-maps@npm:1.0.0" + checksum: 10/0763150adf303040c304009231314d1e84c6e5ebfa2d82b7d94e96a6e82bacd1dcc0b58ae257315f3c8adb89a91d8d0f12928241cba2df1680fbe6f60bf99b0e + languageName: node + linkType: hard + "resolve-protobuf-schema@npm:^2.1.0": version: 2.1.0 resolution: "resolve-protobuf-schema@npm:2.1.0"