@gadmin2n/schematics 0.0.60 → 0.0.61

package/dist/lib/application/files/gadmin2-game-angle-demo/Dockerfile

@@ -1,14 +1,49 @@
 # syntax=docker/dockerfile:1
-FROM node:16.17.1
+
+# ─── Stage 1: Builder ────────────────────────────────────────
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 
-STOPSIGNAL SIGQUIT
+# 禁止 husky 在无 .git 环境下报错
+ENV HUSKY=0
+
+# 安装 gadmin2 CLI（单独一层，利用缓存）
+RUN yarn global add @gadmin2n/cli@0.0.79
 
+# 先复制 package.json，利用 Docker 层缓存：依赖未变则跳过 yarn install
+COPY server/package.json server/yarn.lock* ./server/
+COPY web/package.json web/yarn.lock* ./web/
+
+RUN cd server && yarn install --frozen-lockfile && \
+    cd ../web && yarn install --frozen-lockfile
+
+# 再复制其余源码
 COPY . .
 
-RUN chmod +x ./build.sh && ./build.sh
+# 生成代码、构建 web、构建 server
+RUN gadmin2 g prisma && \
+    cd web && yarn build && yarn cache clean --all && \
+    cd ../server && yarn build
+
+# 切换为仅生产依赖，减小体积
+RUN cd server && NODE_ENV=production yarn install --production --frozen-lockfile && \
+    yarn cache clean --all
+
+# 将 web 构建产物放入 server 静态目录
+RUN cp -R web/build server/dist/www
+
+
+# ─── Stage 2: Runtime ────────────────────────────────────────
+FROM node:20-alpine AS runtime
 
 WORKDIR /app/server
 
-CMD [ "yarn", "start:prod" ]
+STOPSIGNAL SIGQUIT
+
+COPY --from=builder /app/server/dist       ./dist
+COPY --from=builder /app/server/node_modules ./node_modules
+COPY --from=builder /app/server/package.json ./package.json
+COPY --from=builder /app/server/prisma     ./prisma
+
+CMD ["yarn", "start:prod"]

package/dist/lib/application/files/gadmin2-game-angle-demo/server/package.json

@@ -9,6 +9,7 @@
     "prebuild": "rimraf dist",
     "build": "gadmin2 build",
     "format": "prettier --write \"../config/*.ts\" \"src/**/*.ts\" \"src/**/*.tsx\" \"test/**/*.ts\"",
+    "prepare": "cd .. && husky install",
     "start": "gadmin2 start",
     "start:dev": "gadmin2 start --watch",
     "start:debug": "gadmin2 start --debug --watch",
@@ -19,17 +20,19 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "migrate:dev": "prisma migrate dev && npm run format -- --loglevel error",
-    "migrate:dev:create": "prisma migrate dev --create-only",
-    "migrate:deploy": "prisma migrate deploy",
-    "generate": "npx prisma generate && npm run format -- --loglevel error",
-    "generate:dev": "npm run push:db && npx prisma generate && npm run format -- --loglevel error",
-    "push:db": "prisma db push",
-    "seed": "ts-node seed/index.ts",
-    "prisma:studio": "prisma studio"
+    "migrate:dev": "dotenv -e .env.local -e .env -- prisma migrate dev",
+    "migrate:dev:create": "dotenv -e .env.local -e .env -- prisma migrate dev --create-only",
+    "migrate:deploy": "dotenv -e .env.local -e .env -- prisma migrate deploy",
+    "generate": "dotenv -e .env.local -e .env -- npx prisma generate",
+    "generate:dev": "npm run push:db && dotenv -e .env.local -e .env -- npx prisma generate",
+    "generate:web": "dotenv -e .env.local -e .env -- npx prisma generate --generator react",
+    "generate:server": "dotenv -e .env.local -e .env -- npx prisma generate --generator client --generator nestjs",
+    "push:db": "dotenv -e .env.local -e .env -- prisma db push",
+    "seed": "dotenv -e .env.local -e .env -- ts-node seed/index.ts",
+    "prisma:studio": "dotenv -e .env.local -e .env -- prisma studio"
   },
   "dependencies": {
-    "@gadmin2n/nest-common": "^0.0.28",
+    "@gadmin2n/nest-common": "^0.0.29",
     "@nestjs/common": "^8.0.0",
     "@nestjs/config": "^2.0.0",
     "@nestjs/core": "^8.0.0",
@@ -57,8 +60,8 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@gadmin2n/prisma-nest-generator": "^0.0.25",
-    "@gadmin2n/prisma-react-generator": "^0.0.41",
+    "@gadmin2n/prisma-nest-generator": "^0.0.26",
+    "@gadmin2n/prisma-react-generator": "^0.0.42",
     "@nestjs/testing": "^8.0.0",
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.13",
@@ -68,10 +71,13 @@
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
+    "dotenv-cli": "^7.4.4",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.2.5",
+    "husky": "^8.0.0",
+    "lint-staged": "^13.0.0",
     "prettier": "^2.3.2",
     "prettier-plugin-organize-imports": "^3.0.3",
     "prisma-dbml-generator": "^0.9.1",
@@ -102,5 +108,8 @@
   },
   "prisma": {
     "seed": "echo 'npm run seed'"
+  },
+  "lint-staged": {
+    "**/*.{ts,tsx}": "prettier --write"
   }
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/server/prisma/.generator.prisma

@@ -25,6 +25,7 @@ generator nestjs {
 
 generator react {
   provider = "prisma-react-generator"
+  pagesDir = "../../web/src/pages"
 }
 
 generator dbml {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
-    "@gadmin2n/react-common": "^0.0.50",
+    "@gadmin2n/react-common": "^0.0.51",
     "@refinedev/antd": "5.22.0",
     "@refinedev/cli": "2.5.5",
     "@refinedev/core": "4.20.0",
@@ -48,6 +48,9 @@
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "craco-less": "^2.0.0",
+    "husky": "^8.0.0",
+    "lint-staged": "^13.0.0",
+    "prettier": "^3.0.0",
     "process": "^0.11.10",
     "react-scripts": "^5.0.0",
     "typescript": "^5.0.0",
@@ -56,9 +59,11 @@
   "scripts": {
     "dev": "refine start",
     "build": "refine build",
+    "format": "prettier --write \"src/**/*.{ts,tsx}\"",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "refine": "refine"
+    "refine": "refine",
+    "prepare": "cd .. && husky install"
   },
   "eslintConfig": {
     "extends": [
@@ -66,6 +71,9 @@
       "react-app/jest"
     ]
   },
+  "lint-staged": {
+    "**/*.{ts,tsx,js,jsx}": "prettier --write"
+  },
   "browserslist": {
     "production": [
       ">0.2%",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [

package/dist/lib/application/files/gadmin2-game-angle-demo/build.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-yarn global add @gadmin2n/cli@latest
-
-cd server && yarn && cd ../web && yarn && cd ..
-
-gadmin2 g prisma
-
-cd web && yarn build && yarn cache clean --all && cd ..
-
-# 同时删除devDependencies
-cd server && yarn build && NODE_ENV=production yarn && yarn cache clean --all && cd ..
-
-cp -R web/build server/dist/www
-
-yarn global remove @gadmin2n/cli
-
-rm -rf web/