diff --git a/.gitignore b/.gitignore index 22389f683c..478a6f5ceb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .idea .DS_Store -.nyc_output .vscode node_modules *.map diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c1afb7727..4c085a2be2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,46 @@ ## Unreleased -* Add `aria-description` to the list of allowed ARIA attributes ([#7301](https://github.com/sveltejs/svelte/issues/7301)) +* Faster SSR ([#5701](https://github.com/sveltejs/svelte/pull/5701)) +* Fix `class:` directive updates with `` ([#7521](https://github.com/sveltejs/svelte/issues/7521), [#7571](https://github.com/sveltejs/svelte/issues/7571)) +* Harden attribute escaping during ssr ([#7530](https://github.com/sveltejs/svelte/pull/7530)) +* Add `ComponentType` convenience type ([#6770](https://github.com/sveltejs/svelte/pull/6770)) + +## 3.48.0 + +* Allow creating cancelable custom events with `createEventDispatcher` ([#4623](https://github.com/sveltejs/svelte/issues/4623)) +* Support `{@const}` tag in `{#if}` blocks [#7241](https://github.com/sveltejs/svelte/issues/7241) +* Return the context object in `setContext` [#7427](https://github.com/sveltejs/svelte/issues/7427) +* Allow comments inside `{#each}` blocks when using `animate:` ([#3999](https://github.com/sveltejs/svelte/issues/3999)) +* Fix `|local` transitions in `{#key}` blocks ([#5950](https://github.com/sveltejs/svelte/issues/5950)) +* Support svg namespace for `{@html}` ([#7002](https://github.com/sveltejs/svelte/issues/7002), [#7450](https://github.com/sveltejs/svelte/issues/7450)) +* Fix `{@const}` tag not working inside a component when there's no `let:` [#7189](https://github.com/sveltejs/svelte/issues/7189) +* Remove extraneous leading newline inside `
` and `
+
+

+  
+

+
+

+  
+  
+  
+

+
+

+  
+  
+  
+

+
+
+
+

+  
+

diff --git a/test/server-side-rendering/index.ts b/test/server-side-rendering/index.ts
index f5773e37b6..2a4e0596e7 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/attribute-escaped-quotes-spread/_expected.html b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/_expected.html
index b3970f88ba..5db9a90fff 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes-spread/_expected.html
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/_expected.html
@@ -2,4 +2,10 @@
 	bar="'>"
 	foo="">"
 	qux="&&&"
->
\ No newline at end of file
+	quux="">"
+>
+
+

diff --git a/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.svelte b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.svelte
index 66047eb09a..9d721cd88f 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.svelte
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes-spread/main.svelte
@@ -1,10 +1,15 @@
 
 
-

\ No newline at end of file
+

+

diff --git a/test/server-side-rendering/samples/attribute-escaped-quotes/_expected.html b/test/server-side-rendering/samples/attribute-escaped-quotes/_expected.html
index c3c9405d7b..e99c5b0f6e 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes/_expected.html
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes/_expected.html
@@ -1,3 +1,4 @@
 

\ No newline at end of file
+	foo="">\"
+	bar="">\"
+>
diff --git a/test/server-side-rendering/samples/attribute-escaped-quotes/main.svelte b/test/server-side-rendering/samples/attribute-escaped-quotes/main.svelte
index ed34f4d129..aeed0f20d1 100644
--- a/test/server-side-rendering/samples/attribute-escaped-quotes/main.svelte
+++ b/test/server-side-rendering/samples/attribute-escaped-quotes/main.svelte
@@ -1,5 +1,6 @@
 
 
-

\ No newline at end of file
+

diff --git a/test/server-side-rendering/samples/dynamic-element-string/_expected.html b/test/server-side-rendering/samples/dynamic-element-string/_expected.html
new file mode 100644
index 0000000000..cb98432e14
--- /dev/null
+++ b/test/server-side-rendering/samples/dynamic-element-string/_expected.html
@@ -0,0 +1 @@
+
Foo

