adminforth 2.25.0-test.1 → 2.25.0-test.10

package/commands/createApp/templates/Dockerfile.hbs

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

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

@@ -8,12 +8,12 @@
   "license": "ISC",
   "description": "",
   "scripts": {
-    "dev": "pnpm _env:dev -- tsx watch index.ts",
-    "prod": "pnpm _env:prod -- tsx index.ts",
+    "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",
+    "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 --"
   },

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

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

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

@@ -26,7 +26,7 @@ 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
-pnpm makemigration -- --name <name_of_changes>
+pnpm makemigration --name <name_of_changes>
 ```
 
 Your colleagues will need to pull the changes and run `pnpm migrate:local` to apply the migration in their local database.

package/commands/createApp/utils.js

@@ -317,11 +317,6 @@ 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',
@@ -338,6 +333,11 @@ async function writeTemplateFiles(dirname, cwd, options) {
       data: {
         sqliteFile,
       },
+    },
+    {
+      src: 'pnpm-workspace.yaml.hbs',
+      dest: 'pnpm-workspace.yaml',
+      data: {},
     }
   ];
 
@@ -387,7 +387,7 @@ function generateFinalInstructions(skipPrismaSetup, options) {
 
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
-  ${chalk.dim('$')}${chalk.cyan(' pnpm makemigration -- --name init && pnpm migrate:local')}\n`;
+  ${chalk.dim('$')}${chalk.cyan(' pnpm makemigration --name init && pnpm migrate:local')}\n`;
 
   instruction += `
   ${chalk.dim('// Start dev server with tsx watch for hot-reloading')}