Merge pull request #900 from preactjs/fix/jsx-whitespace

Fix/jsx whitespace
preactjs · Jan 19, 2022 · 2f7c74a · 2f7c74a
2 parents 1a1b871 + 69b0496
commit 2f7c74a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.changeset/late-comics-end.md b/.changeset/late-comics-end.md
@@ -0,0 +1,5 @@
+---
+'wmr': patch
+---
+
+Ensures leading newline in text nodes is not converted to whitespace
diff --git a/packages/wmr/src/lib/acorn-traverse.js b/packages/wmr/src/lib/acorn-traverse.js
@@ -890,8 +890,12 @@ const TYPES = {
 							// We can drop the whole matched string if it only contains
 							// whitespace characters, because that means we're at the
 							// beginning or at the end of the JSXText node
-							const replacement = /[^\s]/.test(value) ? ' ' : '';
-							value = value.replace(/\s*\n+\s*/g, replacement);
+							if (/[^\s]/.test(value)) {
+								value = value.replace(/(^\s*\n\s*|\s*\n\s*$)/g, '');
+								value = value.replace(/\s*\n+\s*/g, ' ');
+							} else {
+								value = value.replace(/\s*\n+\s*/g, '');
+							}
 						}
 						children.push(TYPES.stringLiteral(value));
 					}

diff --git a/packages/wmr/test/acorn-traverse.test.js b/packages/wmr/test/acorn-traverse.test.js
@@ -1331,6 +1331,7 @@ describe('acorn-traverse', () => {
 					<p>это
 
 						👩‍🚀</p>
+					, foo
 					</p>
 				);
 			`;
@@ -1343,14 +1344,15 @@ describe('acorn-traverse', () => {
 				<p>это
 
 					👩‍🚀</p>
+				, foo
 				</p>\`
 			);"
 		`);
 
 			// Should remove the whitespaces between the HTM generated syntax
 			expect(doTransformWithCompact(expression)).toMatchInlineSnapshot(`
 			"(
-				html\`<p>hello world <p>это 👩‍🚀</p></p>\`
+				html\`<p>hello world<p>это 👩‍🚀</p>, foo</p>\`
 			);"
 			`);
 		});