adminforth 3.6.5 → 3.6.7

package/commands/createApp/utils.js

@@ -487,42 +487,13 @@ async function writeTemplateFiles(dirname, cwd, useNpm, includePrismaMigrations,
   }
 }
 
-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 command = `${packageManager} install`;
 
-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 } }),
-    ]);
-  }
+  await Promise.all([
+    execAsync(command, { cwd, env: process.env }),
+    execAsync(command, { cwd: ctx.customDir, env: process.env }),
+  ]);
 }
 
 function generateFinalInstructionsPnpm(skipPrismaSetup, options) {
@@ -596,11 +567,7 @@ export function prepareWorkflow(options) {
     {
       title: '📦 Installing dependencies...',
       task: async (ctx) => {
-        if (options.useNpm) {
-          await installDependenciesNpm(ctx, ctx.projectDir);
-        } else {
-          await installDependenciesPnpm(ctx, ctx.projectDir);
-        }
+        await installDependencies(ctx, ctx.projectDir, options.useNpm ? 'npm' : 'pnpm');
       }
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "3.6.5",
+  "version": "3.6.7",
   "description": "OpenSource Agent-Native forth-generation admin panel",
   "keywords": [
     "adminforth",
@@ -89,7 +89,6 @@
     "@inquirer/prompts": "^7.4.1",
     "@scalar/express-api-reference": "^0.9.7",
     "@types/express": "^4.17.21",
-    "adminforth": "link:.",
     "ajv": "^8.18.0",
     "arg": "^5.0.2",
     "ast-types": "^0.14.2",