Merge pull request #247 from devforth/improving-win-installation-speed

feat: Add auto-select for AdminForth version in create-app template package.json

Author: SerVitasik

adminforth/commands/cli.js

@@ -25,19 +25,25 @@ function showHelp() {
   );
 }
 
-function currentFileDir(importMetaUrl) {
+export function currentFileDir(importMetaUrl) {
   const filePath = importMetaUrl.replace("file://", "");
   const fileDir = path.dirname(filePath);
   return fileDir;
 }
 
-function showVersion() {
+export function getVersion() {
   const ADMIN_FORTH_ABSOLUTE_PATH = path.join(currentFileDir(import.meta.url), '..');
 
   const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
 
   const ADMINFORTH_VERSION  = package_json.version;
 
+  return ADMINFORTH_VERSION;
+}
+
+function showVersion() {
+  const ADMINFORTH_VERSION = getVersion();
+
   console.log(
     chalk.white('AdminForth CLI version: ') +
     chalk.cyan.bold(ADMINFORTH_VERSION)

adminforth/commands/createApp/utils.js

@@ -11,17 +11,30 @@ import { exec } from 'child_process';
 
 import Handlebars from 'handlebars';
 import { promisify } from 'util';
+import { getVersion } from '../cli.js';
 
 const execAsync = promisify(exec);
 
 function detectAdminforthVersion() {
-  const userAgent = process.env.npm_config_user_agent || '';
-  if (userAgent.includes('adminforth@next')) {
-    return 'next'
-  };
-  return 'main'; 
+  try {
+    const version =  getVersion();
+
+    if (typeof version !== 'string') {
+      throw new Error('Invalid version format');
+    }
+
+    if (version.includes('next')) {
+      return 'next';
+    }
+    return 'latest';
+  } catch (err) {
+    console.warn('⚠️ Could not detect AdminForth version, defaulting to "latest".');
+    return 'latest';
+  }
 }
 
+const adminforthVersion = detectAdminforthVersion();
+
 
 export function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
@@ -67,7 +80,6 @@ export async function promptForMissingOptions(options) {
       ...options,
       appName: options.appName || answers.appName,
       db: options.db || answers.db,
-      adminforthVersion: detectAdminforthVersion(),
   };
 }
 
@@ -215,7 +227,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
       dest: 'package.json',
       data: { 
         appName,
-        adminforthVersion: options.adminforthVersion || 'latest'
+        adminforthVersion: adminforthVersion,
        },
     },
     {