Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump styled-system and @types/styled-system #43089

Merged
merged 16 commits into from
Jul 15, 2024
Merged

Bump styled-system and @types/styled-system #43089

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
11a3b01
Bump styled-components from 5.3.11 to 6.1.11
dependabot[bot] Jul 3, 2024
d1194f0
Remove @types/styled-components
bl-nero Jul 4, 2024
ab41c43
Add babel-plugin-styled-components
bl-nero Jul 4, 2024
025bcc6
Fix issues after upgrading packages
bl-nero Jul 4, 2024
64db930
Update snapshots
bl-nero Jul 4, 2024
00742e2
Bump styled-system and @types/styled-system
dependabot[bot] Jul 8, 2024
29b9d6e
Fix issues after upgrading styled-system
bl-nero Jul 9, 2024
f3a7af5
Update snapshots
bl-nero Jul 10, 2024
2184531
Merge branch 'master' into dependabot/npm_and_yarn/styled-components-…
bl-nero Jul 12, 2024
91b609e
Post-merge fixes
bl-nero Jul 12, 2024
ab73ca1
Declare @emotion/is-prop-valid as an explicit dependency
bl-nero Jul 12, 2024
220bb0f
Correct formatting
bl-nero Jul 12, 2024
2d8e9ae
Merge branch 'master' into dependabot/npm_and_yarn/styled-components-…
bl-nero Jul 12, 2024
0d50afd
Merge branch 'dependabot/npm_and_yarn/styled-components-6.1.11' into …
bl-nero Jul 12, 2024
d6bbe71
Merge branch 'master' into dependabot/npm_and_yarn/multi-6a96fda183
bl-nero Jul 15, 2024
9c33c7d
Lint
bl-nero Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions web/packages/build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
"@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.1.1",
"@types/react-transition-group": "^4.4.10",
"@types/styled-components": "^5.1.34",
"@types/styled-system": "^3.1.3",
"@types/styled-system": "^5.1.22",
"@vitejs/plugin-react-swc": "^3.7.0",
"babel-loader": "^8.2.5",
"babel-plugin-styled-components": "^2.1.4",
"electron-builder": "^24.13.3",
"eslint": "^8.56.0",
"eslint-import-resolver-typescript": "^3.6.1",
Expand All @@ -75,7 +75,7 @@
"react-select-event": "^5.5.1",
"react-transition-group": "^4.4.5",
"rollup-plugin-visualizer": "^5.12.0",
"styled-components": "5.3.11",
"styled-components": "6.1.11",
"typescript-eslint": "^7.14.1",
"vite": "^5.3.2",
"vite-plugin-wasm": "^3.3.0",
Expand All @@ -85,5 +85,4 @@
"msw-storybook-addon": "^1.8.0",
"ts-loader": "^9.5.1"
}
}

}
2 changes: 1 addition & 1 deletion web/packages/design/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"directory": "packages/design"
},
"dependencies": {
"styled-system": "^3.1.11"
"styled-system": "^5.1.5"
},
"devDependencies": {
"@gravitational/build": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion web/packages/design/src/AnimatedProgressBar/AnimatedProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const Bar = styled.span`
overflow: hidden;
width: 118px;

::after {
&::after {
content: '';
position: absolute;
top: 0;
Expand Down
10 changes: 1 addition & 9 deletions web/packages/design/src/Box/Box.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ import styled from 'styled-components';
import {
alignSelf,
AlignSelfProps,
borderColor,
BorderColorProps,
BorderProps,
borderRadius,
BorderRadiusProps,
borders,
BordersProps,
color,
Expand Down Expand Up @@ -72,9 +68,7 @@ export interface BoxProps
JustifySelfProps,
BorderProps,
BordersProps,
BorderRadiusProps,
OverflowProps,
BorderColorProps {}
OverflowProps {}

const Box = styled.div<BoxProps>`
box-sizing: border-box;
Expand All @@ -92,9 +86,7 @@ const Box = styled.div<BoxProps>`
${alignSelf}
${justifySelf}
${borders}
${borderRadius}
${overflow}
${borderColor}
`;

Box.displayName = 'Box';
Expand Down
Loading
Loading