Skip to content

Conversation

@miq-bot
Copy link
Member

@miq-bot miq-bot commented Oct 5, 2025

Update yarn.lock with latest dependencies

@miq-bot miq-bot requested a review from a team as a code owner October 5, 2025 00:42
@miq-bot miq-bot force-pushed the update_yarn_lock branch 2 times, most recently from 49bf9fe to b435382 Compare October 12, 2025 00:35
@miq-bot miq-bot force-pushed the update_yarn_lock branch 3 times, most recently from 01142f8 to bb7b87e Compare November 9, 2025 00:31
@Fryguy Fryguy merged commit 6bec96a into ManageIQ:master Nov 18, 2025
19 checks passed
@Fryguy
Copy link
Member

Fryguy commented Nov 20, 2025

@miq-bot A conflict occurred during the backport of this pull request to spassky.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the spassky branch in order to resolve this.

Conflict details:

diff --cc yarn.lock
index 58a8a680a9,8487a6eed3..0000000000
--- a/yarn.lock
+++ b/yarn.lock
@@@ -1449,13 -1449,13 +1449,19 @@@ __metadata
    languageName: node
    linkType: hard
  
++<<<<<<< HEAD
 +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
 +  version: 7.28.4
 +  resolution: "@babel/types@npm:7.28.4"
++=======
+ "@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.4, @babel/types@npm:^7.28.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4":
+   version: 7.28.5
+   resolution: "@babel/types@npm:7.28.5"
++>>>>>>> 6bec96a910 (Merge pull request #9641 from miq-bot/update_yarn_lock)
    dependencies:
      "@babel/helper-string-parser": "npm:^7.27.1"
-     "@babel/helper-validator-identifier": "npm:^7.27.1"
-   checksum: 10/db50bf257aafa5d845ad16dae0587f57d596e4be4cbb233ea539976a4c461f9fbcc0bf3d37adae3f8ce5dcb4001462aa608f3558161258b585f6ce6ce21a2e45
+     "@babel/helper-validator-identifier": "npm:^7.28.5"
+   checksum: 10/4256bb9fb2298c4f9b320bde56e625b7091ea8d2433d98dcf524d4086150da0b6555aabd7d0725162670614a9ac5bf036d1134ca13dedc9707f988670f1362d7
    languageName: node
    linkType: hard
  

@miq-bot
Copy link
Member Author

miq-bot commented Nov 20, 2025

@Fryguy unrecognized command 'A', ignoring...

Accepted commands are: add_label, add_reviewer, request_review, assign, close_issue, cross_repo_test, move_issue, remove_label, rm_label, remove_reviewer, set_milestone, unassign

Fryguy added a commit that referenced this pull request Nov 20, 2025
Update yarn.lock with latest dependencies

(cherry picked from commit 6bec96a)
@Fryguy
Copy link
Member

Fryguy commented Nov 20, 2025

manually backported to spassky via 0a42fc6

commit 0a42fc603d5171ee5aa8584a531efcee3e3d7bf8 (HEAD -> spassky, upstream/spassky)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Tue Nov 18 10:03:48 2025 -0500

    Merge pull request #9641 from miq-bot/update_yarn_lock

    Update yarn.lock with latest dependencies

    (cherry picked from commit 6bec96a9104cce680a0dfafb2ead6a4e66f1e760)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants