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.

Sign up for GitHub

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

Upgrade minimatch, moment #513

Merged
merged 7 commits into from
Oct 27, 2022
Merged

Upgrade minimatch, moment #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af1d66a
update minimatch version
rupal-bq Oct 26, 2022
aeb6ae1
yarn upgrade
rupal-bq Oct 26, 2022
5c228f0
Revert "yarn upgrade"
rupal-bq Oct 26, 2022
50a13b7
Update terser version
rupal-bq Oct 26, 2022
a7d0544
Update moment version
rupal-bq Oct 26, 2022
3760983
update jsdom version
rupal-bq Oct 26, 2022
2a07283
merge 2.x
rupal-bq Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dashboards-reports/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
"ansi-regex": "5.0.1",
"json-schema": "0.4.0",
"ws": "^7.4.6",
"terser": "^4.8.1"
"minimatch": "^3.0.5",
"terser": "^4.8.1",
"moment": "^2.29.4"
Comment on lines +76 to +78
Copy link
Collaborator

Choose a reason for hiding this comment

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

Were these used before? Where are they coming from?

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, all are existing dependencies. Just updating the version.

Copy link
Member

Choose a reason for hiding this comment

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

@rupal-bq can you please check if they are also present in OpenSearch-Dashboards? If so, we need not add the dependencies here again.

Copy link
Member

Choose a reason for hiding this comment

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

In Dashboards this is the current state in 2.x:
https://github.com/opensearch-project/OpenSearch-Dashboards/blob/2.x/package.json

    "minimatch": "^3.0.4",
    "moment": "^2.24.0",

Copy link
Member

Choose a reason for hiding this comment

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

fyi, in OSD, there's a PR pending to update minimatch to 3.0.5, merged in main, pending approval for 2.x
opensearch-project/OpenSearch-Dashboards#2654

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @ps48, I didn't know that. Some are present in OpenSearch-Dashboards. I'll update PR accordingly.

Copy link
Member

Choose a reason for hiding this comment

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

does dashboards resolving it to 3.0.5 prevent plugins resolving it to 3.0.4? I think Dashboards package.json direct dependency will not affect transitive dependencies?

}
}
17 changes: 5 additions & 12 deletions dashboards-reports/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4639,14 +4639,7 @@ minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==

minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"

minimatch@^3.1.1:
minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
Expand Down Expand Up @@ -4706,10 +4699,10 @@ mkdirp@^0.5.4:
dependencies:
minimist "^1.2.5"

moment@^2.27.0:
version "2.29.3"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
moment@^2.27.0, moment@^2.29.4:
version "2.29.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==

move-concurrently@^1.0.1:
version "1.0.1"
Expand Down