From 6bd13425a2b413150c81e63fad1105d7968b5e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Fri, 28 Apr 2023 08:58:29 +0200
Subject: [PATCH] Upgrade Stylis to a version with parsing fix for `&` in
 nested functions (#3025)

---
 .changeset/early-mice-change.md      |  7 +++++++
 .changeset/seven-bags-shave.md       |  8 ++++++++
 packages/babel-plugin/package.json   |  2 +-
 packages/cache/package.json          |  2 +-
 packages/css-prettifier/package.json |  2 +-
 packages/jest/package.json           |  2 +-
 yarn.lock                            | 16 ++++++++--------
 7 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/early-mice-change.md
 create mode 100644 .changeset/seven-bags-shave.md

diff --git a/.changeset/early-mice-change.md b/.changeset/early-mice-change.md
new file mode 100644
index 000000000..098ff104c
--- /dev/null
+++ b/.changeset/early-mice-change.md
@@ -0,0 +1,7 @@
+---
+'@emotion/babel-plugin': patch
+'@emotion/css-prettifier': patch
+'@emotion/jest': patch
+---
+
+Updated the underlying parser ([stylis](https://github.com/thysultan/stylis)) to 4.1.4
diff --git a/.changeset/seven-bags-shave.md b/.changeset/seven-bags-shave.md
new file mode 100644
index 000000000..45acf00e0
--- /dev/null
+++ b/.changeset/seven-bags-shave.md
@@ -0,0 +1,8 @@
+---
+'@emotion/cache': patch
+'@emotion/css': patch
+'@emotion/react': patch
+'@emotion/styled': patch
+---
+
+Fixed a parsing issue with `&` within nested functions in declaration values by updating the underlying parser ([stylis](https://github.com/thysultan/stylis)).
diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json
index 82610e50a..4151614bc 100644
--- a/packages/babel-plugin/package.json
+++ b/packages/babel-plugin/package.json
@@ -27,7 +27,7 @@
     "escape-string-regexp": "^4.0.0",
     "find-root": "^1.1.0",
     "source-map": "^0.5.7",
-    "stylis": "4.1.3"
+    "stylis": "4.1.4"
   },
   "devDependencies": {
     "@babel/core": "^7.18.5",
diff --git a/packages/cache/package.json b/packages/cache/package.json
index a96ec6032..9518f4863 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -29,7 +29,7 @@
     "@emotion/sheet": "^1.2.1",
     "@emotion/utils": "^1.2.0",
     "@emotion/weak-memoize": "^0.3.0",
-    "stylis": "4.1.3"
+    "stylis": "4.1.4"
   },
   "devDependencies": {
     "@definitelytyped/dtslint": "0.0.112",
diff --git a/packages/css-prettifier/package.json b/packages/css-prettifier/package.json
index 314294d7e..8e6b9edce 100644
--- a/packages/css-prettifier/package.json
+++ b/packages/css-prettifier/package.json
@@ -20,7 +20,7 @@
   "repository": "https://github.com/emotion-js/emotion/tree/main/packages/css-prettifier",
   "dependencies": {
     "@emotion/memoize": "^0.8.0",
-    "stylis": "4.1.3"
+    "stylis": "4.1.4"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/jest/package.json b/packages/jest/package.json
index 1f829ad54..685f26792 100644
--- a/packages/jest/package.json
+++ b/packages/jest/package.json
@@ -40,7 +40,7 @@
     "@emotion/css-prettifier": "^1.1.1",
     "chalk": "^4.1.0",
     "specificity": "^0.4.1",
-    "stylis": "4.1.3"
+    "stylis": "4.1.4"
   },
   "peerDependencies": {
     "@types/jest": "^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0",
diff --git a/yarn.lock b/yarn.lock
index 66a0627e2..c75f5dd54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2360,7 +2360,7 @@ __metadata:
     escape-string-regexp: ^4.0.0
     find-root: ^1.1.0
     source-map: ^0.5.7
-    stylis: 4.1.3
+    stylis: 4.1.4
   languageName: unknown
   linkType: soft
 
@@ -2388,7 +2388,7 @@ __metadata:
     "@emotion/sheet": ^1.2.1
     "@emotion/utils": ^1.2.0
     "@emotion/weak-memoize": ^0.3.0
-    stylis: 4.1.3
+    stylis: 4.1.4
     typescript: ^4.5.5
   languageName: unknown
   linkType: soft
@@ -2398,7 +2398,7 @@ __metadata:
   resolution: "@emotion/css-prettifier@workspace:packages/css-prettifier"
   dependencies:
     "@emotion/memoize": ^0.8.0
-    stylis: 4.1.3
+    stylis: 4.1.4
   languageName: unknown
   linkType: soft
 
@@ -2470,7 +2470,7 @@ __metadata:
     react: 16.14.0
     react-dom: 16.14.0
     specificity: ^0.4.1
-    stylis: 4.1.3
+    stylis: 4.1.4
     typescript: ^4.5.5
   peerDependencies:
     "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0
@@ -28305,10 +28305,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylis@npm:4.1.3":
-  version: 4.1.3
-  resolution: "stylis@npm:4.1.3"
-  checksum: d04dbffcb9bf2c5ca8d8dc09534203c75df3bf711d33973ea22038a99cc475412a350b661ebd99cbc01daa50d7eedcf0d130d121800eb7318759a197023442a6
+"stylis@npm:4.1.4":
+  version: 4.1.4
+  resolution: "stylis@npm:4.1.4"
+  checksum: cd929bd89709def13b47e6c16b11317bf996a09b4e987fc45a235549c3adf49d41531e017d7df511daa095bc9468c923ae9094a934fe9c62440b7351874dafb7
   languageName: node
   linkType: hard