[Manual backport 2.x] Bump OUI to 1.3.0 (#4941) (#4946)

* Bump OUI to `1.3.0` Signed-off-by: Josh Romero <rmerqg@amazon.com> * bump changelog Signed-off-by: Josh Romero <rmerqg@amazon.com> * Remove unecessary sass import CollapsibleNav vars now provided via theme import see opensearch-project/oui#968 Signed-off-by: Josh Romero <rmerqg@amazon.com> --------- Signed-off-by: Josh Romero <rmerqg@amazon.com> Signed-off-by: Kawika Avilla <kavilla414@gmail.com> Co-authored-by: Kawika Avilla <kavilla414@gmail.com>
opensearch-project · Sep 7, 2023 · 848123d · 848123d
1 parent 2b167df
commit 848123d
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/package.json b/package.json
@@ -125,7 +125,7 @@
   "dependencies": {
     "@aws-crypto/client-node": "^3.1.1",
     "@elastic/datemath": "5.0.3",
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "2.0.0",

diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json
@@ -23,7 +23,7 @@
     "enzyme-adapter-react-16": "^1.9.1"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "@osd/babel-preset": "1.0.0",
     "@osd/optimizer": "1.0.0",
     "comment-stripper": "^0.0.4",

diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json
@@ -10,8 +10,9 @@
   },
   "dependencies": {
     "@elastic/charts": "31.1.0",
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "@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",

diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss
@@ -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;
 

diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.12.0",

diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"
   }

diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0-alpha.2",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.3.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"