Skip to content

Commit

Permalink
update ds and fix console errors (#1379)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsladerman authored Oct 11, 2024
1 parent 41f79e1 commit e9b3b0c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 18 deletions.
3 changes: 2 additions & 1 deletion www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"dependencies": {
"@absinthe/socket": "0.2.1",
"@apollo/client": "3.10.3",
"@emotion/is-prop-valid": "1.3.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@fireworks-js/react": "2.10.5",
Expand All @@ -44,7 +45,7 @@
"@nivo/geo": "0.83.0",
"@nivo/line": "0.83.0",
"@octokit/core": "4.2.1",
"@pluralsh/design-system": "3.74.4",
"@pluralsh/design-system": "3.75.0",
"@react-spring/web": "9.7.3",
"@stripe/react-stripe-js": "2.1.0",
"@stripe/stripe-js": "1.54.0",
Expand Down
14 changes: 9 additions & 5 deletions www/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ import {
useThemeColorMode,
} from '@pluralsh/design-system'
import { MarkdocContextProvider } from '@pluralsh/design-system/dist/markdoc'
import { CssBaseline, ThemeProvider, mergeTheme } from 'honorable'
import {
CssBaseline,
ThemeProvider as HonorableThemeProvider,
mergeTheme,
} from 'honorable'
import styled, {
StyleSheetManager,
ThemeProvider as StyledThemeProvider,
Expand Down Expand Up @@ -176,8 +180,8 @@ function App() {
<Suspense>
<ApolloProvider client={client}>
<IntercomProvider appId={INTERCOM_APP_ID}>
<ThemeProvider theme={honorableTheme}>
<StyleSheetManager shouldForwardProp={shouldForwardProp}>
<StyleSheetManager shouldForwardProp={shouldForwardProp}>
<HonorableThemeProvider theme={honorableTheme}>
<StyledThemeProvider theme={mergedStyledTheme}>
<GrowthBookProvider
growthbook={growthbook as any as GrowthBook}
Expand Down Expand Up @@ -205,8 +209,8 @@ function App() {
</CursorPositionProvider>
</GrowthBookProvider>
</StyledThemeProvider>
</StyleSheetManager>
</ThemeProvider>
</HonorableThemeProvider>
</StyleSheetManager>
</IntercomProvider>
</ApolloProvider>
</Suspense>
Expand Down
4 changes: 1 addition & 3 deletions www/src/components/marketplace/RepoCardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ export function RepoCardList({
to={`/repository/${repository.name}${
urlParams ? `?${urlParams}` : ''
}`}
color="text"
textDecoration="none"
width="100%"
title={repository.name}
imageUrl={getRepoIcon(repository, theme.mode)}
publisher={repository.publisher?.name}
Expand All @@ -50,4 +47,5 @@ const FixedRepositoryCard = styled(RepositoryCard)(({ theme }) => ({
width: '100%',
position: 'relative',
textDecoration: 'none',
color: theme.colors.text,
}))
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Flex } from 'honorable'

export function ResponsiveLayoutContentContainer(props: any) {
return (
import { forwardRef } from 'react'

export const ResponsiveLayoutContentContainer = forwardRef(
(props: any, ref) => (
<Flex
direction="column"
flexGrow={1}
Expand All @@ -15,7 +17,8 @@ export function ResponsiveLayoutContentContainer(props: any) {
width-desktopLarge-up={896}
overflowY="auto"
overflowX="hidden"
ref={ref}
{...props}
/>
)
}
)
13 changes: 7 additions & 6 deletions www/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1911,7 +1911,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.0, @emotion/is-prop-valid@npm:^1.2.1":
"@emotion/is-prop-valid@npm:1.3.1, @emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.0, @emotion/is-prop-valid@npm:^1.2.1":
version: 1.3.1
resolution: "@emotion/is-prop-valid@npm:1.3.1"
dependencies:
Expand Down Expand Up @@ -4025,9 +4025,9 @@ __metadata:
languageName: node
linkType: hard

"@pluralsh/design-system@npm:3.74.4":
version: 3.74.4
resolution: "@pluralsh/design-system@npm:3.74.4"
"@pluralsh/design-system@npm:3.75.0":
version: 3.75.0
resolution: "@pluralsh/design-system@npm:3.75.0"
dependencies:
"@floating-ui/react-dom-interactions": 0.13.3
"@loomhq/loom-embed": 1.5.0
Expand Down Expand Up @@ -4073,7 +4073,7 @@ __metadata:
react-dom: ">=18.3.1"
react-transition-group: ">=4.4.5"
styled-components: ">=6.1.13"
checksum: b50d9b7f2fda9e769911de1895ed83318771e7fae74fb6c4c3ce8ca88562f4890d4859e806af1bf8fc3175841ca1639e7b64376d1e6d7966d980a8c2e5fcd01a
checksum: 5097f1502fa1fa5e0cffa7bcc572068cf856572542bfd22aab12524261b1a99571c4c20ab012719d50b34b3f27d01b3632227d9a70d9831fdfa91582139e6b72
languageName: node
linkType: hard

Expand Down Expand Up @@ -20073,6 +20073,7 @@ __metadata:
dependencies:
"@absinthe/socket": 0.2.1
"@apollo/client": 3.10.3
"@emotion/is-prop-valid": 1.3.1
"@emotion/react": 11.11.1
"@emotion/styled": 11.11.0
"@esbuild-plugins/node-globals-polyfill": 0.2.3
Expand All @@ -20092,7 +20093,7 @@ __metadata:
"@nivo/geo": 0.83.0
"@nivo/line": 0.83.0
"@octokit/core": 4.2.1
"@pluralsh/design-system": 3.74.4
"@pluralsh/design-system": 3.75.0
"@pluralsh/eslint-config-typescript": 2.5.150
"@pluralsh/stylelint-config": 2.0.10
"@react-spring/web": 9.7.3
Expand Down

0 comments on commit e9b3b0c

Please sign in to comment.