@gmcb/cli 0.4.6 → 0.5.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.5.0](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.4.7...@gmcb/cli@0.5.0) (2026-06-21)
+
+
+### Features
+
+* uni.build.json结构调整 ([4e2b3dc](http://10.10.10.16/caoben/front-end/commits/4e2b3dc10f0ad3a230a8b38f1b3704747abc9c74))
+
+
+
+
+
+## [0.4.7](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.4.6...@gmcb/cli@0.4.7) (2026-06-15)
+
+**Note:** Version bump only for package @gmcb/cli
+
+
+
+
+
 ## [0.4.6](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.4.5...@gmcb/cli@0.4.6) (2026-06-15)
 
 **Note:** Version bump only for package @gmcb/cli

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

@@ -25,12 +25,13 @@ npm i @gmcb/cli -g
 
 将资源从源目录复制到目标目录，支持 `{...}` 占位符自动解析：
 
-- `{build.*}` 取自已合并的 `uni.build.json` 配置（扁平化键），例如 `{build.app.windows.packagename}`
+- `{build.*}` 取自已合并的 `uni.build.json` 配置（扁平化键），例如 `{build.h5.windows.appid}`
 - `{manifest.*}` 取自项目根目录的 `manifest.json`（扁平化键），例如 `{manifest.appid}`
+- `{package.*}` 取自项目根目录的 `package.json`（扁平化键），例如 `{package.appid}`
 
 示例：
 
 ```bash
-gmcb copy -s ./dist/build/h5 -d ../electron/out/renderer/{build.app.windows.packagename}/
+gmcb copy -s ./dist/build/h5 -d ../electron/out/renderer/{package.appid}/
 gmcb copy -s ./dist/build/app  -d ../android/app/src/main/assets/apps/{manifest.appid}/www/
 ```

package/lib/actions/build.js

@@ -179,6 +179,18 @@ async function getCommands(...args) {
     }
     return commands;
 }
+function generateH5Manifest() {
+    const manifest = (0, utils_1.readManifest)();
+    const source = (0, path_1.join)(utils_1.COMMAND_PATH, utils_1.HAS_SRC ? 'dist/build/h5' : 'unpackage/dist/build/web');
+    if (!(0, fs_1.existsSync)(source)) {
+        utils_1.log.warning('H5 构建输出目录不存在，跳过生成 manifest.json');
+        return;
+    }
+    (0, fs_extra_1.writeJsonSync)((0, path_1.join)(source, 'manifest.json'), {
+        versionName: manifest['versionName'] || '',
+        versionCode: manifest['versionCode'] || '',
+    });
+}
 async function createZip(compiler, platform) {
     const spinner = (0, ora_1.default)(`正在生成资源文件...`).start();
     await (0, delay_1.default)(1000);
@@ -192,7 +204,7 @@ async function createZip(compiler, platform) {
         defaultSource = utils_1.HAS_SRC ? 'dist/build/h5' : 'unpackage/dist/build/web';
     }
     else {
-        zipConfig = config.app?.zip || {};
+        zipConfig = config.h5?.zip || {};
         defaultSource = 'dist/win-unpacked/resources';
     }
     const name = zipConfig.name || `${manifest['appid'] || pkg.name}.zip`;
@@ -201,13 +213,7 @@ async function createZip(compiler, platform) {
     if ((0, fs_1.existsSync)(dest)) {
         (0, fs_1.unlinkSync)(dest);
     }
-    if (compiler === 'uni' && platform === 'h5') {
-        (0, fs_extra_1.writeJsonSync)((0, path_1.join)(source, 'manifest.json'), {
-            versionName: manifest['versionName'] || '',
-            versionCode: manifest['versionCode'] || '',
-        });
-    }
-    const zipRoot = compiler === 'uni' && platform === 'h5' ? (config.app?.windows?.packagename || '') : '';
+    const zipRoot = compiler === 'uni' && platform === 'h5' ? (config.h5?.windows?.appid || '') : '';
     zip.addLocalFolder(source, zipRoot);
     zip.writeZip(dest);
     spinner.stop();
@@ -227,6 +233,10 @@ async function default_1(...args) {
             utils_1.log.error('检测到您的HbuilderX未启动或项目管理器中未发现构建项目，请检查后重试！');
         }
     }
+    // H5 构建完成后立即生成 manifest.json
+    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);

package/lib/actions/config.d.ts

@@ -9,6 +9,9 @@ interface Cos {
     path?: string;
 }
 interface App {
+    harmony?: {
+        packagename?: string;
+    };
     android?: {
         packagename?: string;
         androidpacktype?: number;
@@ -23,21 +26,10 @@ interface App {
         certfile?: string;
         certpassword?: string;
     };
-    windows?: {
-        packagename?: string;
-    };
-    macos?: {
-        packagename?: string;
-    };
     wgt?: {
         name?: string;
         path?: string;
     };
-    zip?: {
-        name?: string;
-        path?: string;
-        source?: string;
-    };
     custom?: App;
 }
 interface Mp {
@@ -63,6 +55,12 @@ interface Publish {
     platform?: string;
 }
 interface H5 {
+    windows?: {
+        appid?: string;
+    };
+    macos?: {
+        appid?: string;
+    };
     zip?: {
         name?: string;
         path?: string;

package/lib/actions/config.js

@@ -35,10 +35,34 @@ function getConfig() {
     return (0, fs_extra_1.readJsonSync)(utils_1.CONFIG_PATH, { throws: false }) || {};
 }
 function getLocalConfig() {
+    let config = {};
     if ((0, fs_1.existsSync)(utils_1.LOCAL_CONFIG_PATH)) {
-        return (0, fs_extra_1.readJsonSync)(utils_1.LOCAL_CONFIG_PATH, { throws: false }) || {};
+        config = (0, fs_extra_1.readJsonSync)(utils_1.LOCAL_CONFIG_PATH, { throws: false }) || {};
     }
-    return {};
+    const pkg = (0, fs_1.existsSync)(utils_1.PACKAGE_PATH) ? ((0, fs_extra_1.readJsonSync)(utils_1.PACKAGE_PATH, { throws: false }) || {}) : {};
+    const appid = pkg.appid;
+    if (appid) {
+        if (!config.app)
+            config.app = {};
+        if (!config.app.android)
+            config.app.android = {};
+        if (!config.app.ios)
+            config.app.ios = {};
+        if (!config.app.harmony)
+            config.app.harmony = {};
+        if (!config.h5)
+            config.h5 = {};
+        if (!config.h5.windows)
+            config.h5.windows = {};
+        if (!config.h5.macos)
+            config.h5.macos = {};
+        config.app.android.packagename ??= appid;
+        config.app.ios.bundle ??= appid;
+        config.app.harmony.packagename ??= appid;
+        config.h5.windows.appid ??= appid;
+        config.h5.macos.appid ??= appid;
+    }
+    return config;
 }
 function getMergeConfig() {
     return (0, lodash_1.merge)({}, getConfig(), getLocalConfig());

package/lib/actions/copy.js

@@ -23,12 +23,16 @@ async function default_1(...args) {
     const data = {};
     const flatConfig = (0, flat_1.flatten)((0, config_1.getMergeConfig)());
     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) => {
         data[`build.${k}`] = flatConfig[k];
     });
     Object.keys(flatManifest).forEach((k) => {
         data[`manifest.${k}`] = flatManifest[k];
     });
+    Object.keys(flatPackage).forEach((k) => {
+        data[`package.${k}`] = flatPackage[k];
+    });
     const resolvedSource = (0, utils_1.resolvePlaceholder)(opts.source, data);
     const resolvedDest = (0, utils_1.resolvePlaceholder)(opts.dest, data);
     const sourcePath = (0, path_1.join)(utils_1.COMMAND_PATH, resolvedSource);

package/package.json

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

package/schema.json

@@ -125,30 +125,7 @@
               "type": "string",
               "description": "包名"
             }
-          },
-          "required": ["packagename"]
-        },
-        "windows": {
-          "type": "object",
-          "description": "windows配置",
-          "properties": {
-            "packagename": {
-              "type": "string",
-              "description": "包名"
-            }
-          },
-          "required": ["packagename"]
-        },
-        "macos": {
-          "type": "object",
-          "description": "macos配置",
-          "properties": {
-            "packagename": {
-              "type": "string",
-              "description": "包名"
-            }
-          },
-          "required": ["packagename"]
+          }
         },
         "android": {
           "type": "object",
@@ -175,7 +152,7 @@
               "description": "打包证书密码"
             }
           },
