Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' of https://github.com/evergreen-ci/spruce into EV…
Browse files Browse the repository at this point in the history 
…G-19815
  • Loading branch information
@sophstad
sophstad committed Sep 19, 2023
2 parents a439d7d + e9fd63f commit db68a15
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 41 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spruce",
"version": "3.0.138",
"version": "3.0.139",
"private": true,
"scripts": {
"bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
Expand Down Expand Up @@ -58,7 +58,7 @@
"@bugsnag/js": "7.20.2",
"@bugsnag/plugin-react": "7.18.0",
"@emotion/css": "11.11.2",
"@emotion/react": "11.11.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@leafygreen-ui/badge": "8.0.2",
"@leafygreen-ui/banner": "7.0.4",
Expand Down Expand Up @@ -100,7 +100,7 @@
"@leafygreen-ui/toggle": "10.0.1",
"@leafygreen-ui/tokens": "2.1.0",
"@leafygreen-ui/tooltip": "10.0.10",
"@leafygreen-ui/typography": "16.4.1",
"@leafygreen-ui/typography": "17.0.1",
"@rjsf/core": "4.2.3",
"@sentry/react": "7.56.0",
"@sentry/types": "7.56.0",
Expand All @@ -113,7 +113,7 @@
"env-cmd": "10.1.0",
"graphql": "16.6.0",
"html-react-parser": "4.2.1",
"js-cookie": "3.0.1",
"js-cookie": "3.0.5",
"linkify-html": "4.1.1",
"linkifyjs": "4.1.0",
"lodash.debounce": "4.0.8",
Expand Down Expand Up @@ -156,7 +156,7 @@
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"@types/jest": "29.4.0",
"@types/js-cookie": "^3.0.2",
"@types/js-cookie": "^3.0.4",
"@types/lodash.debounce": "4.0.7",
"@types/lodash.throttle": "^4.1.7",
"@types/new-relic-browser": "0.1212.2",
Expand Down
8 changes: 1 addition & 7 deletions src/components/styles/StyledLink.tsx → src/components/styles/Link.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ export const StyledLink = (props) => (
<LGLink
hideExternalIcon
css={css`
// TODO: Remove when fixed: https://jira.mongodb.org/browse/EVG-18183
// Override LG's fixed 13px line height
line-height: inherit;
// Override LeafyGreen's font-size declaration for Link
font-size: inherit;
// Override LeafyGreen's font-weight declaration for Link
font-weight: inherit;
`}
{...props}
Expand Down
6 changes: 1 addition & 5 deletions src/components/styles/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,9 @@ import {
TableControlInnerRow,
TableControlOuterRow,
} from "./Layout";
import { ShortenedRouterLink, StyledLink, StyledRouterLink } from "./Link";
import { SideNav, SideNavGroup, SideNavItem } from "./SideNav";
import { SiderCard } from "./SiderCard";
import {
ShortenedRouterLink,
StyledLink,
StyledRouterLink,
} from "./StyledLink";
import { WordBreak, wordBreakCss } from "./Typography";

export {
Expand Down
57 changes: 33 additions & 24 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1957,10 +1957,10 @@
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17"
integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==

"@emotion/[email protected].0":
version "11.11.0"
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.0.tgz#408196b7ef8729d8ad08fc061b03b046d1460e02"
integrity sha512-ZSK3ZJsNkwfjT3JpDAWJZlrGD81Z3ytNDsxw1LKq1o+xkmO5pnWfr6gmCC8gHEFf3nSSX/09YrG67jybNPxSUw==
"@emotion/[email protected].1":
version "11.11.1"
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.1.tgz#b2c36afac95b184f73b08da8c214fdf861fa4157"
integrity sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==
dependencies:
"@babel/runtime" "^7.18.3"
"@emotion/babel-plugin" "^11.11.0"
Expand Down Expand Up @@ -3609,7 +3609,7 @@
dependencies:
"@leafygreen-ui/emotion" "^4.0.3"

"@leafygreen-ui/icon@^11.12.0", "@leafygreen-ui/icon@^11.12.1", "@leafygreen-ui/icon@^11.12.3", "@leafygreen-ui/icon@^11.12.4", "@leafygreen-ui/icon@^11.12.5", "@leafygreen-ui/icon@^11.13.1", "@leafygreen-ui/icon@^11.14.0", "@leafygreen-ui/icon@^11.15.0", "@leafygreen-ui/icon@^11.17.0", "@leafygreen-ui/icon@^11.22.1":
"@leafygreen-ui/icon@^11.12.0", "@leafygreen-ui/icon@^11.12.1", "@leafygreen-ui/icon@^11.12.3", "@leafygreen-ui/icon@^11.12.4", "@leafygreen-ui/icon@^11.12.5", "@leafygreen-ui/icon@^11.13.1", "@leafygreen-ui/icon@^11.15.0", "@leafygreen-ui/icon@^11.17.0", "@leafygreen-ui/icon@^11.22.1":
version "11.22.1"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/icon/-/icon-11.22.1.tgz#99359f771ef681703801d188a1280b6cb0cc2963"
integrity sha512-ZwlLW4OuSkErJL1MFNUuIPeke48TKX2ikZPhEylbbt1YepbnXrpF9TgoNoe+eQCmWcRT5Uhw9M8MDCTUfNPGfg==
Expand Down Expand Up @@ -3697,6 +3697,15 @@
lodash "^4.17.21"
prop-types "^15.7.2"

"@leafygreen-ui/lib@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/lib/-/lib-12.0.0.tgz#1ab22c541435e6c0060e21d7097dd65892da24a1"
integrity sha512-nhaxi4oBesnizxO0YK7XwcmiLL9U5QuN7lkZdWGDdmoJgNNL+aRju4W5vmZc7vcazSHfr3gAL+NFAGaAuopyRA==
dependencies:
"@storybook/csf" "^0.1.0"
lodash "^4.17.21"
prop-types "^15.7.2"

"@leafygreen-ui/[email protected]":
version "2.0.5"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/loading-indicator/-/loading-indicator-2.0.5.tgz#a961ac1da31346aab14a15c3f1efa84226af2ad4"
Expand Down Expand Up @@ -3789,7 +3798,7 @@
resolved "https://registry.yarnpkg.com/@leafygreen-ui/palette/-/palette-3.4.7.tgz#7c4a619ca0cb7a9785326dcb67e012369b3d92d6"
integrity sha512-AsvPlbvF7CERiZbAQR8hy3lAJ2/rieXI3cO0jsOwV8ztDqYNotKAdLujyr/NviudrRUenYiXrLizIKVlSPUMuA==

"@leafygreen-ui/polymorphic@^1.2.0", "@leafygreen-ui/polymorphic@^1.3.1", "@leafygreen-ui/polymorphic@^1.3.2":
"@leafygreen-ui/polymorphic@^1.2.0", "@leafygreen-ui/polymorphic@^1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/polymorphic/-/polymorphic-1.3.2.tgz#7f1752b41679c7afb0818936fa429ce2742e01e7"
integrity sha512-av3FtFGf86c9ccIrgEArBhum0M+IklpBvnONsW70mMtEXKnJsGwGwY+HkuSAxbUpjGFIkIPbn5bIp1rHwAIOHA==
Expand Down Expand Up @@ -4203,17 +4212,17 @@
lodash "^4.17.21"
polished "^4.2.2"

"@leafygreen-ui/typography@16.4.1":
version "16.4.1"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-16.4.1.tgz#0f5f124dfb02c58b67f70b64f74503dc5813b16e"
integrity sha512-UKvuAiCPa5jv8QNZHZDfVqfCzEPodNX5tpOVFeSLzt5hs8IBTCsxXqxPgzzapRHR+5NzebpyNmZEou5ZKtpa0Q==
"@leafygreen-ui/typography@17.0.1":
version "17.0.1"
resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-17.0.1.tgz#11c52b4441e4f30f58f4bfe3a69cf8365fdc6a5e"
integrity sha512-hsj92VPWODCSzajFDfM5kBTD5wXAQVt7ERnUX8DfdUal8h3XsWJYvluA3QdehvDv2xS2pQeBmcCS1vWFlB+rTA==
dependencies:
"@leafygreen-ui/emotion" "^4.0.4"
"@leafygreen-ui/icon" "^11.14.0"
"@leafygreen-ui/lib" "^10.3.3"
"@leafygreen-ui/palette" "^4.0.4"
"@leafygreen-ui/polymorphic" "^1.3.1"
"@leafygreen-ui/tokens" "^2.1.0"
"@leafygreen-ui/emotion" "^4.0.7"
"@leafygreen-ui/icon" "^11.22.2"
"@leafygreen-ui/lib" "^12.0.0"
"@leafygreen-ui/palette" "^4.0.7"
"@leafygreen-ui/polymorphic" "^1.3.6"
"@leafygreen-ui/tokens" "^2.1.4"

"@leafygreen-ui/typography@^15.0.0", "@leafygreen-ui/typography@^15.1.0":
version "15.3.0"
Expand Down Expand Up @@ -6039,10 +6048,10 @@
expect "^29.0.0"
pretty-format "^29.0.0"

"@types/js-cookie@^3.0.2":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-3.0.3.tgz#d6bfbbdd0c187354ca555213d1962f6d0691ff4e"
integrity sha512-Xe7IImK09HP1sv2M/aI+48a20VX+TdRJucfq4vfRVy6nWN8PYPOEnlMRSgxJAgYQIXJVL8dZ4/ilAM7dWNaOww==
"@types/js-cookie@^3.0.4":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-3.0.4.tgz#23475b6d3b03acc84192e7c24da88eb38c1039ef"
integrity sha512-vMMnFF+H5KYqdd/myCzq6wLDlPpteJK+jGFgBus3Da7lw+YsDmx2C8feGTzY2M3Fo823yON+HC2CL240j4OV+w==

"@types/js-yaml@^4.0.0":
version "4.0.5"
Expand Down Expand Up @@ -11534,10 +11543,10 @@ jose@^4.11.4:
resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==

[email protected].1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
[email protected].5:
version "3.0.5"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==

"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
Expand Down

0 comments on commit db68a15

Please sign in to comment.