deps; update oas-kit, move to yaml

Author: MikeRalphson

adaptor.js

@@ -4,7 +4,7 @@
 const util = require('util');
 const url = require('url');
 
-const yaml = require('js-yaml');
+const yaml = require('yaml');
 const uuidv4 = require('uuid/v4');
 const safeJson = require('safe-json-stringify');
 const Case = require('case');
@@ -774,9 +774,9 @@ function transform(api, defaults, callback) {
         obj.swagger = conv.convert();
     }
 
-    obj["swagger-yaml"] = yaml.safeDump(obj.swagger, {lineWidth:-1}); // set to original if converted v2.0
+    obj["swagger-yaml"] = yaml.stringify(obj.swagger); // set to original if converted v2.0
     obj["swagger-json"] = JSON.stringify(obj.swagger, null, 2); // set to original if converted 2.0
-    obj["openapi-yaml"] = yaml.safeDump(api, {lineWidth:-1});
+    obj["openapi-yaml"] = yaml.stringify(api);
     obj["openapi-json"] = JSON.stringify(api, null, 2);
 
     // openapi3 extensions

cg.js

@@ -7,7 +7,7 @@ const path = require('path');
 const url = require('url');
 const util = require('util');
 
-const yaml = require('js-yaml');
+const yaml = require('yaml');
 const fetch = require('node-fetch');
 const co = require('co');
 const swagger2openapi = require('swagger2openapi');
@@ -140,7 +140,7 @@ function convert12(api){
                 return res.text();
             })
             .then(data => {
-                apiDeclarations.push(yaml.safeLoad(data,{json:true}));
+                apiDeclarations.push(yaml.parse(data));
             })
             .catch(err => {
                 console.error(util.inspect(err));
@@ -167,7 +167,7 @@ function convert12(api){
 }
 
 function main(s) {
-    let o = yaml.safeLoad(s, { json: true });
+    let o = yaml.parse(s);
     if (argv.verbose) console.log('Loaded definition '+defName);
 
     if (o && o.openapi) {