adminforth 3.6.9 → 3.6.11

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/dist/spa/src/stores/toast.ts

@@ -1,6 +1,7 @@
 import { ref, watch, type Ref } from 'vue'
 import { defineStore } from 'pinia'
 import { useRoute } from 'vue-router';
+import { randomBrowserUUID } from '@/utils/browserUuid';
 
 
 
@@ -22,7 +23,7 @@ export const useToastStore = defineStore('toast', () => {
         buttons?: { value: any; label: string }[];
         onResolve?: (value?: any) => void;
     }): string => {
-        const toastId = crypto.randomUUID();
+        const toastId = randomBrowserUUID();
         toasts.value.push({
             ...toast,
             id: toastId,
@@ -45,4 +46,4 @@ export const useToastStore = defineStore('toast', () => {
     };
 
     return { toasts, addToast, removeToast, resolveToast };
-});
+});

package/dist/spa/src/utils/browserUuid.ts

@@ -0,0 +1,42 @@
+const UUID_BYTE_LENGTH = 16;
+
+const UUID_HEX = Array.from(
+  { length: 256 },
+  (_, index) => index.toString(16).padStart(2, '0'),
+);
+
+export function randomBrowserUUID(): string {
+  if (typeof crypto.randomUUID === 'function') {
+    return crypto.randomUUID();
+  }
+
+  const bytes = crypto.getRandomValues(
+    new Uint8Array(UUID_BYTE_LENGTH),
+  );
+
+  bytes[6] = (bytes[6] & 0x0f) | 0x40;
+  bytes[8] = (bytes[8] & 0x3f) | 0x80;
+
+  return [
+    UUID_HEX[bytes[0]],
+    UUID_HEX[bytes[1]],
+    UUID_HEX[bytes[2]],
+    UUID_HEX[bytes[3]],
+    '-',
+    UUID_HEX[bytes[4]],
+    UUID_HEX[bytes[5]],
+    '-',
+    UUID_HEX[bytes[6]],
+    UUID_HEX[bytes[7]],
+    '-',
+    UUID_HEX[bytes[8]],
+    UUID_HEX[bytes[9]],
+    '-',
+    UUID_HEX[bytes[10]],
+    UUID_HEX[bytes[11]],
+    UUID_HEX[bytes[12]],
+    UUID_HEX[bytes[13]],
+    UUID_HEX[bytes[14]],
+    UUID_HEX[bytes[15]],
+  ].join('');
+}

package/dist/spa/src/utils/clientId.ts

@@ -1,3 +1,5 @@
+import { randomBrowserUUID } from './browserUuid';
+
 const ADMINFORTH_CLIENT_ID_STORAGE_KEY = 'adminforthClientId';
 
 export const ADMINFORTH_CLIENT_ID_HEADER = 'x-adminforth-client-id';
@@ -8,7 +10,7 @@ export function getAdminForthClientId(): string {
     return existingClientId;
   }
 
-  const clientId = crypto.randomUUID();
+  const clientId = randomBrowserUUID();
   sessionStorage.setItem(ADMINFORTH_CLIENT_ID_STORAGE_KEY, clientId);
   return clientId;
 }

package/package.json

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