Skip to content

Commit 0a1833e

Browse files
[feature-layers] Update dependency eslint to v9.25.1 (#427) (#428)
* 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 * Update package.json * Update yarn.lock --------- Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Co-authored-by: Jorge Sanz <[email protected]> (cherry picked from commit 7174e9a) # Conflicts: # package.json # yarn.lock
1 parent a4a2d4b commit 0a1833e

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,15 @@
3232
"ajv-formats": "3.0.1",
3333
"@babel/eslint-parser": "7.27.0",
3434
"csv-parse": "5.6.0",
35+
<<<<<<< HEAD
3536
<<<<<<< HEAD
3637
"eslint": "9.25.1",
3738
=======
3839
"eslint": "9.25.0",
3940
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
41+
=======
42+
"eslint": "9.25.1",
43+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
4044
"eslint-plugin-babel": "5.3.1",
4145
"eslint-plugin-import": "2.31.0",
4246
"eslint-plugin-prefer-object-spread": "1.2.1",

yarn.lock

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,22 @@
9090
strip-json-comments "^3.1.1"
9191

9292
<<<<<<< HEAD
93+
<<<<<<< HEAD
94+
=======
95+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
9396
9497
version "9.25.1"
9598
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117"
9699
integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==
100+
<<<<<<< HEAD
97101
=======
98102
99103
version "9.25.0"
100104
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.0.tgz#4656b39de7cbf12fd66e7d54d9a26d05855b2a5a"
101105
integrity sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w==
102106
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
107+
=======
108+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
103109

104110
"@eslint/object-schema@^2.1.6":
105111
version "2.1.6"
@@ -1459,28 +1465,38 @@ eslint-visitor-keys@^4.2.0:
14591465
integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
14601466

14611467
<<<<<<< HEAD
1468+
<<<<<<< HEAD
1469+
=======
1470+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
14621471
14631472
version "9.25.1"
14641473
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.1.tgz#8a7cf8dd0e6acb858f86029720adb1785ee57580"
14651474
integrity sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==
1475+
<<<<<<< HEAD
14661476
=======
14671477
14681478
version "9.25.0"
14691479
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.0.tgz#ebf629bb26d8e7490ff94f87321863cd73272351"
14701480
integrity sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA==
14711481
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
1482+
=======
1483+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
14721484
dependencies:
14731485
"@eslint-community/eslint-utils" "^4.2.0"
14741486
"@eslint-community/regexpp" "^4.12.1"
14751487
"@eslint/config-array" "^0.20.0"
14761488
"@eslint/config-helpers" "^0.2.1"
14771489
"@eslint/core" "^0.13.0"
14781490
"@eslint/eslintrc" "^3.3.1"
1491+
<<<<<<< HEAD
14791492
<<<<<<< HEAD
14801493
"@eslint/js" "9.25.1"
14811494
=======
14821495
"@eslint/js" "9.25.0"
14831496
>>>>>>> 9d6b8a6 (Update dependency eslint to v9.25.0 (#425) (#426))
1497+
=======
1498+
"@eslint/js" "9.25.1"
1499+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
14841500
"@eslint/plugin-kit" "^0.2.8"
14851501
"@humanfs/node" "^0.16.6"
14861502
"@humanwhocodes/module-importer" "^1.0.1"
@@ -1642,6 +1658,7 @@ foreground-child@^3.1.0, foreground-child@^3.1.1:
16421658
version "3.3.1"
16431659
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
16441660
integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
1661+
<<<<<<< HEAD
16451662
dependencies:
16461663
<<<<<<< HEAD
16471664
cross-spawn "^7.0.6"
@@ -1663,6 +1680,10 @@ foreground-child@^3.1.1:
16631680
dependencies:
16641681
cross-spawn "^7.0.0"
16651682
>>>>>>> 2985677 (Update dependency glob to v11.0.2)
1683+
=======
1684+
dependencies:
1685+
cross-spawn "^7.0.6"
1686+
>>>>>>> 7174e9a ([feature-layers] Update dependency eslint to v9.25.1 (#427) (#428))
16661687
signal-exit "^4.0.1"
16671688

16681689
formdata-polyfill@^4.0.10:

0 commit comments

Comments
 (0)