Attachment 165829 Details for Bug 36546 – Bug 36546: Fix js-yaml dependency in package.json

[patch] Bug 36546: Fix js-yaml dependency in package.json

Bug-36546-Fix-js-yaml-dependency-in-packagejson.patch (text/plain), 2.48 KB, created by Martin Renvoize (ashimema) on 2024-04-30 06:44:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-04-30 06:44:29 UTC

Size: 2.48 KB

patch

obsolete

>From 1d067eaf54c63f6a23931364a0b7b8c3b5ad39ad Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Wed, 24 Apr 2024 03:19:33 +0000
>Subject: [PATCH] Bug 36546: Fix js-yaml dependency in package.json
>
>Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> package.json |  3 +--
> yarn.lock    | 14 +++++++++++++-
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/package.json b/package.json
>index 97f46bf294c..d71e55236a5 100644
>--- a/package.json
>+++ b/package.json
>@@ -62,8 +62,7 @@
>   },
>   "resolutions": {
>     "minimatch": "^3.0.2",
>-    "lodash": "^4.17.12",
>-    "js-yaml": "^3.13.1"
>+    "lodash": "^4.17.12"
>   },
>   "author": "",
>   "license": "GPL-3.0",
>diff --git a/yarn.lock b/yarn.lock
>index f9950588647..c7595bc5989 100644
>--- a/yarn.lock
>+++ b/yarn.lock
>@@ -2091,6 +2091,11 @@ argparse@^1.0.7:
>   dependencies:
>     sprintf-js "~1.0.2"
> 
>+argparse@^2.0.1:
>+  version "2.0.1"
>+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
>+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
>+
> arr-diff@^1.0.1:
>   version "1.1.0"
>   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
>@@ -6263,7 +6268,7 @@ js-message@1.0.7:
>   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
>   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
> 
>-js-yaml@^3.13.1, js-yaml@^4.1.0:
>+js-yaml@^3.13.1:
>   version "3.14.1"
>   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
>   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
>@@ -6271,6 +6276,13 @@ js-yaml@^3.13.1, js-yaml@^4.1.0:
>     argparse "^1.0.7"
>     esprima "^4.0.0"
> 
>+js-yaml@^4.1.0:
>+  version "4.1.0"
>+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
>+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
>+  dependencies:
>+    argparse "^2.0.1"
>+
> jsbn@~0.1.0:
>   version "0.1.1"
>   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 36546: 164520 | 165412 | 165446 | 165449 | 165450 | 165550 | 165581 | 165589 | 165821 | 165828 | 165829 | 165830 | 165831 | 165923 | 165945