From bb5325a8ef727e667055412de95a59cb3910851d Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Tue, 21 Feb 2023 14:20:05 +0100 Subject: [PATCH 1/5] feat: integrate SwaggerUI@v5 with experimental OpenAPI 3.1.0 support Refs #3854 --- package-lock.json | 735 +++++++++++++++++- package.json | 2 +- .../EditorPreviewSwaggerUIFallback.jsx | 27 - .../editor-preview-swagger-ui/index.js | 2 - .../wrap-components/EditorPreviewWrapper.jsx | 9 +- 5 files changed, 713 insertions(+), 62 deletions(-) delete mode 100644 src/plugins/editor-preview-swagger-ui/components/EditorPreviewSwaggerUIFallback.jsx diff --git a/package-lock.json b/package-lock.json index eea02787e46..3121030a1be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "reselect": "^4.1.7", "short-unique-id": "^4.4.4", "styled-components": "^5.3.6", - "swagger-ui-react": "^4.15.5", + "swagger-ui-react": "4.16.0-alpha.3", "vscode": "npm:@codingame/monaco-vscode-api@~1.69.13", "vscode-languageclient": "^8.1.0", "vscode-languageserver-textdocument": "^1.0.8" @@ -24985,14 +24985,24 @@ } }, "node_modules/swagger-client": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.18.5.tgz", - "integrity": "sha512-c0txGDtfQTJnaIBaEKCwtRNcUaaAfj+RXI4QVV9p3WW+AUCQqp4naCjaDNNsOfMkE4ySyhnblbL+jGqAVC7snw==", + "version": "3.19.0-alpha.4", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.19.0-alpha.4.tgz", + "integrity": "sha512-Wfi/DHCRNQ2+hBqW/nUptdqU6rDIqa1bzZu6lN50qL6sstEnR0OXPowtVpAW8jVVUF2BzEUMCkyZtQKKTeJO6Q==", + "bundleDependencies": [ + "@swagger-api/apidom-core", + "@swagger-api/apidom-reference", + "@swagger-api/apidom-ns-openapi-3-1", + "@swagger-api/apidom-json-pointer" + ], "dependencies": { "@babel/runtime-corejs3": "^7.11.2", + "@swagger-api/apidom-core": "*", + "@swagger-api/apidom-json-pointer": "*", + "@swagger-api/apidom-ns-openapi-3-1": "*", + "@swagger-api/apidom-reference": "*", "cookie": "~0.5.0", "cross-fetch": "^3.1.5", - "deepmerge": "~4.2.2", + "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", "form-data-encoder": "^1.4.3", "formdata-node": "^4.0.0", @@ -25004,18 +25014,398 @@ "url": "~0.11.0" } }, - "node_modules/swagger-client/node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2", + "unraw": "=2.0.1" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, "engines": { - "node": ">=0.10.0" + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-core": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-ast": "^0.66.0", + "@types/ramda": "=0.28.21", + "minim": "=0.23.8", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "short-unique-id": "=4.4.4", + "stampit": "=4.3.2" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-core/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-asyncapi-2": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-ns-json-schema-draft-4": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-ns-openapi-3-0": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-json": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-json-2": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-json": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-1": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-yaml-1-2": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference": { + "version": "0.66.0", + "inBundle": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-json-pointer": "^0.66.0", + "@swagger-api/apidom-ns-asyncapi-2": "=0.0.1", + "@swagger-api/apidom-ns-openapi-3-0": "^0.66.0", + "@swagger-api/apidom-ns-openapi-3-1": "^0.66.0", + "@swagger-api/apidom-parser-adapter-api-design-systems-json": "=0.0.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "=0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "=0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "=0.0.1", + "@swagger-api/apidom-parser-adapter-json": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "=0.0.1", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "=0.0.1", + "@types/ramda": "=0.28.21", + "axios": "=1.2.4", + "minimatch": "=6.1.6", + "process": "=0.11.10", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + } + }, + "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference/node_modules/@babel/runtime-corejs3": { + "version": "7.20.7", + "inBundle": true, + "license": "MIT", + "dependencies": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/swagger-client/node_modules/@types/ramda": { + "version": "0.28.21", + "inBundle": true, + "license": "MIT", + "dependencies": { + "ts-toolbelt": "^6.15.1" + } + }, + "node_modules/swagger-client/node_modules/axios": { + "name": "-", + "version": "0.0.1", + "inBundle": true, + "license": "UNLICENSED" + }, + "node_modules/swagger-client/node_modules/balanced-match": { + "version": "1.0.2", + "inBundle": true, + "license": "MIT" + }, + "node_modules/swagger-client/node_modules/brace-expansion": { + "version": "2.0.1", + "inBundle": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/swagger-client/node_modules/core-js-pure": { + "version": "3.27.2", + "hasInstallScript": true, + "inBundle": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/swagger-client/node_modules/lodash": { + "version": "4.17.21", + "inBundle": true, + "license": "MIT" + }, + "node_modules/swagger-client/node_modules/minim": { + "version": "0.23.8", + "inBundle": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.15.0" + }, + "engines": { + "node": ">=6" } }, + "node_modules/swagger-client/node_modules/minimatch": { + "version": "6.1.6", + "inBundle": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/swagger-client/node_modules/process": { + "version": "0.11.10", + "inBundle": true, + "license": "MIT", + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/swagger-client/node_modules/ramda": { + "version": "0.28.0", + "inBundle": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ramda" + } + }, + "node_modules/swagger-client/node_modules/ramda-adjunct": { + "version": "3.4.0", + "inBundle": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ramda-adjunct" + }, + "peerDependencies": { + "ramda": ">= 0.28.0 <= 0.28.0" + } + }, + "node_modules/swagger-client/node_modules/regenerator-runtime": { + "version": "0.13.11", + "inBundle": true, + "license": "MIT" + }, + "node_modules/swagger-client/node_modules/short-unique-id": { + "version": "4.4.4", + "inBundle": true, + "license": "Apache-2.0", + "bin": { + "short-unique-id": "bin/short-unique-id", + "suid": "bin/short-unique-id" + } + }, + "node_modules/swagger-client/node_modules/stampit": { + "version": "4.3.2", + "inBundle": true, + "license": "MIT" + }, + "node_modules/swagger-client/node_modules/ts-toolbelt": { + "version": "6.15.5", + "inBundle": true, + "license": "Apache-2.0" + }, + "node_modules/swagger-client/node_modules/unraw": { + "version": "2.0.1", + "inBundle": true, + "license": "MIT" + }, "node_modules/swagger-ui-react": { - "version": "4.15.5", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.15.5.tgz", - "integrity": "sha512-jt2g6cDt3wOsc+1YQv4D86V4K659Xs1/pbhjYWlgNfjZB0TSN601MASWxbP+65U0iPpsJTpF7EmRzAunTOVs8Q==", + "version": "4.16.0-alpha.3", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.16.0-alpha.3.tgz", + "integrity": "sha512-GmZGxuLzfMgIH9GaX7malbwrmN0oVQXA4deAo/79CLAQ4Z1PsWNCpbYNZEb0Zzw1us/OBZDbpcFa/hruZSl1Cg==", "dependencies": { "@babel/runtime-corejs3": "^7.18.9", "@braintree/sanitize-url": "=6.0.0", @@ -25046,7 +25436,7 @@ "reselect": "^4.1.5", "serialize-error": "^8.1.0", "sha.js": "^2.4.11", - "swagger-client": "^3.18.5", + "swagger-client": "=3.19.0-alpha.4", "url-parse": "^1.5.8", "xml": "=1.0.1", "xml-but-prettier": "^1.0.1", @@ -45912,14 +46302,18 @@ } }, "swagger-client": { - "version": "3.18.5", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.18.5.tgz", - "integrity": "sha512-c0txGDtfQTJnaIBaEKCwtRNcUaaAfj+RXI4QVV9p3WW+AUCQqp4naCjaDNNsOfMkE4ySyhnblbL+jGqAVC7snw==", + "version": "3.19.0-alpha.4", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.19.0-alpha.4.tgz", + "integrity": "sha512-Wfi/DHCRNQ2+hBqW/nUptdqU6rDIqa1bzZu6lN50qL6sstEnR0OXPowtVpAW8jVVUF2BzEUMCkyZtQKKTeJO6Q==", "requires": { "@babel/runtime-corejs3": "^7.11.2", + "@swagger-api/apidom-core": "*", + "@swagger-api/apidom-json-pointer": "*", + "@swagger-api/apidom-ns-openapi-3-1": "*", + "@swagger-api/apidom-reference": "*", "cookie": "~0.5.0", "cross-fetch": "^3.1.5", - "deepmerge": "~4.2.2", + "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", "form-data-encoder": "^1.4.3", "formdata-node": "^4.0.0", @@ -45931,17 +46325,306 @@ "url": "~0.11.0" }, "dependencies": { - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + "@swagger-api/apidom-ast": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2", + "unraw": "=2.0.1" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-core": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-ast": "^0.66.0", + "@types/ramda": "=0.28.21", + "minim": "=0.23.8", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "short-unique-id": "=4.4.4", + "stampit": "=4.3.2" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-json-pointer": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-ns-asyncapi-2": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-ns-json-schema-draft-4": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-ns-openapi-3-0": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-ns-json-schema-draft-4": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-ns-openapi-3-1": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-ns-openapi-3-0": "^0.66.0", + "@types/ramda": "=0.28.21", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@swagger-api/apidom-parser-adapter-api-design-systems-json": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-json": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-parser-adapter-yaml-1-2": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "@swagger-api/apidom-reference": { + "version": "0.66.0", + "bundled": true, + "requires": { + "@babel/runtime-corejs3": "=7.20.7", + "@swagger-api/apidom-core": "^0.66.0", + "@swagger-api/apidom-json-pointer": "^0.66.0", + "@swagger-api/apidom-ns-asyncapi-2": "=0.0.1", + "@swagger-api/apidom-ns-openapi-3-0": "^0.66.0", + "@swagger-api/apidom-ns-openapi-3-1": "^0.66.0", + "@swagger-api/apidom-parser-adapter-api-design-systems-json": "=0.0.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "=0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "=0.0.1", + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "=0.0.1", + "@swagger-api/apidom-parser-adapter-json": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "=0.0.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "=0.0.1", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "=0.0.1", + "@types/ramda": "=0.28.21", + "axios": "=1.2.4", + "minimatch": "=6.1.6", + "process": "=0.11.10", + "ramda": "=0.28.0", + "ramda-adjunct": "=3.4.0", + "stampit": "=4.3.2" + }, + "dependencies": { + "@babel/runtime-corejs3": { + "version": "7.20.7", + "bundled": true, + "requires": { + "core-js-pure": "^3.25.1", + "regenerator-runtime": "^0.13.11" + } + } + } + }, + "@types/ramda": { + "version": "0.28.21", + "bundled": true, + "requires": { + "ts-toolbelt": "^6.15.1" + } + }, + "axios": { + "version": "npm:-@0.0.1", + "bundled": true + }, + "balanced-match": { + "version": "1.0.2", + "bundled": true + }, + "brace-expansion": { + "version": "2.0.1", + "bundled": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "core-js-pure": { + "version": "3.27.2", + "bundled": true + }, + "lodash": { + "version": "4.17.21", + "bundled": true + }, + "minim": { + "version": "0.23.8", + "bundled": true, + "requires": { + "lodash": "^4.15.0" + } + }, + "minimatch": { + "version": "6.1.6", + "bundled": true, + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "process": { + "version": "0.11.10", + "bundled": true + }, + "ramda": { + "version": "0.28.0", + "bundled": true + }, + "ramda-adjunct": { + "version": "3.4.0", + "bundled": true, + "requires": {} + }, + "regenerator-runtime": { + "version": "0.13.11", + "bundled": true + }, + "short-unique-id": { + "version": "4.4.4", + "bundled": true + }, + "stampit": { + "version": "4.3.2", + "bundled": true + }, + "ts-toolbelt": { + "version": "6.15.5", + "bundled": true + }, + "unraw": { + "version": "2.0.1", + "bundled": true } } }, "swagger-ui-react": { - "version": "4.15.5", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.15.5.tgz", - "integrity": "sha512-jt2g6cDt3wOsc+1YQv4D86V4K659Xs1/pbhjYWlgNfjZB0TSN601MASWxbP+65U0iPpsJTpF7EmRzAunTOVs8Q==", + "version": "4.16.0-alpha.3", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.16.0-alpha.3.tgz", + "integrity": "sha512-GmZGxuLzfMgIH9GaX7malbwrmN0oVQXA4deAo/79CLAQ4Z1PsWNCpbYNZEb0Zzw1us/OBZDbpcFa/hruZSl1Cg==", "requires": { "@babel/runtime-corejs3": "^7.18.9", "@braintree/sanitize-url": "=6.0.0", @@ -45972,7 +46655,7 @@ "reselect": "^4.1.5", "serialize-error": "^8.1.0", "sha.js": "^2.4.11", - "swagger-client": "^3.18.5", + "swagger-client": "=3.19.0-alpha.4", "url-parse": "^1.5.8", "xml": "=1.0.1", "xml-but-prettier": "^1.0.1", diff --git a/package.json b/package.json index bcff7e92f3a..e7b621bdb8b 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "reselect": "^4.1.7", "short-unique-id": "^4.4.4", "styled-components": "^5.3.6", - "swagger-ui-react": "^4.15.5", + "swagger-ui-react": "4.16.0-alpha.3", "vscode": "npm:@codingame/monaco-vscode-api@~1.69.13", "vscode-languageclient": "^8.1.0", "vscode-languageserver-textdocument": "^1.0.8" diff --git a/src/plugins/editor-preview-swagger-ui/components/EditorPreviewSwaggerUIFallback.jsx b/src/plugins/editor-preview-swagger-ui/components/EditorPreviewSwaggerUIFallback.jsx deleted file mode 100644 index cf426ad12b0..00000000000 --- a/src/plugins/editor-preview-swagger-ui/components/EditorPreviewSwaggerUIFallback.jsx +++ /dev/null @@ -1,27 +0,0 @@ -const EditorPreviewSwaggerUIFallback = () => ( -
-
-
-
-

