Merge branch 'main' into bug/hover-icon-button

BigSamu · Jan 1, 2024 · 144782c · 144782c
2 parents a9ecbf9 + 6ef0c94
commit 144782c
Show file tree

Hide file tree

Showing 29 changed files with 821 additions and 165 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -32,9 +32,9 @@ module.exports = {
     "./scripts/babel/variables-from-scss",
     "add-module-exports",
     // stage 3
-    "@babel/proposal-object-rest-spread",
+    "@babel/transform-object-rest-spread",
     // stage 2
-    "@babel/proposal-class-properties",
+    "@babel/transform-class-properties",
     [
       "inline-react-svg",
       {

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @seanneumann @AMoo-Miki @rednaksi91 @KrooshalUX @BSFishy @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak
+*   @AMoo-Miki @rednaksi91 @KrooshalUX @BSFishy @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -2,7 +2,7 @@ name: Build and test
 
 on:
   push:
-    branches: ['**', '!backport/**', '!whitesource-remediate/**']
+    branches: ['**', '!backport/**', '!dependabot/**', '!whitesource-remediate/**']
     paths-ignore:
       - '**/*.md'
   pull_request:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,13 +10,17 @@
 
 - [CVE-2023-46234] Bump `browserify-sign` from `4.0.4` to `4.2.2` ([#1117](https://github.com/opensearch-project/oui/pull/1117))
 - Bump `babel-template` from `6.26.0` to `@babel/template` `7.10.4` ([#1095](https://github.com/opensearch-project/oui/pull/1095))
+- [CVE-2023-45133] Bump `@babel/traverse` from `7.12.10` to `7.23.6` ([#1174](https://github.com/opensearch-project/oui/pull/1174))
 
 ### 📈 Features/Enhancements
 
 - Update ouiTextSubduedColor in `next` dark theme ([#973](https://github.com/opensearch-project/oui/pull/973))
 - Add slugs to markdown headers ([#1051](https://github.com/opensearch-project/oui/pull/1051))
 - Add `crossInCircleEmpty` and `power` icons ([#1044](https://github.com/opensearch-project/oui/pull/1044))
 - Add `Figma` icon and link to OUI Figma resources ([#1064](https://github.com/opensearch-project/oui/pull/1064))
+- Rename `crossInACircleFilled` asset files and ensure backward compatibility ([#1113](https://github.com/opensearch-project/oui/pull/1113))
+- Implement validation for icon input source & set default icon to `Beaker` ([#1137](https://github.com/opensearch-project/oui/pull/1137))
+- Add `Docking` icons ([#1041](https://github.com/opensearch-project/oui/pull/1041))
 
 ### 🐛 Bug Fixes
 
@@ -29,6 +33,7 @@
 ### 🚞 Infrastructure
 
 - Add integration test with OSD workflows ([#1017](https://github.com/opensearch-project/oui/pull/1017))
+- Skip build and test workflows on dependabot PR ([#1170](https://github.com/opensearch-project/oui/pull/1170))
 
 ### 📝 Documentation
 
@@ -44,6 +49,8 @@
 - Clean up `react-datepicker` package to remove unnecessary directories and files ([#1067](https://github.com/opensearch-project/oui/pull/1067))
 - Bump `@types/react` and `csstype` ([#1105](https://github.com/opensearch-project/oui/pull/1105))
 - Add `scripts` folder to lint-es script ([#1143](https://github.com/opensearch-project/oui/pull/1143))
+- Update deprecated Babel plugins ([#1155](https://github.com/opensearch-project/oui/pull/1155))
+- Move @seanneumann to emeritus maintainer ([#1188](https://github.com/opensearch-project/oui/pull/1188))
 
 ### 🪛 Refactoring
 
@@ -74,6 +81,7 @@
 - Add support for null types when deriving JSON from Sass variables ([#1019](https://github.com/opensearch-project/oui/pull/1019))
 - Fix alignment of left icon for OuiListGroupItem with multiline text ([#1027](https://github.com/opensearch-project/oui/pull/1027))
 - Update new polygon icon svg ([#1068](https://github.com/opensearch-project/oui/pull/1083))
+- Remove max-height for TreeView node ([[#1118](https://github.com/opensearch-project/oui/issues/1118)])
 
 ### 🚞 Infrastructure
 

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -6,7 +6,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 | Maintainer               | GitHub ID                                         | Affiliation |
 | ------------------------ | ------------------------------------------------- | ----------- |
-| Sean Neumann             | [seanneumann](https://github.com/seanneumann)     | Amazon      |
 | Miki Barahmand           | [AMoo-Miki](https://github.com/AMoo-Miki)         | Amazon      |
 | Iskander Rakhmanberdiyev | [rednaksi91](https://github.com/rednaksi91)       | Amazon      |
 | Kroosh                   | [KrooshalUX](https://github.com/KrooshalUX)       | Amazon      |
@@ -16,3 +15,10 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Josh Romero              | [joshuarrrr](https://github.com/joshuarrrr)       | Amazon      |
 | Andrey Myssak            | [andreymyssak](https://github.com/andreymyssak)   | Contributor |
 | Sergey Myssak            | [SergeyMyssak](https://github.com/SergeyMyssak)   | Contributor |
+
+
+## Emeritus
+
+| Maintainer               | GitHub ID                                         | Affiliation |
+|--------------------------|---------------------------------------------------|-------------|
+| Sean Neumann             | [seanneumann](https://github.com/seanneumann)     | Contributor |
diff --git a/i18ntokens.json b/i18ntokens.json
@@ -1643,14 +1643,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 275,
+        "line": 279,
         "column": 4,
-        "index": 10041
+        "index": 10184
       },
       "end": {
-        "line": 278,
+        "line": 282,
         "column": 46,
-        "index": 10201
+        "index": 10344
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1661,14 +1661,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 281,
+        "line": 285,
         "column": 10,
-        "index": 10275
+        "index": 10418
       },
       "end": {
-        "line": 283,
+        "line": 287,
         "column": 52,
-        "index": 10397
+        "index": 10540
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1679,14 +1679,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 990,
+        "line": 1004,
         "column": 4,
-        "index": 32868
+        "index": 33235
       },
       "end": {
-        "line": 995,
+        "line": 1009,
         "column": 53,
-        "index": 33041
+        "index": 33408
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1697,14 +1697,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 990,
+        "line": 1004,
         "column": 4,
-        "index": 32868
+        "index": 33235
       },
       "end": {
-        "line": 995,
+        "line": 1009,
         "column": 53,
-        "index": 33041
+        "index": 33408
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1715,14 +1715,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 1031,
+        "line": 1045,
         "column": 20,
-        "index": 34079
+        "index": 34453
       },
       "end": {
-        "line": 1041,
+        "line": 1055,
         "column": 3,
-        "index": 34366
+        "index": 34740
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1733,14 +1733,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 1043,
+        "line": 1057,
         "column": 25,
-        "index": 34394
+        "index": 34768
       },
       "end": {
-        "line": 1052,
+        "line": 1066,
         "column": 3,
-        "index": 34644
+        "index": 35018
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"
@@ -1751,14 +1751,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 1171,
+        "line": 1185,
         "column": 18,
-        "index": 39758
+        "index": 40132
       },
       "end": {
-        "line": 1174,
+        "line": 1188,
         "column": 20,
-        "index": 39911
+        "index": 40285
       }
     },
     "filepath": "src/components/datagrid/data_grid.tsx"

diff --git a/package.json b/package.json
@@ -136,10 +136,10 @@
     "@axe-core/puppeteer": "4.6.1",
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.11.4",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-async-to-generator": "^7.10.4",
+    "@babel/plugin-transform-class-properties": "^7.23.3",
+    "@babel/plugin-transform-object-rest-spread": "^7.23.3",
     "@babel/plugin-transform-runtime": "^7.11.0",
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-react": "^7.10.4",

diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js
@@ -71,7 +71,7 @@ export const iconTypes = [
   'cross',
   'crosshairs',
   'crossInCircleEmpty',
-  'crossInACircleFilled',
+  'crossInCircleFilled',
   'currency',
   'cut',
   'database',
@@ -81,6 +81,12 @@ export const iconTypes = [
   'documents',
   'dot',
   'download',
+  'dockedBottom',
+  'dockedDetached',
+  'dockedLeft',
+  'dockedRight',
+  'dockedTakeover',
+  'dockedTop',
   'email',
   'empty',
   'eql',

diff --git a/src-docs/src/views/package/changelog.js b/src-docs/src/views/package/changelog.js
@@ -15,8 +15,8 @@ import { OuiMarkdownFormat } from '../../../../src';
 import { GuidePage } from '../../components/guide_page';
 
 const changelogSource = require('!!raw-loader!../../../../CHANGELOG.md').default.replace(
-  /## \[`main`\].+?##/s, // remove the `main` heading & contents
-  '##'
+  /[\r\n]##\s+\[Unreleased\].+?[\r\n]+(?=##\s)/s, // remove the `unreleased` heading & contents
+  ''
 );
 
 export const Changelog = {

diff --git a/src-docs/webpack.config.js b/src-docs/webpack.config.js
@@ -57,7 +57,7 @@ const webpackConfig = {
   },
 
   resolve: {
-    extensions: ['.ts', '.tsx', '.js', '.json'],
+    extensions: ['.ts', '.tsx', '.js', '.json', '.mjs'],
   },
 
   resolveLoader: {
@@ -111,6 +111,11 @@ const webpackConfig = {
           name: 'images/[hash]-[name].[ext]',
         },
       },
+      {
+        test: /\.mjs$/,
+        include: /node_modules/,
+        type: 'javascript/auto',
+      },
     ],
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @seanneumann @AMoo-Miki @rednaksi91 @KrooshalUX @BSFishy @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak
		* @AMoo-Miki @rednaksi91 @KrooshalUX @BSFishy @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak