fix: 🐛 make markup tag regexp less greedy

aka copy-paste from svelte's source ✅ Closes: #310
sveltejs · Feb 11, 2021 · 64f3362 · 64f3362
1 parent 4b35944
commit 64f3362
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/modules/markup.ts b/src/modules/markup.ts
@@ -10,7 +10,7 @@ export async function transformMarkup(
   markupTagName = markupTagName.toLocaleLowerCase();
 
   const markupPattern = new RegExp(
-    `<${markupTagName}([\\s\\S]*?)(?:>([\\s\\S]*)<\\/${markupTagName}>|/>)`,
+    `/<!--[^]*?-->|<${markupTagName}(\\s[^]*?)?(?:>([^]*?)<\\/${markupTagName}>|\\/>)`,
   );
 
   const templateMatch = content.match(markupPattern);
@@ -20,7 +20,7 @@ export async function transformMarkup(
     return transformer({ content, attributes: {}, filename, options });
   }
 
-  const [fullMatch, attributesStr, templateCode] = templateMatch;
+  const [fullMatch, attributesStr = '', templateCode] = templateMatch;
 
   /** Transform an attribute string into a key-value object */
   const attributes = attributesStr

diff --git a/test/autoProcess/markup.test.ts b/test/autoProcess/markup.test.ts
@@ -39,6 +39,15 @@ test('should transform a custom language between <template lang="..."></template
   expect(preprocessed.toString()).toBe('<script></script><style></style>');
 });
 
+test('should ignore subsequent markup tags.', async () => {
+  const input = `<template><div>Hey</div></template><template>ignored</template>`;
+  const preprocessed = await preprocess(input, sveltePreprocess());
+
+  expect(preprocessed.toString()).toBe(
+    `<div>Hey</div><template>ignored</template>`,
+  );
+});
+
 MARKUP_LANGS.forEach(([lang, ext]) => {
   describe(`markup - preprocessor - ${lang}`, () => {
     const template = `<template lang="${lang}">${getFixtureContent(