Merge pull request #522 from devforth/next

Next

Author: SerVitasik

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 plugins/*
-!plugins/install-plugins.sh
+!plugins/README.md
 adapters/*
-!adapters/install-adapters.sh
+!adapters/README.md
 background-jobs-dbs

README.md

@@ -59,6 +59,13 @@ 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
@@ -109,18 +116,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:
 
 ```

adapters/README.md

@@ -0,0 +1 @@
+This folder will be filled with adapters, after dev_demo setup

adapters/install-adapters.sh

@@ -45,7 +45,7 @@ class AdminForthAuth implements IAdminForthAuth {
     this.adminforth = adminforth;
   }
 
-getClientIp(headers: object) {
+  getClientIp(headers: object) {
     const clientIpHeader = this.adminforth.config.auth.clientIpHeader;
 
     const headersLower = Object.keys(headers).reduce((acc, key) => {

adminforth/auth.ts

@@ -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/bundle.js

@@ -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/Dockerfile.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/package.json.hbs

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