gmoonc 0.0.20 → 0.0.21

package/README.md

@@ -63,6 +63,11 @@ The logo is installed at `src/gmoonc/assets/gmoonc-logo.png`. You can replace it
 
 ## Changelog
 
+### 0.0.21
+- Fix: Navigate import now always added when route protection is present in GMooncAppLayout.tsx
+- Fix: Improved Navigate import detection - checks for route protection code, not just usage
+- Fix: More robust regex matching for react-router-dom imports (handles both single and double quotes)
+
 ### 0.0.20
 - Fix: Navigate import now always added to GMooncAppLayout.tsx when patching
 - Fix: Improved Navigate import detection and addition logic

package/dist/index.cjs

@@ -1667,20 +1667,6 @@ function patchExistingCode(projectDir, gmooncDir) {
       /import\s+{\s*GMooncSessionProvider[^}]*}\s+from\s+['"][^'"]*session\/GMooncSessionContext['"]/g,
       "import { GMooncSupabaseSessionProvider, useGMooncSession } from '../supabase/auth/GMooncSupabaseSessionProvider'"
     );
-    const usesNavigate = /<Navigate\s+to=/.test(content);
-    const hasNavigateImport = /import\s+{[^}]*Navigate[^}]*}\s+from\s+['"]react-router-dom['"]/.test(content);
-    if (usesNavigate && !hasNavigateImport) {
-      content = content.replace(
-        /import\s+{\s*([^}]*)\s*}\s+from\s+['"]react-router-dom['"]/,
-        (match, imports) => {
-          if (/\bNavigate\b/.test(imports)) {
-            return match;
-          }
-          const cleanImports = imports.trim().replace(/,\s*$/, "");
-          return `import { ${cleanImports}, Navigate } from 'react-router-dom'`;
-        }
-      );
-    }
     content = content.replace(/GMooncSessionProvider/g, "GMooncSupabaseSessionProvider");
     if (!content.includes("!isAuthenticated")) {
       content = content.replace(
@@ -1745,6 +1731,26 @@ $2`
 $1`
       );
     }
+    const usesNavigate = /<Navigate\s+to=/.test(content);
+    const hasNavigateImport = /import\s+{[^}]*\bNavigate\b[^}]*}\s+from\s+['"]react-router-dom['"]/.test(content);
+    if (usesNavigate && !hasNavigateImport) {
+      const importRegex = /import\s+{\s*([^}]*)\s*}\s+from\s+['"]react-router-dom['"]/;
+      const match = content.match(importRegex);
+      if (match) {
+        const imports = match[1];
+        if (!/\bNavigate\b/.test(imports)) {
+          const cleanImports = imports.trim().replace(/,\s*$/, "");
+          const quote = match[0].includes("'") ? "'" : '"';
+          content = content.replace(
+            importRegex,
+            `import { ${cleanImports}, Navigate } from ${quote}react-router-dom${quote}`
+          );
+        }
+      } else {
+        content = `import { Navigate } from 'react-router-dom';
+${content}`;
+      }
+    }
     writeFileSafe(layoutPath, content);
     logSuccess("Patched layout/GMooncAppLayout.tsx to use GMooncSupabaseSessionProvider and add route protection");
   }
@@ -1804,7 +1810,7 @@ function updateAllSessionImports(gmooncDir) {
 
 // src/cli/index.ts
 var program = new import_commander.Command();
-program.name("gmoonc").description("Goalmoon Ctrl (gmoonc): Install complete dashboard into your React project").version("0.0.20").option("--base <path>", "Base path for dashboard routes", "/app").option("--skip-router-patch", "Skip automatic router integration (only copy files and inject CSS)").option("--dry-run", "Show what would be done without making changes").action(async (options) => {
+program.name("gmoonc").description("Goalmoon Ctrl (gmoonc): Install complete dashboard into your React project").version("0.0.21").option("--base <path>", "Base path for dashboard routes", "/app").option("--skip-router-patch", "Skip automatic router integration (only copy files and inject CSS)").option("--dry-run", "Show what would be done without making changes").action(async (options) => {
   try {
     logInfo("\u{1F680} Starting gmoonc installer...");
     logInfo("\u{1F4E6} Installing complete dashboard into your React project\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gmoonc",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Goalmoon Ctrl (gmoonc): Complete dashboard installer for React projects",
   "license": "MIT",
   "homepage": "https://gmoonc.com",