Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.2.x] Fix OpenAPI editor and viewer issues #6135

Merged
merged 2 commits into from Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions gravitee-apim-console-webui/.browserslistrc
@@ -0,0 +1,9 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5% and supports es6-module
last 2 versions and supports es6-module
15 changes: 1 addition & 14 deletions gravitee-apim-console-webui/babel.config.js
Expand Up @@ -14,18 +14,5 @@
* limitations under the License.
*/
module.exports = {
env: {
test: {
presets: [
[
'@babel/preset-env',
{
targets: {
node: 'current',
},
},
],
],
},
},
presets: ['@babel/preset-env'],
};
5 changes: 5 additions & 0 deletions gravitee-apim-console-webui/conf/webpack-dist.conf.js
Expand Up @@ -61,6 +61,11 @@ module.exports = {
type: 'javascript/auto',
resolve: { mainFields: ['es2015', 'browser', 'module', 'main'] },
},
{
test: /\.js$/,
use: ['babel-loader'],
include: /node_modules\/swagger-ui-dist/,
},
{
test: /\.html$/i,
loader: 'html-loader',
Expand Down
5 changes: 5 additions & 0 deletions gravitee-apim-console-webui/conf/webpack.conf.js
Expand Up @@ -65,6 +65,11 @@ module.exports = {
use: ['ignore-loader'],
include: /node_modules\/codemirror/,
},
{
test: /\.js$/,
use: ['babel-loader'],
include: /node_modules\/swagger-ui-dist/,
},
{
test: /.html$/,
use: ['html-loader'],
Expand Down
9,651 changes: 5,537 additions & 4,114 deletions gravitee-apim-console-webui/package-lock.json

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions gravitee-apim-console-webui/package.json
Expand Up @@ -87,7 +87,7 @@
"reflect-metadata": "0.1.13",
"rxjs": "6.6.7",
"satellizer": "0.15.5",
"swagger-ui-dist": "4.3.0",
"swagger-ui-dist": "5.10.3",
"tinycolor2": "1.4.2",
"traverse": "0.6.6",
"unicode": "11.0.1",
Expand All @@ -99,8 +99,8 @@
"@angular-devkit/build-angular": "13.3.10",
"@angular/cli": "13.3.10",
"@angular/compiler-cli": "13.3.12",
"@babel/core": "7.16.12",
"@babel/preset-env": "7.16.11",
"@babel/core": "7.23.3",
"@babel/preset-env": "7.23.3",
"@storybook/addon-essentials": "6.4.17",
"@storybook/angular": "6.4.17",
"@types/angular": "1.8.4",
Expand All @@ -118,9 +118,8 @@
"@typescript-eslint/eslint-plugin": "5.59.9",
"@typescript-eslint/parser": "5.59.9",
"angular-mocks": "1.8.2",
"babel-core": "6.26.3",
"babel-jest": "27.4.6",
"babel-loader": "7.1.5",
"babel-loader": "8.3.0",
"chromatic": "6.4.2",
"clean-webpack-plugin": "3.0.0",
"compression": "1.7.4",
Expand Down
Expand Up @@ -21,7 +21,7 @@ import { SwaggerUIBundle } from 'swagger-ui-dist';

import UserService from '../../../services/user.service';

const yamlSchema = jsyaml.Schema.create(jsyaml.FAILSAFE_SCHEMA, []);
const yamlSchema = jsyaml.Schema.create(jsyaml.JSON_SCHEMA, []);

const DisableTryItOutPlugin = function () {
return {
Expand Down
8 changes: 4 additions & 4 deletions gravitee-apim-portal-webui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gravitee-apim-portal-webui/package.json
Expand Up @@ -53,7 +53,7 @@
"redoc": "2.0.0",
"resize-observer-polyfill": "1.5.1",
"rxjs": "6.5.5",
"swagger-ui-dist": "4.3.0",
"swagger-ui-dist": "5.10.3",
"tslib": "2.3.1",
"url": "0.11.0",
"zone.js": "0.14.2"
Expand Down