From 888b685adbc5fdd55e1d3011d27820d03e9772bf Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver@ortham.io>
Date: Tue, 23 Aug 2022 19:47:54 +0100
Subject: [PATCH] Update js-yaml to 4.1.0

This fixes an issue resolving aliases inside merge keys, but also
changes the formatting to quote less than the input YAML does when
dumping YAML.
---
 convert-settings.html | 2 +-
 js/convert.js         | 2 +-
 js/search.js          | 4 ++--
 search.html           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/convert-settings.html b/convert-settings.html
index 19ca05e..73c8bf7 100644
--- a/convert-settings.html
+++ b/convert-settings.html
@@ -18,6 +18,6 @@ permalink: /convert-settings/
 
 <p>Note that the download link that appears above after converting YAML does not work in Internet Explorer or Edge. Users of those browsers will need to copy the content of the TOML text box into a <code>settings.toml</code> file they create themselves, or use a different browser</code>.</p>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.4.3/js-yaml.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/tomlify-j0.4@3.0.0/tomlify.min.js"></script>
 <script src="/js/convert.js"></script>
diff --git a/js/convert.js b/js/convert.js
index 6427b77..622249d 100644
--- a/js/convert.js
+++ b/js/convert.js
@@ -37,7 +37,7 @@ function upgradeOldYaml(yaml) {
 
 function yamlToToml(evt) {
     try {
-        const settings = upgradeOldYaml(jsyaml.safeLoad(evt.target.value));
+        const settings = upgradeOldYaml(jsyaml.load(evt.target.value));
 
         const options = {
             space: 2,
diff --git a/js/search.js b/js/search.js
index 546a3a6..32a2b18 100644
--- a/js/search.js
+++ b/js/search.js
@@ -34,7 +34,7 @@ function isRegexEntry(name) {
 }
 
 function readMasterlist(response) {
-    var masterlist = jsyaml.safeLoad(response.data);
+    var masterlist = jsyaml.load(response.data);
     document.getElementById('progress').classList.add('hidden');
 
     /* Do search here. */
@@ -53,7 +53,7 @@ function readMasterlist(response) {
                 console.log("Match: " + JSON.stringify(masterlist["plugins"][index]));
                 var code = document.createElement('code');
                 code.className = 'loot-search-result';
-                code.textContent = '  - ' + jsyaml.safeDump(masterlist["plugins"][index]).replace(new RegExp('\n', 'g'), '\n    ').trim();
+                code.textContent = '  - ' + jsyaml.dump(masterlist["plugins"][index]).replace(new RegExp('\n', 'g'), '\n    ').trim();
                 resultsDiv.appendChild(code);
             }
         }
diff --git a/search.html b/search.html
index bd8c88e..c104484 100644
--- a/search.html
+++ b/search.html
@@ -24,6 +24,6 @@ permalink: /search/
 <div id="progress" class="mdl-spinner mdl-js-spinner mdl-spinner--single-color is-active hidden"></div>
 <div id="results" class="mdl-shadow--2dp"></div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.4.3/js-yaml.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js"></script>
 <script src="https://unpkg.com/github-api@2.3.0/dist/GitHub.bundle.min.js"></script>
 <script src="/js/search.js"></script>