From 77ba5e7a2ff4cf4e35cadc8e0755a949cac3052f Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 20 Nov 2023 10:54:23 +0100
Subject: [PATCH] fix: adjust static attribute regex (#9551)

a `+` was missing
Fixes https://github.com/sveltejs/vite-plugin-svelte/issues/804
---
 .changeset/khaki-turkeys-hunt.md              |   5 +
 .../svelte/src/compiler/parse/state/tag.js    |   2 +-
 .../svelte/src/compiler/preprocess/index.js   |   4 +-
 .../input.svelte                              |   7 +
 .../output.json                               | 178 ++++++++++++++++++
 5 files changed, 193 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/khaki-turkeys-hunt.md
 create mode 100644 packages/svelte/test/parser/samples/script-context-module-unquoted/input.svelte
 create mode 100644 packages/svelte/test/parser/samples/script-context-module-unquoted/output.json

diff --git a/.changeset/khaki-turkeys-hunt.md b/.changeset/khaki-turkeys-hunt.md
new file mode 100644
index 000000000000..76a45519bf51
--- /dev/null
+++ b/.changeset/khaki-turkeys-hunt.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: adjust static attribute regex
diff --git a/packages/svelte/src/compiler/parse/state/tag.js b/packages/svelte/src/compiler/parse/state/tag.js
index 37281c5156e9..e04d9abc73fd 100644
--- a/packages/svelte/src/compiler/parse/state/tag.js
+++ b/packages/svelte/src/compiler/parse/state/tag.js
@@ -437,7 +437,7 @@ function get_directive_type(name) {
 	if (name === 'in' || name === 'out' || name === 'transition') return 'Transition';
 }
 
-const regex_attribute_value = /^(?:"([^"]*)"|'([^'])*'|([^>\s]))/;
+const regex_attribute_value = /^(?:"([^"]*)"|'([^'])*'|([^>\s]+))/;
 
 /**
  * @param {import('../index.js').Parser} parser
diff --git a/packages/svelte/src/compiler/preprocess/index.js b/packages/svelte/src/compiler/preprocess/index.js
index 492368abd533..0f215598ba1e 100644
--- a/packages/svelte/src/compiler/preprocess/index.js
+++ b/packages/svelte/src/compiler/preprocess/index.js
@@ -253,9 +253,9 @@ function stringify_tag_attributes(attributes) {
 }
 
 const regex_style_tags =
-	/<!--[^]*?-->|<style((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s])|\s+[^=>'"\/]+)*\s*)(?:\/>|>([\S\s]*?)<\/style>)/g;
+	/<!--[^]*?-->|<style((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)(?:\/>|>([\S\s]*?)<\/style>)/g;
 const regex_script_tags =
-	/<!--[^]*?-->|<script((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s])|\s+[^=>'"\/]+)*\s*)(?:\/>|>([\S\s]*?)<\/script>)/g;
+	/<!--[^]*?-->|<script((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)(?:\/>|>([\S\s]*?)<\/script>)/g;
 
 /**
  * Calculate the updates required to process all instances of the specified tag.
diff --git a/packages/svelte/test/parser/samples/script-context-module-unquoted/input.svelte b/packages/svelte/test/parser/samples/script-context-module-unquoted/input.svelte
new file mode 100644
index 000000000000..b88dae2a65b2
--- /dev/null
+++ b/packages/svelte/test/parser/samples/script-context-module-unquoted/input.svelte
@@ -0,0 +1,7 @@
+<script context=module>
+	export const foo = 'bar';
+</script>
+
+<script>
+	foo;
+</script>
diff --git a/packages/svelte/test/parser/samples/script-context-module-unquoted/output.json b/packages/svelte/test/parser/samples/script-context-module-unquoted/output.json
new file mode 100644
index 000000000000..072e10178289
--- /dev/null
+++ b/packages/svelte/test/parser/samples/script-context-module-unquoted/output.json
@@ -0,0 +1,178 @@
+{
+	"html": {
+		"start": 62,
+		"end": 60,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 60,
+				"end": 62,
+				"type": "Text",
+				"raw": "\n\n",
+				"data": "\n\n"
+			}
+		]
+	},
+	"instance": {
+		"type": "Script",
+		"start": 62,
+		"end": 86,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 70,
+			"end": 77,
+			"loc": {
+				"start": {
+					"line": 1,
+					"column": 0
+				},
+				"end": {
+					"line": 7,
+					"column": 0
+				}
+			},
+			"body": [
+				{
+					"type": "ExpressionStatement",
+					"start": 72,
+					"end": 76,
+					"loc": {
+						"start": {
+							"line": 6,
+							"column": 1
+						},
+						"end": {
+							"line": 6,
+							"column": 5
+						}
+					},
+					"expression": {
+						"type": "Identifier",
+						"start": 72,
+						"end": 75,
+						"loc": {
+							"start": {
+								"line": 6,
+								"column": 1
+							},
+							"end": {
+								"line": 6,
+								"column": 4
+							}
+						},
+						"name": "foo"
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	},
+	"module": {
+		"type": "Script",
+		"start": 0,
+		"end": 60,
+		"context": "module",
+		"content": {
+			"type": "Program",
+			"start": 23,
+			"end": 51,
+			"loc": {
+				"start": {
+					"line": 1,
+					"column": 0
+				},
+				"end": {
+					"line": 3,
+					"column": 0
+				}
+			},
+			"body": [
+				{
+					"type": "ExportNamedDeclaration",
+					"start": 25,
+					"end": 50,
+					"loc": {
+						"start": {
+							"line": 2,
+							"column": 1
+						},
+						"end": {
+							"line": 2,
+							"column": 26
+						}
+					},
+					"declaration": {
+						"type": "VariableDeclaration",
+						"start": 32,
+						"end": 50,
+						"loc": {
+							"start": {
+								"line": 2,
+								"column": 8
+							},
+							"end": {
+								"line": 2,
+								"column": 26
+							}
+						},
+						"declarations": [
+							{
+								"type": "VariableDeclarator",
+								"start": 38,
+								"end": 49,
+								"loc": {
+									"start": {
+										"line": 2,
+										"column": 14
+									},
+									"end": {
+										"line": 2,
+										"column": 25
+									}
+								},
+								"id": {
+									"type": "Identifier",
+									"start": 38,
+									"end": 41,
+									"loc": {
+										"start": {
+											"line": 2,
+											"column": 14
+										},
+										"end": {
+											"line": 2,
+											"column": 17
+										}
+									},
+									"name": "foo"
+								},
+								"init": {
+									"type": "Literal",
+									"start": 44,
+									"end": 49,
+									"loc": {
+										"start": {
+											"line": 2,
+											"column": 20
+										},
+										"end": {
+											"line": 2,
+											"column": 25
+										}
+									},
+									"value": "bar",
+									"raw": "'bar'"
+								}
+							}
+						],
+						"kind": "const"
+					},
+					"specifiers": [],
+					"source": null
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}