Merge branch 'main' into countProp#934

Signed-off-by: Josh Romero <[email protected]>
opensearch-project · Nov 14, 2023 · a96e1a8 · a96e1a8
2 parents 1899723 + 07a11b6
commit a96e1a8
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 162 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -125,7 +125,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
-          cache: 'yarn'
 
       - name: Setup Yarn
         run: |
@@ -138,9 +137,12 @@ jobs:
         with:
           name: build
 
+      - name: Extract build archive
+        run: tar -xf ${{ steps.download.outputs.download-path }}/oui.tgz
+
       - name: Get Escaped Download Path
         run: |
-          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/oui.tgz"
+          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/package"
           OUI_PATH=$(echo $RAW_OUI_PATH | sed 's/\//\\\//g')
           echo "OUI_PATH=$OUI_PATH" >> "$GITHUB_ENV"
 
@@ -169,7 +171,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
-          cache: 'yarn'
 
       - name: Setup Yarn
         run: |
@@ -182,9 +183,12 @@ jobs:
         with:
           name: build
 
+      - name: Extract build archive
+        run: tar -xf ${{ steps.download.outputs.download-path }}/oui.tgz
+
       - name: Get Escaped Download Path
         run: |
-          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/oui.tgz"
+          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/package"
           OUI_PATH=$(echo $RAW_OUI_PATH | sed 's/\//\\\//g')
           echo "OUI_PATH=$OUI_PATH" >> "$GITHUB_ENV"
 
@@ -215,33 +219,18 @@ jobs:
             script: build-platform --linux-arm --skip-os-packages
     runs-on: ${{ matrix.os }}
     needs: build
-    defaults:
-      run:
-        working-directory: ./artifacts
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          path: ./artifacts
           repository: opensearch-project/OpenSearch-Dashboards
 
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version-file: './artifacts/.nvmrc'
+          node-version-file: '.nvmrc'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Configure Yarn Cache (Linux)
-        run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV
-
-      - name: Initialize Yarn Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.YARN_CACHE_LOCATION }}
-          key: yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-
-
       - name: Setup Yarn
         run: |
           npm uninstall -g yarn
@@ -253,17 +242,19 @@ jobs:
         with:
           name: build
 
+      - name: Extract build archive
+        run: tar -xf ${{ steps.download.outputs.download-path }}/oui.tgz
+
       - name: Get Escaped Download Path
         run: |
-          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/oui.tgz"
+          RAW_OUI_PATH="${{ steps.download.outputs.download-path }}/package"
           OUI_PATH=$(echo $RAW_OUI_PATH | sed 's/\//\\\//g')
           echo "OUI_PATH=$OUI_PATH" >> "$GITHUB_ENV"
 
       - name: Update OUI version in OSD
         run: |
           find . -type f -name package.json -exec sed -i 's/"@elastic\/eui": ".*"/"@elastic\/eui": "file:${{ env.OUI_PATH }}"/g' {} \;
 
-
       - name: Get package version
         run: |
           echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
@@ -282,5 +273,5 @@ jobs:
         if: success()
         with:
           name: ${{ matrix.suffix }}-${{ env.VERSION }}
-          path: ./artifacts/target/${{ env.ARTIFACT_BUILD_NAME }}
+          path: ./target/${{ env.ARTIFACT_BUILD_NAME }}
           retention-days: 7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### 🛡 Security
 
+- Bump `babel-template` from `6.26.0` to `@babel/template` `7.10.4` ([#1095](https://github.com/opensearch-project/oui/pull/1095))
+
 ### 📈 Features/Enhancements
 
 - Update ouiTextSubduedColor in `next` dark theme ([#973](https://github.com/opensearch-project/oui/pull/973))
@@ -17,6 +19,7 @@
 ### 🐛 Bug Fixes
 
 - Add exit code to compile-scss script on failure ([#1024](https://github.com/opensearch-project/oui/pull/1024))
+- Extract build archive into a folder for OSD integration test CI ([#1075](https://github.com/opensearch-project/oui/pull/1075))
 - Correct file path for import of Query component ([#1069](https://github.com/opensearch-project/oui/pull/1069))
 - Fix "Guidelines" documentation links rendering blank pages ([#1111](https://github.com/opensearch-project/oui/pull/1111))
 
@@ -59,6 +62,7 @@
 - Add new `middle-out` order prop option to `OuiPaletteColorBlind` ([#856](https://github.com/opensearch-project/oui/pull/856))
 - Add new icons for OpenSearch Dashboards v2.10.0 ([#1014](https://github.com/opensearch-project/oui/pull/1014))
 - Add count prop to OuiTreeView with OuiFacetButton ([[#934](https://github.com/opensearch-project/oui/issues/934)])
+- Add `onFullScreenChange` to `OuiDataGrid` ([#1053](https://github.com/opensearch-project/oui/pull/1053))
 
 ### 🐛 Bug Fixes
 

diff --git a/package.json b/package.json
@@ -143,6 +143,7 @@
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.12.1",
+    "@babel/template": "^7.10.4",
     "@elastic/charts": "^30.2.0",
     "@elastic/eslint-config-kibana": "^0.15.0",
     "@faker-js/faker": "^8.0.1",
@@ -163,15 +164,13 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "autoprefixer": "^9.8.6",
-    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.1.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-inline-react-svg": "^1.1.1",
     "babel-plugin-pegjs-inline-precompile": "^0.1.1",
-    "babel-template": "^6.26.0",
     "cache-loader": "^4.1.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",