From 2a08f9ee6d22ed1f33e63a9502367da0619c7188 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Sun, 9 Aug 2020 17:10:09 +0200
Subject: [PATCH] Upgrade csstype dependency (#1956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove grayscale filter from the docs (#1929)

* Add emotion-native-extended to the ecosystem list of packages (#1849)

* Make links more accessible in the docs (#1930)

* run test:typescript for emotion/serialize in CI

* fix emotion/serialize type tests

* Bump csstype to 3.0.2

* Add changeset

* Update .circleci/config.yml

* Tweak changeset

Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com>
Co-authored-by: Wendell Misiedjan <wmisiedj@student.codam.nl>
---
 .changeset/spotty-cars-camp.md       |  8 ++++++++
 packages/serialize/package.json      |  2 +-
 packages/serialize/types/tslint.json | 19 ++++++++-----------
 yarn.lock                            |  7 ++++++-
 4 files changed, 23 insertions(+), 13 deletions(-)
 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 0000000000..b6ab56cc89
--- /dev/null
+++ b/.changeset/spotty-cars-camp.md
@@ -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.
diff --git a/packages/serialize/package.json b/packages/serialize/package.json
index 598627ffa3..8f068cfa2a 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": "1.0.0-next.0",
-    "csstype": "^2.6.7"
+    "csstype": "^3.0.2"
   },
   "devDependencies": {
     "dtslint": "^0.3.0"
diff --git a/packages/serialize/types/tslint.json b/packages/serialize/types/tslint.json
index 4ffac3c17b..b2802853bf 100644
--- a/packages/serialize/types/tslint.json
+++ b/packages/serialize/types/tslint.json
@@ -1,12 +1,9 @@
 {
-    "extends": "dtslint/dtslint.json",
-    "rules": {
-        "array-type": [
-            true,
-            "generic"
-        ],
-        "semicolon": false,
-        "no-null-undefined-union": false,
-        "callable-types": false
-    }
-}
\ No newline at end of file
+  "extends": "dtslint/dtslint.json",
+  "rules": {
+    "array-type": [true, "generic"],
+    "semicolon": false,
+    "no-null-undefined-union": false,
+    "callable-types": false
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index fe2608a21a..3332b85806 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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"