adminforth 3.6.9 → 3.6.10

package/commands/createApp/utils.js

@@ -487,32 +487,42 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
   }
 }
 
-async function resolvePackageManagerCommand(packageManager) {
-  if (packageManager !== 'pnpm') {
-    return packageManager;
-  }
-
-  try {
-    await execAsync('pnpm --version', { env: process.env });
-    return 'pnpm';
-  } catch {
-    try {
-      await execAsync('corepack pnpm --version', { env: process.env });
-      return 'corepack pnpm';
-    } catch {
-      throw new Error('pnpm is not available. Install pnpm globally or enable Corepack before creating a pnpm project.');
-    }
+async function installDependenciesPnpm(ctx, cwd) {
+  const isWindows = process.platform === 'win32';
+
+  const nodeBinary = process.execPath; 
+  const pnpmPath = path.join(path.dirname(nodeBinary), isWindows ? 'pnpm.cmd' : 'pnpm');
+  const customDir = ctx.customDir;
+  if (isWindows) {
+    const res = await Promise.all([
+      execAsync(`pnpm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`pnpm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${pnpmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
   }
 }
 
-async function installDependencies(ctx, cwd, packageManager) {
-  const packageManagerCommand = await resolvePackageManagerCommand(packageManager);
-  const command = `${packageManagerCommand} install`;
-
-  await Promise.all([
-    execAsync(command, { cwd, env: process.env }),
-    execAsync(command, { cwd: ctx.customDir, env: process.env }),
-  ]);
+async function installDependenciesNpm(ctx, cwd) {
+  const isWindows = process.platform === 'win32';
+
+  const nodeBinary = process.execPath; 
+  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'npm.cmd' : 'npm');
+  const customDir = ctx.customDir;
+  if (isWindows) {
+    const res = await Promise.all([
+      execAsync(`npm install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`npm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  }
 }
 
 function generateFinalInstructionsPnpm(skipPrismaSetup, options) {
@@ -586,7 +596,11 @@ export function prepareWorkflow(options) {
     {
       title: '📦 Installing dependencies...',
       task: async (ctx) => {
-        await installDependencies(ctx, ctx.projectDir, options.useNpm ? 'npm' : 'pnpm');
+        if (options.useNpm) {
+          await installDependenciesNpm(ctx, ctx.projectDir);
+        } else {
+          await installDependenciesPnpm(ctx, ctx.projectDir);
+        }
       }
     },
     {

package/package.json

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