gmoonc 0.0.8 → 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.cjs

@@ -565,12 +565,19 @@ function patchBrowserRouter(consumerDir, basePath, dryRun) {
   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;
-      reactRouterImportLine = lines[i];
-      if (line.includes("BrowserRouter")) {
+      reactRouterImportLine = line;
+      const browserRouterPattern = /\bBrowserRouter\b/;
+      if (browserRouterPattern.test(trimmed)) {
         hasBrowserRouterImport = true;
       }
     }
@@ -578,20 +585,29 @@ function patchBrowserRouter(consumerDir, basePath, dryRun) {
   if (!hasBrowserRouterImport) {
     if (reactRouterImportIndex >= 0 && reactRouterImportLine) {
       const existingLine = reactRouterImportLine;
-      const namedMatch = existingLine.match(/^(\s*)import\s+\{([^}]+)\}\s+from\s+["']react-router-dom["']/);
+      const indent2 = existingLine.match(/^(\s*)/)?.[1] || "";
+      const namedMatch = existingLine.match(/^(\s*)import\s+\{([^}]+)\}\s+from\s+(["'])react-router-dom\2/);
       if (namedMatch) {
-        const indent2 = namedMatch[1];
-        const importList = namedMatch[2].split(",").map((s) => s.trim()).filter(Boolean);
-        if (!importList.includes("BrowserRouter")) {
-          importList.push("BrowserRouter");
-          const updatedLine = `${indent2}import { ${importList.join(", ")} } from "react-router-dom";`;
+        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();
@@ -673,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.8").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.8",
+  "version": "0.0.9",
   "description": "Goalmoon Ctrl (gmoonc): Complete dashboard installer for React projects",
   "license": "MIT",
   "homepage": "https://gmoonc.com",