@gmcb/cli 0.6.3 → 0.7.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.7.0](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.7.0) (2026-07-06)
+
+
+### Features
+
+* 优化cli ([676ac43](http://10.10.10.16/caoben/front-end/commits/676ac4381ca645ef232936b86e3b77124337a03c))
+
+
+
+
+
+## [0.6.4](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.4) (2026-07-06)
+
+
+### Features
+
+* 优化cli ([676ac43](http://10.10.10.16/caoben/front-end/commits/676ac4381ca645ef232936b86e3b77124337a03c))
+
+
+
+
+
 ## [0.6.3](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.3) (2026-07-06)
 
 

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 aniu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -33,6 +33,7 @@ npm i @gmcb/cli -g
 | `-e, --env` | 构建环境，默认 prod |
 | `--wgt` | 构建移动应用热更新资源 |
 | `--zip` | 构建桌面应用热更新资源 |
+| `--apk` | 构建 Android 应用 |
 
 使用 `--wgt` 构建移动应用热更新资源时，会先通过 vite/uni 正常构建 app，再将构建产物（`dist/build/app` 或 `unpackage/dist/build/app-plus`）打包为 `.wgt` 文件，输出路径默认为 `unpackage/release`。
 
@@ -69,6 +70,7 @@ gmcb build -p app --wgt
 | `--wgt` | 构建移动应用热更新资源 |
 | `--res` | 构建移动应用本地资源 |
 | `--zip` | 构建桌面应用热更新资源 |
+| `--apk` | 构建 Android 应用 |
 | `-a, --auto` | 自动发布，跳过所有确认提示 |
 
 示例：

package/lib/actions/build.js

@@ -186,7 +186,7 @@ async function getCommands(...args) {
         }
     }
     else if (opts.compiler === 'gradlew') {
-        commands = ['gradlew assembleRelease'];
+        commands = [...commands, 'gradlew assembleRelease'];
     }
     else {
         commands = [...commands, bin, 'build'];
@@ -272,7 +272,7 @@ async function fetchRemoteResources(opts) {
     const pkg = (0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH);
     const appId = pkg.appId;
     const result = await (0, apis_1.fetchRemoteVersionInfo)(appId);
-    const { appName, iconUrl } = result;
+    const { appName, iconUrl, versionName, versionNum } = result;
     if (opts.win) {
         // Windows
         const zipUrl = result.resourcePackageUrl;
@@ -288,14 +288,11 @@ async function fetchRemoteResources(opts) {
         const zip = new adm_zip_1.default(tmpZip);
         zip.extractAllTo(rendererDir, true);
         (0, fs_extra_1.removeSync)(tmpZip);
-        // 从目标目录读取 manifest
-        const manifest = (0, fs_extra_1.readJsonSync)((0, path_1.join)(rendererDir, appId, 'manifest.json'));
-        const { versionName, versionCode } = manifest;
         // 替换 package.json
         const pkgPath = (0, path_1.join)(utils_1.COMMAND_PATH, 'package.json');
         let pkgContent = (0, fs_1.readFileSync)(pkgPath, 'utf-8');
         pkgContent = pkgContent.replace(/"version":\s*"[^"]*"/, `"version": "${versionName}"`);
-        pkgContent = pkgContent.replace(/"versionCode":\s*\d+/, `"versionCode": ${versionCode}`);
+        pkgContent = pkgContent.replace(/"versionCode":\s*\d+/, `"versionCode": ${versionNum}`);
         pkgContent = pkgContent.replace(/"productName":\s*"[^"]*"/, `"productName": "${appName}"`);
         (0, fs_1.writeFileSync)(pkgPath, pkgContent);
         // 下载图标
@@ -306,6 +303,9 @@ async function fetchRemoteResources(opts) {
             await (0, utils_1.png2ico)(iconPath, (0, path_1.join)(utils_1.COMMAND_PATH, 'res', 'icon.ico'));
         }
         spinner.succeed(`Windows本地资源已更新`);
+        if (!config_1.CONFIG_DATA.publish)
+            config_1.CONFIG_DATA.publish = {};
+        config_1.CONFIG_DATA.publish['_remoteResourceUrl'] = zipUrl;
     }
     else if (opts.compiler === 'gradlew') {
         // Android
@@ -325,7 +325,7 @@ async function fetchRemoteResources(opts) {
         (0, fs_extra_1.removeSync)(tmpWgt);
         // 从目标目录读取 manifest
         const manifest = (0, fs_extra_1.readJsonSync)((0, path_1.join)(tempDir, 'manifest.json'));
-        const { version, id } = manifest;
+        const { id } = manifest;
         const assetsDir = (0, path_1.join)(appDir, id, 'www');
         // 将解压内容复制到 assetsDir，然后删除临时目录
         (0, fs_extra_1.ensureDirSync)(assetsDir);
@@ -334,8 +334,8 @@ async function fetchRemoteResources(opts) {
         // 替换 build.gradle
         const gradlePath = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'build.gradle');
         let gradleContent = (0, fs_1.readFileSync)(gradlePath, 'utf-8');
-        gradleContent = gradleContent.replace(/versionCode\s+\d+/, `versionCode ${version.code}`);
-        gradleContent = gradleContent.replace(/versionName\s+"[^"]*"/, `versionName "${version.name}"`);
+        gradleContent = gradleContent.replace(/versionName\s+"[^"]*"/, `versionName "${versionName}"`);
+        gradleContent = gradleContent.replace(/versionCode\s+\d+/, `versionCode ${versionNum}`);
         (0, fs_1.writeFileSync)(gradlePath, gradleContent);
         // 替换 strings.xml
         const stringsPath = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'res', 'values', 'strings.xml');
@@ -351,6 +351,9 @@ async function fetchRemoteResources(opts) {
             (0, fs_1.copyFileSync)(iconPath, (0, path_1.join)(drawableDir, 'push.png'));
         }
         spinner.succeed(`Android本地资源已更新`);
+        if (!config_1.CONFIG_DATA.publish)
+            config_1.CONFIG_DATA.publish = {};
+        config_1.CONFIG_DATA.publish['_remoteResourceUrl'] = wgtUrl;
     }
 }
 async function default_1(...args) {
@@ -377,7 +380,7 @@ async function default_1(...args) {
     if ((opts.compiler === 'electron-vite' && (opts.zip || opts.win)) ||
         (opts.compiler === 'uni' && opts.platform === 'h5' && opts.zip) ||
         (opts.compiler === 'uni' && opts.platform?.startsWith('app') && opts.wgt && !opts.pack) ||
-        opts.compiler === 'gradlew' && opts.platform === 'app') {
+        opts.compiler === 'gradlew' && opts.apk) {
         await generatePackage(opts);
     }
     return commands;

package/lib/actions/publish.js

@@ -12,7 +12,7 @@ async function default_1(...args) {
     const opts = args[0];
     const isPublishFlow = !!config_1.CONFIG_DATA.publish;
     const isAuto = opts.auto;
-    const pub = { platform: 0, status: 0, updateType: 0 };
+    const pub = { platform: 0, status: 0, updateType: 0, updateMode: 0 };
     let install = true;
     if (!isAuto) {
         const { start } = await inquirer_1.default.prompt({
@@ -54,15 +54,36 @@ async function default_1(...args) {
                         {
                             type: 'list',
                             name: 'updateType',
-                            message: '请选择应用更新方式',
+                            message: '请选择应用更新类型',
                             choices: [
                                 { name: '强制更新', value: 2 },
                                 { name: '提示升级', value: 1 },
+                                { name: '静默更新', value: 3 },
                             ],
                         },
                     ]);
                     pub.updateType = updateType;
                 }
+                // --wgt/--zip 一律热更新
+                // --win/--apk 一律整包更新
+                // --remote 则提示热更新还是整包更新
+                if (opts.win || opts.apk) {
+                    pub.updateMode = 1;
+                    if (opts.remote) {
+                        const { updateMode } = await inquirer_1.default.prompt([
+                            {
+                                type: 'list',
+                                name: 'updateMode',
+                                message: '请选择更新方式',
+                                choices: [
+                                    { name: '整包更新', value: 1 },
+                                    { name: '热更新', value: 2 },
+                                ],
+                            },
+                        ]);
+                        pub.updateMode = updateMode;
+                    }
+                }
             }
             else {
                 // pub 流程
@@ -93,7 +114,7 @@ async function default_1(...args) {
                         {
                             type: 'list',
                             name: 'status',
-                            message: '请选择应用更新状态',
+                            message: '请选择应用更新类型',
                             choices: [
                                 { name: '强制更新', value: 4 },
                                 { name: '提示升级', value: 3 },
@@ -152,9 +173,6 @@ async function default_1(...args) {
     else {
         cmds = await (0, build_1.default)(...args);
     }
-    if (opts.compiler === 'gradlew' || opts.remote) {
-        return;
-    }
     // 从 cmds 提取 buildEnv
     const buildEnv = cmds[2]?.split('=')[1];
     if (!buildEnv || !['dev', 'sit', 'uat', 'pre', 'prod'].includes(buildEnv)) {
@@ -176,6 +194,9 @@ async function default_1(...args) {
         if (pub.updateType) {
             config_1.CONFIG_DATA.publish.updateType = pub.updateType;
         }
+        if (pub.updateMode) {
+            config_1.CONFIG_DATA.publish.updateMode = pub.updateMode;
+        }
     }
     else {
         if (!config_1.CONFIG_DATA.pub) {
@@ -196,6 +217,11 @@ async function default_1(...args) {
             await require('../scripts/h5-exe').default();
         }
     }
+    else if (opts.compiler === 'gradlew') {
+        if (opts.apk) {
+            await require('../scripts/app-apk').default();
+        }
+    }
     else if (opts.compiler === 'uni') {
         if (opts.platform?.startsWith('mp')) {
             await require('../scripts/mp-weixin').default();

package/lib/apis/index.js

@@ -207,13 +207,24 @@ async function publishVersion(params) {
         const urls = Array.isArray(remoteUrl) ? remoteUrl : [remoteUrl || ''];
         const fullUrl = urls.find((u) => !/\.zip$/i.test(u)) || '';
         const resUrl = urls.find((u) => /\.zip$/i.test(u)) || '';
-        const fallbackFullUrl = existingVersion?.fullPackageUrl || latest?.fullPackageUrl || '';
-        const fallbackResUrl = existingVersion?.resourcePackageUrl || latest?.resourcePackageUrl || '';
-        await postVersion({
-            id: versionId,
-            fullPackageUrl: fullUrl || fallbackFullUrl,
-            resourcePackageUrl: resUrl || fallbackResUrl,
-        });
+        if (config_1.CONFIG_DATA.publish?.updateMode != null) {
+            const isHotUpdate = config_1.CONFIG_DATA.publish.updateMode == 2;
+            const hotResUrl = isHotUpdate ? (config_1.CONFIG_DATA.publish['_remoteResourceUrl'] || '') : '';
+            await postVersion({
+                id: versionId,
+                fullPackageUrl: fullUrl,
+                resourcePackageUrl: hotResUrl,
+            });
+        }
+        else {
+            const fallbackFullUrl = existingVersion?.fullPackageUrl || latest?.fullPackageUrl || '';
+            const fallbackResUrl = existingVersion?.resourcePackageUrl || latest?.resourcePackageUrl || '';
+            await postVersion({
+                id: versionId,
+                fullPackageUrl: fullUrl || fallbackFullUrl,
+                resourcePackageUrl: resUrl || fallbackResUrl,
+            });
+        }
     }
     catch (err) {
         console.error(err);

package/lib/bin.js

@@ -49,6 +49,7 @@ program
     .option(...commands_1.win)
     .option(...commands_1.mac)
     .option(...commands_1.linux)
+    .option(...commands_1.apk)
     .option(...commands_1.remote)
     .action(build_1.default);
 program
@@ -76,6 +77,7 @@ program
     .option(...commands_1.win)
     .option(...commands_1.mac)
     .option(...commands_1.linux)
+    .option(...commands_1.apk)
     .option(...commands_1.auto)
     .option(...commands_1.remote)
     .action(publish_1.default);

package/lib/commands/option.d.ts

@@ -21,6 +21,7 @@ export declare const custom: readonly ["--custom", "是否构建自定义基座"
 export declare const pack: readonly ["--pack", "是否使用hbuilderx构建应用"];
 export declare const wgt: readonly ["--wgt", "是否构建移动应用热更新资源"];
 export declare const res: readonly ["--res", "是否构建移动应用本地资源"];
+export declare const apk: readonly ["--apk", "是否构建Android应用"];
 export declare const auto: readonly ["-a, --auto", "自动发布，跳过所有确认"];
 export declare const remote: readonly ["--remote", "是否从远程拉取资源构建"];
 export declare const hbuilderxCli: readonly ["--cli.hbuilderx <cli-path>", "HbuilderX Cli路径"];
@@ -53,6 +54,7 @@ export interface Options {
     win: boolean;
     mac: boolean;
     linux: boolean;
+    apk?: boolean;
     remote?: boolean;
     'skill.repo'?: string;
     'template.repo'?: string;

package/lib/commands/option.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.templateRepo = exports.skillRepo = exports.cosSecretkey = exports.cosSecretid = exports.alipayCli = exports.weixinCli = exports.hbuilderxCli = exports.remote = exports.auto = exports.res = exports.wgt = exports.pack = exports.custom = exports.zip = exports.linux = exports.mac = exports.win = exports.link = exports.path = exports.name = exports.clean = exports.ignore = exports.dest = exports.source = exports.branch = exports.env = exports.compiler = exports.project = exports.platform = exports.template = exports.version = void 0;
+exports.templateRepo = exports.skillRepo = exports.cosSecretkey = exports.cosSecretid = exports.alipayCli = exports.weixinCli = exports.hbuilderxCli = exports.remote = exports.auto = exports.apk = exports.res = exports.wgt = exports.pack = exports.custom = exports.zip = exports.linux = exports.mac = exports.win = exports.link = exports.path = exports.name = exports.clean = exports.ignore = exports.dest = exports.source = exports.branch = exports.env = exports.compiler = exports.project = exports.platform = exports.template = exports.version = void 0;
 exports.version = ['-v, --version', '输出版本号'];
 exports.template = ['-t, --template <template-name>', '模版仓库名称'];
 exports.platform = ['-p, --platform <platform-name>', '编译平台，默认h5', 'h5'];
@@ -23,6 +23,7 @@ exports.custom = ['--custom', '是否构建自定义基座'];
 exports.pack = ['--pack', '是否使用hbuilderx构建应用'];
 exports.wgt = ['--wgt', '是否构建移动应用热更新资源'];
 exports.res = ['--res', '是否构建移动应用本地资源'];
+exports.apk = ['--apk', '是否构建Android应用'];
 exports.auto = ['-a, --auto', '自动发布，跳过所有确认'];
 exports.remote = ['--remote', '是否从远程拉取资源构建'];
 exports.hbuilderxCli = ['--cli.hbuilderx <cli-path>', 'HbuilderX Cli路径'];

package/lib/scripts/app-apk.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const utils_1 = require("../utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const const_1 = require("../utils/const");
 const publish_1 = require("./publish");
 async function default_1() {
-    const manifest = (0, utils_1.readManifest)();
+    const gradleContent = (0, fs_1.readFileSync)((0, path_1.join)(const_1.COMMAND_PATH, 'app', 'build.gradle'), 'utf-8');
+    const versionName = gradleContent.match(/versionName\s+"([^"]*)"/)?.[1];
+    const versionCode = gradleContent.match(/versionCode\s+(\d+)/)?.[1];
     await (0, publish_1.publish)({
         ext: 'apk',
         name: 'app-release',
         path: 'app/build/outputs/apk/release',
-        versionName: manifest['versionName'],
-        versionCode: manifest['versionCode'],
+        versionName,
+        versionCode: versionCode ? Number(versionCode) : undefined,
     });
 }

package/lib/utils/config.d.ts

@@ -66,6 +66,7 @@ interface PublishConfig {
     brandId?: string;
     channel?: number;
     updateType?: number;
+    updateMode?: number;
     versionDesc?: string;
     publishType?: number;
     platform?: number;

package/lib/utils/const.d.ts

@@ -14,7 +14,7 @@ export declare const DIST_PATH: string;
 export declare const MAINFEST_PATH: string;
 export { HOME_PATH };
 export declare const PLATFORM_OPTIONS: readonly ["h5", "mp-alipay", "mp-baidu", "mp-jd", "mp-kuaishou", "mp-qq", "mp-toutiao", "mp-weixin", "app", "app-ios", "app-android", "app-harmony", "windows", "macos", "linux"];
-export declare const COMPILER_OPTIONS: readonly ["vite", "uni", "electron-vite", "gradlew"];
+export declare const COMPILER_OPTIONS: string[];
 export declare const DEFAULT_SKILL_REPO = "http://10.10.10.16/caoben/project-template.git";
 export declare const DEFAULT_TEMPLATE_REPO = "http://10.10.10.16/caoben/project-template.git";
 export declare const BASE_URL: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gmcb/cli",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "工茂草本前端命令行工具",
   "author": "yinjiazeng@163.com",
   "license": "MIT",
@@ -58,5 +58,6 @@
     "@types/inquirer": "^9.0.7",
     "@types/rimraf": "^4.0.5",
     "@types/user-home": "^2.0.2"
-  }
+  },
+  "gitHead": "7aa3012c0c76701618d1e54ea9efcdcb3c3ed438"
 }

package/schema.json

@@ -77,10 +77,14 @@
         "channel": {
           "type": "number",
           "description": "渠道类型"
+        },
+        "updateMode": {
+          "type": "number",
+          "description": "更新方式"
         },
         "updateType": {
           "type": "number",
-          "description": "更新方式"
+          "description": "更新类型"
         },
         "versionDesc": {
           "type": "string",