adminforth 2.25.0-next.7 → 2.25.0-next.8

package/commands/bundle.js

@@ -16,7 +16,8 @@ async function bundle() {
     `);
 
   } catch (e) {
-    console.log(`Running budndle failed`, e);
+    console.log(`Running bundle failed`, e);
+    throw new Error(`Failed to bundle admin SPA: ${e.message}`);
   }
 }
 

package/commands/createApp/templates/Dockerfile.hbs

@@ -1,3 +1,14 @@
+
+{{#unless useNpm}}
+FROM devforth/node20-pnpm:latest
+WORKDIR /code/
+ADD package.json pnpm-lock.yaml pnpm-workspace.yaml /code/
+RUN pnpm i  
+ADD . /code/
+RUN pnpm exec adminforth bundle
+CMD ["sh", "-c", "pnpm migrate:prod && pnpm prod"]
+{{/unless}}
+{{#if useNpm}}
 FROM node:{{nodeMajor}}-slim
 WORKDIR /code/
 ADD package.json package-lock.json /code/
@@ -5,3 +16,4 @@ RUN npm ci
 ADD . /code/
 RUN npx adminforth bundle
 CMD ["sh", "-c", "npm run migrate:prod && npm run prod"]
+{{/if}}

package/commands/createApp/templates/package.json.hbs

@@ -8,14 +8,26 @@
   "license": "ISC",
   "description": "",
   "scripts": {
-    "dev": "npm run _env:dev -- tsx watch index.ts",
-    "prod": "npm run _env:prod -- tsx index.ts",
-    "start": "npm run dev",
-    "makemigration": "npm run _env:dev -- npx --yes prisma migrate dev --create-only",
-    "migrate:local": "npm run _env:dev -- npx --yes prisma migrate deploy",
-    "migrate:prod": "npm run _env:prod -- npx --yes prisma migrate deploy",
+    {{#unless useNpm}}
+    "dev": "pnpm _env:dev tsx watch index.ts",
+    "prod": "pnpm _env:prod tsx index.ts",
+    "start": "pnpm dev",
+    "makemigration": "pnpm _env:dev npx --yes prisma migrate dev --create-only",
+    "migrate:local": "pnpm _env:dev npx --yes prisma migrate deploy",
+    "migrate:prod": "pnpm _env:prod npx --yes prisma migrate deploy",
     "_env:dev": "dotenvx run -f .env -f .env.local --",
     "_env:prod": "dotenvx run -f .env.prod --"
+    {{/unless}}
+    {{#if useNpm}}
+      "dev": "npm run _env:dev -- tsx watch index.ts",
+      "prod": "npm run _env:prod -- tsx index.ts",
+      "start": "npm run dev",
+      "makemigration": "npm run _env:dev -- npx --yes prisma migrate dev --create-only",
+      "migrate:local": "npm run _env:dev -- npx --yes prisma migrate deploy",
+      "migrate:prod": "npm run _env:prod -- npx --yes prisma migrate deploy",
+      "_env:dev": "dotenvx run -f .env -f .env.local --",
+      "_env:prod": "dotenvx run -f .env.prod --"
+    {{/if}}
   },
   "engines": {
     "node": ">=20"

package/commands/createApp/templates/pnpm_templates/pnpm-lock.yaml.hbs

@@ -0,0 +1,8 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+  .: {}

package/commands/createApp/templates/pnpm_templates/pnpm-workspace.yaml.hbs

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - better-sqlite3

package/commands/createApp/templates/readme.md.hbs

@@ -1,9 +1,9 @@
 ## Starting the application
 
 Install dependencies:
-
+{{#if useNpm}}
 ```bash
-npm ci
+npm i
 ```
 
 Migrate the database:
@@ -17,6 +17,25 @@ Start the server:
 ```bash
 npm run dev
 ```
+{{/if}}
+
+{{#unless useNpm}}
+```bash
+pnpm i
+```
+
+Migrate the database:
+
+```bash
+pnpm migrate:local
+```
+
+Start the server:
+
+```bash
+pnpm dev
+```
+{{/unless}}
 
 {{#if prismaDbUrl}}
 ## Changing schema
@@ -26,10 +45,10 @@ Open `schema.prisma` and change schema as needed: add new tables, columns, etc (
 Run the following command to generate a new migration and apply it instantly in local database:
 
 ```bash
-npm run makemigration -- --name <name_of_changes>
+pnpm makemigration --name <name_of_changes>
 ```
 
-Your colleagues will need to pull the changes and run `npm run migrateLocal` to apply the migration in their local database.
+Your colleagues will need to pull the changes and run `pnpm migrate:local` to apply the migration in their local database.
 {{/if}}
 
 ## Deployment tips

package/commands/createApp/utils.js

@@ -44,6 +44,7 @@ export function parseArgumentsIntoOptions(rawArgs) {
     {
       '--app-name': String,
       '--db': String,
+      '--use-npm': Boolean,
       // you can add more flags here if needed
     },
     {
@@ -54,6 +55,7 @@ export function parseArgumentsIntoOptions(rawArgs) {
   return {
     appName: args['--app-name'],
     db: args['--db'],
+    useNpm: args['--use-npm'],
   };
 }
 
@@ -78,11 +80,25 @@ export async function promptForMissingOptions(options) {
       });
   };
 
+  if (!options.useNpm) {
+    questions.push({
+      type: 'select',
+      name: 'useNpm',
+      message: 'Select your package manager ->',
+      choices: [
+        { name: 'pnpm', value: false },
+        { name: 'npm', value: true },
+      ],
+      default: false,
+    });
+  }
+
   const answers = await inquirer.prompt(questions);
   return {
       ...options,
       appName: options.appName || answers.appName,
       db: options.db || answers.db,
+      useNpm: options.useNpm || answers.useNpm,
   };
 }
 
@@ -230,7 +246,7 @@ async function scaffoldProject(ctx, options, cwd) {
   await fse.copy(sourceAssetsDir, targetAssetsDir);
 
   // Write templated files
-  await writeTemplateFiles(dirname, projectDir, {
+  await writeTemplateFiles(dirname, projectDir, options.useNpm, {
     dbUrl: connectionString.toString(),
     dbUrlProd: connectionStringProd,
     prismaDbUrl,
@@ -244,7 +260,7 @@ async function scaffoldProject(ctx, options, cwd) {
   return projectDir;  // Return the new directory path
 }
 
-async function writeTemplateFiles(dirname, cwd, options) {
+async function writeTemplateFiles(dirname, cwd, useNpm, options) {
   const { 
     dbUrl, prismaDbUrl, appName, provider, nodeMajor,
     dbUrlProd, prismaDbUrlProd, sqliteFile
@@ -268,14 +284,6 @@ async function writeTemplateFiles(dirname, cwd, options) {
       dest: 'prisma.config.ts',
       data: {},
     },
-    {
-      src: 'package.json.hbs',
-      dest: 'package.json',
-      data: { 
-        appName,
-        adminforthVersion: adminforthVersion,
-       },
-    },
     {
       src: 'index.ts.hbs',
       dest: 'index.ts',
@@ -304,7 +312,7 @@ async function writeTemplateFiles(dirname, cwd, options) {
     {
       src: 'readme.md.hbs',
       dest: 'README.md',
-      data: { dbUrl, prismaDbUrl, appName, sqliteFile },
+      data: { dbUrl, prismaDbUrl, appName, sqliteFile, useNpm },
     },
     {
       // We'll write .env using the same content as .env.sample
@@ -317,30 +325,54 @@ async function writeTemplateFiles(dirname, cwd, options) {
       dest: 'resources/adminuser.ts',
       data: {},
     },
-    {
-      src: 'custom/package.json.hbs',
-      dest: 'custom/package.json',
-      data: {},
-    },
     {
       src: 'custom/tsconfig.json.hbs',
       dest: 'custom/tsconfig.json',
       data: {},
     },
-    {
-      src: 'Dockerfile.hbs',
-      dest: 'Dockerfile',
-      data: { nodeMajor },
-    },
     {
       src: '.dockerignore.hbs',
       dest: '.dockerignore',
       data: {
         sqliteFile,
       },
+    },
+    {
+      src: 'Dockerfile.hbs',
+      dest: 'Dockerfile',
+      data: { nodeMajor, useNpm },
+    },
+    {
+      src: 'package.json.hbs',
+      dest: 'package.json',
+      data: { 
+        appName,
+        adminforthVersion: adminforthVersion,
+        useNpm
+      },
+    },
+    {
+      src: 'custom/package.json.hbs',
+      dest: 'custom/package.json',
+      data: {}
     }
   ];
 
+  if (!useNpm) {
+    templateTasks.push(
+      {
+        src: 'pnpm_templates/pnpm-workspace.yaml.hbs',
+        dest: 'pnpm-workspace.yaml',
+        data: {},
+      },
+      {
+        src: 'pnpm_templates/pnpm-lock.yaml.hbs',
+        dest: 'custom/pnpm-lock.yaml',
+        data: {},
+      }
+    )
+  }
+
   for (const task of templateTasks) {
     // If a condition is specified and false, skip this file
     if (task.condition === false) continue;
@@ -358,7 +390,26 @@ async function writeTemplateFiles(dirname, cwd, options) {
   }
 }
 
-async function installDependencies(ctx, cwd) {
+async function installDependenciesPnpm(ctx, cwd) {
+  const isWindows = process.platform === 'win32';
+
+  const nodeBinary = process.execPath; 
+  const npmPath = path.join(path.dirname(nodeBinary), isWindows ? 'pnpm.cmd' : 'pnpm');
+  const customDir = ctx.customDir;
+  if (isWindows) {
+    const res = await Promise.all([
+      await execAsync(`pnpm install`, { cwd, env: { PATH: process.env.PATH } }),
+      await execAsync(`pnpm install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  } else {
+    const res = await Promise.all([
+      await execAsync(`${nodeBinary} ${npmPath} install`, { cwd, env: { PATH: process.env.PATH } }),
+      await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
+    ]);
+  }
+}
+
+async function installDependenciesNpm(ctx, cwd) {
   const isWindows = process.platform === 'win32';
 
   const nodeBinary = process.execPath; 
@@ -375,10 +426,30 @@ async function installDependencies(ctx, cwd) {
       await execAsync(`${nodeBinary} ${npmPath} install`, { cwd: customDir, env: { PATH: process.env.PATH } }),
     ]);
   }
