@zeppos/zeus-cli 1.1.8 → 1.2.0

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

@@ -0,0 +1,254 @@
+"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);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) 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]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.createX = void 0;
+var chalk_1 = __importDefault(require("chalk"));
+var rd = __importStar(require("rd"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
+var path_1 = require("path");
+var fs_1 = require("fs");
+var lodash_1 = require("lodash");
+var yeoman_environment_1 = __importDefault(require("yeoman-environment"));
+var local_app_1 = require("./local-app");
+var yeoman_app_1 = require("./yeoman-app");
+var index_1 = require("../../index");
+var AppType = index_1.config.AppType, AppSourceType = index_1.config.AppSourceType, TemplateCopyType = index_1.config.TemplateCopyType, zeppFontIcon = index_1.config.zeppFontIcon;
+var child_process_1 = require("child_process");
+var projectPreInstall = function (dir) {
+    return new Promise(function (resolve) {
+        var execInstall = (0, child_process_1.spawn)('npm', ['install'], {
+            stdio: 'pipe',
+            cwd: dir
+        });
+        execInstall.stdout.pipe(process.stdout);
+        execInstall.on('close', function (code) {
+            resolve(code);
+        });
+    });
+};
+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, workDir, V1_TEMPLATE_DIR, V2_TEMPLATE_DIR, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
+                    workDir = cwdPath;
+                    V1_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v1');
+                    V2_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v2');
+                    localTemplates = {
+                        v1: (0, fs_1.readdirSync)(V1_TEMPLATE_DIR),
+                        v2: (0, fs_1.readdirSync)(V2_TEMPLATE_DIR)
+                    };
+                    localChoices = { v1: [], v2: [] };
+                    watchfaceTemplateChoices = { v1: [], v2: [] };
+                    appTemplateChoices = { v1: [], v2: [] };
+                    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);
+                                }
+                            }
+                        });
+                    };
+                    if (!(0, lodash_1.isEmpty)(localTemplates)) {
+                        templatesInit('v1', V1_TEMPLATE_DIR);
+                        templatesInit('v2', V2_TEMPLATE_DIR);
+                    }
+                    env = yeoman_environment_1["default"].createEnv();
+                    env.lookup();
+                    generatorMate = env.getGeneratorsMeta();
+                    generatorMateKeys = Object.keys(generatorMate);
+                    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
+                                });
+                            }
+                        });
+                    }
+                    choicesValueFormat = function (arr) {
+                        arr['v1'].map(function (val, index) { return (val.value = index); });
+                        arr['v2'].map(function (val, index) { return (val.value = index); });
+                    };
+                    choicesValueFormat(localChoices);
+                    choicesValueFormat(appTemplateChoices);
+                    choicesValueFormat(watchfaceTemplateChoices);
+                    return [4, func(args, {
+                            appTemplateChoices: appTemplateChoices,
+                            watchfaceTemplateChoices: watchfaceTemplateChoices
+                        })];
+                case 1:
+                    answer = _b.sent();
+                    answer.appType = answer.appType || AppType.APP;
+                    answer.workDir = workDir;
+                    choosePkg = answer.appType.toLowerCase() === AppType.APP
+                        ? appTemplateChoices[answer.OSVersion][answer.template]
+                        : watchfaceTemplateChoices[answer.OSVersion][answer.template];
+                    index_1.logger.info('fetching template...');
+                    return [4, (0, index_1.sleep)(100)];
+                case 2:
+                    _b.sent();
+                    if (choosePkg.type === AppSourceType.YEOMAN) {
+                        index_1.logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
+                        (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generatorMate[choosePkg.name] }));
+                    }
+                    else {
+                        index_1.logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
+                        (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
+                    }
+                    index_1.logger.log('\n');
+                    return [4, (0, index_1.sleep)(50)];
+                case 3:
+                    _b.sent();
+                    rd.eachFileSync(workDir, function (file) {
+                        if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
+                            fs_extra_1["default"].remove(file);
+                        }
+                        else {
+                            var shortFile = file.replace(cwdPath, '');
+                            if (beforeFiles.includes(file)) {
+                                index_1.logger.log(chalk_1["default"].yellow("  ".concat(chalk_1["default"].bold('replace'), "  ")), shortFile);
+                            }
+                            else {
+                                index_1.logger.log(chalk_1["default"].green("   ".concat(chalk_1["default"].bold('create'), "  ")), shortFile);
+                            }
+                        }
+                    });
+                    index_1.logger.log('\n');
+                    index_1.logger.success("Project created successfully by \"".concat(choosePkg.name, "\" template."));
+                    index_1.logger.log('Start installing dependency packages.');
+                    return [4, projectPreInstall(workDir)];
+                case 4:
+                    _b.sent();
+                    index_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppFontIcon));
+                    index_1.logger.log("I'm all done. Now you can start your application.");
+                    return [2, [
+                            "Project created successfully by \"".concat(choosePkg.name, "\" template."),
+                            "I'm all done. Now you can start your application.",
+                        ]];
+            }
+        });
+    });
+};
+exports.createX = createX;

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

