@zeppos/zeus-cli 1.3.0-beta.9 → 1.3.1

package/bin/main.js

@@ -16,7 +16,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/modules/bridge.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -187,7 +187,7 @@ var connectWSCB = function () {
         });
     }); });
     vorpal
-        .command('screenshot', 'Screenshot of the current watch device, OS 2.0-enabled devices only.')
+        .command('screenshot', 'Screenshot of the current watch device, devices with OS 2.0 and above are supported.')
         .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             if (hasConnectDevice) {

package/modules/build.js

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -128,7 +128,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                         var _a;
                         var _b = device.apiLevelLimit || {}, min = _b.min, max = _b.max;
                         if (usefulScreenTypes.includes((0, lodash_1.get)(device, 'screen.type', '')) || (0, lodash_1.find)(device.platforms, function (o) { return usefulDeviceSource.includes("".concat(o.deviceSource)); })) {
-                            if ((0, tools_1.compareVersion)(min || '1.0.0', apiLevel) >= 0 && (0, tools_1.compareVersion)(max || '99.99.99', apiLevel) < 0) {
+                            if ((0, tools_1.compareVersion)(min || '1.0.0', apiLevel) >= 0 && max && (0, tools_1.compareVersion)(max, apiLevel) <= 0) {
                                 Object.assign(targetDevices, (_a = {},
                                     _a[device.deviceName] = device,
                                     _a));
@@ -137,7 +137,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                     });
                     deviceNames = Object.keys(targetDevices);
                     if (!deviceNames.length) {
-                        zeppos_app_utils_1.logger.error("The current project's API Level version is too high and there is no available device for debugging, please check if the version is correct.");
+                        zeppos_app_utils_1.logger.error("The current project's API Level version is too high and there is no available device for debugging currently.");
                         process.exit(1);
                     }
                     return [4, inquirer_1["default"].prompt([

package/modules/create.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -87,19 +87,29 @@ var inquirerFunc = function (args, _a) {
                                     return bool;
                                 },
                                 message: 'Which OS version API to develop with?',
-                                choices: [
-                                    new inquirer_1["default"].Separator(),
-                                    new inquirer_1["default"].Separator('Device Basic Information：https://docs.zepp.com/docs/reference/related-resources/device-list/'),
-                                    new inquirer_1["default"].Separator(),
-                                    {
-                                        name: 'OS 1.0 API (Build products can run on OS 2.0, OS 1.0 devices)',
-                                        value: 'v1'
-                                    },
-                                    {
-                                        name: 'OS 2.0 API (Build products can only run on OS 2.0 devices)',
-                                        value: 'v2'
+                                choices: function (args) {
+                                    var isWatchFace = args.appType.toLowerCase() === AppType.WATCHFACE;
+                                    var options = [{
+                                            name: 'OS 1.0 API (Build products can run on devices with OS 1.0 and above)',
+                                            value: 'v1'
+                                        },
+                                        {
+                                            name: 'OS 2.0 API (Build products can run on devices with OS 2.0 and above)',
+                                            value: 'v2'
+                                        },
+                                        {
+                                            name: 'OS 3.0 API (Build products can run on devices with OS 3.0 and above)',
+                                            value: 'v3'
+                                        }];
+                                    if (isWatchFace) {
+                                        options = options.slice(0, 2);
                                     }
-                                ]
+                                    return __spreadArray([
+                                        new inquirer_1["default"].Separator(),
+                                        new inquirer_1["default"].Separator('Device Basic Information: https://docs.zepp.com/docs/reference/related-resources/device-list/'),
+                                        new inquirer_1["default"].Separator()
+                                    ], options, true);
+                                }
                             },
                             {
                                 name: 'template',
@@ -170,6 +180,24 @@ var inquirerFunc = function (args, _a) {
                                     return withAppSide;
                                 },
                                 message: 'Should this application contain a settings component?'
+                            }, {
+                                name: 'shapeOfPlatform',
+                                type: 'checkbox',
+                                when: function (args) {
+                                    var isApp = args.appType.toLowerCase() === AppType.APP;
+                                    var isEmpty = args.template === 0;
+                                    var osVersionAboveV2 = args.OSVersion.replace('v', '') - 2 > 0;
+                                    return osVersionAboveV2 && isApp && isEmpty;
+                                },
+                                choices: [
+                                    new inquirer_1["default"].Separator(),
+                                    new inquirer_1["default"].Separator('Choose the shape of the device'),
+                                    { name: 'Round-screen smartwatch device', value: 'r', checked: true },
+                                    { name: 'Square-screen smartwatch device', value: 's' },
+                                    { name: 'Band device', value: 'b' },
+                                ],
+                                "default": 'r',
+                                message: 'On which device platform do you plan to install the application?'
                             }
                         ]).then(function (args) { return __awaiter(void 0, void 0, void 0, function () {
                             var choicePlatforms_1, answer;

package/modules/help.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/modules/run.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.0-beta.9",
+  "version": "1.3.1",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,7 +21,7 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/zpm": "^2.9.22-beta",
+    "@zeppos/zpm": "^3.0.0",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

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

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/private-modules/zeppos-app-utils/dist/config/device-server.js

@@ -33,7 +33,8 @@ var path = __importStar(require("path"));
 var fs = __importStar(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var lodash_1 = require("lodash");
-var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_device");
+var logger_1 = require("../logger");
+var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_devices");
 var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
 var DeviceScreenType;
 (function (DeviceScreenType) {
@@ -65,6 +66,10 @@ if (!((0, lodash_1.get)(localContent, 'expiredTime') > now)) {
                 });
             }
         }
+    })["catch"](function () {
+        console.log();
+        logger_1.logger.error('[Fetch remote device list]: please check network status');
+        process.exit(1);
     });
 }
 var deviceList = (0, lodash_1.get)(localContent, 'devices', []);
@@ -101,7 +106,7 @@ Object.values(deviceGroup).forEach(function (devices) {
         });
         Object.assign(info.apiLevelLimit, {
             min: (0, lodash_1.get)(cur, 'value.os.apiLevelLimitMin', '1.0.0'),
-            max: (0, lodash_1.get)(cur, 'value.os.apiLevelLimitMax', '')
+            max: (0, lodash_1.get)(cur, 'value.os.version', '')
         });
         return cur.code.length < acc.length ? cur.code : acc;
     }, devices[0].code);

package/private-modules/zeppos-app-utils/dist/config/device.js

@@ -269,7 +269,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 466
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.LILLE] = {
     deviceName: 'GTS 4',
@@ -289,7 +290,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 450
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.VIENNA] = {
     deviceName: 'Falcon',
@@ -330,10 +332,11 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 454
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a[DeviceTarget.MONACO] = {
-    deviceName: 'GTR 5',
+    deviceName: 'Amazfit Balance',
     platforms: [
         {
             name: DevicePlatformName.MONACO,
@@ -354,7 +357,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 480
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '3.99.99'
     }
 }, _a[DeviceTarget.SWIFT] = {
     deviceName: 'Runner (Round)',
@@ -409,7 +413,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.HANNOVER] = {
-    deviceName: 'GTS 5 Active',
+    deviceName: 'Amazfit Active',
     platforms: [
         {
             name: DevicePlatformName.HANNOVER,
@@ -458,7 +462,8 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         height: 380
     },
     apiLevelLimit: {
-        min: '1.0.0'
+        min: '1.0.0',
+        max: '2.99.99'
     }
 }, _a), device_server_1["default"]);
 exports.OSV2Devices = Object.values(exports.deviceTargets).reduce(function (targetDevices, target) {
@@ -466,7 +471,7 @@ exports.OSV2Devices = Object.values(exports.deviceTargets).reduce(function (targ
     var min = apiLevelLimit.min, max = apiLevelLimit.max;
     if (!(0, lodash_1.isEmpty)(platforms) &&
         (0, tools_1.compareVersion)(min || '1.0.0', '2.0.0') >= 0 &&
-        (0, tools_1.compareVersion)(max || '99.99.99', '2.0.0') < 0) {
+        max && (0, tools_1.compareVersion)(max, '2.0.0') <= 0) {
         targetDevices.push.apply(targetDevices, platforms.reduce(function (list, o) { return (0, lodash_1.compact)(list.concat([o.deviceSource])); }, []));
     }
     return targetDevices;

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

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -145,7 +145,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                     else if (sources.length) {
                         index_1.logger.info("Start building package, device sources: ".concat(sources.join(', '), "."));
                     }
-                    if (!(mode === BuildMode.DEV)) return [3, 3];
+                    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, _h.sent()];
                 case 3: return [4, (0, zpm_1.start)(buildOptions)];
@@ -307,7 +307,7 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                                 case 8:
                                     if (!(curCommand === 'install')) return [3, 10];
                                     _a = (0, index_1.getDeviceInfoFromAppJson)(root), deviceSource = _a.deviceSource, appId = _a.appId, appName = _a.appName, appType_1 = _a.appType, deviceSourceArr = _a.deviceSourceArr, targetDeviceInternalName = _a.targetDeviceInternalName;
-                                    return [4, index_1.api.downloadPackage(code, deviceSource, appType_1)];
+                                    return [4, index_1.api.downloadPackage(code, (0, lodash_1.get)(args, "sources[0]", deviceSource), appType_1)];
                                 case 9:
                                     packageInfo = _b.sent();
                                     url = packageInfo;
@@ -325,7 +325,7 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                                         name: appName,
                                         "debugger": true,
                                         updatedTime: Math.round(new Date().getTime() / 1000),
-                                        devices: deviceSourceArr,
+                                        devices: (0, lodash_1.get)(args, "sources", deviceSourceArr),
                                         target: targetDeviceInternalName
                                     });
                                     _b.label = 10;

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

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

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

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -101,7 +101,7 @@ var projectPreInstall = function (dir) {
 var createX = function (cwdPath, args, func, beforeFiles) {
     if (beforeFiles === void 0) { beforeFiles = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var cmd, _a, projectName, _b, configVersion, workDir, templateDir, V1_TEMPLATE_DIR, V2_TEMPLATE_DIR, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
+        var cmd, _a, projectName, _b, configVersion, workDir, templateDir, localTemplatesDirMap, localTemplates, allOS, appTypes, genChoices, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -109,51 +109,64 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     workDir = cwdPath;
                     args.configVersion = (0, lodash_1.toLower)(configVersion);
                     templateDir = (0, path_1.resolve)(__dirname, "../../public/template".concat((0, lodash_1.toLower)(configVersion) === 'v3' ? '/config-version-v3' : ''));
-                    V1_TEMPLATE_DIR = (0, path_1.resolve)(templateDir, './v1');
-                    V2_TEMPLATE_DIR = (0, path_1.resolve)(templateDir, './v2');
-                    localTemplates = {
-                        v1: (0, fs_1.readdirSync)(V1_TEMPLATE_DIR),
-                        v2: (0, fs_1.readdirSync)(V2_TEMPLATE_DIR)
+                    localTemplatesDirMap = {
+                        v1: (0, path_1.resolve)(templateDir, './os1.0'),
+                        v2: (0, path_1.resolve)(templateDir, './os2.0'),
+                        v3: (0, path_1.resolve)(templateDir, './os3.0')
                     };
-                    localChoices = { v1: [], v2: [] };
+                    localTemplates = Object.keys(localTemplatesDirMap).reduce(function (temps, osVersion) {
+                        var dir = localTemplatesDirMap[osVersion];
+                        var appDir = "".concat(dir, "/app");
+                        var watchfaceDir = "".concat(dir, "/watchface");
+                        temps[osVersion] = {
+                            app: (0, fs_1.existsSync)(appDir) ? (0, fs_1.readdirSync)(appDir) : [],
+                            watchface: (0, fs_1.existsSync)(watchfaceDir) ? (0, fs_1.readdirSync)(watchfaceDir) : []
+                        };
+                        return temps;
+                    }, {});
+                    allOS = ['v1', 'v2', 'v3'];
+                    appTypes = ['watchface', 'app'];
+                    genChoices = function () { return allOS.reduce(function (pre, osVersion) {
+                        pre[osVersion] = [];
+                        return pre;
+                    }, {}); };
+                    localChoices = genChoices();
                     watchfaceTemplateChoices = { v1: [], v2: [] };
-                    appTemplateChoices = { v1: [], v2: [] };
+                    appTemplateChoices = genChoices();
                     templatesInit = function (os, dir) {
-                        localTemplates[os].forEach(function (dirName) {
-                            var dirPath = "".concat(dir, "/").concat(dirName);
-                            var dirStat = (0, fs_1.lstatSync)(dirPath);
-                            if (dirStat.isDirectory()) {
-                                var chooseItem = {
-                                    name: (0, lodash_1.startCase)(dirName),
-                                    path: dirPath,
-                                    type: AppSourceType.LOCAL
-                                };
-                                if (dirName === 'empty') {
-                                    localChoices[os].unshift(Object.assign(chooseItem, {
-                                        copyType: TemplateCopyType.EDIT
-                                    }));
-                                    watchfaceTemplateChoices[os].unshift(Object.assign(chooseItem, {
-                                        copyType: TemplateCopyType.EDIT
-                                    }));
-                                    appTemplateChoices[os].unshift(Object.assign(chooseItem, {
-                                        copyType: TemplateCopyType.EDIT
-                                    }));
-                                }
-                                else if (['hello-world', 'calories', 'fetch-api', 'todo-list'].includes(dirName)) {
-                                    appTemplateChoices[os].push(chooseItem);
-                                }
-                                else if (dirName === 'timer') {
-                                    watchfaceTemplateChoices[os].push(chooseItem);
-                                }
-                                else {
-                                    localChoices[os].push(chooseItem);
-                                }
+                        var initTemp = function (appType, dirPath, dirName) {
+                            var tempChoices = appType === 'app' ? appTemplateChoices : watchfaceTemplateChoices;
+                            var tempName = (0, lodash_1.startCase)(dirName);
+                            var chooseItem = {
+                                name: tempName,
+                                path: dirPath,
+                                type: AppSourceType.LOCAL
+                            };
+                            if (tempName === 'Empty') {
+                                Object.assign(chooseItem, {
+                                    copyType: TemplateCopyType.EDIT
+                                });
+                                localChoices[os].unshift(chooseItem);
+                                tempChoices[os].unshift(chooseItem);
+                            }
+                            else {
+                                tempChoices[os].push(chooseItem);
                             }
+                        };
+                        appTypes.forEach(function (appType) {
+                            localTemplates[os][appType].forEach(function (dirName) {
+                                var dirPath = "".concat(dir, "/").concat(appType, "/").concat(dirName);
+                                var dirStat = (0, fs_1.lstatSync)(dirPath);
+                                if (!dirStat.isDirectory())
+                                    return;
+                                initTemp(appType, dirPath, dirName);
+                            });
                         });
                     };
                     if (!(0, lodash_1.isEmpty)(localTemplates)) {
-                        templatesInit('v1', V1_TEMPLATE_DIR);
-                        templatesInit('v2', V2_TEMPLATE_DIR);
+                        allOS.forEach(function (osVersion) {
+                            templatesInit(osVersion, localTemplatesDirMap[osVersion]);
+                        });
                     }
                     env = yeoman_environment_1["default"].createEnv();
                     env.lookup();
@@ -162,36 +175,29 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     if (generatorMateKeys.length) {
                         generatorMateKeys.forEach(function (name) {
                             if (/:(app|all)$/.test(name)) {
-                                localChoices['v1'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
-                                });
-                                appTemplateChoices['v1'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
-                                });
-                                watchfaceTemplateChoices['v1'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
-                                });
-                                localChoices['v2'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
-                                });
-                                appTemplateChoices['v2'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
-                                });
-                                watchfaceTemplateChoices['v2'].push({
-                                    name: name,
-                                    type: AppSourceType.YEOMAN
+                                allOS.forEach(function (osVersion) {
+                                    localChoices[osVersion].push({
+                                        name: name,
+                                        type: AppSourceType.YEOMAN
+                                    });
+                                    appTemplateChoices[osVersion].push({
+                                        name: name,
+                                        type: AppSourceType.YEOMAN
+                                    });
+                                    watchfaceTemplateChoices[osVersion].push({
+                                        name: name,
+                                        type: AppSourceType.YEOMAN
+                                    });
                                 });
                             }
                         });
                     }
                     choicesValueFormat = function (arr) {
-                        arr['v1'].map(function (val, index) { return (val.value = index); });
-                        arr['v2'].map(function (val, index) { return (val.value = index); });
+                        allOS.forEach(function (osVersion) {
+                            if (!Array.isArray(arr[osVersion]))
+                                return;
+                            arr[osVersion].map(function (val, index) { return (val.value = index); });
+                        });
                     };
                     choicesValueFormat(localChoices);
                     choicesValueFormat(appTemplateChoices);

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

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -54,18 +54,21 @@ exports.createLocalApp = void 0;
 var os_1 = __importDefault(require("os"));
 var lodash_1 = __importDefault(require("lodash"));
 var path_1 = require("path");
-var fs_extra_1 = __importDefault(require("fs-extra"));
 var fs_1 = __importDefault(require("fs"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
 var index_1 = require("../../index");
-var TemplateCopyType = index_1.config.TemplateCopyType, AppType = index_1.config.AppType, deviceTargets = index_1.config.deviceTargets;
+var TemplateCopyType = index_1.config.TemplateCopyType, deviceTargets = index_1.config.deviceTargets;
 var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
+    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, shapeOfPlatform, appJsonPath, appJson, appID, defaultTarget, targets, shapes, needDelShapeConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
-        workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
+        workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType, shapeOfPlatform = args.shapeOfPlatform;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
-        fs_extra_1["default"].copySync((0, path_1.resolve)(templateInfo.path, "../jsconfig.json"), "".concat(workDir, "/jsconfig.json"));
-        fs_extra_1["default"].copySync((0, path_1.resolve)(templateInfo.path, "../_package.json"), "".concat(workDir, "/package.json"));
-        fs_1["default"].writeFileSync("".concat(workDir, "/global.d.ts"), '/// <reference path="node_modules/@zeppos/device-types/index.d.ts" />');
+        if (fs_extra_1["default"].existsSync((0, path_1.resolve)(workDir, "./_package.json"))) {
+            fs_1["default"].renameSync((0, path_1.resolve)(workDir, "./_package.json"), (0, path_1.resolve)(workDir, "./package.json"));
+        }
+        if (fs_extra_1["default"].existsSync((0, path_1.resolve)(templateInfo.path, "./package.json")) && !fs_extra_1["default"].existsSync((0, path_1.resolve)(templateInfo.path, "./global.d.ts"))) {
+            fs_1["default"].writeFileSync("".concat(workDir, "/global.d.ts"), '/// <reference path="node_modules/@zeppos/device-types/index.d.ts" />');
+        }
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
         appID = Math.floor(Math.random() * 10001) + 20000;
@@ -79,23 +82,6 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         }
         defaultTarget = lodash_1["default"].get(appJson, 'targets.default');
         targets = {};
-        if (appType.toLowerCase() === AppType.WATCHFACE) {
-            defaultWatchFaceConfig = {
-                path: 'watchface/index',
-                main: 1,
-                editable: 0,
-                lockscreen: 0,
-                photoscreen: 0
-            };
-            lodash_1["default"].set(appJson, 'app.appType', AppType.WATCHFACE);
-            lodash_1["default"].set(appJson, 'app.description', 'empty watchface');
-            lodash_1["default"].unset(defaultTarget, 'module.page');
-            lodash_1["default"].set(defaultTarget, 'module.watchface', defaultWatchFaceConfig);
-            fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './pages'));
-        }
-        else {
-            fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './watchface'));
-        }
         if (!withAppSide) {
             lodash_1["default"].unset(defaultTarget, 'module.app-side');
             fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './app-side'));
@@ -104,6 +90,20 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
             lodash_1["default"].unset(defaultTarget, 'module.setting');
             fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './setting'));
         }
+        if (Array.isArray(shapeOfPlatform)) {
+            shapes = ['r', 's', 'b'];
+            needDelShapeConfig = shapes.filter(function (item) { return !shapeOfPlatform.includes(item); });
+            needDelShapeConfig.forEach(function (shape) {
+                fs_extra_1["default"].remove((0, path_1.resolve)(workDir, "./assets/gt.".concat(shape)));
+                fs_extra_1["default"].remove((0, path_1.resolve)(workDir, "./page/index.".concat(shape, ".layout.js")));
+                var platformsPathStr = 'targets.gt.platforms';
+                var platforms = lodash_1["default"].get(appJson, platformsPathStr);
+                if (!Array.isArray(platforms))
+                    return;
+                var filteredPlatforms = lodash_1["default"].filter(platforms, function (platform) { return platform.st !== shape; });
+                lodash_1["default"].set(appJson, platformsPathStr, filteredPlatforms);
+            });
+        }
         if (buildTargets && buildTargets.length) {
             defaultAssetsPath_1 = (0, path_1.resolve)(workDir, './assets/default');
             buildTargets.forEach(function (type) {
@@ -114,11 +114,11 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
             });
             fs_extra_1["default"].removeSync(defaultAssetsPath_1);
             lodash_1["default"].set(appJson, 'targets', targets);
-            fs_extra_1["default"].writeJson(appJsonPath, appJson, {
-                spaces: 2,
-                EOL: os_1["default"].EOL
-            });
         }
+        fs_extra_1["default"].writeJson(appJsonPath, appJson, {
+            spaces: 2,
+            EOL: os_1["default"].EOL
+        });
         return [2];
     });
 }); };

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

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

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

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {