diff --git a/package-lock.json b/package-lock.json index 447afd61de1..df7a1e41d9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3684,6 +3684,16 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3773,6 +3783,16 @@ "path-exists": "^4.0.0" } }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -13259,6 +13279,16 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -21650,12 +21680,18 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + } } }, "jsbn": { @@ -21788,6 +21824,17 @@ "path-loader": "^1.0.10", "slash": "^3.0.0", "uri-js": "^4.2.2" + }, + "dependencies": { + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + } } }, "json-schema": { @@ -32959,6 +33006,15 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "qs": { "version": "6.10.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", @@ -33031,6 +33087,15 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", diff --git a/package.json b/package.json index fb937cbe97c..778dd86aa02 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "file-dialog": "0.0.8", "immutable": "^3.x.x", "is-json": "^2.0.1", - "js-yaml": "^3.13.1", + "js-yaml": "=4.1.0", "json-beautify": "^1.0.1", "json-refs": "^3.0.4", "lodash": "^4.17.21", diff --git a/src/plugins/editor/editor-plugins/json-to-yaml.js b/src/plugins/editor/editor-plugins/json-to-yaml.js index 0219e235835..12c71e6f9d0 100644 --- a/src/plugins/editor/editor-plugins/json-to-yaml.js +++ b/src/plugins/editor/editor-plugins/json-to-yaml.js @@ -9,7 +9,7 @@ export default function(editor) { let yamlString try { - yamlString = YAML.safeDump(YAML.safeLoad(originalStr), { + yamlString = YAML.dump(YAML.load(originalStr), { lineWidth: -1 // don't generate line folds }) } catch (e) { diff --git a/src/plugins/json-schema-validator/index.js b/src/plugins/json-schema-validator/index.js index 93eb2a2cc72..518a110b922 100644 --- a/src/plugins/json-schema-validator/index.js +++ b/src/plugins/json-schema-validator/index.js @@ -6,8 +6,8 @@ import debounce from "lodash/debounce" import swagger2SchemaYaml from "./swagger2-schema.yaml" import oas3SchemaYaml from "./oas3-schema.yaml" -const swagger2Schema = YAML.safeLoad(swagger2SchemaYaml) -const oas3Schema = YAML.safeLoad(oas3SchemaYaml) +const swagger2Schema = YAML.load(swagger2SchemaYaml) +const oas3Schema = YAML.load(oas3SchemaYaml) // Lazily created promise worker let _promiseWorker diff --git a/src/standalone/topbar-insert/forms/components/AddForm.jsx b/src/standalone/topbar-insert/forms/components/AddForm.jsx index 2370d25536e..c008a69fba5 100644 --- a/src/standalone/topbar-insert/forms/components/AddForm.jsx +++ b/src/standalone/topbar-insert/forms/components/AddForm.jsx @@ -9,7 +9,7 @@ class AddForm extends Component { this.state = { formErrors: false, - formData: this.props.existingData ? + formData: this.props.existingData ? this.props.getFormData( (newForm, path) => this.updateForm(newForm, path), [], this.props.existingData) : this.props.getFormData( (newForm, path) => this.updateForm(newForm, path), [] ) } @@ -40,15 +40,15 @@ class AddForm extends Component { // Update the spec string in the Swagger UI state with the new json. const currentJson = this.props.specSelectors.specJson() - this.props.specActions.updateSpec(YAML.safeDump(currentJson.toJS()), "insert") + this.props.specActions.updateSpec(YAML.dump(currentJson.toJS()), "insert") // Perform any parent component actions for the form. this.props.submit() } updateForm = (newFormData, path) => { - this.setState(prevState => ({ - formData: prevState.formData.setIn(path, newFormData) + this.setState(prevState => ({ + formData: prevState.formData.setIn(path, newFormData) })) } @@ -61,7 +61,7 @@ class AddForm extends Component {