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

Change dompurify version to 3.0.11 to match OSD #516

Merged
merged 1 commit into from
Feb 4, 2025

Conversation

ritvibhatt
Copy link
Contributor

Description

Change dompurify version to 3.0.11 to match OSD
Different versions are causing build issues

dompurify

          ^3.0.11 => opensearch-dashboards

          ^3.2.4 => reports-dashboards

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@@ -2512,7 +2512,7 @@ dompurify@^2.2.0:
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.6.tgz#8402b501611eaa7fb3786072297fcbe2787f8592"
integrity sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ==

dompurify@^3.2.4:
dompurify@^3.0.11:
version "3.2.4"
Copy link

@rishabh6788 rishabh6788 Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't the version field be updated automatically to 3.1.6 like in OSD?
@ritvibhatt @ps48

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tried bootstrapping without the --single-version=loose flag and that version difference isn't causing any errors

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please bootstrap without the flag like we do it in jenkins build.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes without the flag, it's not showing an error with this change

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, please merge the changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can actually remove dompurify here and use the one from core, since core also depends on dompurify now

@joshuali925 joshuali925 merged commit 9fa0467 into opensearch-project:2.19 Feb 4, 2025
9 of 12 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 4, 2025
Signed-off-by: Ritvi Bhatt <[email protected]>
Co-authored-by: Ritvi Bhatt <[email protected]>
(cherry picked from commit 9fa0467)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 4, 2025
Signed-off-by: Ritvi Bhatt <[email protected]>
Co-authored-by: Ritvi Bhatt <[email protected]>
(cherry picked from commit 9fa0467)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
joshuali925 pushed a commit that referenced this pull request Feb 4, 2025
(cherry picked from commit 9fa0467)

Signed-off-by: Ritvi Bhatt <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ritvi Bhatt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants