vona-cli-set-api 1.0.58 → 1.0.61

package/cli/templates/create/project/basic/boilerplate/docker-compose/config/nginx/conf.d/nginx.conf

@@ -0,0 +1,28 @@
+server {
+
+  resolver 127.0.0.11 ipv6=off;
+
+  listen 80;
+  server_name localhost;
+
+  set $node_ip app;
+  set $node_port 7102;
+
+  location / {
+    proxy_http_version 1.1;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $server_name;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-NginX-Proxy true;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_pass http://$node_ip:$node_port$request_uri;
+    proxy_redirect off;
+    proxy_buffer_size 64k;
+    proxy_buffers   4 32k;
+    proxy_busy_buffers_size 64k;
+  }
+
+}

package/cli/templates/create/project/basic/boilerplate/docker-compose-dockerfile-app

@@ -0,0 +1,12 @@
+FROM node:24
+
+RUN mkdir -p /opt/node/app/dist
+WORKDIR /opt/node/app
+
+COPY ./scripts /opt/node/app/scripts
+
+RUN chmod +x /opt/node/app/scripts/*.sh
+
+# start
+
+CMD node ./dist/docker/bootstrap.js

package/cli/templates/create/project/basic/boilerplate/docker-compose.yml

@@ -0,0 +1,80 @@
+version: '3.7'
+
+services:
+  app:
+    depends_on:
+      - pg
+      - mysql
+      - redis
+    build:
+      context: .
+      dockerfile: docker-compose-dockerfile-app
+    restart: always
+    ports:
+      - '7202:7102'
+    volumes:
+      - ./docker-compose/output/dist/docker:/opt/node/app/dist/docker
+      - ./docker-compose/output/app/vona:/root/vona
+      - ./docker-compose/logs/app:/root/logs
+    command: [./scripts/wait-for-it.sh, 'pg:5432', 'mysql:3306', 'redis:6379', -s, --, ./scripts/app-init.sh]
+
+  nginx:
+    image: nginx:latest
+    depends_on:
+      - app
+    restart: always
+    ports:
+      - '80:80'
+    volumes:
+      - ./docker-compose/output/app/vona:/usr/share/nginx/app/vona
+      - ./docker-compose/logs/nginx:/var/log/nginx
+      - ./docker-compose/config/nginx/conf.d:/etc/nginx/conf.d
+
+  pg:
+    image: postgres:17
+    restart: always
+    ports:
+      - '35432:5432'
+    # set shared memory limit when using docker compose
+    shm_size: 128mb
+    # or set shared memory limit when deploy via swarm stack
+    volumes:
+      - ./docker-compose/data/pg:/var/lib/postgresql/data 
+    environment:
+      POSTGRES_DB: <%=argv.name%>
+      POSTGRES_USER: <%=argv.DATABASE_CLIENT_PG_USER%>
+      POSTGRES_PASSWORD: '<%=argv.DATABASE_CLIENT_PG_PASSWORD%>'
+ 
+  mysql:
+    image: mysql:8.1
+    command:
+      - --default-authentication-plugin=mysql_native_password
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_general_ci
+      - --skip-host-cache
+      - --skip-name-resolve
+      - --slow_query_log=1
+      - --long_query_time=0.5
+      - --log-queries-not-using-indexes=1
+      - --lower_case_table_names=1
+    restart: always
+    ports:
+      - '33306:3306'
+    volumes:
+      - ./docker-compose/data/mysql:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: '<%=argv.DATABASE_CLIENT_MYSQL_PASSWORD_ROOT%>'
+      MYSQL_DATABASE: <%=argv.name%>
+      MYSQL_USER: <%=argv.DATABASE_CLIENT_MYSQL_USER%>
+      MYSQL_PASSWORD: '<%=argv.DATABASE_CLIENT_MYSQL_PASSWORD%>'
+    security_opt:
+      - seccomp:unconfined
+
+  redis:
+    image: redis:latest
+    command: [redis-server, --appendonly, yes]
+    restart: always
+    ports:
+      - '36379:6379'
+    volumes:
+      - ./docker-compose/data/redis:/data

package/cli/templates/create/project/basic/boilerplate/env/.env

@@ -32,6 +32,8 @@ BUILD_SOURCEMAP = false
 BUILD_MINIFY = true
 BUILD_INLINEDYNAMICIMPORTS = true
 BUILD_LOG_CIRCULAR_DEPENDENCY = false
+BUILD_COPY_DIST = 
+BUILD_COPY_RELEASE =
 
 # test
 

package/cli/templates/create/project/basic/boilerplate/env/.env.docker.prod

@@ -1,6 +1,11 @@
 # server
 
 SERVER_KEYS = <%=argv.SERVER_KEYS_PROD%>
+SERVER_WORKERS = 1
+
+# build
+
+BUILD_COPY_DIST = ./docker-compose/output/dist
 
 # database
 

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.33"
+    "vona": "^5.0.34"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/scripts/app-init.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
-cp /opt/node/app/dist/* -r /root/output/app/dist
-npm run start:backend
+# cp /opt/node/app/dist/* -r /root/output/app/dist
+# npm run start:backend
+node ./dist/docker/bootstrap.js

package/cli/templates/tools/crud/snippets/3-en-us.ts

@@ -3,6 +3,8 @@ import { metadataCustomSnippet } from '@cabloy/cli';
 import { catchError } from '@cabloy/utils';
 import { locale_transform } from '../utils.ts';
 
+const __resources = { Name: 'Name', Description: 'Description' };
+
 declare module '@cabloy/cli' {
   interface ICommandArgv {
     module: string;
@@ -22,6 +24,6 @@ export default metadataCustomSnippet({
     return fs.readFileSync(targetFile).toString('utf8');
   },
   async transform({ ast, argv }) {
-    return locale_transform({ ast, argv });
+    return locale_transform({ ast, argv, resources: __resources });
   },
 });

package/cli/templates/tools/crud/snippets/4-zh-cn.ts

@@ -1,10 +1,12 @@
 import { metadataCustomSnippet } from '@cabloy/cli';
 import { locale_transform } from '../utils.ts';
 
+const __resources = { Name: '名称', Description: '描述' };
+
 export default metadataCustomSnippet({
   file: 'src/config/locale/zh-cn.ts',
   language: 'gogo',
   async transform({ ast, argv }) {
-    return locale_transform({ ast, argv });
+    return locale_transform({ ast, argv, resources: __resources });
   },
 });

package/cli/templates/tools/crud/utils.ts

@@ -1,14 +1,13 @@
-const __names = ['Name', 'Description'];
-
-export async function locale_transform({ ast, argv }) {
-  const names = __names.concat(argv.resourceNameCapitalize);
+export async function locale_transform({ ast, argv, resources }) {
+  const names = Object.keys(resources).concat(argv.resourceNameCapitalize);
   const nodes = ast.find('export default {$$$0}');
   for (const name of names) {
     const node = nodes.match.$$$0.find(node => {
       return (node as any).key.name === name;
     });
     if (!node) {
-      const code = `${name}: '${name}',`;
+      const value = resources[name] ?? argv.resourceNameCapitalize;
+      const code = `${name}: '${value}',`;
       ast.replace(
         'export default {$$$0}',
         `export default { $$$0, \n ${code}}`,

package/dist/lib/bean/cli.bin.build.js

@@ -48,6 +48,23 @@ export class CliBinBuild extends BeanCliBase {
         const outReleasesDir = path.join(projectPath, getOutReleasesDir());
         await rimraf(outReleasesDir);
         fse.copySync(outDir, outReleasesDir);
+        // copy
+        if (process.env.BUILD_COPY_DIST) {
+            const envDist = path.isAbsolute(process.env.BUILD_COPY_DIST)
+                ? process.env.BUILD_COPY_DIST
+                : path.join(projectPath, process.env.BUILD_COPY_DIST);
+            const outDirCopy = path.join(envDist, path.basename(outDir));
+            fse.removeSync(outDirCopy);
+            fse.copySync(outDir, outDirCopy);
+        }
+        if (process.env.BUILD_COPY_RELEASE) {
+            const envRelease = path.isAbsolute(process.env.BUILD_COPY_RELEASE)
+                ? process.env.BUILD_COPY_RELEASE
+                : path.join(projectPath, process.env.BUILD_COPY_RELEASE);
+            const outReleasesDirCopy = path.join(envRelease, path.basename(outReleasesDir));
+            fse.removeSync(outReleasesDirCopy);
+            fse.copySync(outDir, outReleasesDirCopy);
+        }
     }
     async _assets(_projectPath, modulesMeta, outDir) {
         const assetsPath = path.join(outDir, 'assets');

package/dist/lib/bean/cli.create.project.js

@@ -34,7 +34,7 @@ export class CliCreateProject extends BeanCliBase {
         argv.DATABASE_CLIENT_MYSQL_USER = 'web_user';
         argv.DATABASE_CLIENT_MYSQL_PASSWORD = randomize('*', 16, { exclude: '\\\'"$' });
         argv.DATABASE_CLIENT_MYSQL_PASSWORD_ROOT = randomize('*', 16, { exclude: '\\\'"$' });
-        argv.DATABASE_CLIENT_PG_USER = 'web_user';
+        argv.DATABASE_CLIENT_PG_USER = 'postgres';
         argv.DATABASE_CLIENT_PG_PASSWORD = randomize('*', 16, { exclude: '\\\'"$' });
         argv.DATABASE_CLIENT_PG_PASSWORD_ROOT = randomize('*', 16, { exclude: '\\\'"$' });
         // template
@@ -46,6 +46,8 @@ export class CliCreateProject extends BeanCliBase {
             snippetsPath: null,
             boilerplatePath: `create/project/${template}/boilerplate`,
         });
+        // create docker-compose/data/pg
+        fse.ensureDirSync(path.join(targetDir, 'docker-compose/data/pg'));
         // copy package.json
         fse.copyFileSync(path.join(targetDir, 'package.original.json'), path.join(targetDir, 'package.json'));
         // npm run init

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.58",
+  "version": "1.0.61",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"