@gmcb/cli 0.5.5 → 0.6.2

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.6.2](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.2) (2026-07-05)
+
+
+### Features
+
+* 优化cli ([676ac43](http://10.10.10.16/caoben/front-end/commits/676ac4381ca645ef232936b86e3b77124337a03c))
+
+
+
+
+
+# [0.6.0](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.0) (2026-07-05)
+
+
+### Features
+
+* 优化cli ([676ac43](http://10.10.10.16/caoben/front-end/commits/676ac4381ca645ef232936b86e3b77124337a03c))
+
+
+
+
+
 ## [0.5.5](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.4...@gmcb/cli@0.5.5) (2026-06-30)
 
 **Note:** Version bump only for package @gmcb/cli

package/README.md

@@ -21,6 +21,41 @@ npm i @gmcb/cli -g
 | `gmcb skill sync` | 同步技能到本地项目 |
 | `gmcb skill list` | 列出当前项目所有技能 |
 
+## `gmcb build`
+
+应用程序构建。支持以下选项：
+
+| 选项 | 描述 |
+|---|---|
+| `-p, --platform` | 编译平台，默认 h5 |
+| `-c, --compiler` | 构建工具，默认 uni |
+| `-b, --branch` | Git 分支名称 |
+| `-e, --env` | 构建环境，默认 prod |
+| `--wgt` | 构建移动应用热更新资源 |
+| `--zip` | 构建桌面应用热更新资源 |
+
+使用 `--wgt` 构建移动应用热更新资源时，会先通过 vite/uni 正常构建 app，再将构建产物（`dist/build/app` 或 `unpackage/dist/build/app-plus`）打包为 `.wgt` 文件，输出路径默认为 `unpackage/release`。
+
+`uni.build.json` 中可通过 `app.wgt` 配置导出文件名和路径：
+
+```json
+{
+  "app": {
+    "wgt": {
+      "name": "app.wgt",
+      "path": "unpackage/release"
+    }
+  }
+}
+```
+
+示例：
+
+```bash
+# 构建 app 并打包 wgt
+gmcb build -p app --wgt
+```
+
 ## `gmcb publish`
 
 应用程序发布。支持以下选项：

package/lib/actions/build.js

@@ -30,6 +30,8 @@ exports.getCommands = getCommands;
 exports.default = default_1;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const https_1 = __importDefault(require("https"));
+const http_1 = __importDefault(require("http"));
 const fs_extra_1 = require("fs-extra");
 const simple_git_1 = __importDefault(require("simple-git"));
 const strip_json_comments_1 = __importDefault(require("strip-json-comments"));
@@ -38,16 +40,13 @@ const ora_1 = __importDefault(require("ora"));
 const delay_1 = __importDefault(require("delay"));
 const platform = __importStar(require("../commands/platform"));
 const utils_1 = require("../utils");
-const config_1 = require("./config");
-let config = null;
+const config_1 = require("../utils/config");
+const apis_1 = require("../apis");
 let envPath = utils_1.BUILD_ENV_PATH;
 async function getCommands(...args) {
-    if (!config) {
-        config = (0, config_1.getMergeConfig)();
-    }
     const opts = args[0];
-    if (config.branch && config.branch !== 'false') {
-        opts.branch = config.branch;
+    if (config_1.CONFIG_DATA.branch && config_1.CONFIG_DATA.branch !== 'false') {
+        opts.branch = config_1.CONFIG_DATA.branch;
     }
     if (opts.branch) {
         try {
@@ -70,6 +69,7 @@ async function getCommands(...args) {
     const buildEnv = ['master', 'main'].includes(opts.branch) ? 'prod' : opts.branch || opts.env;
     if (buildEnv) {
         commands.push(`BUILD_ENV=${buildEnv}`);
+        process.env.BUILD_ENV = buildEnv;
     }
     const currentName = (0, path_1.basename)(utils_1.COMMAND_PATH);
     const projectName = opts.project || currentName;
@@ -81,7 +81,7 @@ async function getCommands(...args) {
             commands = [...commands, bin, 'build -p', opts.platform];
         }
         else {
-            if (!(0, fs_1.existsSync)(config?.cli?.hbuilderx)) {
+            if (!(0, fs_1.existsSync)(config_1.CONFIG_DATA?.cli?.hbuilderx)) {
                 utils_1.log.error('HbuilderX Cli路径不正确，请执行“gmcb config --cli.hbuilderx <cli-path>”设置正确的路径！');
             }
             if (projectName !== currentName) {
@@ -107,18 +107,26 @@ async function getCommands(...args) {
             if (opts.platform.startsWith('app')) {
                 const app = platform.app(opts);
                 if (opts.wgt) {
-                    let index = app.wgt.indexOf('--path');
-                    if (index === -1) {
-                        index = app.wgt.length;
-                        app.wgt = [...app.wgt, '--path', (0, path_1.resolve)('unpackage/release')];
+                    if (opts.pack) {
+                        // HBuilderX CLI publish 流程
+                        let index = app.wgt.indexOf('--path');
+                        if (index === -1) {
+                            index = app.wgt.length;
+                            app.wgt = [...app.wgt, '--path', (0, path_1.resolve)('unpackage/release')];
+                        }
+                        const wgtDist = app.wgt[index + 1];
+                        (0, fs_extra_1.ensureDirSync)(wgtDist);
+                        const manifest = JSON.parse((0, strip_json_comments_1.default)((0, fs_1.readFileSync)(utils_1.MAINFEST_PATH).toString()));
+                        if (manifest.appid) {
+                            (0, fs_extra_1.removeSync)((0, path_1.join)(wgtDist, `${manifest.appid}.wgt`));
+                        }
+                        cmds = ['publish', '--platform APP', '--type wgt', ...app.wgt];
                     }
-                    const wgtDist = app.wgt[index + 1];
-                    (0, fs_extra_1.ensureDirSync)(wgtDist);
-                    const manifest = JSON.parse((0, strip_json_comments_1.default)((0, fs_1.readFileSync)(utils_1.MAINFEST_PATH).toString()));
-                    if (manifest.appid) {
-                        (0, fs_extra_1.removeSync)((0, path_1.join)(wgtDist, `${manifest.appid}.wgt`));
+                    else {
+                        // 普通构建，后续由 generatePackage 打包 wgt
+                        commands = [...commands, bin, 'build -p', opts.platform];
+                        cmds = null;
                     }
-                    cmds = ['publish', '--platform APP', '--type wgt', ...app.wgt];
                 }
                 else if (opts.res) {
                     cmds = ['publish', '--platform APP', '--type appResource'];
@@ -151,15 +159,18 @@ async function getCommands(...args) {
                 const h5 = platform.h5();
                 cmds = ['publish', '--platform h5', ...h5];
             }
-            commands = [...commands, config?.cli?.hbuilderx, ...cmds, '--project', projectName];
+            if (cmds) {
+                commands = [...commands, config_1.CONFIG_DATA?.cli?.hbuilderx, ...cmds, '--project', projectName];
+            }
         }
     }
     else if (opts.compiler === 'electron-vite') {
+        const pkg = (0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH);
         commands = [
             ...commands,
             bin,
             'build',
-            `&& cross-env CHANNEL=${String(buildEnv).startsWith('pro') ? '' : `-${buildEnv}`}`,
+            `&& cross-env CHANNEL=${String(buildEnv).startsWith('pro') ? '' : `-${buildEnv}`} VERSION_CODE=${pkg.versionCode || ''} VERSION_NAME=${pkg.version || ''}`,
         ];
         if (opts.zip) {
             commands.push('electron-builder --dir');
@@ -174,6 +185,9 @@ async function getCommands(...args) {
             commands.push('electron-builder --linux');
         }
     }
+    else if (opts.compiler === 'gradlew') {
+        commands = ['gradlew assembleRelease'];
+    }
     else {
         commands = [...commands, bin, 'build'];
     }
@@ -191,37 +205,160 @@ function generateH5Manifest() {
         versionCode: manifest['versionCode'] || '',
     });
 }
-async function createZip(compiler, platform) {
+async function generatePackage(opts) {
+    const { compiler, platform, win } = opts;
     const spinner = (0, ora_1.default)(`正在生成资源文件...`).start();
     await (0, delay_1.default)(1000);
-    const pkg = (0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH);
+    const pkg = (0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH, { throws: false }) || {};
     const manifest = (0, utils_1.readManifest)();
-    const zip = new adm_zip_1.default();
-    let zipConfig;
-    let defaultSource;
-    if (compiler === 'uni' && platform === 'h5') {
-        zipConfig = config.h5?.zip || {};
-        defaultSource = utils_1.HAS_SRC ? 'dist/build/h5' : 'unpackage/dist/build/web';
+    let dest;
+    if (compiler === 'electron-vite' && win) {
+        const exeCfg = config_1.CONFIG_DATA.h5?.windows;
+        dest = (0, path_1.join)(utils_1.COMMAND_PATH, exeCfg?.path ?? 'dist', exeCfg?.name ?? `${pkg.version}.${pkg.versionCode}.exe`);
+    }
+    else if (compiler === 'gradlew') {
+        const apkCfg = config_1.CONFIG_DATA.app?.android;
+        dest = (0, path_1.join)(utils_1.COMMAND_PATH, apkCfg?.path ?? 'app/build/outputs/apk/release', apkCfg?.name ?? 'app-release.apk');
     }
     else {
-        zipConfig = config.h5?.zip || {};
-        defaultSource = 'dist/win-unpacked/resources';
-    }
-    const name = zipConfig.name || `${manifest['appid'] || pkg.name}.zip`;
-    const source = (0, path_1.join)(utils_1.COMMAND_PATH, zipConfig.source ?? defaultSource);
-    const dest = (0, path_1.join)(utils_1.COMMAND_PATH, `${zipConfig.path ?? 'unpackage/release'}/${name}`);
-    if ((0, fs_1.existsSync)(dest)) {
-        (0, fs_1.unlinkSync)(dest);
-    }
-    const zipRoot = compiler === 'uni' && platform === 'h5' ? (config.h5?.windows?.appid || '') : '';
-    zip.addLocalFolder(source, zipRoot);
-    zip.writeZip(dest);
+        const zip = new adm_zip_1.default();
+        let zipConfig;
+        let defaultSource;
+        if (compiler === 'uni') {
+            if (platform === 'h5') {
+                zipConfig = config_1.CONFIG_DATA.h5?.zip || {};
+                defaultSource = utils_1.HAS_SRC ? 'dist/build/h5' : 'unpackage/dist/build/web';
+            }
+            else if (platform?.startsWith('app')) {
+                zipConfig = config_1.CONFIG_DATA.app?.wgt || {};
+                defaultSource = utils_1.HAS_SRC ? 'dist/build/app' : 'unpackage/dist/build/app-plus';
+            }
+        }
+        else if (compiler === 'electron-vite') {
+            zipConfig = config_1.CONFIG_DATA.h5?.zip || {};
+            defaultSource = 'dist/win-unpacked/resources';
+        }
+        const ext = platform?.startsWith('app') ? '.wgt' : '.zip';
+        const name = zipConfig.name || `${manifest['appid'] || pkg.name}${ext}`;
+        const source = (0, path_1.join)(utils_1.COMMAND_PATH, zipConfig.source ?? defaultSource);
+        dest = (0, path_1.join)(utils_1.COMMAND_PATH, `${zipConfig.path ?? 'unpackage/release'}/${name}`);
+        if ((0, fs_1.existsSync)(dest)) {
+            (0, fs_1.unlinkSync)(dest);
+        }
+        const zipRoot = compiler === 'uni' && platform === 'h5' ? (pkg.appId || '') : '';
+        zip.addLocalFolder(source, zipRoot);
+        zip.writeZip(dest);
+    }
     spinner.stop();
-    spinner.succeed(`资源导出成功，路径为：${dest}`);
+    spinner.succeed(`资源路径：${dest}`);
+}
+function downloadFile(url, dest) {
+    return new Promise((res, rej) => {
+        const mod = url.startsWith('https') ? https_1.default : http_1.default;
+        mod.get(url, (response) => {
+            if (response.statusCode === 301 || response.statusCode === 302) {
+                downloadFile(response.headers.location, dest).then(res, rej);
+                return;
+            }
+            const ws = require('fs').createWriteStream(dest);
+            response.pipe(ws);
+            ws.on('finish', () => { ws.close(); res(); });
+            ws.on('error', rej);
+        }).on('error', rej);
+    });
+}
+async function fetchRemoteResources(opts) {
+    const spinner = (0, ora_1.default)('正在加载主应用数据...').start();
+    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;
+    if (opts.win) {
+        // Windows
+        const zipUrl = result.resourcePackageUrl;
+        if (!zipUrl) {
+            spinner.fail(`${appName} zip链接未上传`);
+            process.exit(1);
+        }
+        const rendererDir = (0, path_1.join)(utils_1.COMMAND_PATH, 'out', 'renderer');
+        (0, fs_extra_1.removeSync)(rendererDir);
+        (0, fs_extra_1.ensureDirSync)(rendererDir);
+        const tmpZip = (0, path_1.join)(utils_1.COMMAND_PATH, '__tmp_remote.zip');
+        await downloadFile(zipUrl, tmpZip);
+        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(/"productName":\s*"[^"]*"/, `"productName": "${appName}"`);
+        (0, fs_1.writeFileSync)(pkgPath, pkgContent);
+        // 下载图标
+        if (iconUrl) {
+            (0, fs_extra_1.ensureDirSync)((0, path_1.join)(utils_1.COMMAND_PATH, 'res'));
+            const iconPath = (0, path_1.join)(utils_1.COMMAND_PATH, 'res', 'icon.png');
+            await downloadFile(iconUrl, iconPath);
+            await (0, utils_1.png2ico)(iconPath, (0, path_1.join)(utils_1.COMMAND_PATH, 'res', 'icon.ico'));
+        }
+        spinner.succeed(`Windows本地资源已更新`);
+    }
+    else if (opts.compiler === 'gradlew') {
+        // Android
+        const wgtUrl = result.fullPackageUrl;
+        if (!wgtUrl) {
+            spinner.fail(`${appName} wgt链接未上传`);
+            process.exit(1);
+        }
+        const appDir = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'assets', 'apps');
+        const tempDir = (0, path_1.join)(appDir, appId);
+        (0, fs_extra_1.removeSync)(tempDir);
+        (0, fs_extra_1.ensureDirSync)(tempDir);
+        const tmpWgt = (0, path_1.join)(utils_1.COMMAND_PATH, '__tmp_remote.wgt');
+        await downloadFile(wgtUrl, tmpWgt);
+        const wgtZip = new adm_zip_1.default(tmpWgt);
+        wgtZip.extractAllTo(tempDir, true);
+        (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 assetsDir = (0, path_1.join)(appDir, id, 'www');
+        // 将解压内容复制到 assetsDir，然后删除临时目录
+        (0, fs_extra_1.ensureDirSync)(assetsDir);
+        (0, fs_extra_1.copySync)(tempDir, assetsDir, { overwrite: true });
+        (0, fs_extra_1.removeSync)(tempDir);
+        // 替换 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}"`);
+        (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');
+        let stringsContent = (0, fs_1.readFileSync)(stringsPath, 'utf-8');
+        stringsContent = stringsContent.replace(/<string name="app_name">[^<]*<\/string>/, `<string name="app_name">${appName}</string>`);
+        (0, fs_1.writeFileSync)(stringsPath, stringsContent);
+        // 下载图标
+        if (iconUrl) {
+            const drawableDir = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'res', 'drawable-xxhdpi');
+            (0, fs_extra_1.ensureDirSync)(drawableDir);
+            const iconPath = (0, path_1.join)(drawableDir, 'icon.png');
+            await downloadFile(iconUrl, iconPath);
+            (0, fs_1.copyFileSync)(iconPath, (0, path_1.join)(drawableDir, 'push.png'));
+        }
+        spinner.succeed(`Android本地资源已更新`);
+    }
 }
 async function default_1(...args) {
     const opts = args[0];
     const commands = await getCommands(...args);
+    if (opts.remote && ['electron-vite', 'gradlew'].includes(opts.compiler)) {
+        await fetchRemoteResources(opts);
+    }
     const command = commands.join(' ');
     const time = Date.now();
     (0, utils_1.spawnSync)(command);
@@ -229,7 +366,7 @@ async function default_1(...args) {
         (0, fs_1.unlinkSync)(envPath);
     }
     if ((Date.now() - time) / 1000 <= 1) {
-        if (command.includes(config.cli.hbuilderx)) {
+        if (command.includes(config_1.CONFIG_DATA.cli.hbuilderx)) {
             utils_1.log.error('检测到您的HbuilderX未启动或项目管理器中未发现构建项目，请检查后重试！');
         }
     }
@@ -237,9 +374,11 @@ async function default_1(...args) {
     if (opts.compiler === 'uni' && opts.platform === 'h5') {
         generateH5Manifest();
     }
-    if ((opts.compiler === 'electron-vite' && opts.zip) ||
-        (opts.compiler === 'uni' && opts.platform === 'h5' && opts.zip)) {
-        await createZip(opts.compiler, opts.platform);
+    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') {
+        await generatePackage(opts);
     }
     return commands;
 }

package/lib/actions/copy.js

@@ -11,7 +11,7 @@ const ora_1 = __importDefault(require("ora"));
 const delay_1 = __importDefault(require("delay"));
 const flat_1 = require("flat");
 const utils_1 = require("../utils");
-const config_1 = require("./config");
+const config_1 = require("../utils/config");
 async function default_1(...args) {
     const opts = args[0];
     if (!opts.source) {
@@ -21,7 +21,7 @@ async function default_1(...args) {
         utils_1.log.error('请使用-d或--dest设置复制资源的目标目录');
     }
     const data = {};
-    const flatConfig = (0, flat_1.flatten)((0, config_1.getMergeConfig)());
+    const flatConfig = (0, flat_1.flatten)(config_1.CONFIG_DATA);
     const flatManifest = (0, flat_1.flatten)((0, utils_1.readManifest)());
     const flatPackage = (0, flat_1.flatten)((0, fs_1.existsSync)(utils_1.PACKAGE_PATH) ? ((0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH, { throws: false }) || {}) : {});
     Object.keys(flatConfig).forEach((k) => {

package/lib/actions/create.js

@@ -36,13 +36,12 @@ const chalk_1 = __importDefault(require("chalk"));
 const fsExtra = __importStar(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const utils_1 = require("../utils");
-const config_1 = require("./config");
+const config_1 = require("../utils/config");
 async function default_1(...args) {
     const name = args[0];
     const opts = args[1];
     const dest = (0, path_1.join)(utils_1.COMMAND_PATH, name);
-    const config = (0, config_1.getMergeConfig)();
-    const repoUrl = opts['template.repo'] || config.template?.repo || utils_1.DEFAULT_TEMPLATE_REPO;
+    const repoUrl = opts['template.repo'] || config_1.CONFIG_DATA.template?.repo || utils_1.DEFAULT_TEMPLATE_REPO;
     const tempDir = (0, path_1.join)(os_1.default.tmpdir(), `gmcb-template-${Date.now()}`);
     const spinner = (0, ora_1.default)('正在克隆模板仓库...');
     try {

package/lib/actions/publish.js

@@ -4,19 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const fs_1 = require("fs");
-const path_1 = require("path");
 const inquirer_1 = __importDefault(require("inquirer"));
 const utils_1 = require("../utils");
 const build_1 = __importDefault(require("./build"));
-const config_1 = require("./config");
+const config_1 = require("../utils/config");
 async function default_1(...args) {
-    if (!(0, fs_1.existsSync)((0, path_1.join)(utils_1.COMMAND_PATH, 'node_modules/@gmcb/publish'))) {
-        utils_1.log.error('缺少必要的依赖，请执行“npm i @gmcb/publish -D”安装依赖！');
-    }
-    const config = (0, config_1.getMergeConfig)();
     const opts = args[0];
-    const isPublishFlow = !!config.publish;
+    const isPublishFlow = !!config_1.CONFIG_DATA.publish;
     const isAuto = opts.auto;
     const pub = { platform: 0, status: 0, updateType: 0 };
     let install = true;
@@ -33,7 +27,7 @@ async function default_1(...args) {
         if (/^(app|h5)/.test(opts.platform)) {
             if (isPublishFlow) {
                 // publish 流程
-                if (!config.publish?.platform && config.publish?.publishType == 1) {
+                if (!config_1.CONFIG_DATA.publish?.platform && config_1.CONFIG_DATA.publish?.publishType == 1 && !(opts.wgt && opts.zip)) {
                     const { platform } = await inquirer_1.default.prompt([
                         {
                             type: 'list',
@@ -55,7 +49,7 @@ async function default_1(...args) {
                     ]);
                     pub.platform = platform;
                 }
-                if (!config.publish?.updateType) {
+                if (!config_1.CONFIG_DATA.publish?.updateType) {
                     const { updateType } = await inquirer_1.default.prompt([
                         {
                             type: 'list',
@@ -72,7 +66,7 @@ async function default_1(...args) {
             }
             else {
                 // pub 流程
-                if (!config.pub?.platform) {
+                if (!config_1.CONFIG_DATA.pub?.platform) {
                     const { platform } = await inquirer_1.default.prompt([
                         {
                             type: 'list',
@@ -94,7 +88,7 @@ async function default_1(...args) {
                     ]);
                     pub.platform = platform;
                 }
-                if (!config.pub?.status) {
+                if (!config_1.CONFIG_DATA.pub?.status) {
                     const { status } = await inquirer_1.default.prompt([
                         {
                             type: 'list',
@@ -141,51 +135,86 @@ async function default_1(...args) {
         install = false;
     }
     if (install) {
-        (0, utils_1.spawnSync)(config.install || 'npm install');
+        (0, utils_1.spawnSync)(config_1.CONFIG_DATA.install || 'npm install');
+    }
+    let cmds;
+    if (opts.compiler === 'uni' && opts.wgt && opts.zip) {
+        const originalPlatform = opts.platform;
+        // 先构建 app（生成 wgt）
+        opts.platform = 'app';
+        cmds = await (0, build_1.default)(...args);
+        // 再构建 h5（生成 zip）
+        opts.platform = 'h5';
+        await (0, build_1.default)(...args);
+        // 恢复
+        opts.platform = originalPlatform;
     }
-    const cmds = await (0, build_1.default)(...args);
-    const commands = cmds.slice(0, 3);
-    if (!commands[2].startsWith('BUILD_ENV')) {
-        commands[2] = 'BUILD_ENV=';
+    else {
+        cmds = await (0, build_1.default)(...args);
     }
-    if (!['dev', 'sit', 'uat', 'pre', 'prod'].includes(commands[2].split('=')[1])) {
+    if (opts.compiler === 'gradlew' || opts.remote) {
+        return;
+    }
+    // 从 cmds 提取 buildEnv
+    const buildEnv = cmds[2]?.split('=')[1];
+    if (!buildEnv || !['dev', 'sit', 'uat', 'pre', 'prod'].includes(buildEnv)) {
         utils_1.log.error('没有检测到需要发布的环境，无法完成上传，请切换到dev/sit/uat/pre/master分支再次执行脚本，或者您可以选择手动上传！');
     }
+    // 更新 CONFIG_DATA（动态 require 前，确保脚本模块能读取到正确值）
+    process.env.BUILD_ENV = buildEnv;
     if (isPublishFlow) {
-        if (pub.updateType) {
-            commands.push(`UPDATE_TYPE=${pub.updateType}`);
+        if (!config_1.CONFIG_DATA.publish) {
+            config_1.CONFIG_DATA.publish = {};
+        }
+        if (opts.wgt && opts.zip) {
+            // 2个都传则为发布主应用
+            config_1.CONFIG_DATA.publish.publishType = 2;
         }
         if (pub.platform) {
-            commands.push(`PUBLISH_PLATFORM=${pub.platform}`);
+            config_1.CONFIG_DATA.publish.platform = pub.platform;
+        }
+        if (pub.updateType) {
+            config_1.CONFIG_DATA.publish.updateType = pub.updateType;
         }
     }
     else {
+        if (!config_1.CONFIG_DATA.pub) {
+            config_1.CONFIG_DATA.pub = {};
+        }
         if (pub.platform) {
-            commands.push(`PUBLISH_PLATFORM=${pub.platform}`);
+            config_1.CONFIG_DATA.pub.platform = pub.platform;
         }
         if (pub.status) {
-            commands.push(`PUBLISH_STATUS=${pub.status}`);
+            config_1.CONFIG_DATA.pub.status = pub.status;
         }
     }
-    commands.push('node');
-    const scriptPath = (0, path_1.join)(utils_1.COMMAND_PATH, 'node_modules/@gmcb/publish/lib');
-    if (opts.platform?.startsWith('mp')) {
-        commands.push((0, path_1.join)(scriptPath, opts.platform));
-    }
-    else if (opts.platform === 'h5') {
+    if (opts.compiler === 'electron-vite') {
         if (opts.zip) {
-            commands.push((0, path_1.join)(scriptPath, 'h5-zip'));
+            await require('../scripts/asar-zip').default();
+        }
+        else if (opts.win) {
+            await require('../scripts/h5-exe').default();
         }
     }
-    else if (opts.platform?.startsWith('app')) {
-        if (opts.wgt) {
-            commands.push((0, path_1.join)(scriptPath, 'app-wgt'));
+    else if (opts.compiler === 'uni') {
+        if (opts.platform?.startsWith('mp')) {
+            await require('../scripts/mp-weixin').default();
+        }
+        else if (opts.platform === 'h5') {
+            if (opts.wgt && opts.zip) {
+                await require('../scripts/wgt-zip').default();
+            }
+            else if (opts.zip) {
+                await require('../scripts/h5-zip').default();
+            }
         }
-        else if (opts.zip) {
-            commands.push((0, path_1.join)(scriptPath, 'app-zip'));
+        else if (opts.platform?.startsWith('app')) {
+            if (opts.wgt && opts.zip) {
+                await require('../scripts/wgt-zip').default();
+            }
+            else if (opts.wgt) {
+                await require('../scripts/app-wgt').default();
+            }
         }
     }
-    if (commands[commands.length - 1] !== 'node') {
-        (0, utils_1.spawnSync)(commands.join(' '));
-    }
 }

package/lib/actions/skill.js

@@ -37,7 +37,7 @@ const ora_1 = __importDefault(require("ora"));
 const chalk_1 = __importDefault(require("chalk"));
 const fsExtra = __importStar(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
-const config_1 = require("./config");
+const config_1 = require("../utils/config");
 const utils_1 = require("../utils");
 const ENV_MAP = {
     default: ".agents",
@@ -101,8 +101,7 @@ function scanRemoteSkills(repoDir) {
 }
 async function syncSkill(...args) {
     const opts = args[0];
-    const config = (0, config_1.getMergeConfig)();
-    const repoUrl = opts["skill.repo"] || config.skill?.repo || utils_1.DEFAULT_SKILL_REPO;
+    const repoUrl = opts["skill.repo"] || config_1.CONFIG_DATA.skill?.repo || utils_1.DEFAULT_SKILL_REPO;
     const tempDir = (0, path_1.join)(os_1.default.tmpdir(), `gmcb-skill-${Date.now()}`);
     const spinner = (0, ora_1.default)("正在克隆技能仓库...");
     try {