Upgrade js-yaml to 4.x. Quoting changed.

ddebin · Apr 1, 2021 · d8e1b6b · d8e1b6b
1 parent a6c58e1
commit d8e1b6b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yaml-sort",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "CLI tool to sort YAML files alphabetically",
   "main": "yaml-sort.js",
   "scripts": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/ddebin/yaml-sort#readme",
   "dependencies": {
-    "js-yaml": "^3.14.1",
+    "js-yaml": "^4.0.0",
     "yargs": "^15.0.0"
   },
   "devDependencies": {

diff --git a/test/test.js b/test/test.js
@@ -16,7 +16,7 @@ test('CLI w/o arg', (t) => {
 test('CLI w/ arg', (t) => {
     const proc = spawn(t, '../yaml-sort.js --input test.yml --stdout', opts);
     proc.exitCode(0);
-    proc.stdout.match('a: \'Lorem ipsum dolor sit amet, consectetur adipiscing elit...\'\n' +
+    proc.stdout.match('a: Lorem ipsum dolor sit amet, consectetur adipiscing elit...\n' +
         'b:\n' +
         '  b: 35\n' +
         '  c:\n' +
@@ -31,7 +31,7 @@ test('CLI --output', (t) => {
         ' && cat output.yml' +
         ' && rm -f output.yml', opts);
     proc.exitCode(0);
-    proc.stdout.match('a: \'Lorem ipsum dolor sit amet, consectetur adipiscing elit...\'\n' +
+    proc.stdout.match('a: Lorem ipsum dolor sit amet, consectetur adipiscing elit...\n' +
         'b:\n' +
         '  b: 35\n' +
         '  c:\n' +
@@ -42,7 +42,7 @@ test('CLI --output', (t) => {
 test('CLI --indent', (t) => {
     const proc = spawn(t, '../yaml-sort.js --input test.yml --stdout --indent 4', opts);
     proc.exitCode(0);
-    proc.stdout.match('a: \'Lorem ipsum dolor sit amet, consectetur adipiscing elit...\'\n' +
+    proc.stdout.match('a: Lorem ipsum dolor sit amet, consectetur adipiscing elit...\n' +
         'b:\n' +
         '    b: 35\n' +
         '    c:\n' +

diff --git a/yaml-sort.js b/yaml-sort.js
@@ -68,7 +68,7 @@ argv.input.forEach((file) => {
     try {
         const content = fs.readFileSync(file, 'utf8');
 
-        const sorted = yaml.safeDump(yaml.safeLoad(content), {
+        const sorted = yaml.dump(yaml.load(content), {
             sortKeys: true,
             indent: argv.indent,
             lineWidth: argv.lineWidth,