From c0b7aec00fc997bc4466f9c432c045c833ae4f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Wed, 8 Jul 2020 22:21:43 +0200 Subject: [PATCH 1/9] Remove grayscale filter from the docs (#1929) --- site/src/components/DocWrapper.js | 8 ++------ site/src/components/SiteHeader.js | 3 +-- site/src/pages/404.js | 10 ++-------- site/src/pages/community.js | 3 +-- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/site/src/components/DocWrapper.js b/site/src/components/DocWrapper.js index a23ead414..de6685317 100644 --- a/site/src/components/DocWrapper.js +++ b/site/src/components/DocWrapper.js @@ -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 + ] })} > @@ -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} diff --git a/site/src/components/SiteHeader.js b/site/src/components/SiteHeader.js index 12931a35b..124a9d029 100644 --- a/site/src/components/SiteHeader.js +++ b/site/src/components/SiteHeader.js @@ -64,8 +64,7 @@ export default function SiteHeader() { paddingTop: 24, display: 'flex', alignItems: 'center', - paddingBottom: space[2], - filter: 'grayscale(100%)' + paddingBottom: space[2] }} > { const title = 'NOT FOUND' return ( -
-

{title}

-

You just hit a route that doesn't exist... the sadness.😢

-
+

{title}

+

You just hit a route that doesn't exist... the sadness.😢

 ) } diff --git a/site/src/pages/community.js b/site/src/pages/community.js index bcba8cbf0..2c6c6a7de 100644 --- a/site/src/pages/community.js +++ b/site/src/pages/community.js @@ -16,8 +16,7 @@ const Community = (props: *) => {
From b7b2e163c619264622e23ab83735fa63235b633d Mon Sep 17 00:00:00 2001 From: Wendell Misiedjan Date: Thu, 9 Jul 2020 00:05:55 +0200 Subject: [PATCH 2/9] Add emotion-native-extended to the ecosystem list of packages (#1849) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3078dcc72..d65fb9550 100644 --- a/README.md +++ b/README.md @@ -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 From b4214b8757c7ede1db1688075251946b2082f9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Thu, 9 Jul 2020 11:21:07 +0200 Subject: [PATCH 3/9] Make links more accessible in the docs (#1930) --- site/src/utils/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/utils/style.js b/site/src/utils/style.js index 3e33bab7c..cd9a81379 100644 --- a/site/src/utils/style.js +++ b/site/src/utils/style.js @@ -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', From 2643c4f65fcbedbd7da6545eeb24278a52877dad Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 3 Aug 2020 11:08:45 +0200 Subject: [PATCH 4/9] run test:typescript for emotion/serialize in CI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7212aaf19..bd48ce9cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,6 +77,7 @@ jobs: - v4-dependencies- - run: yarn install --pure-lockfile - run: yarn lint:check + - run: yarn workspace @emotion/serialize test:typescript workflows: version: 2 From 0d22414ccf64e96d7ed12454a0f7bf84bf70ab21 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 3 Aug 2020 11:12:25 +0200 Subject: [PATCH 5/9] fix emotion/serialize type tests --- packages/serialize/types/tests.ts | 22 +++++++++++----------- packages/serialize/types/tslint.json | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/serialize/types/tests.ts b/packages/serialize/types/tests.ts index 729d5d026..92a666f1e 100644 --- a/packages/serialize/types/tests.ts +++ b/packages/serialize/types/tests.ts @@ -16,25 +16,24 @@ const testObjectInterpolation1: ObjectInterpolation = { } // $ExpectType SerializedStyles -serializeStyles({}, []) +serializeStyles([], {}) // $ExpectType SerializedStyles serializeStyles( - { + [{ 'emotion-cache': 'width: 200px' - }, - [] + }], + {} ) // $ExpectType SerializedStyles -serializeStyles({}, [], {}) +serializeStyles([], {}, {}) // $ExpectType SerializedStyles -serializeStyles({}, ['abc'], {}) +serializeStyles(['abc'], {}, {}) // $ExpectType SerializedStyles -serializeStyles({}, ['width: 200px;'], {}) +serializeStyles(['width: 200px;'], {}, {}) // $ExpectType SerializedStyles -serializeStyles({}, [() => 'height: 300px;'], {}) +serializeStyles([() => 'height: 300px;'], {}, {}) // $ExpectType SerializedStyles serializeStyles( - {}, [ 'display: block;', { @@ -42,15 +41,16 @@ serializeStyles( backgroundColor: 'red' } ], + {}, {} ) // $ExpectType SerializedStyles -serializeStyles({}, [testTemplateStringsArray, 5, '4px'], {}) +serializeStyles([testTemplateStringsArray, 5, '4px'], {}, {}) // $ExpectError serializeStyles() // $ExpectError -serializeStyles({}) +serializeStyles([]) // $ExpectError serializeStyles({}, {}) diff --git a/packages/serialize/types/tslint.json b/packages/serialize/types/tslint.json index eec7af5ea..ece80f5ea 100644 --- a/packages/serialize/types/tslint.json +++ b/packages/serialize/types/tslint.json @@ -5,6 +5,7 @@ true, "generic" ], + "no-null-undefined-union": false, "semicolon": false } } From 1b798b6c37642edffc8f0a6b2430195e54292391 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 3 Aug 2020 11:15:53 +0200 Subject: [PATCH 6/9] Bump csstype to 3.0.2 --- packages/serialize/package.json | 2 +- yarn.lock | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/serialize/package.json b/packages/serialize/package.json index f68989d27..bf886957c 100644 --- a/packages/serialize/package.json +++ b/packages/serialize/package.json @@ -18,7 +18,7 @@ "@emotion/memoize": "0.7.4", "@emotion/unitless": "0.7.5", "@emotion/utils": "0.11.3", - "csstype": "^2.5.7" + "csstype": "^3.0.2" }, "devDependencies": { "dtslint": "^0.3.0" diff --git a/yarn.lock b/yarn.lock index e3c9ee7f2..779b612fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6876,11 +6876,16 @@ cssstyle@^1.0.0, cssstyle@^1.2.2: dependencies: cssom "0.3.x" -csstype@^2.2.0, csstype@^2.5.7: +csstype@^2.2.0: version "2.6.6" resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41" integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg== +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" From e56fde036546dede68c93a48f5cd8fffc3dc7531 Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 3 Aug 2020 11:19:24 +0200 Subject: [PATCH 7/9] Add changeset --- .changeset/spotty-cars-camp.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/spotty-cars-camp.md diff --git a/.changeset/spotty-cars-camp.md b/.changeset/spotty-cars-camp.md new file mode 100644 index 000000000..9a00c9bc7 --- /dev/null +++ b/.changeset/spotty-cars-camp.md @@ -0,0 +1,5 @@ +--- +'@emotion/serialize': minor +--- + +Bump `csstype` to 3.0.2 From 565445447ec352dc35e6dadad2157e59b0a582ce Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Mon, 3 Aug 2020 12:40:07 +0200 Subject: [PATCH 8/9] Update .circleci/config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bd48ce9cd..7212aaf19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,7 +77,6 @@ jobs: - v4-dependencies- - run: yarn install --pure-lockfile - run: yarn lint:check - - run: yarn workspace @emotion/serialize test:typescript workflows: version: 2 From e9c87f00e64222b5202b40ea33ee6cc88881e8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Sun, 9 Aug 2020 16:39:25 +0200 Subject: [PATCH 9/9] Tweak changeset --- .changeset/spotty-cars-camp.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.changeset/spotty-cars-camp.md b/.changeset/spotty-cars-camp.md index 9a00c9bc7..b6ab56cc8 100644 --- a/.changeset/spotty-cars-camp.md +++ b/.changeset/spotty-cars-camp.md @@ -1,5 +1,8 @@ --- +'@emotion/core': minor +'@emotion/css': minor '@emotion/serialize': minor +'@emotion/styled': minor --- -Bump `csstype` to 3.0.2 +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.