diff --git a/test/server-side-rendering/samples/dynamic-element-string/main.svelte b/test/server-side-rendering/samples/dynamic-element-string/main.svelte
new file mode 100644
index 0000000000..62d65d5f20
--- /dev/null
+++ b/test/server-side-rendering/samples/dynamic-element-string/main.svelte
@@ -0,0 +1 @@
+Foo
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/dynamic-element-variable/_expected.html b/test/server-side-rendering/samples/dynamic-element-variable/_expected.html
new file mode 100644
index 0000000000..3ae445f54c
--- /dev/null
+++ b/test/server-side-rendering/samples/dynamic-element-variable/_expected.html
@@ -0,0 +1,2 @@
+
Foo

+
Bar

\ No newline at end of file
diff --git a/test/server-side-rendering/samples/dynamic-element-variable/main.svelte b/test/server-side-rendering/samples/dynamic-element-variable/main.svelte
new file mode 100644
index 0000000000..9aaba18bf1
--- /dev/null
+++ b/test/server-side-rendering/samples/dynamic-element-variable/main.svelte
@@ -0,0 +1,7 @@
+
+
+Foo
+Bar
\ No newline at end of file
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 0000000000..d53d6a3faf
--- /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 7f88acdff4..5459102786 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 fb240817f7..be3bf9e7ff 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 fb240817f7..c712354f6a 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 0000000000..d53d6a3faf
--- /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 0000000000..39b31839f5
--- /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 0000000000..5ca4604bb6
--- /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 0000000000..e2e052ca7a
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-content/main.svelte
@@ -0,0 +1,40 @@
+
+
+

+  
+

+
+

+  
+  
+  
+

+
+

+  
+  
+  
+

+
+
+
+

+  
+

