8000 Merge pull request #2416 from Shopify/emily/eslint · Shopify/ruby-lsp@d92ea6e · GitHub
[go: up one dir, main page]
Skip to content

Commit d92ea6e

Browse files
egiurleoegiurleo
authored
Merge pull request #2416 from Shopify/emily/eslint
Upgrade @shopify/eslint-plugin 46.0.0 in /vscode
2 parents e637df0 + 83098fc commit d92ea6e

File tree

4 files changed

+109
-41
lines changed

4 files changed

+109
-41
lines changed

‎vscode/.eslintrc.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎vscode/eslint.config.mjs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import tsParser from "@typescript-eslint/parser";
2+
import tsPlugin from "@typescript-eslint/eslint-plugin";
3+
import shopifyPlugin from "@shopify/eslint-plugin";
4+
5+
const config = [
6+
...shopifyPlugin.configs.core,
7+
...shopifyPlugin.configs.typescript,
8+
...shopifyPlugin.configs.prettier,
9+
{
10+
languageOptions: {
11+
parser: tsParser,
12+
ecmaVersion: 5,
13+
sourceType: "script",
14+
15+
parserOptions: {
16+
project: "tsconfig.json",
17+
},
18+
},
19+
20+
plugins: {
21+
"@typescript-eslint": tsPlugin,
22+
},
23+
24+
settings: {
25+
"import/resolver": {
26+
typescript: {
27+
project: "tsconfig.json",
28+
},
29+
},
30+
},
31+
32+
"rules": {
33+
"@typescript-eslint/no-floating-promises": "error",
34+
"consistent-return": "off",
35+
"no-warning-comments": "off",
36+
"no-console": "warn",
37+
"@shopify/no-debugger": "warn",
38+
"no-template-curly-in-string": "warn",
39+
"eqeqeq": "error",
40+
"no-invalid-this": "error",
41+
"no-lonely-if": "error",
42+
"max-len": [
43+
"error",
44+
{
45+
"code": 120
46+
}
47+
]
48+
}
49+
}
50+
]
51+
52+
export default config;

‎vscode/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,9 @@
643643
},
644644
"devDependencies": {
645645
"@babel/core": "^7.25.2",
646-
"@shopify/eslint-plugin": "^45.0.0",
646+
"@eslint/eslintrc": "^3.1.0",
647+
"@eslint/js": "^9.8.0",
648+
"@shopify/eslint-plugin": "^46.0.0",
647649
"@shopify/prettier-config": "^1.1.2",
648650
"@types/glob": "^8.1.0",
649651
"@types/mocha": "^10.0.7",

‎vscode/yarn.lock

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,31 @@
455455
minimatch "^3.1.2"
456456
strip-json-comments "^3.1.1"
457457

458+
"@eslint/eslintrc@^3.1.0":
459+
version "3.1.0"
460+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
461+
integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
462+
dependencies:
463+
ajv "^6.12.4"
464+
debug "^4.3.2"
465+
espree "^10.0.1"
466+
globals "^14.0.0"
467+
ignore "^5.2.0"
468+
import-fresh "^3.2.1"
469+
js-yaml "^4.1.0"
470+
minimatch "^3.1.2"
471+
strip-json-comments "^3.1.1"
472+
458473
"@eslint/js@8.57.0":
459474
version "8.57.0"
460475
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
461476
integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
462477

478+
"@eslint/js@^9.8.0":
479+
version "9.8.0"
480+
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.8.0.tgz#ae9bc14bb839713c5056f5018bcefa955556d3a4"
481+
integrity sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==
482+
463483
"@humanwhocodes/config-array@^0.11.14":
464484
version "0.11.14"
465485
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
@@ -583,10 +603,10 @@
583603
resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
584604
integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
585605

586-
"@shopify/eslint-plugin@^45.0.0":
587-
version "45.0.0"
588-
resolved "https://registry.yarnpkg.com/@shopify/eslint-plugin/-/eslint-plugin-45.0.0.tgz#e4a87e66f89f4a09f1268378bd8caef713661744"
589-
integrity sha512-aRgVkl+EovLk6OC4WzT+C6hgAyta5VReEIdetpe+/bJhVovlqbFjYa3yHGvEM4VuWv8sim7XH2VV3ZsDiwpgvQ==
606+
"@shopify/eslint-plugin@^46.0.0":
607+
version "46.0.0"
608+
resolved "https://registry.yarnpkg.com/@shopify/eslint-plugin/-/eslint-plugin-46.0.0.tgz#1943e4d5064fd33311047358ddeb3bb41856cc71"
609+
integrity sha512-sYUKGaBMXcTEyvMxSECb1H8YPQojgsv6FkUWDN1isLNDrTyk52VETCmRFiS9Aj/hon8W6x8IL5597FyN/SC+qg==
590610
dependencies:
591611
"@babel/eslint-parser" "^7.16.3"
592612
"@babel/eslint-plugin" "^7.14.5"
@@ -608,6 +628,7 @@
608628
eslint-plugin-react "^7.34.1"
609629
eslint-plugin-react-hooks "^4.6.2"
610630
eslint-plugin-sort-class-members "^1.20.0"
631+
globals "^15.8.0"
611632
jsx-ast-utils "^3.2.1"
612633
pkg-dir "^5.0.0"
613634
pluralize "^8.0.0"
@@ -893,6 +914,11 @@ acorn-jsx@^5.3.2:
893914
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
894915
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
895916

917+
acorn@^8.12.0:
918+
version "8.12.1"
919+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
920+
integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
921+
896922
acorn@^8.9.0:
897923
version "8.11.3"
898924
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
@@ -2158,6 +2184,11 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
21582184
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
21592185
integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
21602186

2187+
eslint-visitor-keys@^4.0.0:
2188+
version "4.0.0"
2189+
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
2190+
integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
2191+
21612192
eslint@^8.57.0:
21622193
version "8.57.0"
21632194
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
@@ -2202,6 +2233,15 @@ eslint@^8.57.0:
22022233
strip-ansi "^6.0.1"
22032234
text-table "^0.2.0"
22042235

2236+
espree@^10.0.1:
2237+
version "10.1.0"
2238+
resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56"
2239+
integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==
2240+
dependencies:
2241+
acorn "^8.12.0"
2242+
acorn-jsx "^5.3.2"
2243+
eslint-visitor-keys "^4.0.0"
2244+
22052245
espree@^9.6.0, espree@^9.6.1:
22062246
version "9.6.1"
22072247
resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
@@ -2518,6 +2558,16 @@ globals@^13.19.0:
25182558
dependencies:
25192559
type-fest "^0.20.2"
25202560

2561+
globals@^14.0.0:
2562+
version "14.0.0"
2563+
resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
2564+
integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
2565+
2566+
globals@^15.8.0:
2567+
version "15.9.0"
2568+
resolved "https://registry.yarnpkg.com/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399"
2569+
integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==
2570+
25212571
globalthis@^1.0.3:
25222572
version "1.0.3"
25232573
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"

0 commit comments

Comments
 (0)
0