-          "required": ["packagename", "androidpacktype", "certalias", "certfile", "certpassword"]
+          "required": ["androidpacktype", "certalias", "certfile", "certpassword"]
         },
         "ios": {
           "type": "object",
@@ -202,7 +179,7 @@
               "description": "使用自定义证书打包的证书密码"
             }
           },
-          "required": ["bundle", "supporteddevice", "profile", "certfile", "certpassword"]
+          "required": ["supporteddevice", "profile", "certfile", "certpassword"]
         },
         "wgt": {
           "type": "object",
@@ -218,24 +195,6 @@
             }
           }
         },
-        "zip": {
-          "type": "object",
-          "description": "桌面应用热更新资源配置，仅在compiler为electron-vite且开启--zip时生效",
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "导出文件名称，例如app.zip，默认为[name].zip"
-            },
-            "path": {
-              "type": "string",
-              "description": "导出路径，默认unpackage/release"
-            },
-            "source": {
-              "type": "string",
-              "description": "资源路径，默认dist/win-unpacked/resources"
-            }
-          }
-        },
         "custom": {
           "type": "object",
           "description": "自定义基座配置",
@@ -301,9 +260,29 @@
       "type": "object",
       "description": "h5配置",
       "properties": {
+        "windows": {
+          "type": "object",
+          "description": "windows配置",
+          "properties": {
+            "appid": {
+              "type": "string",
+              "description": "应用ID"
+            }
+          }
+        },
+        "macos": {
+          "type": "object",
+          "description": "macos配置",
+          "properties": {
+            "appid": {
+              "type": "string",
+              "description": "应用ID"
+            }
+          }
+        },
         "zip": {
           "type": "object",
-          "description": "h5打包资源配置，仅在compiler为uni且platform为h5且开启--zip时生效",
+          "description": "打包资源配置，开启--zip时生效",
           "properties": {
             "name": {
               "type": "string",
@@ -315,7 +294,7 @@
             },
             "source": {
               "type": "string",
-              "description": "资源路径，默认dist/build/h5（有src目录）或unpackage/dist/build/web（无src目录）"
+              "description": "资源路径，h5默认dist/build/h5或unpackage/dist/build/web，electron-vite默认dist/win-unpacked/resources"
             }
           }
         }