Skip to content

Commit a4a2d4b

Browse files
Update dependency eslint to v9.25.0 (#425) (#426)
Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> (cherry picked from commit c42b4a7) Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> (cherry picked from commit 9d6b8a6) # Conflicts: # package.json # yarn.lock
1 parent ac1ba8d commit a4a2d4b

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-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.25.1",
37+
=======
38+
"eslint": "9.25.0",
39+
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
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: 18 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.25.1"
9495
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117"
9596
integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==
97+
=======
98+
99+
version "9.25.0"
100+
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.0.tgz#4656b39de7cbf12fd66e7d54d9a26d05855b2a5a"
101+
integrity sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w==
102+
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
96103

97104
"@eslint/object-schema@^2.1.6":
98105
version "2.1.6"
@@ -1451,18 +1458,29 @@ eslint-visitor-keys@^4.2.0:
14511458
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
14521459
integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
14531460

1461+
<<<<<<< HEAD
14541462
14551463
version "9.25.1"
14561464
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.1.tgz#8a7cf8dd0e6acb858f86029720adb1785ee57580"
14571465
integrity sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==
1466+
=======
1467+
1468+
version "9.25.0"
1469+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.0.tgz#ebf629bb26d8e7490ff94f87321863cd73272351"
1470+
integrity sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA==
1471+
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
14581472
dependencies:
14591473
"@eslint-community/eslint-utils" "^4.2.0"
14601474
"@eslint-community/regexpp" "^4.12.1"
14611475
"@eslint/config-array" "^0.20.0"
14621476
"@eslint/config-helpers" "^0.2.1"
14631477
"@eslint/core" "^0.13.0"
14641478
"@eslint/eslintrc" "^3.3.1"
1479+
<<<<<<< HEAD
14651480
"@eslint/js" "9.25.1"
1481+
=======
1482+
"@eslint/js" "9.25.0"
1483+
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
14661484
"@eslint/plugin-kit" "^0.2.8"
14671485
"@humanfs/node" "^0.16.6"
14681486
"@humanwhocodes/module-importer" "^1.0.1"

0 commit comments

Comments
 (0)