Skip to content

Commit

Permalink
[Manual backport 2.x] Bump OUI to 1.3.0 (#4941) (#4946)
Browse files Browse the repository at this point in the history
* Bump OUI to `1.3.0`

Signed-off-by: Josh Romero <[email protected]>

* bump changelog

Signed-off-by: Josh Romero <[email protected]>

* Remove unecessary sass import

CollapsibleNav vars now provided via theme import
see opensearch-project/oui#968

Signed-off-by: Josh Romero <[email protected]>

---------

Signed-off-by: Josh Romero <[email protected]>
Signed-off-by: Kawika Avilla <[email protected]>
Co-authored-by: Kawika Avilla <[email protected]>
  • Loading branch information
joshuarrrr and kavilla authored Sep 7, 2023
1 parent 2b167df commit 848123d
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 110 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

- Adding @ZilongX and @Flyingliuhub as maintainers. ([#4137](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4137))
- Add new MAINTAINERS to CODEOWNERS file. ([#4199](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4199))
- Bump `oui` to `1.3.0` ([#4941](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4941))
- Adding @BSFishy as maintainer. ([#4469](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4469))

### 🪛 Refactoring
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"dependencies": {
"@aws-crypto/client-node": "^3.1.1",
"@elastic/datemath": "5.0.3",
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/numeral": "^2.5.0",
"@elastic/request-crypto": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"enzyme-adapter-react-16": "^1.9.1"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"@osd/babel-preset": "1.0.0",
"@osd/optimizer": "1.0.0",
"comment-stripper": "^0.0.4",
Expand Down
3 changes: 2 additions & 1 deletion packages/osd-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
},
"dependencies": {
"@elastic/charts": "31.1.0",
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"@elastic/numeral": "^2.5.0",
"@opensearch/datemath": "5.0.3",
"@osd/i18n": "1.0.0",
"@osd/monaco": "1.0.0",
"abortcontroller-polyfill": "^1.4.0",
Expand Down
3 changes: 0 additions & 3 deletions src/core/public/styles/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
@import "@elastic/charts/dist/theme";
@import "@elastic/eui/src/themes/charts/theme";

// Grab some nav-specific EUI vars
@import "@elastic/eui/src/components/collapsible_nav/variables";

// Application Layout
$euiCollapsibleNavWidth: $euiSize * 20;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"@osd/plugin-helpers": "1.0.0",
"react": "^16.14.0",
"react-dom": "^16.12.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"react": "^16.14.0",
"typescript": "4.0.2"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/[email protected]-alpha.2",
"@elastic/eui": "npm:@opensearch-project/[email protected]",
"@osd/plugin-helpers": "1.0.0",
"react": "^16.14.0",
"typescript": "4.0.2"
Expand Down
Loading

0 comments on commit 848123d

Please sign in to comment.