gmoonc 0.0.18 → 0.0.20

package/README.md

@@ -63,6 +63,16 @@ The logo is installed at `src/gmoonc/assets/gmoonc-logo.png`. You can replace it
 
 ## Changelog
 
+### 0.0.20
+- Fix: Navigate import now always added to GMooncAppLayout.tsx when patching
+- Fix: Improved Navigate import detection and addition logic
+
+### 0.0.19
+- Fix: Added Navigate import to GMooncAppLayout.tsx template
+- Fix: Corrected route protection order - isLoading checked before isAuthenticated
+- Fix: Automatic update of all session context imports to use GMooncSupabaseSessionProvider
+- Fix: All components now use Supabase provider instead of mock context
+
 ### 0.0.18
 - Fix: env.ts no longer throws when .env is missing - only logs warning
 - Fix: client.ts import corrected - hasSupabaseEnv imported from env.ts

package/dist/index.cjs

@@ -388,8 +388,8 @@ function resolveImportToFile(importPath, fromDir) {
   const extensions = [".tsx", ".ts", ".jsx", ".js"];
   const indexFiles = ["index.tsx", "index.ts", "index.jsx", "index.js"];
   if ((0, import_fs8.existsSync)(basePath)) {
-    const { statSync: statSync2 } = require("fs");
-    const stats = statSync2(basePath);
+    const { statSync: statSync3 } = require("fs");
+    const stats = statSync3(basePath);
     if (stats.isFile()) {
       return basePath;
     }
@@ -405,16 +405,16 @@ function resolveImportToFile(importPath, fromDir) {
   for (const ext of extensions) {
     const fullPath = basePath + ext;
     if ((0, import_fs8.existsSync)(fullPath)) {
-      const { statSync: statSync2 } = require("fs");
-      const stats = statSync2(fullPath);
+      const { statSync: statSync3 } = require("fs");
+      const stats = statSync3(fullPath);
       if (stats.isFile()) {
         return fullPath;
       }
     }
   }
   if ((0, import_fs8.existsSync)(basePath)) {
-    const { statSync: statSync2 } = require("fs");
-    const stats = statSync2(basePath);
+    const { statSync: statSync3 } = require("fs");
+    const stats = statSync3(basePath);
     if (stats.isDirectory()) {
       for (const indexFile of indexFiles) {
         const indexPath = (0, import_path5.join)(basePath, indexFile);
@@ -1667,19 +1667,22 @@ function patchExistingCode(projectDir, gmooncDir) {
       /import\s+{\s*GMooncSessionProvider[^}]*}\s+from\s+['"][^'"]*session\/GMooncSessionContext['"]/g,
       "import { GMooncSupabaseSessionProvider, useGMooncSession } from '../supabase/auth/GMooncSupabaseSessionProvider'"
     );
-    if (!content.includes("from 'react-router-dom'") || !content.includes("Navigate")) {
+    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 (!imports.includes("Navigate")) {
-            return `import { ${imports}, Navigate } from 'react-router-dom'`;
+          if (/\bNavigate\b/.test(imports)) {
+            return match;
           }
-          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("!isLoading && !isAuthenticated")) {
+    if (!content.includes("!isAuthenticated")) {
       content = content.replace(
         /const\s+{\s*roles,\s*logout\s*}\s+=\s+useGMooncSession\(\);/,
         "const { roles, logout, isLoading, isAuthenticated } = useGMooncSession();"
@@ -1688,12 +1691,35 @@ function patchExistingCode(projectDir, gmooncDir) {
         /(\s+}, \[navigate, getBasePath\]\);)\s+(\s+return\s+\()/,
         `$1
 
+  // Show loading state while checking authentication (verificar primeiro)
+  if (isLoading) {
+    return (
+      <div className="gmoonc-root">
+        <div style={{ 
+          display: 'flex', 
+          justifyContent: 'center', 
+          alignItems: 'center', 
+          height: '100vh',
+          fontSize: 'var(--gmoonc-font-size-base, 16px)',
+          color: 'var(--gmoonc-color-text, #333)'
+        }}>
+          Loading...
+        </div>
+      </div>
+    );
+  }
+
   // Route protection: redirect to login if not authenticated
-  if (!isLoading && !isAuthenticated) {
+  if (!isAuthenticated) {
     return <Navigate to="/login" replace />;
   }
 
-  // Show loading state while checking authentication
+$2`
+      );
+    } else {
+      content = content.replace(
+        /\/\/ Route protection: redirect to login if not authenticated\s+if\s+\(!isLoading\s+&&\s+!isAuthenticated\)\s+\{[\s\S]*?return\s+<Navigate[^>]+>;[\s\S]*?\}\s+(\/\/ Show loading state)/,
+        `// Show loading state while checking authentication (verificar primeiro)
   if (isLoading) {
     return (
       <div className="gmoonc-root">
@@ -1711,18 +1737,74 @@ function patchExistingCode(projectDir, gmooncDir) {
     );
   }
 
-$2`
+  // Route protection: redirect to login if not authenticated
+  if (!isAuthenticated) {
+    return <Navigate to="/login" replace />;
+  }
+
+$1`
       );
     }
     writeFileSafe(layoutPath, content);
     logSuccess("Patched layout/GMooncAppLayout.tsx to use GMooncSupabaseSessionProvider and add route protection");
   }
-  logInfo("Auth pages will use Supabase via GMooncSupabaseSessionProvider");
+  updateAllSessionImports(gmooncDir);
+}
+function updateAllSessionImports(gmooncDir) {
+  const filesToUpdate = [];
+  function findFiles(dir) {
+    if (!(0, import_fs9.existsSync)(dir)) return;
+    const entries = (0, import_fs9.readdirSync)(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = (0, import_path6.join)(dir, entry.name);
+      if (entry.name.includes(".bak-") || entry.name === "supabase") {
+        continue;
+      }
+      if (entry.isDirectory()) {
+        findFiles(fullPath);
+      } else if (entry.isFile() && (entry.name.endsWith(".ts") || entry.name.endsWith(".tsx"))) {
+        filesToUpdate.push(fullPath);
+      }
+    }
+  }
+  findFiles(gmooncDir);
+  let updatedCount = 0;
+  for (const filePath of filesToUpdate) {
+    let content = (0, import_fs9.readFileSync)(filePath, "utf-8");
+    let modified = false;
+    const fileDir = (0, import_path6.dirname)(filePath);
+    const supabaseProviderPath = (0, import_path6.join)(gmooncDir, "supabase", "auth", "GMooncSupabaseSessionProvider");
+    let relativePath = (0, import_path6.relative)(fileDir, supabaseProviderPath).replace(/\\/g, "/");
+    if (!relativePath.startsWith(".")) {
+      relativePath = "./" + relativePath;
+    }
+    const oldImportPattern = /from\s+['"](\.\.?\/)+session\/GMooncSessionContext['"]/g;
+    if (oldImportPattern.test(content)) {
+      content = content.replace(
+        /from\s+['"](\.\.?\/)+session\/GMooncSessionContext['"]/g,
+        `from '${relativePath}'`
+      );
+      modified = true;
+    }
+    if (content.includes("GMooncSessionProvider") && !content.includes("GMooncSupabaseSessionProvider")) {
+      content = content.replace(/GMooncSessionProvider/g, "GMooncSupabaseSessionProvider");
+      modified = true;
+    }
+    if (modified) {
+      writeFileSafe(filePath, content);
+      updatedCount++;
+    }
+  }
+  if (updatedCount > 0) {
+    logSuccess(`Updated ${updatedCount} file(s) to use GMooncSupabaseSessionProvider`);
+  } else {
+    logInfo("All files already use GMooncSupabaseSessionProvider");
+  }
 }
 
 // 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.18").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.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) => {
   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.18",
+  "version": "0.0.20",
   "description": "Goalmoon Ctrl (gmoonc): Complete dashboard installer for React projects",
   "license": "MIT",
   "homepage": "https://gmoonc.com",

package/src/templates/shared/src/gmoonc/layout/GMooncAppLayout.tsx

@@ -47,12 +47,7 @@ function GMooncAppLayoutInner() {
     navigate(normalizedBasePath);
   }, [navigate, getBasePath]);
 
-  // Route protection: redirect to login if not authenticated
-  if (!isLoading && !isAuthenticated) {
-    return <Navigate to="/login" replace />;
-  }
-
-  // Show loading state while checking authentication
+  // Show loading state while checking authentication (verificar primeiro)
   if (isLoading) {
     return (
       <div className="gmoonc-root">
@@ -70,6 +65,11 @@ function GMooncAppLayoutInner() {
     );
   }
 
+  // Route protection: redirect to login if not authenticated
+  if (!isAuthenticated) {
+    return <Navigate to="/login" replace />;
+  }
+
   return (
     <div className="gmoonc-root">
       <GmooncShell