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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Fix OpenAPI editor and viewer issues #6134

Merged
merged 2 commits into from Dec 6, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 6, 2023

This is an automatic copy of pull request #6122 done by Mergify.


This is an automatic copy of pull request #5997 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-3401
gravitee-io/issues#9391

https://gravitee.atlassian.net/browse/APIM-3536
gravitee-io/issues#9414

Description

Need to update Babel and Webpack configuration to properly load the latest versions of Swagger-ui-dist

Applied #3242 to the console


馃摎聽聽View the storybook of this branch here


Cherry-pick of 1819642 has failed:

On branch mergify/bp/4.0.x/pr-5997
Your branch is up to date with 'origin/4.0.x'.

You are currently cherry-picking commit 181964235a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-console-webui/babel.config.js
	modified:   gravitee-apim-console-webui/conf/webpack-dist.conf.js
	modified:   gravitee-apim-console-webui/conf/webpack.conf.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/package-lock.json
	both modified:   gravitee-apim-console-webui/package.json
	both modified:   gravitee-apim-portal-webui/package-lock.json
	both modified:   gravitee-apim-portal-webui/package.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


馃摎聽聽View the storybook of this branch here


Cherry-pick of df4ac9f has failed:

On branch mergify/bp/master/pr-6122
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit df4ac9f16c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-apim-console-webui/.browserslistrc
	modified:   gravitee-apim-console-webui/babel.config.js
	modified:   gravitee-apim-console-webui/conf/webpack-dist.conf.js
	modified:   gravitee-apim-console-webui/conf/webpack.conf.js
	modified:   gravitee-apim-console-webui/package.json
	modified:   gravitee-apim-portal-webui/package-lock.json
	modified:   gravitee-apim-portal-webui/package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/package-lock.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


馃摎聽聽View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner December 6, 2023 16:00
@mergify mergify bot added the conflicts label Dec 6, 2023
@gaetanmaisse gaetanmaisse changed the title [master] [4.0.x] Fix OpenAPI editor and viewer issues [master] Fix OpenAPI editor and viewer issues Dec 6, 2023
Need to update Babel and Webpack configuration to properly load the latest versions of Swagger-ui-dist

Also, added a browserlistrc file to (the same as the portal one) for Babel preset env to be configured in relevant way

https://gravitee.atlassian.net/browse/APIM-3401
gravitee-io/issues#9391
(cherry picked from commit df4ac9f)
@gaetanmaisse gaetanmaisse enabled auto-merge (rebase) December 6, 2023 16:22
@gaetanmaisse gaetanmaisse merged commit 3712c28 into master Dec 6, 2023
11 of 13 checks passed
@gaetanmaisse gaetanmaisse deleted the mergify/bp/master/pr-6122 branch December 6, 2023 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant