fix: track commented out stylesheet helpers, when retrieving css file…

…s from templates
bigcommerce · Feb 14, 2024 · 6b402e8 · 6b402e8
1 parent 3e43256
commit 6b402e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/StylesheetsFileResolver.js b/lib/StylesheetsFileResolver.js
@@ -4,11 +4,12 @@ const path = require('path');
 const cheerio = require('cheerio');
 const recursiveReadDir = require('recursive-readdir');
 
-const STYLESHEET_REGEXP = /{{\s*stylesheet\s*([\/a-zA-Z'"\.-]+)\s*}}/gi;
+const STYLESHEET_REGEXP = /{{\s*stylesheet\s*([\/a-zA-Z'"\.-]+)\s*/gi;
 
 class StylesheetsFileResolver {
     constructor(themePath) {
         this.themePath = themePath;
+        this.alreadyExlcudedComments = [];
     }
 
     async get() {
@@ -47,7 +48,8 @@ class StylesheetsFileResolver {
             });
         for (const comment of comments) {
             const { data } = comment;
-            if (data && data.includes('stylesheet') && data.includes(cssFilePath)) {
+            if (data && data.includes('stylesheet') && data.includes(cssFilePath) && !this.alreadyExlcudedComments.includes(data)) {
+                this.alreadyExlcudedComments.push(data);
                 return true;
             }
         }

diff --git a/test/mocks/themes/invalid/templates/pages/page2.html b/test/mocks/themes/invalid/templates/pages/page2.html
@@ -4,6 +4,7 @@
     <title>page2.html</title>
     {{head.scripts}}
     {{ stylesheet     "assets/css/test.css"    }}
+    /* {{ stylesheet  "assets/css/test.css" }} */
     /* {{ stylesheet  "assets/css/commented.css" }} */
 </head>
 <body>