From eb09413725aefad8e27c4277c5b3e1ad91d10806 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 13 Aug 2024 10:41:10 +0800
Subject: [PATCH] Update postcss-prefixwrap dependency to 1.51.0 to fix
 prefixing in :where selectors

---
 package-lock.json                             | 31 +++++++++---------
 packages/block-editor/package.json            |  2 +-
 .../src/utils/test/transform-styles.js        | 32 +++++++++++++++++++
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 66c32076d3b36..471d7b845d24f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41754,14 +41754,6 @@
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true
 		},
-		"node_modules/postcss-prefixwrap": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.41.0.tgz",
-			"integrity": "sha512-gmwwAEE+ci3/ZKjUZppTETINlh1QwihY8gCstInuS7ohk353KYItU4d64hvnUvO2GUy29hBGPHz4Ce+qJRi90A==",
-			"peerDependencies": {
-				"postcss": "*"
-			}
-		},
 		"node_modules/postcss-reduce-initial": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
@@ -52237,7 +52229,7 @@
 				"fast-deep-equal": "^3.1.3",
 				"memize": "^2.1.0",
 				"postcss": "^8.4.21",
-				"postcss-prefixwrap": "^1.41.0",
+				"postcss-prefixwrap": "^1.51.0",
 				"postcss-urlrebase": "^1.4.0",
 				"react-autosize-textarea": "^7.1.0",
 				"react-easy-crop": "^5.0.6",
@@ -52252,6 +52244,15 @@
 				"react-dom": "^18.0.0"
 			}
 		},
+		"packages/block-editor/node_modules/postcss-prefixwrap": {
+			"version": "1.51.0",
+			"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.51.0.tgz",
+			"integrity": "sha512-PuP4md5zFSY921dUcLShwSLv2YyyDec0dK9/puXl/lu7ZNvJ1U59+ZEFRMS67xwfNg5nIIlPXnAycPJlhA/Isw==",
+			"license": "MIT",
+			"peerDependencies": {
+				"postcss": "*"
+			}
+		},
 		"packages/block-editor/node_modules/postcss-urlrebase": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.4.0.tgz",
@@ -67255,13 +67256,18 @@
 				"fast-deep-equal": "^3.1.3",
 				"memize": "^2.1.0",
 				"postcss": "^8.4.21",
-				"postcss-prefixwrap": "^1.41.0",
+				"postcss-prefixwrap": "^1.51.0",
 				"postcss-urlrebase": "^1.4.0",
 				"react-autosize-textarea": "^7.1.0",
 				"react-easy-crop": "^5.0.6",
 				"remove-accents": "^0.5.0"
 			},
 			"dependencies": {
+				"postcss-prefixwrap": {
+					"version": "1.51.0",
+					"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.51.0.tgz",
+					"integrity": "sha512-PuP4md5zFSY921dUcLShwSLv2YyyDec0dK9/puXl/lu7ZNvJ1U59+ZEFRMS67xwfNg5nIIlPXnAycPJlhA/Isw=="
+				},
 				"postcss-urlrebase": {
 					"version": "1.4.0",
 					"resolved": "https://registry.npmjs.org/postcss-urlrebase/-/postcss-urlrebase-1.4.0.tgz",
@@ -87820,11 +87826,6 @@
 				}
 			}
 		},
-		"postcss-prefixwrap": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/postcss-prefixwrap/-/postcss-prefixwrap-1.41.0.tgz",
-			"integrity": "sha512-gmwwAEE+ci3/ZKjUZppTETINlh1QwihY8gCstInuS7ohk353KYItU4d64hvnUvO2GUy29hBGPHz4Ce+qJRi90A=="
-		},
 		"postcss-reduce-initial": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index 8ccaee6f0a955..02765376e314b 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -73,7 +73,7 @@
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
 		"postcss": "^8.4.21",
-		"postcss-prefixwrap": "^1.41.0",
+		"postcss-prefixwrap": "^1.51.0",
 		"postcss-urlrebase": "^1.4.0",
 		"react-autosize-textarea": "^7.1.0",
 		"react-easy-crop": "^5.0.6",
diff --git a/packages/block-editor/src/utils/test/transform-styles.js b/packages/block-editor/src/utils/test/transform-styles.js
index 8245ce6283107..f16d7ef5a98d3 100644
--- a/packages/block-editor/src/utils/test/transform-styles.js
+++ b/packages/block-editor/src/utils/test/transform-styles.js
@@ -125,6 +125,21 @@ describe( 'transformStyles', () => {
 			expect( output ).toMatchSnapshot();
 		} );
 
+		it( `should not try to replace 'body' in the middle of a classname`, () => {
+			const prefix = '.my-namespace';
+			const input = `.has-body-text { color: red; }`;
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				prefix
+			);
+
+			expect( output ).toEqual( [ `${ prefix } ${ input }` ] );
+		} );
+
 		it( 'should ignore keyframes', () => {
 			const input = `
 			@keyframes edit-post__fade-in-animation {
@@ -210,6 +225,23 @@ describe( 'transformStyles', () => {
 
 			expect( output ).toMatchSnapshot();
 		} );
+
+		it( 'should not try to wrap items within `:where` selectors', () => {
+			const input = `:where(.wp-element-button:active, .wp-block-button__link:active) { color: blue; }`;
+			const prefix = '.my-namespace';
+			const expected = [ `${ prefix } ${ input }` ];
+
+			const output = transformStyles(
+				[
+					{
+						css: input,
+					},
+				],
+				prefix
+			);
+
+			expect( output ).toEqual( expected );
+		} );
 	} );
 
 	it( 'should not break with data urls', () => {