Skip to content

fix: adjust static attribute regex #9551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2023
Merged

fix: adjust static attribute regex #9551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e3128b
fix: adjust static attribute regex
dummdidumm Nov 20, 2023
bb3c9c1
same here
dummdidumm Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/khaki-turkeys-hunt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: adjust static attribute regex
2 changes: 1 addition & 1 deletion packages/svelte/src/compiler/parse/state/tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/compiler/preprocess/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 7 additions & 0 deletions packages/svelte/test/parser/samples/script-context-module-unquoted/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script context=module>
export const foo = 'bar';
</script>

<script>
foo;
</script>
178 changes: 178 additions & 0 deletions packages/svelte/test/parser/samples/script-context-module-unquoted/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}