adminforth 3.6.12 → 3.6.13

package/commands/cli.js

@@ -42,6 +42,61 @@ export function getVersion() {
   return ADMINFORTH_VERSION;
 }
 
+/**
+ * Resolves the adminforth version range to write into a scaffolded package.json.
+ *
+ * Returns a caret range pinned to the latest published release of the dist-tag
+ * matching the running CLI, e.g. "^3.6.12" (installs the latest 3.x.x, never a
+ * major upgrade). For "next" builds the moving "next" tag is kept, since
+ * prerelease versions do not caret cleanly. Falls back to a major-only range
+ * (e.g. "^3.0.0"), and finally to "latest", when the registry is unreachable.
+ */
+export async function resolveAdminforthVersionRange() {
+  // Determine which dist-tag matches the CLI currently running, and derive an
+  // offline fallback range from the CLI's own major version.
+  let tag = 'latest';
+  let offlineFallback = 'latest';
+  try {
+    const version = getVersion();
+    if (typeof version === 'string') {
+      if (version.includes('next')) {
+        tag = 'next';
+      }
+      const major = version.split('.')[0];
+      if (/^\d+$/.test(major)) {
+        offlineFallback = `^${major}.0.0`;
+      }
+    }
+  } catch {
+    // Ignore; fall back to "latest" below.
+  }
+
+  // "next" builds keep the moving tag — prerelease versions don't caret cleanly.
+  if (tag === 'next') {
+    return 'next';
+  }
+
+  try {
+    const res = await fetch('https://registry.npmjs.org/-/package/adminforth/dist-tags', {
+      signal: AbortSignal.timeout(5000),
+    });
+    if (!res.ok) {
+      throw new Error(`registry responded with ${res.status}`);
+    }
+    const distTags = await res.json();
+    const latest = distTags[tag];
+    if (typeof latest !== 'string' || !/^\d+\.\d+\.\d+/.test(latest)) {
+      throw new Error('invalid version received from registry');
+    }
+    return `^${latest}`;
+  } catch (err) {
+    console.warn(
+      `⚠️ Could not resolve AdminForth version from npm registry (${err.message}); defaulting to "${offlineFallback}".`
+    );
+    return offlineFallback;
+  }
+}
+
 function showVersion() {
   const ADMINFORTH_VERSION = getVersion();
 

package/commands/createApp/utils.js

@@ -11,33 +11,14 @@ import { exec } from 'child_process';
 
 import Handlebars from 'handlebars';
 import { promisify } from 'util';
-import { getVersion } from '../cli.js';
+import { resolveAdminforthVersionRange } from '../cli.js';
 
 import { URL } from 'url'
 import net from 'net'
 
 const execAsync = promisify(exec);
 
-function detectAdminforthVersion() {
-  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();
-const SUPPORTED_DB_URL_SCHEMES = ['sqlite://', 'postgresql://', 'mongodb://', 'mysql://', 'clickhouse://'];
+const SUPPORTED_DB_URL_SCHEMES =['sqlite://', 'postgresql://', 'mongodb://', 'mysql://', 'clickhouse://'];
 const PRISMA_MIGRATION_DB_PROTOCOLS = ['sqlite', 'postgres', 'postgresql', 'mysql'];
 
 
@@ -314,6 +295,7 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
     dbUrlProd, prismaDbUrlProd, sqliteFile
    } = options;
   const packageManagerTemplateData = getPackageManagerTemplateData(useNpm, nodeMajor);
+  const adminforthVersion = await resolveAdminforthVersionRange();
   const resolvedPrismaDbUrl = includePrismaMigrations ? prismaDbUrl : null;
   const resolvedPrismaDbUrlProd = includePrismaMigrations ? prismaDbUrlProd : null;
   const connectorProvider = provider === 'postgresql' ? 'postgres' : 

package/commands/createPlugin/templates/package.json.hbs

@@ -16,6 +16,6 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "adminforth": "latest"
+    "adminforth": "{{adminforthVersion}}"
   }
 }

package/commands/createPlugin/utils.js

@@ -8,6 +8,7 @@ import { Listr } from 'listr2';
 import { fileURLToPath } from 'url';
 import { execa } from 'execa';
 import Handlebars from 'handlebars';
+import { resolveAdminforthVersionRange } from '../cli.js';
 
 export function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
@@ -102,6 +103,7 @@ async function scaffoldProject(ctx, options, cwd) {
 
 async function writeTemplateFiles(dirname, cwd, options) {
   const { pluginName } = options;
+  const adminforthVersion = await resolveAdminforthVersionRange();
 
   // Build a list of files to generate
   const templateTasks = [
@@ -113,7 +115,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: "package.json.hbs",
       dest: "package.json",
-      data: { pluginName },
+      data: { pluginName, adminforthVersion },
     },
     {
       src: "index.ts.hbs",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "3.6.12",
+  "version": "3.6.13",
   "description": "OpenSource Agent-Native forth-generation admin panel",
   "keywords": [
     "adminforth",