Skip to content

Commit 38fd141

Browse files
Update dependency eslint to v9.25.1 (#427)
Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> (cherry picked from commit 6a787b3) # Conflicts: # package.json # yarn.lock
1 parent 8ae18a4 commit 38fd141

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
"ajv-formats": "3.0.1",
3333
"@babel/eslint-parser": "7.27.0",
3434
"csv-parse": "5.6.0",
35+
<<<<<<< HEAD
3536
"eslint": "9.24.0",
37+
=======
38+
"eslint": "9.25.1",
39+
>>>>>>> 6a787b3 (Update dependency eslint to v9.25.1 (#427))
3640
"eslint-plugin-babel": "5.3.1",
3741
"eslint-plugin-import": "2.31.0",
3842
"eslint-plugin-prefer-object-spread": "1.2.1",

yarn.lock

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,17 @@
8989
minimatch "^3.1.2"
9090
strip-json-comments "^3.1.1"
9191

92+
<<<<<<< HEAD
9293
9394
version "9.24.0"
9495
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.24.0.tgz#685277980bb7bf84ecc8e4e133ccdda7545a691e"
9596
integrity sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==
97+
=======
98+
99+
version "9.25.1"
100+
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117"
101+
integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==
102+
>>>>>>> 6a787b3 (Update dependency eslint to v9.25.1 (#427))
96103

97104
"@eslint/object-schema@^2.1.6":
98105
version "2.1.6"
@@ -1448,19 +1455,31 @@ eslint-visitor-keys@^4.2.0:
14481455
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
14491456
integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
14501457

1458+
<<<<<<< HEAD
14511459
14521460
version "9.24.0"
14531461
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.24.0.tgz#9a7f2e6cb2de81c405ab244b02f4584c79dc6bee"
14541462
integrity sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==
1463+
=======
1464+
1465+
version "9.25.1"
1466+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.1.tgz#8a7cf8dd0e6acb858f86029720adb1785ee57580"
1467+
integrity sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==
1468+
>>>>>>> 6a787b3 (Update dependency eslint to v9.25.1 (#427))
14551469
dependencies:
14561470
"@eslint-community/eslint-utils" "^4.2.0"
14571471
"@eslint-community/regexpp" "^4.12.1"
14581472
"@eslint/config-array" "^0.20.0"
14591473
"@eslint/config-helpers" "^0.2.0"
14601474
"@eslint/core" "^0.12.0"
14611475
"@eslint/eslintrc" "^3.3.1"
1476+
<<<<<<< HEAD
14621477
"@eslint/js" "9.24.0"
14631478
"@eslint/plugin-kit" "^0.2.7"
1479+
=======
1480+
"@eslint/js" "9.25.1"
1481+
"@eslint/plugin-kit" "^0.2.8"
1482+
>>>>>>> 6a787b3 (Update dependency eslint to v9.25.1 (#427))
14641483
"@humanfs/node" "^0.16.6"
14651484
"@humanwhocodes/module-importer" "^1.0.1"
14661485
"@humanwhocodes/retry" "^0.4.2"

0 commit comments

Comments
 (0)