gmoonc 0.0.7 → 0.0.9

package/README.md

@@ -46,6 +46,16 @@ Your dashboard is now available at:
 
 The dashboard code is in `src/gmoonc/` and is independent. You can remove `gmoonc` from `package.json` if desired.
 
+## Changelog
+
+### 0.0.9
+- Fix: ensure BrowserRouter import when patched into App.tsx
+
+### 0.0.8
+- Fix: BIN corrected to use CommonJS (.cjs) for Windows compatibility
+- Fix: Router patch now ensures BrowserRouter import is always present
+- Fix: Route order corrected (NotFound "*" route is always last)
+
 ## Uninstalling
 
 To remove gmoonc:

package/dist/{index.js → index.cjs}

@@ -454,30 +454,42 @@ function generateAppRoutes(consumerDir, basePath, routes, appPath, dryRun) {
     return { success: true };
   }
   ensureDirectoryExists(appRoutesPath);
-  const routeElements = [];
-  for (const route of routes) {
-    if (route.path === "/" || route.path === "*") {
-      routeElements.push(`    { path: "${route.path}", element: <${route.componentName} /> }`);
-    }
-  }
-  routeElements.push(`    ...createGmooncRoutes({ basePath })`);
+  const indexRoute = routes.find((r) => r.path === "/");
+  const notFoundRoute = routes.find((r) => r.path === "*");
   const imports = [
     "import { useRoutes, type RouteObject } from 'react-router-dom';",
     "import { createGmooncRoutes } from './createGmooncRoutes';"
   ];