diff --git a/test/validator/samples/animation-comment-siblings/errors.json b/test/validator/samples/animation-comment-siblings/errors.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/test/validator/samples/animation-comment-siblings/errors.json
@@ -0,0 +1 @@
+[]
diff --git a/test/validator/samples/animation-comment-siblings/input.svelte b/test/validator/samples/animation-comment-siblings/input.svelte
new file mode 100644
index 0000000000..1c8170950b
--- /dev/null
+++ b/test/validator/samples/animation-comment-siblings/input.svelte
@@ -0,0 +1,9 @@
+
+
+{#each things as thing (thing)}
+	
+	

+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/animation-not-in-keyed-each/errors.json b/test/validator/samples/animation-not-in-keyed-each/errors.json
index 3e0b2d3c0c..a21579ce4f 100644
--- a/test/validator/samples/animation-not-in-keyed-each/errors.json
+++ b/test/validator/samples/animation-not-in-keyed-each/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "invalid-animation",
-	"message": "An element that uses the animate directive must be the immediate child of a keyed each block",
+	"message": "An element that uses the animate directive must be used inside a keyed each block. Did you forget to add a key to your each block?",
 	"start": {
 		"line": 6,
 		"column": 6,
diff --git a/test/validator/samples/const-tag-placement-1/errors.json b/test/validator/samples/const-tag-placement-1/errors.json
index 52de84e2be..5291b3a351 100644
--- a/test/validator/samples/const-tag-placement-1/errors.json
+++ b/test/validator/samples/const-tag-placement-1/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "invalid-const-placement",
-		"message": "{@const} must be the immediate child of {#each}, {:then}, {:catch},  or ",
+		"message": "{@const} must be the immediate child of {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch},  or ",
 		"start": { "line": 5, "column": 0, "character": 36 },
 		"end": { "line": 5, "column": 18, "character": 54 },
 		"pos": 36
diff --git a/test/validator/samples/const-tag-placement-2/errors.json b/test/validator/samples/const-tag-placement-2/errors.json
index 005b3ff8b7..9922063a1d 100644
--- a/test/validator/samples/const-tag-placement-2/errors.json
+++ b/test/validator/samples/const-tag-placement-2/errors.json
@@ -1,9 +1,9 @@
 [
 	{
 		"code": "invalid-const-placement",
-		"message": "{@const} must be the immediate child of {#each}, {:then}, {:catch},  or ",
-		"start": { "line": 6, "column": 2, "character": 46 },
-		"end": { "line": 6, "column": 20, "character": 64 },
-		"pos": 46
+		"message": "{@const} must be the immediate child of {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch},  or ",
+		"start": { "line": 7, "column": 4, "character": 63 },
+		"end": { "line": 7, "column": 18, "character": 77 },
+		"pos": 63
 	}
 ]
diff --git a/test/validator/samples/const-tag-placement-2/input.svelte b/test/validator/samples/const-tag-placement-2/input.svelte
index a843f9d58f..2519482a98 100644
--- a/test/validator/samples/const-tag-placement-2/input.svelte
+++ b/test/validator/samples/const-tag-placement-2/input.svelte
@@ -2,6 +2,8 @@
   export let a;
 
 
-{#if a}
-  {@const b = a + 1}
-{/if}
\ No newline at end of file
+{#each a as i}
+  

+    {@const b = i}
+  

+{/each}
\ No newline at end of file
diff --git a/test/validator/samples/const-tag-placement-3/errors.json b/test/validator/samples/const-tag-placement-3/errors.json
deleted file mode 100644
index cc0ba4d74d..0000000000
--- a/test/validator/samples/const-tag-placement-3/errors.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-	{
-		"code": "invalid-const-placement",
-		"message": "{@const} must be the immediate child of {#each}, {:then}, {:catch},  or ",
-		"start": { "line": 7, "column": 4, "character": 63 },
-		"end": { "line": 7, "column": 18, "character": 77 },
-		"pos": 63
-	}
-]
diff --git a/test/validator/samples/const-tag-placement-3/input.svelte b/test/validator/samples/const-tag-placement-3/input.svelte
deleted file mode 100644
index 2519482a98..0000000000
--- a/test/validator/samples/const-tag-placement-3/input.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-{#each a as i}
-  

-    {@const b = i}
-  

-{/each}
\ No newline at end of file
diff --git a/test/validator/samples/dynamic-element-invalid-tag/errors.json b/test/validator/samples/dynamic-element-invalid-tag/errors.json
new file mode 100644
index 0000000000..c8d3c52490
--- /dev/null
+++ b/test/validator/samples/dynamic-element-invalid-tag/errors.json
@@ -0,0 +1,17 @@
+[
+	{
+		"message": "Invalid element definition",
+		"code": "invalid-element-definition",
+		"start": {
+			"line": 2,
+			"column": 17,
+			"character": 23
+		},
+		"end": {
+			"line": 2,
+			"column": 17,
+			"character": 23
+		},
+		"pos": 23
+	}
+]
diff --git a/test/validator/samples/dynamic-element-invalid-tag/input.svelte b/test/validator/samples/dynamic-element-invalid-tag/input.svelte
new file mode 100644
index 0000000000..bc6b8be822
--- /dev/null
+++ b/test/validator/samples/dynamic-element-invalid-tag/input.svelte
@@ -0,0 +1,3 @@
+

+	foo
+

diff --git a/test/validator/samples/dynamic-element-missing-tag/errors.json b/test/validator/samples/dynamic-element-missing-tag/errors.json
new file mode 100644
index 0000000000..8243deeb80
--- /dev/null
+++ b/test/validator/samples/dynamic-element-missing-tag/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "missing-element-definition",
+	"message": " must have a 'this' attribute",
+	"start": {
+		"line": 2,
+		"column": 1,
+		"character": 7
+	},
+	"end": {
+		"line": 2,
+		"column": 1,
+		"character": 7
+	},
+	"pos": 7
+}]
diff --git a/test/validator/samples/dynamic-element-missing-tag/input.svelte b/test/validator/samples/dynamic-element-missing-tag/input.svelte
new file mode 100644
index 0000000000..4b645d25a1
--- /dev/null
+++ b/test/validator/samples/dynamic-element-missing-tag/input.svelte
@@ -0,0 +1,3 @@
+

+	foo
+

diff --git a/test/validator/samples/dynamic-element-this/errors.json b/test/validator/samples/dynamic-element-this/errors.json
new file mode 100644
index 0000000000..7d61c20ee2
--- /dev/null
+++ b/test/validator/samples/dynamic-element-this/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "unexpected-reserved-word",
+	"message": "'this' is a reserved word in JavaScript and cannot be used here",
+	"start": {
+		"line": 2,
+		"column": 18,
+		"character": 24
+	},
+	"end": {
+		"line": 2,
+		"column": 18,
+		"character": 24
+	},
+	"pos": 24
+	}]
diff --git a/test/validator/samples/dynamic-element-this/input.svelte b/test/validator/samples/dynamic-element-this/input.svelte
new file mode 100644
index 0000000000..1a5079b924
--- /dev/null
+++ b/test/validator/samples/dynamic-element-this/input.svelte
@@ -0,0 +1,3 @@
+

