@lark-apaas/coding-template-nestjs-react-fullstack 0.1.60-beta.0 → 0.1.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/coding-template-nestjs-react-fullstack",
-  "version": "0.1.60-beta.0",
+  "version": "0.1.60",
   "description": "NestJS + React fullstack template for miaoda coding",
   "type": "module",
   "files": [

package/template/package-lock.json

@@ -8,7 +8,7 @@
       "name": "fullstack-nestjs-template",
       "version": "2.3.0",
       "dependencies": {
-        "@lark-apaas/fullstack-nestjs-core": "^1.1.74",
+        "@lark-apaas/fullstack-nestjs-core": "^1.1.75",
         "@nestjs/axios": "^4.0.1",
         "@nestjs/cache-manager": "^3.1.3",
         "@nestjs/common": "^10.4.20",
@@ -25,7 +25,7 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.15",
         "dotenv": "^17.2.2",
-        "drizzle-orm": "0.45.2",
+        "drizzle-orm": "0.44.6",
         "hbs": "^4.2.0",
         "reflect-metadata": "^0.1.14",
         "tslib": "^2.8.1"
@@ -33,7 +33,7 @@
       "devDependencies": {
         "@hookform/resolvers": "^5.2.2",
         "@lark-apaas/client-toolkit": "^1.2.82",
-        "@lark-apaas/coding-preset-vite-react": "^1.0.29",
+        "@lark-apaas/coding-preset-vite-react": "^1.0.30",
         "@lark-apaas/fullstack-presets": "^1.1.25",
         "@nestjs/cli": "^10.4.9",
         "@radix-ui/react-accordion": "^1.2.12",
@@ -1634,9 +1634,9 @@
       "license": "MIT"
     },
     "node_modules/@lark-apaas/coding-preset-vite-react": {
-      "version": "1.0.29",
-      "resolved": "https://registry.npmmirror.com/@lark-apaas/coding-preset-vite-react/-/coding-preset-vite-react-1.0.29.tgz",
-      "integrity": "sha512-cIoxwcl85cEbQ3Wm3QGzEVdugf8IAk/cl5xRNMiPR4V7Z40hs6XVdkNyNeao/LNUT4ODk4VXIlgqo7S1iMHEGg==",
+      "version": "1.0.30",
+      "resolved": "https://registry.npmmirror.com/@lark-apaas/coding-preset-vite-react/-/coding-preset-vite-react-1.0.30.tgz",
+      "integrity": "sha512-tuAv426t06m/Mcp4dLJzJ0WxmocGJwA7UEksM9uCCMj2Yyv42A3PFln6Z/WYi4H12V1iRwFvg93uHwJuAaaurw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1705,9 +1705,9 @@
       }
     },
     "node_modules/@lark-apaas/fullstack-nestjs-core": {
-      "version": "1.1.74",
-      "resolved": "https://registry.npmmirror.com/@lark-apaas/fullstack-nestjs-core/-/fullstack-nestjs-core-1.1.74.tgz",
-      "integrity": "sha512-hjzep5F06Z0OflnazANLhAQHeThp/NVSVumXQWGyGDoGVK1cxadELgXAsBS+1Dv4r0LRLy2YugL+yccG4Bewug==",
+      "version": "1.1.75",
+      "resolved": "https://registry.npmmirror.com/@lark-apaas/fullstack-nestjs-core/-/fullstack-nestjs-core-1.1.75.tgz",
+      "integrity": "sha512-8L3BxYUACH/TkZpC91tgtj1nyYXrMtabteALMQ2ocusMrLQ/TIveDwPpUtAkGuVm/z/qOlxiBoFBAFSwmgDfMw==",
       "license": "MIT",
       "dependencies": {
         "@lark-apaas/cache-service": "^0.1.6",
@@ -1717,7 +1717,7 @@
         "@lark-apaas/nestjs-authzpaas": "^0.1.16",
         "@lark-apaas/nestjs-capability": "^0.1.14",
         "@lark-apaas/nestjs-common": "^0.1.9",
-        "@lark-apaas/nestjs-datapaas": "^1.0.26",
+        "@lark-apaas/nestjs-datapaas": "^1.0.27",
         "@lark-apaas/nestjs-http-forwarder": "^0.1.4",
         "@lark-apaas/nestjs-logger": "^1.0.22",
         "@lark-apaas/nestjs-mcp": "^0.1.2",
@@ -1738,31 +1738,10 @@
         "@nestjs/swagger": "^7.4.2",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.2",
-        "drizzle-orm": "0.44.6",
+        "drizzle-orm": ">=0.44.6",
         "zod": "^3.25.0 || ^4.0.0"
       }
     },
-    "node_modules/@lark-apaas/fullstack-nestjs-core/node_modules/@lark-apaas/nestjs-datapaas": {
-      "version": "1.0.26",
-      "resolved": "https://registry.npmmirror.com/@lark-apaas/nestjs-datapaas/-/nestjs-datapaas-1.0.26.tgz",
-      "integrity": "sha512-bFYjzfXjgQuEQCd508S+bPtixspFW5s499V2XyfPhLGq4ZGUEqNeck3V3jM8298z+/3YilFvLBcpr/+IogTDQw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/pg": "^8.10.9",
-        "postgres": "^3.4.3",
-        "reflect-metadata": "^0.1.13"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "@lark-apaas/nestjs-common": "^0.1.9",
-        "@lark-apaas/nestjs-observable": "^0.0.16",
-        "@nestjs/common": "^10.0.0",
-        "@nestjs/core": "^10.0.0",
-        "drizzle-orm": "0.44.6"
-      }
-    },
     "node_modules/@lark-apaas/fullstack-presets": {
       "version": "1.1.25",
       "resolved": "https://registry.npmmirror.com/@lark-apaas/fullstack-presets/-/fullstack-presets-1.1.25.tgz",
@@ -1915,6 +1894,27 @@
         "@nestjs/common": "^10.4.20"
       }
     },
+    "node_modules/@lark-apaas/nestjs-datapaas": {
+      "version": "1.0.27",
+      "resolved": "https://registry.npmmirror.com/@lark-apaas/nestjs-datapaas/-/nestjs-datapaas-1.0.27.tgz",
+      "integrity": "sha512-vjCg2QDSDFso3rIgazJe3CtPCxRiWuu0MCvsSMvB88oBS/tSqM/T3qZFXXK3rKcLjjNHfv7xFwdW4l7dwnnv3w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/pg": "^8.10.9",
+        "postgres": "^3.4.3",
+        "reflect-metadata": "^0.1.13"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@lark-apaas/nestjs-common": "^0.1.9",
+        "@lark-apaas/nestjs-observable": "^0.0.16",
+        "@nestjs/common": "^10.0.0",
+        "@nestjs/core": "^10.0.0",
+        "drizzle-orm": ">=0.44.6"
+      }
+    },
     "node_modules/@lark-apaas/nestjs-http-forwarder": {
       "version": "0.1.4",
       "resolved": "https://registry.npmmirror.com/@lark-apaas/nestjs-http-forwarder/-/nestjs-http-forwarder-0.1.4.tgz",
@@ -11438,9 +11438,9 @@
       }
     },
     "node_modules/drizzle-orm": {
-      "version": "0.45.2",
-      "resolved": "https://registry.npmmirror.com/drizzle-orm/-/drizzle-orm-0.45.2.tgz",
-      "integrity": "sha512-kY0BSaTNYWnoDMVoyY8uxmyHjpJW1geOmBMdSSicKo9CIIWkSxMIj2rkeSR51b8KAPB7m+qysjuHme5nKP+E5Q==",
+      "version": "0.44.6",
+      "resolved": "https://registry.npmmirror.com/drizzle-orm/-/drizzle-orm-0.44.6.tgz",
+      "integrity": "sha512-uy6uarrrEOc9K1u5/uhBFJbdF5VJ5xQ/Yzbecw3eAYOunv5FDeYkR2m8iitocdHBOHbvorviKOW5GVw0U1j4LQ==",
       "license": "Apache-2.0",
       "peerDependencies": {
         "@aws-sdk/client-rds-data": ">=3",

package/template/package.json

@@ -28,7 +28,7 @@
     "upgrade": "npx -y @lark-apaas/fullstack-cli sync --disable-gen-openapi"
   },
   "dependencies": {
-    "@lark-apaas/fullstack-nestjs-core": "^1.1.74",
+    "@lark-apaas/fullstack-nestjs-core": "^1.1.75",
     "@nestjs/axios": "^4.0.1",
     "@nestjs/cache-manager": "^3.1.3",
     "@nestjs/common": "^10.4.20",
@@ -45,7 +45,7 @@
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.15",
     "dotenv": "^17.2.2",
-    "drizzle-orm": "0.45.2",
+    "drizzle-orm": "0.44.6",
     "hbs": "^4.2.0",
     "reflect-metadata": "^0.1.14",
     "tslib": "^2.8.1"
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@hookform/resolvers": "^5.2.2",
     "@lark-apaas/client-toolkit": "^1.2.82",
-    "@lark-apaas/coding-preset-vite-react": "^1.0.29",
+    "@lark-apaas/coding-preset-vite-react": "^1.0.30",
     "@lark-apaas/fullstack-presets": "^1.1.25",
     "@nestjs/cli": "^10.4.9",
     "@radix-ui/react-accordion": "^1.2.12",

package/template/scripts/build.sh

@@ -45,49 +45,32 @@ STEP_START=$(node -e "console.log(Date.now())")
 
 # 在 client/server 构建之前生成到 dist/，供 DefinePlugin 注入前端 bundle
 # 注意：nest-cli.json 中 deleteOutDir 必须为 false（模板默认值），否则 nest build 会清掉 dist/
-# 生成器来自 @lark-apaas/devtool-kits（由 preset 间接安装）。只用本地命令：
-# 未安装时直接跳过，不走 npx，避免联网查同名包 404 的等待；preset 读不到文件会注入空路由。
-API_ROUTES_BIN="$ROOT_DIR/node_modules/.bin/generate-api-routes"
-PAGE_ROUTES_BIN="$ROOT_DIR/node_modules/.bin/generate-page-routes"
-API_ROUTES_PID=""
-PAGE_ROUTES_PID=""
-
-if [ -x "$API_ROUTES_BIN" ]; then
-  echo "   ├─ 生成 API 路由定义..."
-  "$API_ROUTES_BIN" --server-dir ./server --out-dir ./dist > /tmp/gen-api-routes.log 2>&1 &
-  API_ROUTES_PID=$!
-else
-  echo "   ⏭️  未安装 generate-api-routes，跳过 API 路由定义生成"
-fi
+echo "   ├─ 生成 API 路由定义..."
+npx generate-api-routes --server-dir ./server --out-dir ./dist > /tmp/gen-api-routes.log 2>&1 &
+API_ROUTES_PID=$!
 
-if [ -x "$PAGE_ROUTES_BIN" ]; then
-  echo "   ├─ 生成页面路由定义..."
-  "$PAGE_ROUTES_BIN" --app-path ./client/src/app.tsx --out-dir ./dist > /tmp/gen-page-routes.log 2>&1 &
-  PAGE_ROUTES_PID=$!
-else
-  echo "   ⏭️  未安装 generate-page-routes，跳过页面路由定义生成"
-fi
+echo "   ├─ 生成页面路由定义..."
+npx generate-page-routes --app-path ./client/src/app.tsx --out-dir ./dist > /tmp/gen-page-routes.log 2>&1 &
+PAGE_ROUTES_PID=$!
 
-if [ -n "$API_ROUTES_PID" ]; then
-  API_ROUTES_EXIT=0
-  wait $API_ROUTES_PID || API_ROUTES_EXIT=$?
-  if [ $API_ROUTES_EXIT -ne 0 ]; then
-    echo "   ⚠️  API 路由生成失败（不影响构建）"
-    cat /tmp/gen-api-routes.log
-  else
-    echo "   ✅ API 路由生成完成"
-  fi
+API_ROUTES_EXIT=0
+PAGE_ROUTES_EXIT=0
+
+wait $API_ROUTES_PID || API_ROUTES_EXIT=$?
+wait $PAGE_ROUTES_PID || PAGE_ROUTES_EXIT=$?
+
+if [ $API_ROUTES_EXIT -ne 0 ]; then
+  echo "   ⚠️  API 路由生成失败（不影响构建）"
+  cat /tmp/gen-api-routes.log
+else
+  echo "   ✅ API 路由生成完成"
 fi
 
-if [ -n "$PAGE_ROUTES_PID" ]; then
-  PAGE_ROUTES_EXIT=0
-  wait $PAGE_ROUTES_PID || PAGE_ROUTES_EXIT=$?
-  if [ $PAGE_ROUTES_EXIT -ne 0 ]; then
-    echo "   ⚠️  页面路由生成失败（不影响构建）"
-    cat /tmp/gen-page-routes.log
-  else
-    echo "   ✅ 页面路由生成完成"
-  fi
+if [ $PAGE_ROUTES_EXIT -ne 0 ]; then
+  echo "   ⚠️  页面路由生成失败（不影响构建）"
+  cat /tmp/gen-page-routes.log
+else
+  echo "   ✅ 页面路由生成完成"
 fi
 print_time $STEP_START
 echo ""

package/template/scripts/prune-smart.js

@@ -1,28 +1,9 @@
 #!/usr/bin/env node
 // This file is auto-generated by @lark-apaas/fullstack-cli
 
+const { nodeFileTrace } = require('@vercel/nft');
 const fs = require('fs');
 const path = require('path');
-const { createRequire } = require('module');
-
-// @vercel/nft 是 fullstack-cli 自身的依赖：应用装了 CLI 时从应用 node_modules 加载；
-// 构建镜像全局预装 CLI、应用未安装时，从 PATH 上 fullstack-cli 的安装目录加载
-function loadNft() {
-  try {
-    return require('@vercel/nft');
-  } catch (err) {
-    if (err.code !== 'MODULE_NOT_FOUND') throw err;
-  }
-  for (const dir of (process.env.PATH || '').split(path.delimiter)) {
-    const cliBin = dir && path.join(dir, 'fullstack-cli');
-    if (cliBin && fs.existsSync(cliBin)) {
-      return createRequire(fs.realpathSync(cliBin))('@vercel/nft');
-    }
-  }
-  throw new Error('未找到 @vercel/nft：应用未安装 fullstack-cli，PATH 上也没有全局 fullstack-cli');
-}
-
-const { nodeFileTrace } = loadNft();
 
 const ROOT_DIR = path.resolve(__dirname, '..');