Skip to content

Commit

Permalink
Bump OUI to 1.1.1 (#3884) (#3886)
Browse files Browse the repository at this point in the history
* chore(OUI): bump OUI to 1.1.0

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* bootstrap and update yarn.lock

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* add changelog

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* update snapshot

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* updates to OUI to 1.1.1

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* Update CHANGELOG.md

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* test cache fixes

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* test cache fixes

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

* reenable ci tests

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

---------

Signed-off-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
(cherry picked from commit 712a42f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent a08d7ad commit 76298c8
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 23 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/build_and_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,17 +343,6 @@ jobs:
npm i -g yarn@1.22.10
yarn config set network-timeout 1000000 -g
- name: Configure Yarn Cache
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: Get package version
run: |
echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"dependencies": {
"@aws-crypto/client-node": "^3.1.1",
"@elastic/datemath": "5.0.3",
"@elastic/eui": "npm:@opensearch-project/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"@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/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"@osd/babel-preset": "1.0.0",
"@osd/optimizer": "1.0.0",
"grunt": "^1.5.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@elastic/charts": "31.1.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"@elastic/numeral": "^2.5.0",
"@osd/i18n": "1.0.0",
"@osd/monaco": "1.0.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build": "node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"@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": "node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"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": "node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "npm:@opensearch-project/oui@1.0.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.1.1",
"@osd/plugin-helpers": "1.0.0",
"react": "^16.14.0",
"typescript": "4.0.2"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1273,10 +1273,10 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/eui@npm:@opensearch-project/oui@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.0.0.tgz#bf5e115c8d0f230415b07cc6acfb149ab081c5de"
integrity sha512-J709UQc7+il4y3aiqpHzeLOJAQhN6xEGLLHq4sUL3WHTsP37acONINXCpRNMa3FxZ+ChOd2ABmY+Ajs+fIgmug==
"@elastic/eui@npm:@opensearch-project/oui@1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.1.1.tgz#4a9318c2954659cdd8d83263ff2dc22a77cbd779"
integrity sha512-RBXbsZh6mjJKJqB/hSI2loenyM2rvdq9id29P/ZYlZGKKy0/tSreIOGcegSYMtNFmG029D20xVkhRmdn7cxK1A==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/lodash" "^4.14.160"
Expand Down

0 comments on commit 76298c8

Please sign in to comment.