hale-commenting-system 3.8.2 → 3.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hale-commenting-system",
-  "version": "3.8.2",
+  "version": "3.8.5",
   "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

@@ -466,25 +466,64 @@ VITE_JIRA_BASE_URL=
   if (fs.existsSync(envPath)) {
     let existing = fs.readFileSync(envPath, 'utf-8');
 
-    if (existing.includes('VITE_GITHUB_CLIENT_ID')) {
-      // Update existing values
+    // Check if commenting system config exists (either GitHub or GitLab)
+    const hasCommentingSystemConfig = existing.includes('Hale Commenting System') ||
+                                      existing.includes('VITE_GITHUB_CLIENT_ID') ||
+                                      existing.includes('VITE_GITLAB_CLIENT_ID') ||
+                                      existing.includes('VITE_PROVIDER_TYPE');
+
+    if (hasCommentingSystemConfig) {
+      // Remove old commenting system section and replace with new one
       const lines = existing.split('\n');
-      const updatedLines = lines.map(line => {
-        if (line.startsWith('VITE_GITHUB_CLIENT_ID=')) {
-          return `VITE_GITHUB_CLIENT_ID=${config.github?.clientId || ''}`;
-        }
-        if (line.startsWith('VITE_GITHUB_OWNER=')) {
-          return `VITE_GITHUB_OWNER=${config.owner || ''}`;
-        }
-        if (line.startsWith('VITE_GITHUB_REPO=')) {
-          return `VITE_GITHUB_REPO=${config.repo || ''}`;
+      let newLines = [];
+      let inCommentingSection = false;
+      let foundSection = false;
+      
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        
+        // Detect start of commenting system section
+        if (line.includes('Hale Commenting System')) {
+          inCommentingSection = true;
+          foundSection = true;
+          // Add the new content at this position
+          newLines.push(...envContent.split('\n'));
+          continue;
         }
-        if (line.startsWith('VITE_JIRA_BASE_URL=')) {
-          return `VITE_JIRA_BASE_URL=${config.jira?.baseUrl || ''}`;
+        
+        // Skip lines that are part of the commenting system config
+        if (inCommentingSection) {
+          // 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')))) {
+            // Still in commenting section, skip this line
+            continue;
+          }
+          
+          // Empty line after commenting section - skip it and exit section
+          if (line.trim() === '') {
+            inCommentingSection = false;
+            continue;
+          }
+          
+          // Non-empty, non-commenting line - exit section and keep the line
+          inCommentingSection = false;
         }
-        return line;
-      });
-      fs.writeFileSync(envPath, updatedLines.join('\n'));
+        
+        // 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 (!foundSection) {
+        newLines.push('');
+        newLines.push(...envContent.split('\n'));
+      }
+      
+      fs.writeFileSync(envPath, newLines.join('\n'));
       console.log('   ✅ Updated .env file');
     } else {
       // Append if commenting system config not present
@@ -1377,6 +1416,21 @@ async function main() {
     process.exit(1);
   }
 
+  // Check if the package is installed
+  const cwd = process.cwd();
+  const packageJsonPath = path.join(cwd, 'package.json');
+  const nodeModulesPath = path.join(cwd, 'node_modules', 'hale-commenting-system');
+  
+  if (!fs.existsSync(nodeModulesPath)) {
+    console.error('\n❌ Error: hale-commenting-system is not installed.');
+    console.error('Please install it first:');
+    console.error('   npm install hale-commenting-system');
+    console.error('Then run this command again:');
+    console.error('   npx hale-commenting-system init\n');
+    rl.close();
+    process.exit(1);
+  }
+
   // Detect project setup type
   const gitInfo = detectGitRemote();
   const setupType = detectProjectSetup();

package/scripts/remove.js

@@ -70,12 +70,25 @@ async function main() {
     let content = fs.readFileSync(indexPath, 'utf8');
     const originalContent = content;
 
-    // Remove the import
-    content = content.replace(/import\s*{\s*CommentProvider\s*,\s*GitHubAuthProvider\s*}\s*from\s*["']hale-commenting-system["'];?\s*\n?/g, '');
+    // Remove imports - handle both old (GitHubAuthProvider) and new (ProviderAuthProvider) names
+    // Also handle both @app/commenting-system and hale-commenting-system import paths
+    const importPatterns = [
+      // Pattern 1: Both providers together (any order)
+      /import\s*{\s*[^}]*CommentProvider[^}]*,\s*(?:GitHubAuthProvider|ProviderAuthProvider)[^}]*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+      /import\s*{\s*(?:GitHubAuthProvider|ProviderAuthProvider)[^}]*,\s*[^}]*CommentProvider[^}]*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+      // Pattern 2: Single CommentProvider
+      /import\s*{\s*CommentProvider\s*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+      // Pattern 3: Single auth provider (old or new)
+      /import\s*{\s*(?:GitHubAuthProvider|ProviderAuthProvider)\s*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+    ];
+
+    for (const pattern of importPatterns) {
+      content = content.replace(pattern, '');
+    }
 
-    // Remove the providers from JSX
-    content = content.replace(/<GitHubAuthProvider>\s*/g, '');
-    content = content.replace(/<\/GitHubAuthProvider>/g, '');
+    // Remove the providers from JSX - handle both old and new provider names
+    content = content.replace(/<(?:GitHubAuthProvider|ProviderAuthProvider)>\s*/g, '');
+    content = content.replace(/<\/(?:GitHubAuthProvider|ProviderAuthProvider)>/g, '');
     content = content.replace(/<CommentProvider>\s*/g, '');
     content = content.replace(/<\/CommentProvider>/g, '');
 
@@ -92,13 +105,25 @@ async function main() {
     let content = fs.readFileSync(appLayoutPath, 'utf8');
     const originalContent = content;
 
-    // Remove the import
-    content = content.replace(/import\s*{\s*CommentPanel\s*,\s*CommentOverlay\s*}\s*from\s*["']hale-commenting-system["'];?\s*\n?/g, '');
+    // Remove the import - handle both import paths
+    const importPatterns = [
+      // Both components together
+      /import\s*{\s*CommentPanel\s*,\s*CommentOverlay\s*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+      // Single CommentPanel
+      /import\s*{\s*CommentPanel\s*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+      // Single CommentOverlay
+      /import\s*{\s*CommentOverlay\s*}\s*from\s*["'](?:@app\/commenting-system|hale-commenting-system)["'];?\s*\n?/g,
+    ];
+
+    for (const pattern of importPatterns) {
+      content = content.replace(pattern, '');
+    }
 
     // Remove the components from JSX
     content = content.replace(/<CommentPanel>\s*/g, '');
     content = content.replace(/<\/CommentPanel>/g, '');
     content = content.replace(/<CommentOverlay\s*\/>\s*/g, '');
+    content = content.replace(/<CommentOverlay\s+[^>]*\/>\s*/g, '');
 
     if (content !== originalContent) {
       fs.writeFileSync(appLayoutPath, content, 'utf8');