-  for (const route of routes) {
-    if ((route.path === "/" || route.path === "*") && route.import) {
-      const convertedImport = convertImportToRelative(
-        route.import.line,
-        route.import.from,
-        appRoutesDir,
-        appDir
-      );
-      if (!imports.includes(convertedImport)) {
-        imports.push(convertedImport);
-      }
+  if (indexRoute && indexRoute.import) {
+    const convertedImport = convertImportToRelative(
+      indexRoute.import.line,
+      indexRoute.import.from,
+      appRoutesDir,
+      appDir
+    );
+    if (!imports.includes(convertedImport)) {
+      imports.push(convertedImport);
+    }
+  }
+  if (notFoundRoute && notFoundRoute.import) {
+    const convertedImport = convertImportToRelative(
+      notFoundRoute.import.line,
+      notFoundRoute.import.from,
+      appRoutesDir,
+      appDir
+    );
+    if (!imports.includes(convertedImport)) {
+      imports.push(convertedImport);
     }
   }
+  const routeElements = [];
+  if (indexRoute) {
+    routeElements.push(`    { path: "${indexRoute.path}", element: <${indexRoute.componentName} /> }`);
+  }
+  routeElements.push(`    ...createGmooncRoutes({ basePath })`);
+  if (notFoundRoute) {
+    routeElements.push(`    { path: "${notFoundRoute.path}", element: <${notFoundRoute.componentName} /> }`);
+  }
   const content = `${imports.join("\n")}
 
 export function GMooncAppRoutes({ basePath = "${basePath}" }: { basePath?: string }) {
@@ -552,32 +564,50 @@ function patchBrowserRouter(consumerDir, basePath, dryRun) {
   const lines = appContent.split("\n");
   let hasBrowserRouterImport = false;
   let reactRouterImportIndex = -1;
+  let reactRouterImportLine = null;
+  let quoteStyle = '"';
   for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
-    if (line.includes("from") && line.includes("react-router-dom")) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.startsWith("import ") && (trimmed.includes("'") || trimmed.includes('"'))) {
+      if (trimmed.includes("'")) quoteStyle = "'";
+      else if (trimmed.includes('"')) quoteStyle = '"';
+    }
+    if (trimmed.includes("from") && trimmed.includes("react-router-dom")) {
       reactRouterImportIndex = i;
-      if (line.includes("BrowserRouter")) {
+      reactRouterImportLine = line;
+      const browserRouterPattern = /\bBrowserRouter\b/;
+      if (browserRouterPattern.test(trimmed)) {
         hasBrowserRouterImport = true;
       }
     }
   }
   if (!hasBrowserRouterImport) {
-    if (reactRouterImportIndex >= 0) {
-      const existingLine = lines[reactRouterImportIndex];
-      if (existingLine.includes("{") && existingLine.includes("}")) {
-        const updatedLine = existingLine.replace(/\{([^}]+)\}/, (match, imports2) => {
-          const importList = imports2.split(",").map((s) => s.trim());
-          if (!importList.includes("BrowserRouter")) {
-            importList.push("BrowserRouter");
-          }
-          return `{ ${importList.join(", ")} }`;
-        });
-        lines[reactRouterImportIndex] = updatedLine;
+    if (reactRouterImportIndex >= 0 && reactRouterImportLine) {
+      const existingLine = reactRouterImportLine;
+      const indent2 = existingLine.match(/^(\s*)/)?.[1] || "";
+      const namedMatch = existingLine.match(/^(\s*)import\s+\{([^}]+)\}\s+from\s+(["'])react-router-dom\2/);
+      if (namedMatch) {
+        const importListStr = namedMatch[2];
+        const quote = namedMatch[3];
+        const importItems = importListStr.split(",").map((s) => s.trim()).filter(Boolean);
+        const hasBrowserRouter = importItems.some(
+          (item) => item === "BrowserRouter" || item === "type BrowserRouter" || item.includes("BrowserRouter")
+        );
+        if (!hasBrowserRouter) {
+          importItems.push("BrowserRouter");
+          const hasTrailingComma = importListStr.trim().endsWith(",");
+          const separator = importListStr.includes(",\n") ? ",\n" : ", ";
+          const formatted = importItems.join(separator) + (hasTrailingComma ? "," : "");
+          const updatedLine = `${indent2}import { ${formatted} } from ${quote}react-router-dom${quote};`;
+          lines[reactRouterImportIndex] = updatedLine;
+        }
       } else {
-        lines.splice(reactRouterImportIndex + 1, 0, `import { BrowserRouter } from "react-router-dom";`);
+        const newImportLine = `${indent2}import { BrowserRouter } from ${quoteStyle}react-router-dom${quoteStyle};`;
+        lines.splice(reactRouterImportIndex + 1, 0, newImportLine);
       }
     } else {
-      const importLine2 = `import { BrowserRouter } from "react-router-dom";`;
+      const importLine2 = `import { BrowserRouter } from ${quoteStyle}react-router-dom${quoteStyle};`;
       let lastImportIndex2 = -1;
       for (let i = 0; i < lines.length; i++) {
         const line = lines[i].trim();
@@ -659,7 +689,7 @@ function patchBrowserRouter(consumerDir, basePath, dryRun) {
 
 // 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.7").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.9").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.7",
+  "version": "0.0.9",
   "description": "Goalmoon Ctrl (gmoonc): Complete dashboard installer for React projects",
   "license": "MIT",
   "homepage": "https://gmoonc.com",
@@ -14,7 +14,7 @@
   },
   "type": "module",
   "bin": {
-    "gmoonc": "./dist/index.js"
+    "gmoonc": "dist/index.cjs"
   },
   "files": [
     "dist",
@@ -25,7 +25,7 @@
   ],
   "scripts": {
     "sync:templates": "node scripts/sync-templates.mjs",
-    "build": "tsup src/cli/index.ts --format cjs --no-splitting --out-dir dist && node -e \"const fs=require('fs');const path=require('path');const distDir='dist';const files=fs.readdirSync(distDir);const indexFile=files.find(f=>(f.startsWith('index')&&(f.endsWith('.js')||f.endsWith('.cjs'))));if(indexFile){const oldPath=path.join(distDir,indexFile);const newPath=path.join(distDir,'index.js');if(oldPath!==newPath){fs.renameSync(oldPath,newPath);}const content=fs.readFileSync(newPath,'utf8');if(!content.startsWith('#!/usr/bin/env node')){fs.writeFileSync(newPath,'#!/usr/bin/env node\\n'+content)}}\"",
+    "build": "tsup src/cli/index.ts --format cjs --no-splitting --out-dir dist && node -e \"const fs=require('fs');const path=require('path');const distDir='dist';const files=fs.readdirSync(distDir);const indexFile=files.find(f=>(f.startsWith('index')&&(f.endsWith('.js')||f.endsWith('.cjs'))));if(indexFile){const oldPath=path.join(distDir,indexFile);const newPath=path.join(distDir,'index.cjs');if(oldPath!==newPath){fs.renameSync(oldPath,newPath);}const content=fs.readFileSync(newPath,'utf8');if(!content.startsWith('#!/usr/bin/env node')){fs.writeFileSync(newPath,'#!/usr/bin/env node\\n'+content)}}\"",
     "clean": "rimraf dist",
     "prepublishOnly": "npm run clean && npm run build",
     "postinstall": "node scripts/block-global-install.cjs"