@@ -56,21 +56,21 @@ 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 project_1 = require("../../config/project");
-var device_1 = require("../../config/device");
+var index_1 = require("../../index");
+var TemplateCopyType = index_1.config.TemplateCopyType, AppType = index_1.config.AppType, 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, OSVersion, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, 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, OSVersion = args.OSVersion, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
-        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/jsconfig.json'), "".concat(workDir, "/jsconfig.json"));
-        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/package.json'), "".concat(workDir, "/package.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, "../../public/template/".concat(OSVersion, "/jsconfig.json")), "".concat(workDir, "/jsconfig.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, "../../public/template/".concat(OSVersion, "/_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" />');
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
         appID = Math.floor(Math.random() * 10001) + 20000;
         lodash_1["default"].set(appJson, 'app.appId', appID);
-        if (templateInfo.copyType !== project_1.TemplateCopyType.EDIT) {
+        if (templateInfo.copyType !== TemplateCopyType.EDIT) {
             fs_extra_1["default"].writeJson(appJsonPath, appJson, {
                 spaces: 2,
                 EOL: os_1["default"].EOL
@@ -79,7 +79,7 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         }
         defaultTarget = lodash_1["default"].get(appJson, 'targets.default');
         targets = {};
-        if (appType.toLowerCase() === project_1.AppType.WATCHFACE) {
+        if (appType.toLowerCase() === AppType.WATCHFACE) {
             defaultWatchFaceConfig = {
                 "path": "watchface/index",
                 "main": 1,
@@ -87,7 +87,7 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
                 "lockscreen": 0,
                 "photoscreen": 0
             };
-            lodash_1["default"].set(appJson, 'app.appType', project_1.AppType.WATCHFACE);
+            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);
@@ -107,7 +107,7 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         if (buildTargets && buildTargets.length) {
             defaultAssetsPath_1 = (0, path_1.resolve)(workDir, './assets/default');
             buildTargets.forEach(function (type) {
-                var _a = device_1.deviceTargets[type], deviceName = _a.deviceName, platforms = _a.platforms, screen = _a.screen;
+                var _a = deviceTargets[type], deviceName = _a.deviceName, platforms = _a.platforms, screen = _a.screen;
                 var pkgName = "".concat(screen.width, "x").concat(screen.height, "-").concat(lodash_1["default"].kebabCase(lodash_1["default"].toLower(deviceName)));
                 lodash_1["default"].set(targets, pkgName, __assign(__assign({}, defaultTarget), { platforms: platforms, designWidth: screen.width }));
                 fs_extra_1["default"].copySync(defaultAssetsPath_1, (0, path_1.resolve)(workDir, "./assets/".concat(pkgName)));

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

@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.createYeomanApp = void 0;
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var path_1 = require("path");
 var update_notifier_1 = __importDefault(require("update-notifier"));
@@ -54,7 +54,7 @@ var resolveGenerator = function (generator) {
     var pkg = fs_extra_1["default"].readJSONSync(pkgPath);
     pkg.namespace = generator.namespace;
     pkg.appGenerator = true;
-    pkg.prettyName = lodash_1["default"].kebabCase(lodash_1["default"].toLower((0, yeoman_environment_1.namespaceToName)(generator.namespace)));
+    pkg.prettyName = (0, lodash_1.kebabCase)((0, lodash_1.toLower)((0, yeoman_environment_1.namespaceToName)(generator.namespace)));
     pkg.update = (0, update_notifier_1["default"])({ pkg: pkg }).update;
     if (pkg.update && pkg.version !== pkg.update.latest) {
         pkg.updateAvailable = true;

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

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+exports.__esModule = true;
+__exportStar(require("./login"), exports);
+__exportStar(require("./config"), exports);
+__exportStar(require("./status"), exports);
+__exportStar(require("./build"), exports);
+__exportStar(require("./create/index"), exports);

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -70,10 +47,8 @@ var qs_1 = __importDefault(require("qs"));
 var lodash_1 = __importDefault(require("lodash"));
 var get_port_1 = __importDefault(require("get-port"));
 var stoppable_1 = __importDefault(require("stoppable"));
-var storage_1 = require("./storage");
-var logger = __importStar(require("../utils/logger"));
-var project_1 = require("../config/project");
-var hm_analytics_1 = require("../utils/hm-analytics");
+var index_1 = require("../index");
+var _a = index_1.config.getLocalConfig(), loginConfig = _a.loginConfig, loginStorageKey = _a.loginStorageKey;
 var loginCallbackServer = function (cb) { return __awaiter(void 0, void 0, void 0, function () {
     var callbackPath, port, server;
     return __generator(this, function (_a) {
@@ -113,9 +88,9 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
     return __generator(this, function (_h) {
         switch (_h.label) {
             case 0:
-                _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g;
+                _a = index_1.instanceStorage.getStorage(), _b = loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g;
                 if (apptoken && userid && cname) {
-                    logger.success("Have logged");
+                    index_1.logger.success("Have logged");
                     return [2, { apptoken: apptoken, userid: userid, cname: cname }];
                 }
                 loginPromise = new Promise(function (resolve, reject) {
@@ -126,12 +101,12 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                         var _a;
                         var appToken = loginInfo.appToken, userId = loginInfo.userId, cname = loginInfo.cname;
                         if (appToken && cname) {
-                            storage_1.globalStorage.set((_a = {},
-                                _a[project_1.loginStorageKey.accountToken] = appToken,
-                                _a[project_1.loginStorageKey.userid] = userId,
-                                _a[project_1.loginStorageKey.cname] = cname,
+                            index_1.globalStorage.set((_a = {},
+                                _a[loginStorageKey.accountToken] = appToken,
+                                _a[loginStorageKey.userid] = userId,
+                                _a[loginStorageKey.cname] = cname,
                                 _a));
-                            logger.success('Login success');
+                            index_1.logger.success('Login success');
                             loginPromiseResolve(loginInfo);
                         }
                         else {
@@ -143,30 +118,27 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                 _h.label = 2;
             case 2:
                 _h.trys.push([2, 4, , 5]);
-                return [4, (0, open_1["default"])("".concat(project_1.loginConfig.LOGIN_URL, "?").concat(qs_1["default"].stringify({
-                        project_name: project_1.loginConfig.PROJECT_NAME,
-                        platform_app: project_1.loginConfig.PLATFORM_APP,
+                return [4, (0, open_1["default"])("".concat(loginConfig.LOGIN_URL, "?").concat(qs_1["default"].stringify({
+                        project_name: loginConfig.PROJECT_NAME,
+                        platform_app: loginConfig.PLATFORM_APP,
                         project_redirect_uri: loginCallbackUrl
                     })))];
             case 3:
                 _h.sent();
-                logger.info('The login page has been opened in the default browser.');
+                index_1.logger.info('The login page has been opened in the default browser.');
                 return [3, 5];
             case 4:
                 error_1 = _h.sent();
-                logger.error('Unknown error, the default browser failed to open the login page.');
+                index_1.logger.error('Unknown error, the default browser failed to open the login page.');
                 process.exit(1);
                 return [3, 5];
-            case 5:
-                (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGIN_C');
-                return [2, loginPromise];
+            case 5: return [2, loginPromise];
         }
     });
 }); };
 exports.login = login;
 var logout = function () {
-    (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGOUT_C');
-    storage_1.globalStorage.deleteStorage('____login');
-    logger.success('Logged out');
+    index_1.globalStorage.deleteStorage('____login');
+    index_1.logger.success('Logged out');
 };
 exports.logout = logout;

package/{modules → private-modules/zeppos-app-utils/dist/modules}/status.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -65,19 +42,17 @@ exports.__esModule = true;
 exports.status = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
-var logger = __importStar(require("../utils/logger"));
-var index_1 = require("../api/index");
-var storage_1 = require("./storage");
-var project_1 = require("../config/project");
-var run_1 = require("./run");
-var hm_analytics_1 = require("../utils/hm-analytics");
+var index_1 = require("../index");
+var DEFAULT_HOST = index_1.config.DEFAULT_HOST, DEFAULT_PORT = index_1.config.DEFAULT_PORT, getLocalConfig = index_1.config.getLocalConfig, simulatorStorageKey = index_1.config.simulatorStorageKey;
+var loginStorageKey = getLocalConfig().loginStorageKey;
 var status = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, _h, _j, simulatorHost, _k, _l, simulatorPort, _m, simulatorConnectStatus, loginStatus, userInfoHost, userInfoURL, nickName, res, error_1;
+    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, _h, _j, simulatorHost, _k, _l, simulatorPort, _m, simulatorConnectStatus, loginStatus, loggerMessage, userInfoHost, userInfoURL, nickName, res, message, error_1, message, message1_1, message2_1, message, message1, message2, message3;
     return __generator(this, function (_o) {
         switch (_o.label) {
             case 0:
-                _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g, _h = project_1.simulatorStorageKey.simulatorHost, _j = _a[_h], simulatorHost = _j === void 0 ? run_1.DEFAULT_HOST : _j, _k = project_1.simulatorStorageKey.simulatorPort, _l = _a[_k], simulatorPort = _l === void 0 ? run_1.DEFAULT_PORT : _l, _m = project_1.simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_m];
+                _a = index_1.instanceStorage.getStorage(), _b = loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g, _h = simulatorStorageKey.simulatorHost, _j = _a[_h], simulatorHost = _j === void 0 ? DEFAULT_HOST : _j, _k = simulatorStorageKey.simulatorPort, _l = _a[_k], simulatorPort = _l === void 0 ? DEFAULT_PORT : _l, _m = simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_m];
                 loginStatus = !!(apptoken && userid && cname);
+                loggerMessage = [];
                 if (!loginStatus) return [3, 5];
                 userInfoHost = lodash_1["default"].split(lodash_1["default"].toString(cname), ',').filter(function (h) { return h.indexOf('auth-') > -1; })[0];
                 userInfoURL = "https://".concat(userInfoHost, "/v2/developer/account/center");
@@ -85,31 +60,46 @@ var status = function (args) { return __awaiter(void 0, void 0, void 0, function
                 _o.label = 1;
             case 1:
                 _o.trys.push([1, 3, , 4]);
-                return [4, (0, index_1.getUserInfo)(userInfoURL, apptoken)];
+                return [4, index_1.api.getUserInfo(userInfoURL, apptoken)];
             case 2:
                 res = _o.sent();
                 nickName = res.userName;
-                logger.log('login status:', chalk_1["default"].yellow('logged'));
+                message = "login status: ".concat(chalk_1["default"].yellow('logged'));
+                index_1.logger.log(message);
+                loggerMessage.push(message);
                 return [3, 4];
             case 3:
                 error_1 = _o.sent();
-                logger.log('login status:', chalk_1["default"].keyword('orange')('no login - invalid token, you can login again with the command `zeus login`'));
+                message = "login status: ".concat(chalk_1["default"].keyword('orange')('no login - invalid token, you can login again with the command `zeus login`'));
+                index_1.logger.log(message);
+                loggerMessage.push(message);
                 args._loginAppToken = '';
                 process.env._loginAppToken = '';
                 return [3, 4];
             case 4:
-                logger.log('nickName:', chalk_1["default"].yellow(nickName || '-'));
-                logger.log('userID:', chalk_1["default"].yellow(userid));
+                message1_1 = "nickName: ".concat(chalk_1["default"].yellow(nickName || '-'));
+                index_1.logger.log(message1_1);
+                loggerMessage.push(message1_1);
+                message2_1 = "userID: ".concat(chalk_1["default"].yellow(userid));
+                index_1.logger.log(message2_1);
+                loggerMessage.push(message2_1);
                 return [3, 6];
             case 5:
-                logger.log('login status:', chalk_1["default"].yellow('no login'));
+                message = "login status: ".concat(chalk_1["default"].yellow('no login'));
+                index_1.logger.log(message);
+                loggerMessage.push(message);
                 _o.label = 6;
             case 6:
-                logger.log('simulator connect status:', chalk_1["default"].yellow(simulatorConnectStatus ? simulatorConnectStatus : 'disconnected'));
-                logger.log('simulator host:', chalk_1["default"].yellow(simulatorHost));
-                logger.log('simulator port:', chalk_1["default"].yellow(simulatorPort));
-                (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_STATUS_C');
-                return [2];
+                message1 = "simulator connect status: ".concat(chalk_1["default"].yellow(simulatorConnectStatus ? simulatorConnectStatus : 'disconnected'));
+                index_1.logger.log(message1);
+                loggerMessage.push(message1);
+                message2 = "simulator host: ".concat(chalk_1["default"].yellow(simulatorHost));
+                index_1.logger.log(message2);
+                loggerMessage.push(message2);
+                message3 = "simulator port: ".concat(chalk_1["default"].yellow(simulatorPort));
+                index_1.logger.log(message3);
+                loggerMessage.push(message3);
+                return [2, loggerMessage];
         }
     });
 }); };

package/{public/template → private-modules/zeppos-app-utils/dist/public/template/v1}/empty/app.json

@@ -25,7 +25,7 @@
       "module": {
         "page": {
           "pages": [
-            "pages/index"
+            "page/index"
           ]
         },
         "app-side": {