CLI refactor and cleanup

Author: fgatti675

.yarn/install-state.gz

@@ -71,5 +71,5 @@
     "node_modules",
     "template/node_modules"
   ],
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/cli/package.json

@@ -45,7 +45,7 @@ function findSpecificParentDir(currentDir:string, targetDirName:string) {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const targetDirPath = findSpecificParentDir(__dirname, 'firecms');
+const targetDirPath = findSpecificParentDir(__dirname, "cli");
 
 
 export type Template = "cloud" | "v2" | "pro" | "community";
@@ -214,6 +214,7 @@ async function promptForMissingOptions(options: InitOptions): Promise<InitOption
         type: "input",
         name: "dir_name",
         message: "Please choose which folder to create the project in",
+        when: (answers) => Boolean(answers.existing_firecms_project) || options.template !== "cloud",
         default: options.dir_name ?? defaultName,
     });
 
@@ -230,7 +231,7 @@ async function promptForMissingOptions(options: InitOptions): Promise<InitOption
     const answers = await inquirer.prompt(questions);
 
     if (options.template === "cloud" && !answers.existing_firecms_project) {
-        console.log("Please create a FireCMS project first. Head to https://app.firecms.co to get started and then run this command again!");
+        console.log("Please create a FireCMS Cloud project first. Head to https://app.firecms.co to get started and then run this command again!");
         process.exit(1);
     }
 

packages/cli/src/commands/init.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import path from "path";
 import { defineConfig } from "vite"
 import react from "@vitejs/plugin-react"
 

packages/cli/templates/template/vite.config.ts

@@ -1,6 +1,3 @@
-// @ts-ignore
-import path from "path";
-
 import { defineConfig } from "vite"
 import react from "@vitejs/plugin-react"
 import federation from "@originjs/vite-plugin-federation"

packages/cli/templates/template_cloud/vite.config.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import path from "path";
 import { defineConfig } from "vite"
 import react from "@vitejs/plugin-react"
 

packages/cli/templates/template_pro/vite.config.ts

@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/collection_editor/package.json

@@ -39,5 +39,5 @@
   "exclude": [
     "node_modules"
   ],
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/create_firecms_app/package.json

@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/data_enhancement/package.json

@@ -99,5 +99,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/data_import_export/package.json

@@ -62,5 +62,5 @@
     "typescript": "^5.4.2",
     "vite": "^5.2.3"
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/editor/package.json

@@ -64,5 +64,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/firebase_firecms/package.json

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
-import { entry } from "../dist/index.es.js";
-
-entry(process.argv);
+(async () => {
+  const fireCMS = await import("@firecms/cli");
+  fireCMS.createFireCMSApp(process.argv);
+})();

packages/firecms/bin/firecms.js

@@ -38,5 +38,5 @@
   "exclude": [
     "node_modules"
   ],
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/firecms/package.json

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 (async () => {
-    const fireCMS = await import("firecms");
+    const fireCMS = await import("@firecms/cli");
     fireCMS.entry(process.argv);
 })();

packages/firecms_cloud/bin/firecms.js

@@ -81,5 +81,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/firecms_cloud/package.json

@@ -115,7 +115,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543",
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7",
   "publishConfig": {
     "access": "public"
   }

packages/firecms_core/package.json

@@ -69,5 +69,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/formex/package.json

@@ -47,5 +47,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/mongodb/package.json

@@ -31,5 +31,5 @@
     "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
     "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }

packages/schema_inference/package.json

@@ -114,7 +114,7 @@
         "src",
         "tailwind.config.js"
     ],
-    "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543",
+    "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7",
     "publishConfig": {
         "access": "public"
     }

packages/ui/package.json

@@ -71,5 +71,5 @@
       "react-app/jest"
     ]
   },
-  "gitHead": "62ec98b7e6a391c4389928567476a6e7abb15543"
+  "gitHead": "241b56d35ecc9c8155a2ea0d387974a41a231bb7"
 }