vona-cli-set-api 1.0.52 → 1.0.55

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

@@ -27,6 +27,7 @@ LOGGER_CLIENT_DEFAULT =
 
 # build
 
+BUILD_OUTDIR =
 BUILD_SOURCEMAP = false
 BUILD_MINIFY = true
 BUILD_INLINEDYNAMICIMPORTS = true

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

@@ -32,8 +32,10 @@
     "cov": "npm run prerun && npm run vona :bin:test -- --coverage --flavor=normal",
     "tsc": "npm run prerun && npm run vona :bin:tsc",
     "build": "npm run prerun && npm run vona :bin:build -- --flavor=normal",
-    "start": "node ./dist/bootstrap.js",
-    "start:one": "cross-env SERVER_WORKERS=1 node ./dist/bootstrap.js",
+    "build:docker": "npm run prerun && npm run vona :bin:build -- --flavor=docker",
+    "start": "node ./dist/normal/bootstrap.js",
+    "start:one": "cross-env SERVER_WORKERS=1 node ./dist/normal/bootstrap.js",
+    "start:docker": "cross-env SERVER_WORKERS=1 node ./dist/docker/bootstrap.js",
     "prerun": "npm run vona :tools:deps",
     "lint": "eslint",
     "lint:fix": "eslint --fix"
@@ -44,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.30"
+    "vona": "^5.0.31"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/dist/lib/bean/cli.bin.build.d.ts

@@ -10,6 +10,6 @@ declare module '@cabloy/cli' {
 export declare class CliBinBuild extends BeanCliBase {
     execute(): Promise<void>;
     _build(projectPath: string): Promise<void>;
-    _assets(projectPath: string, modulesMeta: Awaited<ReturnType<typeof glob>>): Promise<void>;
-    _rollup(projectPath: string, env: NodeJS.ProcessEnv): Promise<void>;
+    _assets(_projectPath: string, modulesMeta: Awaited<ReturnType<typeof glob>>, outDir: string): Promise<void>;
+    _rollup(projectPath: string, env: NodeJS.ProcessEnv, outDir: string): Promise<void>;
 }

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

@@ -10,7 +10,7 @@ import terserImport from '@rollup/plugin-terser';
 import fse from 'fs-extra';
 import { rimraf } from 'rimraf';
 import { rollup } from 'rollup';
-import { generateConfigDefine } from "../utils.js";
+import { generateConfigDefine, getOutDir, getOutReleasesDir } from "../utils.js";
 import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
 const commonjs = commonjsImport;
 const resolve = resolveImport;
@@ -39,13 +39,18 @@ export class CliBinBuild extends BeanCliBase {
             workers: argv.workers,
         };
         const { env, modulesMeta } = await generateVonaMeta(configMeta, configOptions);
-        await rimraf(path.join(projectPath, 'dist'));
-        await this._rollup(projectPath, env);
-        await this._assets(projectPath, modulesMeta);
+        const outDir = path.join(projectPath, getOutDir());
+        await rimraf(outDir);
+        await this._rollup(projectPath, env, outDir);
+        await this._assets(projectPath, modulesMeta, outDir);
         await rimraf(path.join(projectPath, '.vona'));
+        // copy
+        const outReleasesDir = path.join(projectPath, getOutReleasesDir());
+        await rimraf(outReleasesDir);
+        fse.copySync(outDir, outReleasesDir);
     }
-    async _assets(projectPath, modulesMeta) {
-        const assetsPath = path.join(projectPath, 'dist/assets');
+    async _assets(_projectPath, modulesMeta, outDir) {
+        const assetsPath = path.join(outDir, 'assets');
         for (const relativeName in modulesMeta.modules) {
             const module = modulesMeta.modules[relativeName];
             if (!module.package.files)
@@ -61,7 +66,7 @@ export class CliBinBuild extends BeanCliBase {
             }
         }
     }
-    async _rollup(projectPath, env) {
+    async _rollup(projectPath, env, outDir) {
         const aliasEntries = [];
         for (const name of ['better-sqlite3', 'mysql', 'oracledb', 'pg-native', 'pg-query-stream', 'sqlite3', 'tedious', 'cloudflare:sockets']) {
             aliasEntries.push({ find: name, replacement: 'vona-shared' });
@@ -117,7 +122,7 @@ export class CliBinBuild extends BeanCliBase {
             },
         };
         const outputOption = {
-            dir: path.join(projectPath, 'dist'),
+            dir: outDir,
             // file: path.join(projectPath, 'dist/index.js'),
             format: 'esm',
             sourcemap: process.env.BUILD_SOURCEMAP === 'true',

package/dist/lib/utils.d.ts

@@ -13,3 +13,5 @@ export declare function copyTemplateFile(fileSrc: URL | string, fileDest: string
 export declare function loadJSONFile(fileName: string): Promise<any>;
 export declare function saveJSONFile(fileName: string, json: object): Promise<void>;
 export declare function pathToHref(fileName: string): string;
+export declare function getOutDir(): string;
+export declare function getOutReleasesDir(): string;

package/dist/lib/utils.js

@@ -61,3 +61,9 @@ export async function saveJSONFile(fileName, json) {
 export function pathToHref(fileName) {
     return pathToFileURL(fileName).href;
 }
+export function getOutDir() {
+    return process.env.BUILD_OUTDIR || `dist/${process.env.META_FLAVOR}`;
+}
+export function getOutReleasesDir() {
+    return `dist-releases/${process.env.META_FLAVOR}-${process.env.APP_VERSION}`;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.52",
+  "version": "1.0.55",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-class-properties": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@cabloy/cli": "^3.0.28",
+    "@cabloy/cli": "^3.0.29",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
     "@cabloy/module-glob": "^5.2.12",