diff --git a/CHANGELOG.md b/CHANGELOG.md index 904c927a862..e8608dddf62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ * Fix `{@const}` tag not working inside Component when there's no `let:` [#7189](https://github.com/sveltejs/svelte/issues/7189) * Ignore comments in `{#each}` blocks when containing elements with `animate:` ([#3999](https://github.com/sveltejs/svelte/issues/3999)) * Add a third parameter to the returned function of `createEventDispatcher` that allows passing an object of `{ cancelable: true }` to create a cancelable custom event. The returned function when called will also return a boolean depending on whether the event is cancelled ([#7064](https://github.com/sveltejs/svelte/pull/7064)) -* Fix value of `let:` bindings not updating in certain cases ([#7440](https://github.com/sveltejs/svelte/issues/7440)) +* Fix value of `let:` bindings not updating in certain cases ([#7440](https://github.com/sveltejs/svelte/issues/7440)) +* Strip leading newline after `
` and `
+
+
+ +
+ +
+ + + +
+ +
+ + + +
+ + + +
+ +
diff --git a/test/server-side-rendering/index.ts b/test/server-side-rendering/index.ts index f5773e37b60..2a4e0596e75 100644 --- a/test/server-side-rendering/index.ts +++ b/test/server-side-rendering/index.ts @@ -84,7 +84,7 @@ describe('ssr', () => { try { if (config.withoutNormalizeHtml) { - assert.strictEqual(html.trim(), expectedHtml.trim().replace(/\r\n/g, '\n')); + assert.strictEqual(html.trim().replace(/\r\n/g, '\n'), expectedHtml.trim().replace(/\r\n/g, '\n')); } else { (compileOptions.preserveComments ? assert.htmlEqualWithComments diff --git a/test/server-side-rendering/samples/pre-tag/.editorconfig b/test/server-side-rendering/samples/pre-tag/.editorconfig new file mode 100644 index 00000000000..d53d6a3faf3 --- /dev/null +++ b/test/server-side-rendering/samples/pre-tag/.editorconfig @@ -0,0 +1,2 @@ +[{main.svelte,_expected.html}] +trim_trailing_whitespace = unset diff --git a/test/server-side-rendering/samples/pre-tag/_expected.html b/test/server-side-rendering/samples/pre-tag/_expected.html index 7f88acdff41..54591027860 100644 --- a/test/server-side-rendering/samples/pre-tag/_expected.html +++ b/test/server-side-rendering/samples/pre-tag/_expected.html @@ -1,5 +1,4 @@ -
-  A
+
  A
   B
   
     C
@@ -18,8 +17,7 @@
   F
 
 
-
-    A
+
    A
     B
     
       C
@@ -28,3 +26,14 @@
     E
     F
   
+ +
leading newline
+
  leading newline and spaces
+
+
+leading newlines
+ +
without spaces
+
  with spaces  
+
 
+newline after leading space
diff --git a/test/server-side-rendering/samples/pre-tag/main.svelte b/test/server-side-rendering/samples/pre-tag/main.svelte index fb240817f7a..be3bf9e7ffc 100644 --- a/test/server-side-rendering/samples/pre-tag/main.svelte +++ b/test/server-side-rendering/samples/pre-tag/main.svelte @@ -32,3 +32,20 @@ F
+ +
+
+leading newline
+
+  leading newline and spaces
+
+
+leading newlines
+
+ +
+
without spaces
+
  with spaces  
+
 
+newline after leading space
+
diff --git a/test/server-side-rendering/samples/preserve-whitespaces/_expected.html b/test/server-side-rendering/samples/preserve-whitespaces/_expected.html index fb240817f7a..c712354f6ab 100644 --- a/test/server-side-rendering/samples/preserve-whitespaces/_expected.html +++ b/test/server-side-rendering/samples/preserve-whitespaces/_expected.html @@ -1,5 +1,4 @@ -
-  A
+
  A
   B
   
     C
@@ -21,8 +20,7 @@
 
 
 
-
-    A
+  
    A
     B
     
       C
diff --git a/test/server-side-rendering/samples/textarea-content/.editorconfig b/test/server-side-rendering/samples/textarea-content/.editorconfig
new file mode 100644
index 00000000000..d53d6a3faf3
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-content/.editorconfig
@@ -0,0 +1,2 @@
+[{main.svelte,_expected.html}]
+trim_trailing_whitespace = unset
diff --git a/test/server-side-rendering/samples/textarea-content/_config.js b/test/server-side-rendering/samples/textarea-content/_config.js
new file mode 100644
index 00000000000..39b31839f50
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-content/_config.js
@@ -0,0 +1,3 @@
+export default {
+	withoutNormalizeHtml: true
+};
diff --git a/test/server-side-rendering/samples/textarea-content/_expected.html b/test/server-side-rendering/samples/textarea-content/_expected.html
new file mode 100644
index 00000000000..5ca4604bb61
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-content/_expected.html
@@ -0,0 +1,28 @@
+
+
+
+ +
+ +
+ +
+ +
+ + + +
diff --git a/test/server-side-rendering/samples/textarea-content/main.svelte b/test/server-side-rendering/samples/textarea-content/main.svelte new file mode 100644 index 00000000000..e2e052ca7a3 --- /dev/null +++ b/test/server-side-rendering/samples/textarea-content/main.svelte @@ -0,0 +1,40 @@ + + +
+ +
+ +
+ + + +
+ +
+ + + +
+ + + +
+ +