@zeppos/zeus-cli 1.6.0 → 1.6.7-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.6.0",
+  "version": "1.6.7-beta2",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,13 +21,13 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/form-data": "^4.0.0",
-    "@zeppos/zpm": "^3.1.0",
+    "@zeppos/zpm": "^3.1.13-beta1",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.0.1",
     "findup-sync": "^5.0.0",
+    "form-data": "^4.0.1",
     "fs-extra": "^10.1.0",
     "get-port": "5.1.1",
     "inquirer": "^8.1.2",

package/private-modules/zeppos-app-utils/dist/modules/build.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -68,7 +79,7 @@ var rd = __importStar(require("rd"));
 var fs_1 = __importDefault(require("fs"));
 var path = __importStar(require("path"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
-var form_data_1 = __importDefault(require("@zeppos/form-data"));
+var form_data_1 = __importDefault(require("form-data"));
 var index_1 = require("../index");
 var lodash_1 = require("lodash");
 var lodash_2 = require("lodash");
@@ -111,11 +122,15 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (buildConfigOption === void 0) { buildConfigOption = {}; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var _a, targets, _b, sources, buildOptions, _c, js2c, _d, js2bin, _e, png2vg, _f, prune, _g, compress, _h, ip, zabName_1, distDir_1, name_1, newName_1, error_1;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _a, sources_1, _b, targets, _c, sources, buildOptions, _d, js2c, _e, js2bin, _f, png2vg, _g, prune, _h, compress, _j, ip, zabName_1, distDir_1, name_1, newName_1, error_1;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    _a = buildConfigOption.targets, targets = _a === void 0 ? [] : _a, _b = buildConfigOption.sources, sources = _b === void 0 ? [] : _b;
+                    if (buildConfigOption.sources) {
+                        _a = buildConfigOption.sources, sources_1 = _a === void 0 ? [] : _a;
+                        buildConfigOption = __assign(__assign({}, buildConfigOption), { sources: Array.isArray(sources_1) ? sources_1 : [sources_1] });
+                    }
+                    _b = buildConfigOption.targets, targets = _b === void 0 ? [] : _b, _c = buildConfigOption.sources, sources = _c === void 0 ? [] : _c;
                     buildOptions = {
                         path: workspace,
                         buildMode: mode,
@@ -124,7 +139,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                         jsc: TransformType.Default
                     };
                     if ([BuildMode.PROD, BuildMode.PREVIEW].includes(mode)) {
-                        _c = buildConfigOption || {}, js2c = _c.js2c, _d = _c.js2bin, js2bin = _d === void 0 ? true : _d, _e = _c.png2vg, png2vg = _e === void 0 ? true : _e, _f = _c.prune, prune = _f === void 0 ? true : _f, _g = _c.compress, compress = _g === void 0 ? true : _g, _h = _c.ip, ip = _h === void 0 ? BuildMode.PROD === mode : _h;
+                        _d = buildConfigOption || {}, js2c = _d.js2c, _e = _d.js2bin, js2bin = _e === void 0 ? true : _e, _f = _d.png2vg, png2vg = _f === void 0 ? true : _f, _g = _d.prune, prune = _g === void 0 ? true : _g, _h = _d.compress, compress = _h === void 0 ? true : _h, _j = _d.ip, ip = _j === void 0 ? BuildMode.PROD === mode : _j;
                         js2c = (0, tools_1.booleanString)(js2c);
                         js2bin = (0, tools_1.booleanString)(js2bin);
                         js2c && Object.assign(buildOptions, { jsc: TransformType.C });
@@ -136,9 +151,9 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                             ip: (0, tools_1.booleanString)(ip)
                         });
                     }
-                    _j.label = 1;
+                    _k.label = 1;
                 case 1:
-                    _j.trys.push([1, 6, , 7]);
+                    _k.trys.push([1, 6, , 7]);
                     if (targets.length) {
                         index_1.logger.info("Start building package, targets: ".concat(targets.join(', '), "."));
                     }
@@ -147,10 +162,10 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                     }
                     if (!(mode === BuildMode.DEV && (0, lodash_1.get)(buildConfigOption, '_[0]') !== 'install')) return [3, 3];
                     return [4, (0, zpm_1.startWithoutDist)(buildOptions)];
-                case 2: return [2, _j.sent()];
+                case 2: return [2, _k.sent()];
                 case 3: return [4, (0, zpm_1.start)(buildOptions)];
                 case 4:
-                    zabName_1 = _j.sent();
+                    zabName_1 = _k.sent();
                     if (!zabName_1) {
                         index_1.logger.error("Build package error, the package name is ".concat(zabName_1));
                         process.exit(1);
@@ -174,7 +189,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                     return [2, zabName_1];
                 case 5: return [3, 7];
                 case 6:
-                    error_1 = _j.sent();
+                    error_1 = _k.sent();
                     index_1.logger.error(error_1);
                     return [3, 7];
                 case 7: return [2];

package/private-modules/zeppos-app-utils/dist/modules/create/index.js

@@ -138,7 +138,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                         return pre;
                     }, {}); };
                     localChoices = genChoices();
-                    watchfaceTemplateChoices = { v1: [], v2: [] };
+                    watchfaceTemplateChoices = { v1: [], v2: [], 'v3': [], 'v3.5': [] };
                     appTemplateChoices = genChoices();
                     workoutExtTemplateChoices = { 'v3.5': [] };
                     getTemplateChoices = function (appType) {

package/private-modules/zeppos-app-utils/dist/modules/fetchDevices.js

@@ -72,8 +72,8 @@ var lodash_1 = require("lodash");
 var config_1 = require("../config");
 var accountEnv = (0, config_1.getLocalConfig)().account_env;
 var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_devices");
-var serverPath = accountEnv === 'test' ? 'https://upload-testing-cdn.huami.com/zeppos/devkit/zeus/devices.json' : 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
-var serverPathBeta = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.beta.json';
+var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
+var serverPathBeta = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.beta1.json';
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";

package/private-modules/zeppos-app-utils/package.json

@@ -13,13 +13,13 @@
     "dev": "nodemon -e ts,tsx --exec \"rimraf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
   },
   "dependencies": {
-    "@zeppos/form-data": "^4.0.0",
-    "@zeppos/zpm": "^3.1.0",
+    "@zeppos/zpm": "^3.1.13-beta1",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.0.1",
     "findup-sync": "^5.0.0",
+    "form-data": "^4.0.1",
     "fs-extra": "^10.1.0",
     "get-port": "5.1.1",
     "inquirer": "^8.1.2",