Merge pull request #498 from devforth/test

Test

Author: yaroslav8765

README.md

@@ -58,14 +58,21 @@ npx adminforth create-app
 
 The most convenient way to add new features or fixes is using `dev-demo`. It imports the source code of the repository and plugins so you can edit them and see changes on the fly.
 
+# Requirements
+
+- **Node.js 20**
+- **Docker**
+- **pnpm**
+- **Taskfile**
+
 To run dev demo:
 ```sh
 cd dev-demo
 
-npm run setup-dev-demo
-npm run migrate:all
+pnpm setup-dev-demo
+pnpm migrate:all
 
-npm start
+pnpm start
 ```
 
 ## Adding columns to a database in dev-demo
@@ -77,13 +84,13 @@ To make migration add to the .prisma file in folder with database you need and a
 
 
 ```
-npm run makemigration:sqlite -- --name init
+pnpm makemigration:sqlite -- --name init
 ```
 
 and 
 
 ```
-npm run migrate:sqlite
+pnpm migrate:sqlite
 ```
 
 to apply migration
@@ -96,7 +103,7 @@ In order to make migration for the clickhouse, go to the `./migrations/clickhous
 
 Then run
 ```
-npm run migrate:clickhouse
+pnpm migrate:clickhouse
 ```
 
 to apply the migration.
@@ -108,18 +115,17 @@ Make sure you have not `adminforth` globally installed. If you have it, remove i
 
 
 ```sh
-npm uninstall -g adminforth
+pnpm uninstall -g adminforth
 ```
 
 Then, in the root of the project, run once:
 
 ```
 cd adminforth/adminforth
-npm run build
+pnpm build
+pnpm link
 ```
 
-This will automatically make an npm link to the `adminforth` package in the root of the project.
-
 Then, go to testing app, e.g. created with CLI, and use next command:
 
 ```

adminforth/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}`);
   }
 }
 

adminforth/commands/createApp/templates/Dockerfile.hbs

@@ -1,7 +1,19 @@
+
+{{#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/
 RUN npm ci  
 ADD . /code/
 RUN npx adminforth bundle
 CMD ["sh", "-c", "npm run migrate:prod && npm run prod"]
+{{/if}}

adminforth/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"

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

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

adminforth/commands/createApp/templates/pnpm_templates/pnpm-workspace.yaml.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