From 7b0cb3774bc8b33ea2abae3fb552e377b3696298 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Fri, 6 Aug 2021 15:57:53 +0200 Subject: [PATCH 1/3] feat(js-yaml): update our main YAML parser to v4.1.0 Refs https://github.com/swagger-api/swagger-ui/pull/6804 --- package-lock.json | 75 +++++++++++++++++-- package.json | 2 +- .../editor/editor-plugins/json-to-yaml.js | 2 +- src/plugins/json-schema-validator/index.js | 4 +- .../forms/components/AddForm.jsx | 12 +-- .../components/ImportFileMenuItem.jsx | 4 +- src/standalone/topbar/topbar.jsx | 16 ++-- .../plugins/json-schema-validator/index.js | 10 +-- 8 files changed, 95 insertions(+), 30 deletions(-) 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 {
-
+
{ this.state.formErrors &&
Please fix errors before submitting.
} @@ -69,7 +69,7 @@ class AddForm extends Component {
) - } + } } AddForm.propTypes = { diff --git a/src/standalone/topbar-menu-file-import_file/components/ImportFileMenuItem.jsx b/src/standalone/topbar-menu-file-import_file/components/ImportFileMenuItem.jsx index 3983f9a0ae1..2870cfb7673 100644 --- a/src/standalone/topbar-menu-file-import_file/components/ImportFileMenuItem.jsx +++ b/src/standalone/topbar-menu-file-import_file/components/ImportFileMenuItem.jsx @@ -14,9 +14,9 @@ export default class ImportFileMenuItem extends Component { fileReader.onload = fileLoadedEvent => { let content = fileLoadedEvent.target.result - + try { - const preparedContent = isJsonObject(content) ? YAML.safeDump(YAML.safeLoad(content)) : content + const preparedContent = isJsonObject(content) ? YAML.dump(YAML.load(content)) : content if (typeof onDocumentLoad === "function") { onDocumentLoad(preparedContent) diff --git a/src/standalone/topbar/topbar.jsx b/src/standalone/topbar/topbar.jsx index f46dd12c3d0..b960d64967f 100644 --- a/src/standalone/topbar/topbar.jsx +++ b/src/standalone/topbar/topbar.jsx @@ -66,7 +66,7 @@ export default class Topbar extends React.Component { .then(res => { this.setState({ clients: res.body || [] }) }) - + serverGetter({}, { // contextUrl is needed because swagger-client is curently // not building relative server URLs correctly @@ -97,7 +97,7 @@ export default class Topbar extends React.Component { .then(res => res.text()) .then(text => { this.props.specActions.updateSpec( - YAML.safeDump(YAML.safeLoad(text), { + YAML.dump(YAML.load(text), { lineWidth: -1 }) ) @@ -129,9 +129,9 @@ export default class Topbar extends React.Component { //// so convert and download // JSON String -> JS object - let jsContent = YAML.safeLoad(editorContent) + let jsContent = YAML.load(editorContent) // JS object -> YAML string - let yamlContent = YAML.safeDump(jsContent) + let yamlContent = YAML.dump(jsContent) this.downloadFile(yamlContent, `${fileName}.yaml`) } @@ -146,7 +146,7 @@ export default class Topbar extends React.Component { } // JSON or YAML String -> JS object - let jsContent = YAML.safeLoad(editorContent) + let jsContent = YAML.load(editorContent) // JS Object -> pretty JSON string let prettyJsonContent = beautifyJson(jsContent, null, 2) this.downloadFile(prettyJsonContent, `${fileName}.json`) @@ -164,8 +164,8 @@ export default class Topbar extends React.Component { convertToYaml = () => { // Editor content -> JS object -> YAML string let editorContent = this.props.specSelectors.specStr() - let jsContent = YAML.safeLoad(editorContent) - let yamlContent = YAML.safeDump(jsContent) + let jsContent = YAML.load(editorContent) + let yamlContent = YAML.dump(jsContent) this.props.specActions.updateSpec(yamlContent) } @@ -361,7 +361,7 @@ export default class Topbar extends React.Component {
    • - topbarActions.showModal("convert")} /> diff --git a/test/unit/plugins/json-schema-validator/index.js b/test/unit/plugins/json-schema-validator/index.js index da398dbe58f..42b559bc952 100644 --- a/test/unit/plugins/json-schema-validator/index.js +++ b/test/unit/plugins/json-schema-validator/index.js @@ -6,8 +6,8 @@ import path from 'path'; const swagger2SchemaYaml = fs.readFileSync(path.join(__dirname, '../../../../src/plugins/json-schema-validator/swagger2-schema.yaml')).toString(); const oas3SchemaYaml = fs.readFileSync(path.join(__dirname, '../../../../src/plugins/json-schema-validator/oas3-schema.yaml')).toString(); -const swagger2Schema = YAML.safeLoad(swagger2SchemaYaml); -const oas3Schema = YAML.safeLoad(oas3SchemaYaml); +const swagger2Schema = YAML.load(swagger2SchemaYaml); +const oas3Schema = YAML.load(oas3SchemaYaml); var testDocuments = fs @@ -19,7 +19,7 @@ var testDocuments = fs })) .map(doc => ({ path: doc.path, - content: YAML.safeLoad(doc.contentString) + content: YAML.load(doc.contentString) })); testDocuments.forEach(doc => { @@ -85,5 +85,5 @@ function assertCaseExpectations(currentCase, result) { itFn('should equal expected value', function() { expect(result).toEqual(currentCase.output.equal); }); - } -} \ No newline at end of file + } +} From 371b0e6ba4616a6fc5898ed9a003b762b34718c6 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Mon, 9 Aug 2021 18:20:51 +0200 Subject: [PATCH 2/3] chore(deps): bump swagger-client to v3.15.0 --- package-lock.json | 82 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index df7a1e41d9e..e4c8cded4fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15028,9 +15028,9 @@ } }, "form-data-encoder": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.1.0.tgz", - "integrity": "sha512-gifpBCPDgUUdJGoSe1d1H1wDhOTuR/Q35zxrQekdOqtmBX9CxkcxqzG/KkeP3LZUCi7SnoFL2HWMNWQ0C2YG4Q==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.4.1.tgz", + "integrity": "sha512-fP/K+x6Y7dRcB39JRxoomw4oo6MGOGAGiidX+q5tp98SMdlANqrgKhr5KbRMa7/nxFpTHiwNs3VxNaW5g+DfuA==" }, "format": { "version": "0.2.2", @@ -15038,22 +15038,19 @@ "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=" }, "formdata-node": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-3.6.2.tgz", - "integrity": "sha512-G8Hjh1S4Ifsk5e+cTZyteYO9u5ODaif+LsWhzGuGtYQMSlmxN3Ug/NrXpX+ij9kK/EsZq+dM7fQH8fEwhMV3dQ==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-3.6.3.tgz", + "integrity": "sha512-1kuwXsWIgTV9k5hL6i2cW5KOuQqmbkOMqYMw2XB+WRKBVq/RFMJvu/8qc3fjPFcBImBIGkSwIJim1JbAZVOFuQ==", "requires": { "fetch-blob": "2.1.2", - "form-data-encoder": "1.0.1", + "form-data-encoder": "1.4.0", "node-domexception": "1.0.0" }, "dependencies": { "form-data-encoder": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.0.1.tgz", - "integrity": "sha512-sCHYvVRBIe2iGx30O8g0H8c5O0j1AdnPPO9IWYLIq3nZqBOa6rO+0mipXk+gqTDj9fSQ1Dm/pItxF5QW+B5faQ==", - "requires": { - "nanoid": "3.1.23" - } + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.4.0.tgz", + "integrity": "sha512-H54s9sqy0YkwaTtiPjce9GmmpVCuM9gu09lx4hkEBna2zmEBwVUz8XCpoIC2lhTuM9grpNgUc4AiBXScDffMOQ==" } } }, @@ -24516,7 +24513,8 @@ "nanoid": { "version": "3.1.23", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==" + "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==", + "dev": true }, "nanomatch": { "version": "1.2.13", @@ -32966,9 +32964,9 @@ } }, "swagger-client": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.14.1.tgz", - "integrity": "sha512-zYTzVwkUEQidYfUty+EPVZOKxcdpB5m5kvemac+kyFtKyx7xr8s6f470lrfFjGyOjXPoUYkauXZde7L9LKXsWA==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.15.0.tgz", + "integrity": "sha512-8Ki4bVbT+bl8hGmy3vR89wktZhVLXKNUk8CoUvfwn7Rq45bZ15c9UQXVr4VU6hP3f9diWJGJs0bKZR9pPOq4ZA==", "requires": { "@babel/runtime-corejs3": "^7.11.2", "btoa": "^1.2.1", @@ -32979,7 +32977,7 @@ "fast-json-patch": "^3.0.0-1", "form-data-encoder": "^1.0.1", "formdata-node": "^3.6.2", - "js-yaml": "^3.14.0", + "js-yaml": "^4.1.0", "lodash": "^4.17.19", "qs": "^6.9.4", "querystring-browser": "^1.0.4", @@ -33006,15 +33004,6 @@ "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", @@ -33074,6 +33063,15 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "hoist-non-react-statics": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", @@ -33096,6 +33094,14 @@ "esprima": "^4.0.0" } }, + "qs": { + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", + "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", + "requires": { + "side-channel": "^1.0.4" + } + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -33116,6 +33122,28 @@ "loose-envify": "^1.4.0", "prop-types": "^15.7.2" } + }, + "swagger-client": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.14.1.tgz", + "integrity": "sha512-zYTzVwkUEQidYfUty+EPVZOKxcdpB5m5kvemac+kyFtKyx7xr8s6f470lrfFjGyOjXPoUYkauXZde7L9LKXsWA==", + "requires": { + "@babel/runtime-corejs3": "^7.11.2", + "btoa": "^1.2.1", + "buffer": "^6.0.3", + "cookie": "~0.4.1", + "cross-fetch": "^3.1.4", + "deep-extend": "~0.6.0", + "fast-json-patch": "^3.0.0-1", + "form-data-encoder": "^1.0.1", + "formdata-node": "^3.6.2", + "js-yaml": "^3.14.0", + "lodash": "^4.17.19", + "qs": "^6.9.4", + "querystring-browser": "^1.0.4", + "traverse": "~0.6.6", + "url": "~0.11.0" + } } } }, diff --git a/package.json b/package.json index 778dd86aa02..370452d6222 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "react-transition-group": "^1.1.1", "redux": "^3.x.x", "reselect": "^4.0.0", - "swagger-client": "^3.14.1", + "swagger-client": "^3.15.0", "swagger-ui": "^3.51.2", "traverse": "^0.6.6", "validator": "=13.6.0", From eff52d56d05fb147abb2a496eb8272aa6388bdb5 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Mon, 9 Aug 2021 18:23:44 +0200 Subject: [PATCH 3/3] chore(deps): bump swagger-ui to v3.52.0 --- package-lock.json | 58 ++++------------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index e4c8cded4fd..2c7f700a74e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33015,9 +33015,9 @@ } }, "swagger-ui": { - "version": "3.51.2", - "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-3.51.2.tgz", - "integrity": "sha512-mf1ymb+SW5r7IwIqzk+oyWwvWWipVqSPXtM5NnHF1N+JSDSzRcDDcpj0LKNtQMrj36mdEv62nO6RxJfZQpWLag==", + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/swagger-ui/-/swagger-ui-3.52.0.tgz", + "integrity": "sha512-NnXyVAmN+MYBYG2uwsc0ESgkMV7Vb3PjTv6OV4nPlX8N/gvlf61KNI7lHdLNfqWxZYYMUIWYqngZIGpTL6W5Qg==", "requires": { "@babel/runtime-corejs3": "^7.14.7", "@braintree/sanitize-url": "^5.0.2", @@ -33031,7 +33031,7 @@ "ieee754": "^1.2.1", "immutable": "^3.x.x", "js-file-download": "^0.4.12", - "js-yaml": "^3.13.1", + "js-yaml": "=4.1.0", "lodash": "^4.17.21", "memoizee": "^0.4.15", "prop-types": "^15.7.2", @@ -33052,7 +33052,7 @@ "reselect": "^4.0.0", "serialize-error": "^8.1.0", "sha.js": "^2.4.11", - "swagger-client": "=3.14.1", + "swagger-client": "^3.15.0", "url-parse": "^1.5.1", "xml-but-prettier": "^1.0.1", "zenscroll": "^4.0.2" @@ -33063,15 +33063,6 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "hoist-non-react-statics": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", @@ -33085,23 +33076,6 @@ "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", - "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", - "requires": { - "side-channel": "^1.0.4" - } - }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -33122,28 +33096,6 @@ "loose-envify": "^1.4.0", "prop-types": "^15.7.2" } - }, - "swagger-client": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.14.1.tgz", - "integrity": "sha512-zYTzVwkUEQidYfUty+EPVZOKxcdpB5m5kvemac+kyFtKyx7xr8s6f470lrfFjGyOjXPoUYkauXZde7L9LKXsWA==", - "requires": { - "@babel/runtime-corejs3": "^7.11.2", - "btoa": "^1.2.1", - "buffer": "^6.0.3", - "cookie": "~0.4.1", - "cross-fetch": "^3.1.4", - "deep-extend": "~0.6.0", - "fast-json-patch": "^3.0.0-1", - "form-data-encoder": "^1.0.1", - "formdata-node": "^3.6.2", - "js-yaml": "^3.14.0", - "lodash": "^4.17.19", - "qs": "^6.9.4", - "querystring-browser": "^1.0.4", - "traverse": "~0.6.6", - "url": "~0.11.0" - } } } }, diff --git a/package.json b/package.json index 370452d6222..16f4e5b332d 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "redux": "^3.x.x", "reselect": "^4.0.0", "swagger-client": "^3.15.0", - "swagger-ui": "^3.51.2", + "swagger-ui": "^3.52.0", "traverse": "^0.6.6", "validator": "=13.6.0", "yaml-js": "^0.2.3"