@lark-apaas/coding-templates 0.1.24 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/coding-templates",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "OpenClaw project templates for mclaw CLI",
   "publishConfig": {
     "access": "public"

package/template-apex/package.json

@@ -12,6 +12,7 @@
     ]
   },
   "scripts": {
+    "postinstall": "pnpm rebuild @lark-apaas/express-datapaas",
     "dev": "tsx --watch --watch-path server --watch-path shared server/index.ts",
     "build": "bash scripts/build.sh",
     "lint": "npm run lint:client && npm run lint:server",
@@ -47,7 +48,8 @@
     "@radix-ui/react-toggle-group": "^1.1.10",
     "@radix-ui/react-tooltip": "^1.1.18",
     "@lark-apaas/client-toolkit-lite": "^0.0.2",
-    "@lark-apaas/express-core": "^0.0.3",
+    "@lark-apaas/express-core": "^0.0.5",
+    "@lark-apaas/express-datapaas": "^0.0.3",
     "@formkit/auto-animate": "^0.9.0",
     "framer-motion": "^12.38.0",
     "class-variance-authority": "^0.7.1",
@@ -87,5 +89,11 @@
     "tsx": "^4",
     "typescript": "~5.9",
     "vite": "^8"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@lark-apaas/express-datapaas",
+      "esbuild"
+    ]
   }
 }

package/template-apex/scripts/build.sh

@@ -32,7 +32,9 @@ echo '{ "version": 1, "type": "apex", "fallback": "index.html" }' > "$OUTPUT/rou
 # 服务端产物（tsc 输出保留 server/、shared/ 子目录）
 cp -r "$ROOT/dist/server/"* "$OUTPUT/"
 
-# package.json 和 node_modules 由 mclaw-dev deploy 的 prune 步骤生成
+# 声明 CJS（服务端 tsc 输出为 commonjs，需要覆盖根 package.json 的 "type": "module"）
+# deploy 时 prune 步骤会用精简版覆盖此文件
+echo '{ "private": true }' > "$OUTPUT/package.json"
 
 # 4. assets/ → dist/output_resource/（JS/CSS/字体，上传到 CDN）
 if [ -d "$ROOT/dist/client/assets" ]; then

package/template-apex/server/index.ts

@@ -8,76 +8,42 @@ import { registerRoutes } from "./routes/index";
 
 const port = Number(process.env.FORCE_SERVER_PORT) || 3000;
 const host = process.env.FORCE_SERVER_HOST || "localhost";
-const isDev = process.env.NODE_ENV !== "production";
+const basePath = process.env.CLIENT_BASE_PATH || "/";
 
 const app = express();
 
-// Platform middleware: body parsing, cookie, user context, DB + RLS, view context
+// Platform middleware
 const { close } = setup(app, {
   database: { schema },
   csrf: { enabled: false },
   viewContext: { enabled: false },
 });
 
-// Register API routes
-registerRoutes(app);
+// All routes under basePath
+const router = express.Router();
+registerRoutes(router);
 
-// HTML rendering: dev uses Vite middleware mode, prod reads build output
-async function setupHtmlRendering() {
-  if (isDev) {
-    // @ts-ignore -- vite types require bundler moduleResolution, dev-only import
-    const { createServer } = await import("vite");
-    const vite = await createServer({
-      server: { middlewareMode: true },
-      appType: "custom",
-    });
+const templatePath = path.resolve(__dirname, "../index.html");
+const template = hbs.compile(fs.readFileSync(templatePath, "utf-8"));
 
-    // Vite handles static assets, module serving, and HMR
-    app.use(vite.middlewares);
-
-    app.get("/{*path}", createViewContextMiddleware(), async (req: Request, res: Response) => {
-      const rawHtml = fs.readFileSync(
-        path.resolve(__dirname, "../client/index.html"),
-        "utf-8",
-      );
-      // Vite transform: inject HMR client, resolve module imports
-      const transformed = await vite.transformIndexHtml(req.originalUrl, rawHtml);
-      // HBS render: inject platform data
-      const template = hbs.compile(transformed);
-      const html = template({
-        ...res.locals,
-        appConfig: safeStringify({
-          appId: res.locals.appId || process.env.MCLAW_APP_ID || "",
-          cdnDomain: process.env.MCLAW_CDN_DOMAIN || "",
-        }),
-      });
-      res.type("html").send(html);
-    });
-  } else {
-    const templatePath = path.resolve(__dirname, "../index.html");
-    const template = hbs.compile(fs.readFileSync(templatePath, "utf-8"));
+router.get("/{*path}", createViewContextMiddleware(), (_req: Request, res: Response) => {
+  const html = template({
+    ...res.locals,
+    appConfig: safeStringify({
+      appId: res.locals.appId || process.env.MCLAW_APP_ID || "",
+      cdnDomain: process.env.MCLAW_CDN_DOMAIN || "",
+    }),
+  });
+  res.type("html").send(html);
+});
 
-    app.get("/{*path}", createViewContextMiddleware(), (_req: Request, res: Response) => {
-      const html = template({
-        ...res.locals,
-        appConfig: safeStringify({
-          appId: res.locals.appId || process.env.MCLAW_APP_ID || "",
-          cdnDomain: process.env.MCLAW_CDN_DOMAIN || "",
-        }),
-      });
-      res.type("html").send(html);
-    });
-  }
-}
+app.use(basePath, router);
 
-setupHtmlRendering().then(() => {
-  const server = app.listen(port, host, () => {
-    console.log(`Server running at http://${host}:${port}`);
-  });
+const server = app.listen(port, host, () => {
+  console.log(`Server running at http://${host}:${port}${basePath}`);
+});
 
-  // Graceful shutdown
-  process.on("SIGTERM", async () => {
-    server.close();
-    await close();
-  });
+process.on("SIGTERM", async () => {
+  server.close();
+  await close();
 });

package/template-apex/server/routes/index.ts

@@ -1,7 +1,7 @@
-import type { Express } from "express";
+import type { Router } from "express";
 // import postsRouter from "./posts";
 
-export function registerRoutes(app: Express) {
+export function registerRoutes(app: Router) {
   // 在此注册 API 路由
   //
   // 使用示例：