fix: broken when PostCSS >= 8.4.6

yisibl · yisibl · commit dd2ec7e2f3fe · 2022-07-15T01:18:19.000+08:00
diff --git a/index.js b/index.js
@@ -60,9 +60,11 @@ function transform(rule) {
     return
   }
 
+  // In PostCSS version 8.4.6, this will contain comments that need to be removed manually
+  rule.params = rule.params.replace(/\/\*.*\*\//gs, '')
+
   // The value doesn't support negative values
   // But -0 is always equivalent to 0 in CSS, and so is also accepted as a valid <mq-boolean> value.
-
   rule.params = rule.params.replace(/\(\s*([a-z-]+?)\s*([<>])(=?)\s*((?:-?\d*\.?(?:\s*\/?\s*)?\d+[a-z]*)?)\s*\)/gi, function($0, $1, $2, $3, $4) {
     if (feature_name.indexOf($1) > -1) {
       return create_query($1, $2, $3, $4);
diff --git a/package.json b/package.json
@@ -27,10 +27,10 @@
     "node": ">=10.0.0"
   },
   "peerDependencies": {
-    "postcss": "8.4.5"
+    "postcss": "8.4.6"
   },
   "devDependencies": {
-    "postcss": "8.4.5",
+    "postcss": "8.4.6",
     "tape": "^5.3.1"
   }
 }
diff --git a/test/fixtures/comment.css b/test/fixtures/comment.css
@@ -1,11 +1 @@
-@media screen and /* comment */ (/* comment */width >= 500px) /* comment */ and (width/* comment */ <= 1200px) /* comment */{
-  .bar {
-    display: block;
-  }
-}
-
-@media screen and /* comment */(500px/* comment */ <= /* comment */width <= 1200px/* comment */) /* comment */{
-  .bar {
-    display: block;
-  }
-}
+@media screen and /* comment */ (/* comment */width >=  500px /* comment */) /* comment */ and (width/* comment */ <= 1200px) /* comment */{}
diff --git a/test/fixtures/comment.output.css b/test/fixtures/comment.output.css
@@ -1,11 +1 @@
-@media screen and  (min-width: 500px)  and (max-width: 1200px) /* comment */{
-  .bar {
-    display: block;
-  }
-}
-
-@media screen and (min-width: 500px) and (max-width: 1200px) /* comment */{
-  .bar {
-    display: block;
-  }
-}
+@media screen and  (min-width: 500px)  and (max-width: 1200px) /* comment */{}
diff --git a/yarn.lock b/yarn.lock
@@ -504,7 +504,7 @@ minimist@^1.2.6:
   resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-nanoid@^3.1.30:
+nanoid@^3.2.0:
   version "3.3.4"
   resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
@@ -564,14 +564,14 @@ picocolors@^1.0.0:
   resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-postcss@8.4.5:
-  version "8.4.5"
-  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
-  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+postcss@8.4.6:
+  version "8.4.6"
+  resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
+  integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
   dependencies:
-    nanoid "^3.1.30"
+    nanoid "^3.2.0"
     picocolors "^1.0.0"
-    source-map-js "^1.0.1"
+    source-map-js "^1.0.2"
 
 regexp.prototype.flags@^1.3.0:
   version "1.3.1"
@@ -614,7 +614,7 @@ side-channel@^1.0.3, side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-source-map-js@^1.0.1:
+source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@`
`27`	`27`	`"node": ">=10.0.0"`
`28`	`28`	`},`
`29`	`29`	`"peerDependencies": {`
`30`		`- "postcss": "8.4.5"`
	`30`	`+ "postcss": "8.4.6"`
`31`	`31`	`},`
`32`	`32`	`"devDependencies": {`
`33`		`- "postcss": "8.4.5",`
	`33`	`+ "postcss": "8.4.6",`
`34`	`34`	`"tape": "^5.3.1"`
`35`	`35`	`}`
`36`	`36`	`}`