Unable to render editor content

-

SwaggerUI does not currently support rendering of OpenAPI 3.1 definitions.

-

- It is in the SwaggerUI roadmap to fully support rendering of OpenAPI 3.1 definitions. - For additional information, please refer to this Github{' '} - issue. -

-

- However, SwaggerEditor itself does support OpenAPI 3.1 within its editing experience. - This includes OpenAPI 3.1 validation rules and semantic highlighting. -

-

- Thus, you may continue to write and update your OpenAPI 3.1 definitions with confidence - in conformance to the OpenAPI 3.1 specification. -

-
-
-
-
-); - -export default EditorPreviewSwaggerUIFallback; diff --git a/src/plugins/editor-preview-swagger-ui/index.js b/src/plugins/editor-preview-swagger-ui/index.js index 697884d49a9..490bc2acdc8 100644 --- a/src/plugins/editor-preview-swagger-ui/index.js +++ b/src/plugins/editor-preview-swagger-ui/index.js @@ -1,5 +1,4 @@ import EditorPreviewSwaggerUI from './components/EditorPreviewSwaggerUI.jsx'; -import EditorPreviewSwaggerUIFallback from './components/EditorPreviewSwaggerUIFallback.jsx'; import EditorPreviewWrapper from './wrap-components/EditorPreviewWrapper.jsx'; import { previewUnmounted } from './actions.js'; import { @@ -10,7 +9,6 @@ import { const EditorPreviewSwaggerUIPlugin = () => ({ components: { EditorPreviewSwaggerUI, - EditorPreviewSwaggerUIFallback, }, wrapComponents: { EditorPreview: EditorPreviewWrapper, diff --git a/src/plugins/editor-preview-swagger-ui/wrap-components/EditorPreviewWrapper.jsx b/src/plugins/editor-preview-swagger-ui/wrap-components/EditorPreviewWrapper.jsx index 278036ad199..b46ef301178 100644 --- a/src/plugins/editor-preview-swagger-ui/wrap-components/EditorPreviewWrapper.jsx +++ b/src/plugins/editor-preview-swagger-ui/wrap-components/EditorPreviewWrapper.jsx @@ -4,15 +4,12 @@ import PropTypes from 'prop-types'; const EditorPreviewWrapper = (Original, system) => { const EditorPreview = ({ getComponent, editorSelectors }) => { const EditorPreviewSwaggerUI = getComponent('EditorPreviewSwaggerUI', true); - const EditorPreviewSwaggerUIFallback = getComponent('EditorPreviewSwaggerUIFallback', true); const isOpenAPI = editorSelectors.selectIsContentTypeOpenAPI(); - const isOpenAPI31 = editorSelectors.selectIsContentTypeOpenAPI31x(); - if (isOpenAPI && !isOpenAPI31) { + + if (isOpenAPI) { return ; } - if (isOpenAPI && isOpenAPI31) { - return ; - } + return ( // eslint-disable-line react/jsx-props-no-spreading ); From 8c3eccdac459cb4147ec0f660a5b55a22db02318 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Tue, 21 Feb 2023 14:22:29 +0100 Subject: [PATCH 2/5] chore(deps): updat e package-lock.json --- package-lock.json | 122 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3121030a1be..7165053da78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25016,6 +25016,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25029,6 +25030,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25041,6 +25043,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-core": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25056,6 +25059,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-core/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25068,6 +25072,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25079,6 +25084,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25092,11 +25098,13 @@ "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-asyncapi-2": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25110,6 +25118,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25122,6 +25131,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25136,6 +25146,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25148,6 +25159,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25162,6 +25174,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25175,65 +25188,76 @@ "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-json": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-json-2": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-json": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-1": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-yaml-1-2": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference": { "version": "0.66.0", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25264,6 +25288,7 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25276,6 +25301,7 @@ }, "node_modules/swagger-client/node_modules/@types/ramda": { "version": "0.28.21", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25285,16 +25311,19 @@ "node_modules/swagger-client/node_modules/axios": { "name": "-", "version": "0.0.1", + "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/balanced-match": { "version": "1.0.2", + "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/brace-expansion": { "version": "2.0.1", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25303,6 +25332,7 @@ }, "node_modules/swagger-client/node_modules/core-js-pure": { "version": "3.27.2", + "extraneous": true, "hasInstallScript": true, "inBundle": true, "license": "MIT", @@ -25318,6 +25348,7 @@ }, "node_modules/swagger-client/node_modules/minim": { "version": "0.23.8", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25329,6 +25360,7 @@ }, "node_modules/swagger-client/node_modules/minimatch": { "version": "6.1.6", + "extraneous": true, "inBundle": true, "license": "ISC", "dependencies": { @@ -25343,6 +25375,7 @@ }, "node_modules/swagger-client/node_modules/process": { "version": "0.11.10", + "extraneous": true, "inBundle": true, "license": "MIT", "engines": { @@ -25351,6 +25384,7 @@ }, "node_modules/swagger-client/node_modules/ramda": { "version": "0.28.0", + "extraneous": true, "inBundle": true, "license": "MIT", "funding": { @@ -25360,6 +25394,7 @@ }, "node_modules/swagger-client/node_modules/ramda-adjunct": { "version": "3.4.0", + "extraneous": true, "inBundle": true, "license": "BSD-3-Clause", "engines": { @@ -25375,11 +25410,13 @@ }, "node_modules/swagger-client/node_modules/regenerator-runtime": { "version": "0.13.11", + "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/short-unique-id": { "version": "4.4.4", + "extraneous": true, "inBundle": true, "license": "Apache-2.0", "bin": { @@ -25389,16 +25426,19 @@ }, "node_modules/swagger-client/node_modules/stampit": { "version": "4.3.2", + "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/ts-toolbelt": { "version": "6.15.5", + "extraneous": true, "inBundle": true, "license": "Apache-2.0" }, "node_modules/swagger-client/node_modules/unraw": { "version": "2.0.1", + "extraneous": true, "inBundle": true, "license": "MIT" }, @@ -46328,6 +46368,7 @@ "@swagger-api/apidom-ast": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@types/ramda": "=0.28.21", @@ -46340,6 +46381,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46350,6 +46392,7 @@ "@swagger-api/apidom-core": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-ast": "^0.66.0", @@ -46364,6 +46407,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46374,6 +46418,7 @@ "@swagger-api/apidom-json-pointer": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46384,6 +46429,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46393,11 +46439,13 @@ }, "@swagger-api/apidom-ns-asyncapi-2": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-ns-json-schema-draft-4": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46410,6 +46458,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46420,6 +46469,7 @@ "@swagger-api/apidom-ns-openapi-3-0": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46433,6 +46483,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46443,6 +46494,7 @@ "@swagger-api/apidom-ns-openapi-3-1": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46456,6 +46508,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46465,47 +46518,58 @@ }, "@swagger-api/apidom-parser-adapter-api-design-systems-json": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-asyncapi-json-2": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-json": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-openapi-json-3-0": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-openapi-json-3-1": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-parser-adapter-yaml-1-2": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "@swagger-api/apidom-reference": { "version": "0.66.0", "bundled": true, + "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46535,6 +46599,7 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, + "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46545,28 +46610,33 @@ "@types/ramda": { "version": "0.28.21", "bundled": true, + "extraneous": true, "requires": { "ts-toolbelt": "^6.15.1" } }, "axios": { "version": "npm:-@0.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "balanced-match": { "version": "1.0.2", - "bundled": true + "bundled": true, + "extraneous": true }, "brace-expansion": { "version": "2.0.1", "bundled": true, + "extraneous": true, "requires": { "balanced-match": "^1.0.0" } }, "core-js-pure": { "version": "3.27.2", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash": { "version": "4.17.21", @@ -46575,6 +46645,7 @@ "minim": { "version": "0.23.8", "bundled": true, + "extraneous": true, "requires": { "lodash": "^4.15.0" } @@ -46582,42 +46653,51 @@ "minimatch": { "version": "6.1.6", "bundled": true, + "extraneous": true, "requires": { "brace-expansion": "^2.0.1" } }, "process": { "version": "0.11.10", - "bundled": true + "bundled": true, + "extraneous": true }, "ramda": { "version": "0.28.0", - "bundled": true + "bundled": true, + "extraneous": true }, "ramda-adjunct": { "version": "3.4.0", "bundled": true, + "extraneous": true, "requires": {} }, "regenerator-runtime": { "version": "0.13.11", - "bundled": true + "bundled": true, + "extraneous": true }, "short-unique-id": { "version": "4.4.4", - "bundled": true + "bundled": true, + "extraneous": true }, "stampit": { "version": "4.3.2", - "bundled": true + "bundled": true, + "extraneous": true }, "ts-toolbelt": { "version": "6.15.5", - "bundled": true + "bundled": true, + "extraneous": true }, "unraw": { "version": "2.0.1", - "bundled": true + "bundled": true, + "extraneous": true } } }, From c19371ac18f1b612e0fd1e62feb55fc6c6cbde79 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Tue, 21 Feb 2023 14:31:18 +0100 Subject: [PATCH 3/5] chore(deps): updat e package-lock.json --- package-lock.json | 134 ++++++++++------------------------------------ 1 file changed, 27 insertions(+), 107 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7165053da78..7e311dcbad4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25016,7 +25016,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25030,7 +25029,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ast/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25043,7 +25041,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-core": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25059,7 +25056,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-core/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25072,7 +25068,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25084,7 +25079,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-json-pointer/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25098,13 +25092,11 @@ "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-asyncapi-2": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25118,7 +25110,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-json-schema-draft-4/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25131,7 +25122,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25146,7 +25136,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-0/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25159,7 +25148,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25174,7 +25162,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-ns-openapi-3-1/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25188,76 +25175,65 @@ "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-json": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-json-2": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-json": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-1": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-parser-adapter-yaml-1-2": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference": { "version": "0.66.0", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -25288,7 +25264,6 @@ }, "node_modules/swagger-client/node_modules/@swagger-api/apidom-reference/node_modules/@babel/runtime-corejs3": { "version": "7.20.7", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25301,7 +25276,6 @@ }, "node_modules/swagger-client/node_modules/@types/ramda": { "version": "0.28.21", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25311,19 +25285,16 @@ "node_modules/swagger-client/node_modules/axios": { "name": "-", "version": "0.0.1", - "extraneous": true, "inBundle": true, "license": "UNLICENSED" }, "node_modules/swagger-client/node_modules/balanced-match": { "version": "1.0.2", - "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/brace-expansion": { "version": "2.0.1", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25332,7 +25303,6 @@ }, "node_modules/swagger-client/node_modules/core-js-pure": { "version": "3.27.2", - "extraneous": true, "hasInstallScript": true, "inBundle": true, "license": "MIT", @@ -25348,7 +25318,6 @@ }, "node_modules/swagger-client/node_modules/minim": { "version": "0.23.8", - "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -25360,7 +25329,6 @@ }, "node_modules/swagger-client/node_modules/minimatch": { "version": "6.1.6", - "extraneous": true, "inBundle": true, "license": "ISC", "dependencies": { @@ -25375,7 +25343,6 @@ }, "node_modules/swagger-client/node_modules/process": { "version": "0.11.10", - "extraneous": true, "inBundle": true, "license": "MIT", "engines": { @@ -25384,7 +25351,6 @@ }, "node_modules/swagger-client/node_modules/ramda": { "version": "0.28.0", - "extraneous": true, "inBundle": true, "license": "MIT", "funding": { @@ -25394,7 +25360,6 @@ }, "node_modules/swagger-client/node_modules/ramda-adjunct": { "version": "3.4.0", - "extraneous": true, "inBundle": true, "license": "BSD-3-Clause", "engines": { @@ -25410,13 +25375,11 @@ }, "node_modules/swagger-client/node_modules/regenerator-runtime": { "version": "0.13.11", - "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/short-unique-id": { "version": "4.4.4", - "extraneous": true, "inBundle": true, "license": "Apache-2.0", "bin": { @@ -25426,19 +25389,16 @@ }, "node_modules/swagger-client/node_modules/stampit": { "version": "4.3.2", - "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/swagger-client/node_modules/ts-toolbelt": { "version": "6.15.5", - "extraneous": true, "inBundle": true, "license": "Apache-2.0" }, "node_modules/swagger-client/node_modules/unraw": { "version": "2.0.1", - "extraneous": true, "inBundle": true, "license": "MIT" }, @@ -26586,9 +26546,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.69.18", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.18.tgz", - "integrity": "sha512-e2hGxp6Tm4B1UncHr6kjXFXp5gKFw5+RZrMNOykSvcQsp1lDxKFXxCIeuGsKxenldI5fXCR8+VxfxAcYQQuqEA==", + "version": "1.69.19", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.19.tgz", + "integrity": "sha512-SCwzkMqPjD7LGc66tnPkQL5q+M1+5phrXl93JruriGEKAMtvf29z1/uluFZwyAg2eHQkpG+BzFA3shEpG0GHOg==", "peerDependencies": { "monaco-editor": "~0.34.0", "vscode-oniguruma": "^1.6.2", @@ -46368,7 +46328,6 @@ "@swagger-api/apidom-ast": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@types/ramda": "=0.28.21", @@ -46381,7 +46340,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46392,7 +46350,6 @@ "@swagger-api/apidom-core": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-ast": "^0.66.0", @@ -46407,7 +46364,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46418,7 +46374,6 @@ "@swagger-api/apidom-json-pointer": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46429,7 +46384,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46439,13 +46393,11 @@ }, "@swagger-api/apidom-ns-asyncapi-2": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-ns-json-schema-draft-4": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46458,7 +46410,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46469,7 +46420,6 @@ "@swagger-api/apidom-ns-openapi-3-0": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46483,7 +46433,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46494,7 +46443,6 @@ "@swagger-api/apidom-ns-openapi-3-1": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46508,7 +46456,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46518,58 +46465,47 @@ }, "@swagger-api/apidom-parser-adapter-api-design-systems-json": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-asyncapi-json-2": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-json": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-openapi-json-3-0": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-openapi-json-3-1": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-parser-adapter-yaml-1-2": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "@swagger-api/apidom-reference": { "version": "0.66.0", "bundled": true, - "extraneous": true, "requires": { "@babel/runtime-corejs3": "=7.20.7", "@swagger-api/apidom-core": "^0.66.0", @@ -46599,7 +46535,6 @@ "@babel/runtime-corejs3": { "version": "7.20.7", "bundled": true, - "extraneous": true, "requires": { "core-js-pure": "^3.25.1", "regenerator-runtime": "^0.13.11" @@ -46610,33 +46545,28 @@ "@types/ramda": { "version": "0.28.21", "bundled": true, - "extraneous": true, "requires": { "ts-toolbelt": "^6.15.1" } }, "axios": { "version": "npm:-@0.0.1", - "bundled": true, - "extraneous": true + "bundled": true }, "balanced-match": { "version": "1.0.2", - "bundled": true, - "extraneous": true + "bundled": true }, "brace-expansion": { "version": "2.0.1", "bundled": true, - "extraneous": true, "requires": { "balanced-match": "^1.0.0" } }, "core-js-pure": { "version": "3.27.2", - "bundled": true, - "extraneous": true + "bundled": true }, "lodash": { "version": "4.17.21", @@ -46645,7 +46575,6 @@ "minim": { "version": "0.23.8", "bundled": true, - "extraneous": true, "requires": { "lodash": "^4.15.0" } @@ -46653,51 +46582,42 @@ "minimatch": { "version": "6.1.6", "bundled": true, - "extraneous": true, "requires": { "brace-expansion": "^2.0.1" } }, "process": { "version": "0.11.10", - "bundled": true, - "extraneous": true + "bundled": true }, "ramda": { "version": "0.28.0", - "bundled": true, - "extraneous": true + "bundled": true }, "ramda-adjunct": { "version": "3.4.0", "bundled": true, - "extraneous": true, "requires": {} }, "regenerator-runtime": { "version": "0.13.11", - "bundled": true, - "extraneous": true + "bundled": true }, "short-unique-id": { "version": "4.4.4", - "bundled": true, - "extraneous": true + "bundled": true }, "stampit": { "version": "4.3.2", - "bundled": true, - "extraneous": true + "bundled": true }, "ts-toolbelt": { "version": "6.15.5", - "bundled": true, - "extraneous": true + "bundled": true }, "unraw": { "version": "2.0.1", - "bundled": true, - "extraneous": true + "bundled": true } } }, @@ -47603,9 +47523,9 @@ } }, "vscode": { - "version": "npm:@codingame/monaco-vscode-api@1.69.18", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.18.tgz", - "integrity": "sha512-e2hGxp6Tm4B1UncHr6kjXFXp5gKFw5+RZrMNOykSvcQsp1lDxKFXxCIeuGsKxenldI5fXCR8+VxfxAcYQQuqEA==", + "version": "npm:@codingame/monaco-vscode-api@1.69.19", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.19.tgz", + "integrity": "sha512-SCwzkMqPjD7LGc66tnPkQL5q+M1+5phrXl93JruriGEKAMtvf29z1/uluFZwyAg2eHQkpG+BzFA3shEpG0GHOg==", "requires": {} }, "vscode-jsonrpc": { From 38ef840cd961ea0e019c2374d15fc2d8f736dfb9 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Fri, 10 Mar 2023 12:32:20 +0100 Subject: [PATCH 4/5] chore(deps): update deps --- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e51a97e6c2..fe926a40bb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,8 +17,8 @@ "@braintree/sanitize-url": "^6.0.2", "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", - "@mui/material": "^5.11.3", - "@primer/octicons-react": "^18.0.0", + "@mui/material": "^5.11.12", + "@primer/octicons-react": "^18.1.0", "@swagger-api/apidom-core": "^0.69.0", "@swagger-api/apidom-ls": "^0.69.0", "@swagger-api/apidom-ns-api-design-systems": "^0.69.0", @@ -51,7 +51,7 @@ "reselect": "^4.1.7", "short-unique-id": "^4.4.4", "styled-components": "^5.3.8", - "swagger-ui-react": "^4.17.1", + "swagger-ui-react": "^5.0.0-alpha.0", "vscode": "npm:@codingame/monaco-vscode-api@~1.69.13", "vscode-languageclient": "^8.1.0", "vscode-languageserver-textdocument": "^1.0.8" @@ -25044,9 +25044,9 @@ } }, "node_modules/swagger-ui-react": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.18.1.tgz", - "integrity": "sha512-ntD8CUJ4K6Yt9x1yZq4HTQoTTCRL6PvINtqS7ot2Dealcq/vX0BTaPHAo+Jq7fbROuVdZCOrjeDNRdzJvWumNQ==", + "version": "5.0.0-alpha.0", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-5.0.0-alpha.0.tgz", + "integrity": "sha512-13nKuFx79R3vOFHn2yrDqQdpOogAOHAZap+WbojNbmmPnT5d75u56+VRsfFbMoCf1Z4ZACYALG0BiTwhAvn+nA==", "dependencies": { "@babel/runtime-corejs3": "^7.18.9", "@braintree/sanitize-url": "=6.0.2", @@ -46045,9 +46045,9 @@ } }, "swagger-ui-react": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-4.18.1.tgz", - "integrity": "sha512-ntD8CUJ4K6Yt9x1yZq4HTQoTTCRL6PvINtqS7ot2Dealcq/vX0BTaPHAo+Jq7fbROuVdZCOrjeDNRdzJvWumNQ==", + "version": "5.0.0-alpha.0", + "resolved": "https://registry.npmjs.org/swagger-ui-react/-/swagger-ui-react-5.0.0-alpha.0.tgz", + "integrity": "sha512-13nKuFx79R3vOFHn2yrDqQdpOogAOHAZap+WbojNbmmPnT5d75u56+VRsfFbMoCf1Z4ZACYALG0BiTwhAvn+nA==", "requires": { "@babel/runtime-corejs3": "^7.18.9", "@braintree/sanitize-url": "=6.0.2", diff --git a/package.json b/package.json index 950b692edf5..d871e7ef357 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "@braintree/sanitize-url": "^6.0.2", "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", - "@mui/material": "^5.11.3", - "@primer/octicons-react": "^18.0.0", + "@mui/material": "^5.11.12", + "@primer/octicons-react": "^18.1.0", "@swagger-api/apidom-core": "^0.69.0", "@swagger-api/apidom-ls": "^0.69.0", "@swagger-api/apidom-ns-api-design-systems": "^0.69.0", @@ -91,7 +91,7 @@ "reselect": "^4.1.7", "short-unique-id": "^4.4.4", "styled-components": "^5.3.8", - "swagger-ui-react": "^4.17.1", + "swagger-ui-react": "^5.0.0-alpha.0", "vscode": "npm:@codingame/monaco-vscode-api@~1.69.13", "vscode-languageclient": "^8.1.0", "vscode-languageserver-textdocument": "^1.0.8" From 71bcd88b9b582ab0f679041a4b5e6e206fa5d162 Mon Sep 17 00:00:00 2001 From: Vladimir Gorej Date: Fri, 10 Mar 2023 12:41:16 +0100 Subject: [PATCH 5/5] test: fix tests --- .../plugin.editor-preview-swagger-ui.spec.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/test/cypress/integration/plugin.editor-preview-swagger-ui.spec.js b/test/cypress/integration/plugin.editor-preview-swagger-ui.spec.js index 94ab1c19b14..801f75afd1f 100644 --- a/test/cypress/integration/plugin.editor-preview-swagger-ui.spec.js +++ b/test/cypress/integration/plugin.editor-preview-swagger-ui.spec.js @@ -6,7 +6,7 @@ describe('Editor Preview Pane: OpenAPI 2.0, 3.0.x, 3.1.x', () => { cy.waitForSplashScreen(); }); - it('displays OpenAPI 2.0', () => { + it('should display OpenAPI 2.0', () => { cy.contains('File').click(); cy.contains('Load Example').trigger('mouseover'); cy.contains('OpenAPI 2.0 Petstore').trigger('mousemove').click(); @@ -16,7 +16,7 @@ describe('Editor Preview Pane: OpenAPI 2.0, 3.0.x, 3.1.x', () => { cy.get('.version-stamp > .version').should('not.exist'); }); - it('displays OpenAPI 3.0', () => { + it('should display OpenAPI 3.0.x', () => { cy.contains('File').click(); cy.contains('Load Example').trigger('mouseover'); cy.contains('OpenAPI 3.0 Petstore').trigger('mousemove').click(); @@ -26,18 +26,14 @@ describe('Editor Preview Pane: OpenAPI 2.0, 3.0.x, 3.1.x', () => { cy.get('.version-stamp > .version').should('be.visible').contains('OAS3').should('be.visible'); }); - it('displays OpenAPI 3.1 fallback', () => { + it('should display OpenAPI 3.1.0', () => { cy.contains('File').click(); cy.contains('Load Example').trigger('mouseover'); cy.contains('OpenAPI 3.1 Petstore').trigger('mousemove').click(); - // `.version-pragma__message` is a SwaggerEditor specific css class, that should only appear in the preview pane - cy.get('.version-pragma__message h3') - .contains('Unable to render editor content') - .should('be.visible'); - cy.get('.version-pragma__message > div') - .contains('SwaggerUI does not currently support rendering of OpenAPI 3.1 definitions') - .should('be.visible'); + // `.title` and `.version-stamp` are SwaggerUI specific css classes, that should only appear in the preview pane + cy.get('.title').contains('Swagger Petstore - OpenAPI 3.1').should('be.visible'); + cy.get('.version-stamp > .version').should('be.visible').contains('OAS3').should('be.visible'); }); it('should be hidden if not OpenAPI', () => {