csstools · Antonio-Laguna · Jun 23, 2022 · Jun 23, 2022 · Jun 23, 2022
diff --git a/plugin-packs/postcss-preset-env/test/basic.ch88-ff78-saf10.expect.css b/plugin-packs/postcss-preset-env/test/basic.ch88-ff78-saf10.expect.css
@@ -503,5 +503,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.ch88-ff78.expect.css b/plugin-packs/postcss-preset-env/test/basic.ch88-ff78.expect.css
@@ -477,5 +477,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.ch88-ff78.no-is-pseudo.expect.css b/plugin-packs/postcss-preset-env/test/basic.ch88-ff78.no-is-pseudo.expect.css
@@ -477,5 +477,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.nesting.true.expect.css b/plugin-packs/postcss-preset-env/test/basic.nesting.true.expect.css
@@ -405,5 +405,5 @@
 @custom-selector :--view-m [data-view-size=m];
 
 :--view-m .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.op_mini.expect.css b/plugin-packs/postcss-preset-env/test/basic.op_mini.expect.css
@@ -594,5 +594,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.preserve.true.expect.css b/plugin-packs/postcss-preset-env/test/basic.preserve.true.expect.css
@@ -1023,9 +1023,9 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 @custom-selector :--view-m [data-view-size=m];
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
 
 :--view-m .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.stage0-ff49.expect.css b/plugin-packs/postcss-preset-env/test/basic.stage0-ff49.expect.css
@@ -505,5 +505,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.stage0-ff66.expect.css b/plugin-packs/postcss-preset-env/test/basic.stage0-ff66.expect.css
@@ -490,5 +490,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/basic.stage0.expect.css b/plugin-packs/postcss-preset-env/test/basic.stage0.expect.css
@@ -616,5 +616,5 @@ h1.test-custom-selectors,h2.test-custom-selectors,h3.test-custom-selectors,h4.te
 }
 
 [data-view-size=m] .view {
-		background: red
+		background: red;
 }
diff --git a/plugin-packs/postcss-preset-env/test/layers-basic.expect.css b/plugin-packs/postcss-preset-env/test/layers-basic.expect.css
@@ -6,7 +6,7 @@
 				-webkit-order: 5.1;
 				   -moz-box-ordinal-group: 6;
 				    -ms-flex-order: 5.1;
-				        order: 5.1
+				        order: 5.1;
 		}
 
 :root:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {
@@ -54,11 +54,11 @@
 }
 
 [dir="ltr"] .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 4px 3px 2px
+		margin: 1px 4px 3px 2px;
 }
 
 [dir="rtl"] .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 2px 3px 4px
+		margin: 1px 2px 3px 4px;
 }
 
 .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {
@@ -87,7 +87,7 @@
 			-webkit-order: 5;
 			   -moz-box-ordinal-group: 6;
 			    -ms-flex-order: 5;
-			        order: 5
+			        order: 5;
 		}
 
 .test-nesting-rules:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {

diff --git a/plugin-packs/postcss-preset-env/test/layers-basic.preserve.true.expect.css b/plugin-packs/postcss-preset-env/test/layers-basic.preserve.true.expect.css
@@ -6,7 +6,7 @@
 				-webkit-order: 5.1;
 				   -moz-box-ordinal-group: 6;
 				    -ms-flex-order: 5.1;
-				        order: 5.1
+				        order: 5.1;
 		}
 
 :root:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {
@@ -60,19 +60,19 @@
 }
 
 [dir="ltr"] .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 4px 3px 2px
+		margin: 1px 4px 3px 2px;
 }
 
 .test-logical-properties-and-values:dir(ltr):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 4px 3px 2px
+		margin: 1px 4px 3px 2px;
 }
 
 [dir="rtl"] .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 2px 3px 4px
+		margin: 1px 2px 3px 4px;
 }
 
 .test-logical-properties-and-values:dir(rtl):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#){
