Skip to content

Commit

Permalink
chore: Update oui to 1.14 (#8372)
Browse files Browse the repository at this point in the history
* chore: Update oui to 1.14

Signed-off-by: Viraj Sanghvi <[email protected]>

* Changeset file for PR #8372 created/updated

---------

Signed-off-by: Viraj Sanghvi <[email protected]>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
(cherry picked from commit b8b563d)
  • Loading branch information
virajsanghvi committed Sep 30, 2024
1 parent 7c011ad commit ad8f624
Show file tree
Hide file tree
Showing 22 changed files with 15 additions and 136 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/8372.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
chore:
- Update oui to 1.14 ([#8372](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8372))
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"dependencies": {
"@aws-crypto/client-node": "^3.1.1",
"@elastic/datemath": "5.0.3",
"@elastic/eui": "npm:@opensearch-project/oui@1.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/numeral": "npm:@amoo-miki/[email protected]",
"@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.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"@osd/babel-preset": "1.0.0",
"@osd/optimizer": "1.0.0",
"comment-stripper": "^0.0.4",
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.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"@elastic/numeral": "npm:@amoo-miki/[email protected]",
"@opensearch/datemath": "5.0.3",
"@osd/i18n": "1.0.0",
Expand Down
Binary file not shown.
93 changes: 0 additions & 93 deletions src/core/server/core_app/assets/fonts/fira_code/LICENSE.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/core/server/core_app/assets/fonts/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
OpenSearch Dashboards packages these fonts:

* [Rubik](https://fonts.google.com/specimen/Rubik) was pulled from the Google Fonts website on August 8th, 2024.
* [Fira Code](https://fonts.google.com/specimen/Fira+Code) was pulled from the Google Fonts website on August 8th, 2024.
* [Source Code Pro](https://github.com/adobe-fonts/source-code-pro) upright v2.042 and italic v1.062.

* [Source Sans 3](https://github.com/adobe-fonts/source-sans) v3.052
* [Source Code Pro](https://github.com/adobe-fonts/source-code-pro) upright v2.042 and italic v1.062.
Expand Down
34 changes: 2 additions & 32 deletions src/core/server/rendering/views/fonts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,36 +127,6 @@ export const Fonts: FunctionComponent<Props> = ({ url, theme }) => {
},
],
};
const firaCode: FontFace = {
family: 'Fira Code',
variants: [
{
weight: 300,
style: 'normal',
sources: [`${url}/fonts/fira_code/static/FiraCode-Light.woff2`],
},
{
weight: 400,
style: 'normal',
sources: [`${url}/fonts/fira_code/static/FiraCode-Regular.woff2`],
},
{
weight: 500,
style: 'normal',
sources: [`${url}/fonts/fira_code/static/FiraCode-Medium.woff2`],
},
{
weight: 600,
style: 'normal',
sources: [`${url}/fonts/fira_code/static/FiraCode-SemiBold.woff2`],
},
{
weight: 700,
style: 'normal',
sources: [`${url}/fonts/fira_code/static/FiraCode-Bold.woff2`],
},
],
};

// For next theme
const sourceSans3: FontFace = {
Expand Down Expand Up @@ -651,10 +621,10 @@ export const Fonts: FunctionComponent<Props> = ({ url, theme }) => {
({
v7: roboto,
v8: sourceCodePro,
v9: firaCode,
v9: sourceCodePro,
} as Record<string, FontFace>)[theme as string] || sourceCodePro;

const fontsDefinitionRules = [interUi, sourceSans3, roboto, sourceCodePro, rubik, firaCode]
const fontsDefinitionRules = [interUi, sourceSans3, roboto, sourceCodePro, rubik]
.flatMap(({ family, variants }) =>
variants.map(({ style, weight, format, sources, unicodeRange }) => {
const src = sources
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/oui@1.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"@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/oui@1.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"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/oui@1.13.0",
"@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
"@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 @@ -1431,10 +1431,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.13.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.13.0.tgz#830de8bfbb9d0471288b9526ddcfd5fcbd45c420"
integrity sha512-5qVqb7OiiMxIttn7ByFzMySFuIImTqP664PtrjmjDgLsiLkah0f7s1RFT5jE4Os1CrWaTFXiSXzleYpuZyA4oA==
"@elastic/eui@npm:@opensearch-project/oui@1.14.0":
version "1.14.0"
resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.14.0.tgz#137aca372fd4d83e33704cdefbf3245c6ba28164"
integrity sha512-vZr9nYWo6vb9+xE9ktgPL8c3ltfcMdPEBmATei1xTEWIKOfzvvLbLAVcf+UTQc+8+GOYayKB9bgENsuV006sAA==
dependencies:
"@types/chroma-js" "^2.4.0"
"@types/react-beautiful-dnd" "^13.1.3"
Expand Down

0 comments on commit ad8f624

Please sign in to comment.