Skip to content

Upgrade styled-components to v5 #3397

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

Merged
merged 17 commits into from
Jul 26, 2023
Merged

Upgrade styled-components to v5 #3397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
47419e6
upgrade styled-components to v5
mperrotti Jun 9, 2023
ad0d8f5
adds changeset
mperrotti Jun 9, 2023
b1c721d
fixes type errors
mperrotti Jun 9, 2023
cc7292c
Merge branch 'main' of github.com:primer/react into mp/styled-compone…
mperrotti Jul 7, 2023
b092ca8
Update .changeset/proud-rules-develop.md
mperrotti Jul 7, 2023
b7ea05d
Merge branch 'main' into mp/styled-components-v5-upgrade
mperrotti Jul 11, 2023
85e593d
Merge branch 'main' into mp/styled-components-v5-upgrade
mperrotti Jul 11, 2023
418d98f
Merge branch 'main' of github.com:primer/react into mp/styled-compone…
mperrotti Jul 12, 2023
8b1dba7
Merge branch 'mp/styled-components-v5-upgrade' of github.com:primer/r…
mperrotti Jul 12, 2023
43e9cdc
updates changeset
mperrotti Jul 12, 2023
89a1739
Merge branch 'main' into mp/styled-components-v5-upgrade
mperrotti Jul 13, 2023
685a430
Merge branch 'main' of github.com:primer/react into mp/styled-compone…
mperrotti Jul 19, 2023
3504e7b
rm Box snapshots emitting empty mq blocks, updates snaps post-merge
mperrotti Jul 19, 2023
70fa296
Merge branch 'mp/styled-components-v5-upgrade' of github.com:primer/r…
mperrotti Jul 19, 2023
6f6d259
Merge branch 'main' of github.com:primer/react into mp/styled-compone…
mperrotti Jul 20, 2023
cfcf638
Merge branch 'main' of github.com:primer/react into mp/styled-compone…
mperrotti Jul 25, 2023
c0dac98
Merge branch 'main' into mp/styled-components-v5-upgrade
mperrotti Jul 26, 2023
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
7 changes: 7 additions & 0 deletions .changeset/proud-rules-develop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@primer/react': major
---

Upgrades styled-components to v5

<!-- Changed components: _none_ -->
Copy link
Member

@broccolinisoup broccolinisoup Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not very fussy about this because it is a major release but I wonder if the practise should be listing all components that are impacted by this change? 🤔

244 changes: 83 additions & 161 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"@styled-system/props": "^5.1.5",
"@styled-system/theme-get": "^5.1.2",
"@types/react-is": "^18.2.1",
"@types/styled-components": "^5.1.11",
"@types/styled-components": "5.1.26",
"@types/styled-system": "^5.1.12",
"@types/styled-system__css": "^5.0.16",
"@types/styled-system__theme-get": "^5.0.1",
Expand Down Expand Up @@ -185,7 +185,7 @@
"babel-plugin-dev-expression": "0.2.3",
"babel-plugin-macros": "3.1.0",
"babel-plugin-open-source": "1.3.4",
"babel-plugin-styled-components": "2.1.1",
"babel-plugin-styled-components": "2.1.3",
"babel-plugin-transform-replace-expressions": "0.2.0",
"babel-polyfill": "6.26.0",
"change-case": "4.1.2",
Expand Down Expand Up @@ -217,7 +217,7 @@
"jest-environment-jsdom": "29.4.3",
"jest-fail-on-console": "3.1.1",
"jest-matchmedia-mock": "1.1.0",
"jest-styled-components": "6.3.4",
"jest-styled-components": "7.1.1",
"jest-watch-typeahead": "2.2.2",
"jscodeshift": "0.14.0",
"lint-staged": "13.2.2",
Expand Down Expand Up @@ -249,7 +249,8 @@
"size-limit": "8.2.4",
"storybook": "7.1.0",
"storybook-addon-turbo-build": "2.0.1",
"styled-components": "4.4.1",
"storybook-css-modules": "1.0.8",
"styled-components": "5.3.11",
"terser": "5.17.6",
"ts-node": "10.9.1",
"ts-toolbelt": "9.6.0",
Expand Down
1 change: 0 additions & 1 deletion src/CounterLabel/CounterLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const CounterLabel = forwardRef<HTMLSpanElement, CounterLabelProps>(
)}
{...props}
as="span"
// @ts-expect-error Box is expecting a divelement, but this component forces a span element
ref={forwardedRef}
>
{children}
Expand Down
Loading