-		margin: 1px 2px 3px 4px
+		margin: 1px 2px 3px 4px;
 }
 
 .test-logical-properties-and-values:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {
@@ -103,7 +103,7 @@
 			-webkit-order: 5;
 			   -moz-box-ordinal-group: 6;
 			    -ms-flex-order: 5;
-			        order: 5
+			        order: 5;
 		}
 
 .test-nesting-rules:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) {

diff --git a/plugins/postcss-nesting/CHANGELOG.md b/plugins/postcss-nesting/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes to PostCSS Nesting
 
+### Unreleased
+
+- Fix semicolons being removed (https://github.com/csstools/postcss-plugins/issues/497).
+
 ### 10.1.8 (June 4, 2022)
 
 - Update `@csstools/selector-specificity` (major)

diff --git a/plugins/postcss-nesting/src/lib/nest-rule-within-rule.js b/plugins/postcss-nesting/src/lib/nest-rule-within-rule.js
@@ -9,6 +9,7 @@ export default function transformNestRuleWithinRule(node, walk, opts) {
 
 	// clone the parent as a new rule with children appended to it
 	const rule = parent.clone().removeAll().append(node.nodes);
+	rule.raws.semicolon = true; /* nested rules end with "}" and do not have this flag set */
 
 	// replace the node with the new rule
 	node.replaceWith(rule);

diff --git a/plugins/postcss-nesting/src/lib/shift-nodes-before-parent.js b/plugins/postcss-nesting/src/lib/shift-nodes-before-parent.js
@@ -7,11 +7,13 @@ export default function shiftNodesBeforeParent(node) {
 	// conditionally move previous siblings into a clone of the parent
 	if (index) {
 		const newParent = parent.cloneBefore().removeAll().append(parent.nodes.slice(0, index));
+		newParent.raws.semicolon = true; /* nested rules end with "}" and do not have this flag set */
 		cleanupParent(newParent);
 	}
 
 	// move the current node before the parent (and after the conditional clone)
 	parent.before(node);
+	parent.raws.semicolon = true; /* nested rules end with "}" and do not have this flag set */
 
 	return parent;
 }
diff --git a/plugins/postcss-nesting/test/at-rule.expect.css b/plugins/postcss-nesting/test/at-rule.expect.css
@@ -1,76 +1,76 @@
 a {
-	order: 1
+	order: 1;
 }
 b a {
-		order: 2
+		order: 2;
 }
 c a {
-		order: 3
+		order: 3;
 }
 d a {
-		order: 4
+		order: 4;
 }
 e a {
-		order: 5
+		order: 5;
 }
 a {
-	order: 1
+	order: 1;
 }
 a b {
-		order: 2
+		order: 2;
 }
 a c {
-		order: 3
+		order: 3;
 }
 a d {
-		order: 4
+		order: 4;
 }
 a e {
-		order: 5
+		order: 5;
 }
 a[foo="& ,\'"] {
-		order: 6
+		order: 6;
 }
 a[a="& ,\'"][b='& . \\a &'] {
-		order: 7
+		order: 7;
 }
 a:is(\\foo) {
-		order: 8
+		order: 8;
 }
 
 h1.foo {
-		color: red
+		color: red;
 }
 
 h1.foo, h2.foo {
-		color: red
+		color: red;
 }
 
 .foo.bar {
-		color: red
+		color: red;
 }
 
 
 .foo.bar, .foo.baz {
-		color: red
+		color: red;
 }
 
 h1.foo {
-		color: blue
+		color: blue;
 }
 
 h1.foo .baz h1 {
-		color: blue
+		color: blue;
 }
 
 h1.foo, h1.bar {
-		color: blue
+		color: blue;
 }
 
 article {
-	color: blue
+	color: blue;
 }
 
 :where(article) {
-		color: red
+		color: red;
 }
diff --git a/plugins/postcss-nesting/test/at-rule.no-is-pseudo-selector.expect.css b/plugins/postcss-nesting/test/at-rule.no-is-pseudo-selector.expect.css
@@ -1,76 +1,76 @@
 a {
-	order: 1
+	order: 1;
 }
 b a {
-		order: 2
+		order: 2;
 }
 c a {
-		order: 3
+		order: 3;
 }
 d a {
-		order: 4
+		order: 4;
 }
 e a {
-		order: 5
+		order: 5;
 }
 a {
-	order: 1
+	order: 1;
 }
 a b {
-		order: 2
+		order: 2;
 }
 a c {
-		order: 3
+		order: 3;
 }
 a d {
-		order: 4
+		order: 4;
 }
 a e {
-		order: 5
+		order: 5;
 }
 a[foo="& ,\'"] {
-		order: 6
+		order: 6;
 }
 a[a="& ,\'"][b='& . \\a &'] {
-		order: 7
+		order: 7;
 }
 a\\foo {
-		order: 8
+		order: 8;
 }
 
 h1.foo {
-		color: red
+		color: red;
 }
 
 h1.foo, h2.foo {
-		color: red
+		color: red;
 }
 
 .foo.bar {
-		color: red
+		color: red;
 }
 
 
 .foo.bar, .foo.baz {
-		color: red
+		color: red;
 }
 
 h1.foo {
-		color: blue
+		color: blue;
 }
 
 h1.foo .baz h1 {
-		color: blue
+		color: blue;
 }
 
 h1.foo, h1.bar {
-		color: blue
+		color: blue;
 }
 
 article {
-	color: blue
+	color: blue;
 }
 
 :where(article) {
-		color: red
+		color: red;
 }
diff --git a/plugins/postcss-nesting/test/basic.css b/plugins/postcss-nesting/test/basic.css
@@ -155,3 +155,21 @@ a {
 		order: 72;
 	}
 }
+
+.has-semi-colons-on-the-last-decl {
+	order: 73;
+	/* a comment */
+
+	& .foo {
+		order: 73.1;
+	}
+}
+
+.has-semi-colons-on-the-last-decl {
+	order: 74;
+	/* a comment */
+
+	@nest & .foo {
+		order: 74.1;
+	}
+}