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.

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

feat(serialize): Bump csstype #1956

Merged
merged 10 commits into from
Aug 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .changeset/spotty-cars-camp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@emotion/core': minor
'@emotion/css': minor
'@emotion/serialize': minor
'@emotion/styled': minor
---

Upgraded [`csstype`](https://www.npmjs.com/package/csstype) dependency to its v3. This is what we use to provide TypeScript typings for object styles. The upgrade should not affect any consuming code but it's worth mentioning if any edge case scenarios arise.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Look here 👉 _[emotion babel plugin feature table and documentation](https://g
- [polished](https://github.com/styled-components/polished) - Lightweight set of Sass/Compass-style mixins/helpers for writing styles in JavaScript.
- [monad-ui](https://github.com/muhajirdev/monad-ui/) - Utility First CSS-In-JS
- [css-in-js-media](https://github.com/zx6658/css-in-js-media) - you can deal with responsive design using css-in-js easily with this `css-in-js-media` which is similar with include-media
- [emotion-native-extended](https://github.com/ItsWendell/emotion-native-extended) - Better styling support for Emotion Native with [React Native Extended Stylesheet](https://github.com/vitalets/react-native-extended-stylesheet)

### In the Wild

Expand Down
2 changes: 1 addition & 1 deletion packages/serialize/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@emotion/memoize": "0.7.4",
"@emotion/unitless": "0.7.5",
"@emotion/utils": "1.0.0-next.0",
"csstype": "^2.6.7"
"csstype": "^3.0.2"
},
"devDependencies": {
"dtslint": "^0.3.0"
Expand Down
19 changes: 8 additions & 11 deletions packages/serialize/types/tslint.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
"extends": "dtslint/dtslint.json",
"rules": {
"array-type": [
true,
"generic"
],
"semicolon": false,
"no-null-undefined-union": false,
"callable-types": false
}
}
"extends": "dtslint/dtslint.json",
"rules": {
"array-type": [true, "generic"],
"semicolon": false,
"no-null-undefined-union": false,
"callable-types": false
}
}
8 changes: 2 additions & 6 deletions site/src/components/DocWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,7 @@ export default ({
'none',
'none',
`1px solid ${colors.lighten(0.25, colors.border)}`
],
filter: 'grayscale(100%)',
// needed for the filter above, Chrome messed up layers without it
zIndex: 1
]
})}
>
<Search />
Expand Down Expand Up @@ -211,8 +208,7 @@ export default ({
],
gridRow: 2,
gridColumn: ['1 / span 2', '1 / span 2', '1 / span 1'],
paddingRight: [0, 0, 0],
filter: 'grayscale(100%)'
paddingRight: [0, 0, 0]
})}
>
{children}
Expand Down
3 changes: 1 addition & 2 deletions site/src/components/SiteHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ export default function SiteHeader() {
paddingTop: 24,
display: 'flex',
alignItems: 'center',
paddingBottom: space[2],
filter: 'grayscale(100%)'
paddingBottom: space[2]
}}
>
<Link
Expand Down
10 changes: 2 additions & 8 deletions site/src/pages/404.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@ const NotFoundPage = () => {
const title = 'NOT FOUND'
return (
<Layout title={title}>
<div
css={{
filter: 'grayscale(100%)'
}}
>
<h1>{title}</h1>
<p>You just hit a route that doesn&#39;t exist... the sadness.😢</p>
</div>
<h1>{title}</h1>
<p>You just hit a route that doesn&#39;t exist... the sadness.😢</p>
</Layout>
)
}
Expand Down
3 changes: 1 addition & 2 deletions site/src/pages/community.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const Community = (props: *) => {
<Layout title={title}>
<div
css={mq({
gridColumn: '1 / span 2',
filter: 'grayscale(100%)'
gridColumn: '1 / span 2'
})}
>
<div>
Expand Down
2 changes: 1 addition & 1 deletion site/src/utils/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const colors = {
darken2: darken(0.15),
darken3: darken(0.2),
reallyLightPink: '#f9e9fb',
hightlight: '#D36AC2',
hightlight: '#C43BAD',
border: '#C865B9',
bg: '#FAF9FA',
color: '#1B1D1D',
Expand Down
7 changes: 6 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7287,11 +7287,16 @@ cssstyle@^2.0.0, cssstyle@^2.2.0:
dependencies:
cssom "~0.3.6"

csstype@^2.2.0, csstype@^2.5.7, csstype@^2.6.7:
csstype@^2.2.0, csstype@^2.5.7:
version "2.6.10"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==

csstype@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.2.tgz#ee5ff8f208c8cd613b389f7b222c9801ca62b3f7"
integrity sha512-ofovWglpqoqbfLNOTBNZLSbMuGrblAf1efvvArGKOZMBrIoJeu5UsAipQolkijtyQx5MtAzT/J9IHj/CEY1mJw==

csv-generate@^3.2.0:
version "3.2.3"
resolved "https://registry.npmjs.org/csv-generate/-/csv-generate-3.2.3.tgz#24004f21de61c2ea1c4474d3e65a18261f638a80"
Expand Down