adminforth 1.10.0-next.1 → 1.10.0-next.2

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

@@ -8,15 +8,17 @@
   "license": "ISC",
   "description": "",
   "scripts": {
-    "start": "tsx watch --env-file=.env index.ts",
-    "migrate": "npx prisma migrate deploy",
-    "makemigration": "npx --yes prisma migrate deploy; npx --yes prisma migrate dev",
+    "env": "dotenvx run -f .env.local -f .env --overload --",
+    "start": "npm run env -- tsx watch index.ts",
+    "migrateLocal": "npm run env -- npx prisma migrate deploy",
+    "makemigration": "npm run migrateLocal; npm run env -- npx --yes prisma migrate dev",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "engines": {
     "node": ">=20"
   },
   "dependencies": {
+    "@dotenvx/dotenvx": "^1.34.0",
     "adminforth": "latest",
     "express": "latest"
   },

package/commands/createApp/utils.js

@@ -182,15 +182,16 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: {},
     },
     {
-      src: '.env.sample.hbs',
-      dest: '.env.sample',
+      src: '.env.local.hbs',
+      dest: '.env.local',
       data: { dbUrl, prismaDbUrl },
     },
     {
       // We'll write .env using the same content as .env.sample
-      src: '.env.sample.hbs',
+      src: '.env.local.hbs',
       dest: '.env',
-      data: { dbUrl, prismaDbUrl },
+      data: {},
+      empty: true,
     },
     {
       src: 'adminuser.ts.hbs',
@@ -213,12 +214,16 @@ async function writeTemplateFiles(dirname, cwd, options) {
     // If a condition is specified and false, skip this file
     if (task.condition === false) continue;
 
-    const templatePath = path.join(dirname, 'templates', task.src);
-    const compiled = renderHBSTemplate(templatePath, task.data);
     const destPath = path.join(cwd, task.dest);
-    // Ensure parent directory exists
     // fse.ensureDirSync(path.dirname(destPath));
-    fs.writeFileSync(destPath, compiled);
+
+    if (task.empty) {
+      fs.writeFileSync(destPath, '');
+    } else {
+      const templatePath = path.join(dirname, 'templates', task.src);
+      const compiled = renderHBSTemplate(templatePath, task.data);
+      fs.writeFileSync(destPath, compiled);
+    }
   }
 }
 
@@ -235,11 +240,11 @@ function generateFinalInstructions(skipPrismaSetup) {
   let instruction = '⏭️  Run the following commands to get started:\n';
   if (!skipPrismaSetup)
     instruction += `
-  ${chalk.dim('// runs "npx prisma migrate dev --name init" to generate and apply initial migration')};
+  ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.cyan('$ npm run makemigration -- --name init')}\n`;
 
   instruction += `
-  ${chalk.dim('// Starts dev server with tsx watch for hot-reloading')}
+  ${chalk.dim('// Start dev server with tsx watch for hot-reloading')}
   ${chalk.cyan('$ npm start')}\n
 `;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.10.0-next.1",
+  "version": "1.10.0-next.2",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",