diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-21 15:08:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-21 15:08:24 +0300 |
| commit | 1f2f131577d9504cc9ce96f67873de0bec6854f6 (patch) | |
| tree | 6df2e758490a6dab0265816e16834d28dfbbfdc3 /patches | |
| parent | 63529c419c778b5abf5bf1318664a00395162fdd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/@vue+compiler-core+3.2.47.dev.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/patches/@vue+compiler-core+3.2.47.dev.patch b/patches/@vue+compiler-core+3.2.47.dev.patch new file mode 100644 index 00000000000..4ac4266d27f --- /dev/null +++ b/patches/@vue+compiler-core+3.2.47.dev.patch @@ -0,0 +1,35 @@ +diff --git a/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js b/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js +index f6afe09..842766d 100644 +--- a/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js ++++ b/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js +@@ -980,6 +980,8 @@ function parseChildren(context, mode, ancestors) { + const node = nodes[i]; + if (node.type === 2 /* NodeTypes.TEXT */) { + if (!context.inPre) { ++ const isInTextTemplate = parent && parent.tag === 'template' && !nodes.some(n => n && n.tag); ++ + if (!/[^\t\r\n\f ]/.test(node.content)) { + const prev = nodes[i - 1]; + const next = nodes[i + 1]; +@@ -988,8 +990,8 @@ function parseChildren(context, mode, ancestors) { + // - (condense mode) the whitespace is between twos comments, or: + // - (condense mode) the whitespace is between comment and element, or: + // - (condense mode) the whitespace is between two elements AND contains newline +- if (!prev || +- !next || ++ if ((!prev && !isInTextTemplate) || ++ (!next && !isInTextTemplate) || + (shouldCondense && + ((prev.type === 3 /* NodeTypes.COMMENT */ && + next.type === 3 /* NodeTypes.COMMENT */) || +@@ -1005,7 +1007,9 @@ function parseChildren(context, mode, ancestors) { + } + else { + // Otherwise, the whitespace is condensed into a single space +- node.content = ' '; ++ if (!isInTextTemplate) { ++ node.content = ' '; ++ } + } + } + else if (shouldCondense) { |