From 336f3d50fd684ccbb160fff0c63d5560936f1ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Sat, 6 May 2023 10:33:28 +0200 Subject: [PATCH] Add support for cascade `@layer`s (#3031) --- .changeset/early-mice-morph.md | 7 +++++++ .changeset/seven-bags-tickle.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-morph.md create mode 100644 .changeset/seven-bags-tickle.md diff --git a/.changeset/early-mice-morph.md b/.changeset/early-mice-morph.md new file mode 100644 index 000000000..55dc9ed05 --- /dev/null +++ b/.changeset/early-mice-morph.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.2.0 diff --git a/.changeset/seven-bags-tickle.md b/.changeset/seven-bags-tickle.md new file mode 100644 index 000000000..60667ec41 --- /dev/null +++ b/.changeset/seven-bags-tickle.md @@ -0,0 +1,8 @@ +--- +'@emotion/cache': minor +'@emotion/css': minor +'@emotion/react': minor +'@emotion/styled': minor +--- + +Added support for cascade `@layer`s 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 a18cbc381..6171a82f9 100644 --- a/packages/babel-plugin/package.json +++ b/packages/babel-plugin/package.json @@ -28,7 +28,7 @@ "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.1.4" + "stylis": "4.2.0" }, "devDependencies": { "@babel/core": "^7.18.5", diff --git a/packages/cache/package.json b/packages/cache/package.json index 0ec5cba76..8ac69a90c 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -30,7 +30,7 @@ "@emotion/sheet": "^1.2.1", "@emotion/utils": "^1.2.0", "@emotion/weak-memoize": "^0.3.0", - "stylis": "4.1.4" + "stylis": "4.2.0" }, "devDependencies": { "@definitelytyped/dtslint": "0.0.112", diff --git a/packages/css-prettifier/package.json b/packages/css-prettifier/package.json index 7d3a29d51..5862e8d7a 100644 --- a/packages/css-prettifier/package.json +++ b/packages/css-prettifier/package.json @@ -21,7 +21,7 @@ "repository": "https://github.com/emotion-js/emotion/tree/main/packages/css-prettifier", "dependencies": { "@emotion/memoize": "^0.8.0", - "stylis": "4.1.4" + "stylis": "4.2.0" }, "publishConfig": { "access": "public" diff --git a/packages/jest/package.json b/packages/jest/package.json index 3a56ffd8d..6b624042a 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -44,7 +44,7 @@ "@emotion/css-prettifier": "^1.1.2", "chalk": "^4.1.0", "specificity": "^0.4.1", - "stylis": "4.1.4" + "stylis": "4.2.0" }, "peerDependencies": { "@types/jest": "^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0", diff --git a/yarn.lock b/yarn.lock index c9cdb2477..d08f16481 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.4 + stylis: 4.2.0 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.4 + stylis: 4.2.0 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.4 + stylis: 4.2.0 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.4 + stylis: 4.2.0 typescript: ^4.5.5 peerDependencies: "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0 @@ -28342,10 +28342,10 @@ __metadata: languageName: node linkType: hard -"stylis@npm:4.1.4": - version: 4.1.4 - resolution: "stylis@npm:4.1.4" - checksum: cd929bd89709def13b47e6c16b11317bf996a09b4e987fc45a235549c3adf49d41531e017d7df511daa095bc9468c923ae9094a934fe9c62440b7351874dafb7 +"stylis@npm:4.2.0": + version: 4.2.0 + resolution: "stylis@npm:4.2.0" + checksum: 0eb6cc1b866dc17a6037d0a82ac7fa877eba6a757443e79e7c4f35bacedbf6421fadcab4363b39667b43355cbaaa570a3cde850f776498e5450f32ed2f9b7584 languageName: node linkType: hard