-  // console.log(chalk.dim(`Dependencies installed in ${cwd} and ${customDir}: \n${res[0].stdout}${res[1].stdout}`));
 }
 
-function generateFinalInstructions(skipPrismaSetup, options) {
+function generateFinalInstructionsPnpm(skipPrismaSetup, options) {
+  let instruction = '⏭️  Run the following commands to get started:\n';
+  if (!skipPrismaSetup)
+    instruction += `
+  ${chalk.dim('// Go to the project directory')}
+  ${chalk.dim('$')}${chalk.cyan(` cd ${options.appName}`)}\n`;
+
+    instruction += `
+  ${chalk.dim('// Generate and apply initial migration')}
+  ${chalk.dim('$')}${chalk.cyan(' pnpm makemigration --name init && pnpm migrate:local')}\n`;
+
+  instruction += `
+  ${chalk.dim('// Start dev server with tsx watch for hot-reloading')}
+  ${chalk.dim('$')}${chalk.cyan(' pnpm dev')}\n
+`;
+
+  instruction += '😉 Happy coding!';
+
+  return instruction;
+}
+
+function generateFinalInstructionsNpm(skipPrismaSetup, options) {
   let instruction = '⏭️  Run the following commands to get started:\n';
   if (!skipPrismaSetup)
     instruction += `
@@ -425,13 +496,23 @@ export function prepareWorkflow(options) {
     },
     {
       title: '📦 Installing dependencies...',
-      task: async (ctx) => installDependencies(ctx, ctx.projectDir)
+      task: async (ctx) => {
+        if (options.useNpm) {
+          await installDependenciesNpm(ctx, ctx.projectDir);
+        } else {
+          await installDependenciesPnpm(ctx, ctx.projectDir);
+        }
+      }
     },
     {
       title: '📝 Preparing final instructions...',
       task: (ctx) => {
         console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
-        console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));
+        if (options.useNpm) {
+          console.log(generateFinalInstructionsNpm(ctx.skipPrismaSetup, options));
+        } else {
+          console.log(generateFinalInstructionsPnpm(ctx.skipPrismaSetup, options));
+        }
         console.log('\n\n');
       }
     }

package/commands/createPlugin/utils.js

@@ -158,8 +158,8 @@ async function installDependencies(ctx, cwd) {
   const customDir = ctx.customDir;
 
   await Promise.all([
-    await execa("npm", ["install", "--no-package-lock"], { cwd }),
-    await execa("npm", ["install"], { cwd: customDir }),
+    await execa("pnpm", ["install"], { cwd }),
+    await execa("pnpm", ["install"], { cwd: customDir }),
   ]);
 }
 
@@ -168,15 +168,14 @@ function generateFinalInstructions() {
 
   instruction += `
   ${chalk.dim("// Build your plugin")}
-  ${chalk.cyan("$ npm run build")}\n`;
+  ${chalk.cyan("$ pnpm build")}\n`;
 
   instruction += `
   ${chalk.dim("// To test your plugin locally")}
-  ${chalk.cyan("$ npm link")}\n`;
-
+  ${chalk.cyan("$ pnpm link")}\n`;
   instruction += `
   ${chalk.dim("// In your AdminForth project")}
-  ${chalk.cyan("$ npm link " + chalk.italic("your-plugin-name"))}\n`;
+  ${chalk.cyan("$ pnpm link " + chalk.italic("your-plugin-name"))}\n`;
 
   instruction += "\n😉 Happy coding!";
 

package/commands/postinstall.js

@@ -7,7 +7,7 @@ const spaPath = path.join(import.meta.dirname, 'dist', 'spa');
 
 if (fs.existsSync(spaPath)){ 
     console.log('Installing SPA dependencies...');
-    execSync('npm ci', { cwd: spaPath, stdio: 'inherit' });
+    execSync('pnpm i', { cwd: spaPath, stdio: 'inherit' });
     console.log('Installed spa dependencies');
 } else {
     console.log('SPA dependencies not found');

package/dist/modules/codeInjector.d.ts

@@ -15,7 +15,8 @@ declare class CodeInjector implements ICodeInjector {
     registerCustomComponent(filePath: string): void;
     cleanup(): void;
     constructor(adminforth: any);
-    runNpmShell({ command, cwd, envOverrides }: {
+    doesUserHasPnpmLockFile(dir: string): Promise<boolean>;
+    runPackageManagerShell({ command, cwd, envOverrides }: {
         command: string;
         cwd: string;
         envOverrides?: {
@@ -24,7 +25,7 @@ declare class CodeInjector implements ICodeInjector {
     }): Promise<void>;
     rmTmpDir(): Promise<void>;
     getServeDir(): string;
-    packagesFromNpm(dir: string): Promise<[string, string[]]>;
+    packagesFromPnpm(dir: string): Promise<[string, string[]]>;
     getSpaDir(): string;
     updatePartials({ filesUpdated }: {
         filesUpdated: string[];

package/dist/modules/codeInjector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codeInjector.d.ts","sourceRoot":"","sources":["../../modules/codeInjector.ts"],"names":[],"mappings":"AAOA,OAAO,UAAwC,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAmEjD,cAAM,YAAa,YAAW,aAAa;IAEzC,WAAW,QAAM;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IAClD,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IACjD,aAAa,EAAE,MAAM,CAAQ;IAE7B,UAAU,IAAI,MAAM;IAQd,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE;IA8BpC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK/C,OAAO;gBAMK,UAAU,KAAA;IAWhB,WAAW,CAAC,EAAC,OAAO,EAAE,GAAG,EAAE,YAAiB,EAAC,EAAE;QACnD,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KACzC;IA+CK,QAAQ;IAUd,WAAW;IAIL,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAyC/D,SAAS;IAQH,cAAc,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,EAAE,CAAA;KAAE;IAgB3D,yBAAyB,CAAC,OAAO,KAAA;IAMjC,cAAc;IA4cd,iBAAiB,CAAC,EAAE,IAAA;IA4CpB,4BAA4B,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE;;;KAAA;IAwEjE,WAAW,CAAC,QAAQ,EAAE,MAAM;IAW5B,kBAAkB,CAAC,UAAU,GAAE,MAA0B,EAAE,QAAQ,GAAE,MAAM,EAAO;IAyBlF,SAAS,CAAC,EAAE,SAAiB,EAAE,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE;CA0H9D;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"codeInjector.d.ts","sourceRoot":"","sources":["../../modules/codeInjector.ts"],"names":[],"mappings":"AAQA,OAAO,UAAwC,MAAM,aAAa,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAmEjD,cAAM,YAAa,YAAW,aAAa;IAEzC,WAAW,QAAM;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IAClD,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;IACjD,aAAa,EAAE,MAAM,CAAQ;IAE7B,UAAU,IAAI,MAAM;IAQd,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE;IA8BpC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK/C,OAAO;gBAMK,UAAU,KAAA;IAYhB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBtD,sBAAsB,CAAC,EAAC,OAAO,EAAE,GAAG,EAAE,YAAiB,EAAC,EAAE;QAC9D,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KACzC;IAuDK,QAAQ;IAUd,WAAW;IAIL,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAgFhE,SAAS;IAQH,cAAc,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,EAAE,CAAA;KAAE;IAgB3D,yBAAyB,CAAC,OAAO,KAAA;IAMjC,cAAc;IA8cd,iBAAiB,CAAC,EAAE,IAAA;IA4CpB,4BAA4B,CAAC,EAAE,mBAAmB,EAAE,WAAW,EAAE;;;KAAA;IAwEjE,WAAW,CAAC,QAAQ,EAAE,MAAM;IAW5B,kBAAkB,CAAC,UAAU,GAAE,MAA0B,EAAE,QAAQ,GAAE,MAAM,EAAO;IAyBlF,SAAS,CAAC,EAAE,SAAiB,EAAE,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE;CA2H9D;AAED,eAAe,YAAY,CAAC"}