hale-commenting-system 3.8.5 → 3.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "3.8.5",
+  "version": "3.8.6",
   "description": "A commenting system for PatternFly React applications that allows designers and developers to add comments directly on design pages, sync with GitHub Issues, and link Jira tickets.",
   "homepage": "https://www.npmjs.com/package/hale-commenting-system",
   "repository": {

package/scripts/integrate.js

@@ -473,10 +473,10 @@ VITE_JIRA_BASE_URL=
                                       existing.includes('VITE_PROVIDER_TYPE');
 
     if (hasCommentingSystemConfig) {
-      // Remove old commenting system section and replace with new one
+      // Remove ALL commenting system related lines and replace with new config
       const lines = existing.split('\n');
       let newLines = [];
-      let inCommentingSection = false;
+      let skipUntilEmptyLine = false;
       let foundSection = false;
       
       for (let i = 0; i < lines.length; i++) {
@@ -484,7 +484,7 @@ VITE_JIRA_BASE_URL=
         
         // Detect start of commenting system section
         if (line.includes('Hale Commenting System')) {
-          inCommentingSection = true;
+          skipUntilEmptyLine = true;
           foundSection = true;
           // Add the new content at this position
           newLines.push(...envContent.split('\n'));
@@ -492,33 +492,47 @@ VITE_JIRA_BASE_URL=
         }
         
         // Skip lines that are part of the commenting system config
-        if (inCommentingSection) {
+        if (skipUntilEmptyLine) {
           // Check if this is still part of the commenting system section
           if (line.startsWith('VITE_GITHUB_') || 
               line.startsWith('VITE_GITLAB_') || 
               line.startsWith('VITE_PROVIDER_TYPE') ||
               line.startsWith('VITE_JIRA_BASE_URL') ||
-              (line.startsWith('#') && (line.includes('GitHub') || line.includes('GitLab') || line.includes('Jira') || line.includes('Provider')))) {
+              (line.startsWith('#') && (line.includes('GitHub') || line.includes('GitLab') || line.includes('Jira') || line.includes('Provider') || line.includes('OAuth') || line.includes('Target')))) {
             // Still in commenting section, skip this line
             continue;
           }
           
           // Empty line after commenting section - skip it and exit section
           if (line.trim() === '') {
-            inCommentingSection = false;
+            skipUntilEmptyLine = false;
+            // Don't add this empty line, we'll add one after our new content
             continue;
           }
           
           // Non-empty, non-commenting line - exit section and keep the line
-          inCommentingSection = false;
+          skipUntilEmptyLine = false;
+        } else {
+          // Also check for standalone commenting system variables (in case header is missing)
+          if (line.startsWith('VITE_GITHUB_') || 
+              line.startsWith('VITE_GITLAB_') || 
+              line.startsWith('VITE_PROVIDER_TYPE') ||
+              (line.startsWith('VITE_JIRA_BASE_URL') && existing.includes('Hale Commenting System'))) {
+            // Skip standalone commenting system variables
+            continue;
+          }
         }
         
         // Keep lines that are not part of commenting system section
         newLines.push(line);
       }
       
-      // If we didn't find the section marker, append to end
+      // If we didn't find the section marker but detected config, append to end
       if (!foundSection) {
+        // Remove any trailing empty lines
+        while (newLines.length > 0 && newLines[newLines.length - 1].trim() === '') {
+          newLines.pop();
+        }
         newLines.push('');
         newLines.push(...envContent.split('\n'));
       }