+	foo
+

diff --git a/test/validator/samples/unreferenced-variables/input.svelte b/test/validator/samples/unreferenced-variables/input.svelte
index 8c9e0b15f3..cebd861985 100644
--- a/test/validator/samples/unreferenced-variables/input.svelte
+++ b/test/validator/samples/unreferenced-variables/input.svelte
@@ -1,25 +1,48 @@
+
+
 
-{$q}
+{$q2}
diff --git a/test/validator/samples/unreferenced-variables/warnings.json b/test/validator/samples/unreferenced-variables/warnings.json
index dfac58ebdb..4097ba023b 100644
--- a/test/validator/samples/unreferenced-variables/warnings.json
+++ b/test/validator/samples/unreferenced-variables/warnings.json
@@ -2,76 +2,76 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 103,
-			"column": 12,
-			"line": 8
+			"character": 519,
+			"column": 13,
+			"line": 31
 		},
-		"message": "Component has unused export property 'd'. If it is for external reference only, please consider using `export const d`",
-		"pos": 102,
+		"message": "Component has unused export property 'd2'. If it is for external reference only, please consider using `export const d2`",
+		"pos": 517,
 		"start": {
-			"character": 102,
+			"character": 517,
 			"column": 11,
-			"line": 8
+			"line": 31
 		}
 	},
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 106,
-			"column": 15,
-			"line": 8
+			"character": 523,
+			"column": 17,
+			"line": 31
 		},
-		"message": "Component has unused export property 'e'. If it is for external reference only, please consider using `export const e`",
-		"pos": 105,
+		"message": "Component has unused export property 'e2'. If it is for external reference only, please consider using `export const e2`",
+		"pos": 521,
 		"start": {
-			"character": 105,
-			"column": 14,
-			"line": 8
+			"character": 521,
+			"column": 15,
+			"line": 31
 		}
 	},
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 130,
-			"column": 18,
-			"line": 9
+			"character": 549,
+			"column": 19,
+			"line": 32
 		},
-		"message": "Component has unused export property 'g'. If it is for external reference only, please consider using `export const g`",
-		"pos": 125,
+		"message": "Component has unused export property 'g2'. If it is for external reference only, please consider using `export const g2`",
+		"pos": 543,
 		"start": {
-			"character": 125,
+			"character": 543,
 			"column": 13,
-			"line": 9
+			"line": 32
 		}
 	},
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 150,
-			"column": 18,
-			"line": 10
+			"character": 570,
+			"column": 19,
+			"line": 33
 		},
-		"message": "Component has unused export property 'h'. If it is for external reference only, please consider using `export const h`",
-		"pos": 145,
+		"message": "Component has unused export property 'h2'. If it is for external reference only, please consider using `export const h2`",
+		"pos": 564,
 		"start": {
-			"character": 145,
+			"character": 564,
 			"column": 13,
-			"line": 10
+			"line": 33
 		}
 	},
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 199,
-			"column": 25,
-			"line": 12
+			"character": 621,
+			"column": 26,
+			"line": 35
 		},
-		"message": "Component has unused export property 'j'. If it is for external reference only, please consider using `export const j`",
-		"pos": 187,
+		"message": "Component has unused export property 'j2'. If it is for external reference only, please consider using `export const j2`",
+		"pos": 608,
 		"start": {
-			"character": 187,
+			"character": 608,
 			"column": 13,
-			"line": 12
+			"line": 35
 		}
 	}
 ]