@zeppos/zeus-cli 1.2.3 → 1.2.4

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]) {
@@ -62,7 +62,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.runX = exports.previewBuild = exports.build = exports.BuildMode = void 0;
+exports.runX = exports.previewBuild = exports.build = exports.buildSupportV3Config = exports.BuildMode = void 0;
 var zpm_1 = require("@zeppos/zpm");
 var rd = __importStar(require("rd"));
 var fs_1 = __importDefault(require("fs"));
@@ -105,13 +105,86 @@ var gitignoreDefaultItem = [
     '*.njsproj',
     '*.sln',
 ];
+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, zabName_1, distDir_1, name_1, newName_1, error_1;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    _a = buildConfigOption.targets, targets = _a === void 0 ? [] : _a, _b = buildConfigOption.sources, sources = _b === void 0 ? [] : _b;
+                    buildOptions = {
+                        path: workspace,
+                        buildMode: mode,
+                        targets: targets,
+                        sources: sources,
+                        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;
+                        js2c = !!(js2c === 'true' || js2c === true);
+                        js2bin = !!(js2bin === 'true' || js2bin === true);
+                        png2vg = !!(png2vg === 'true' || png2vg === true);
+                        prune = !!(prune === 'true' || prune === true);
+                        compress = !!(compress === 'true' || compress === true);
+                        js2c && Object.assign(buildOptions, { jsc: TransformType.C });
+                        js2bin && Object.assign(buildOptions, { jsc: TransformType.Bin });
+                        Object.assign(buildOptions, {
+                            png2vg: png2vg,
+                            prune: prune,
+                            compress: compress
+                        });
+                    }
+                    _h.label = 1;
+                case 1:
+                    _h.trys.push([1, 6, , 7]);
+                    if (targets.length) {
+                        index_1.logger.info("Start building package, targets: ".concat(targets.join(', '), "."));
+                    }
+                    else if (sources.length) {
+                        index_1.logger.info("Start building package, device sources: ".concat(sources.join(', '), "."));
+                    }
+                    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)];
+                case 4:
+                    zabName_1 = _h.sent();
+                    if (buildConfigOption.renameWithAppId) {
+                        distDir_1 = path.join(workspace, 'dist');
+                        name_1 = zabName_1.replace(/[\s]/g, '_').split('.zab');
+                        newName_1 = "".concat(buildConfigOption.renameWithAppId, "-").concat(name_1[0], ".zab");
+                        rd.eachFileSync(distDir_1, function (file) {
+                            var oldName = path.join(distDir_1, zabName_1);
+                            if (file !== oldName) {
+                                fs_extra_1["default"].removeSync(file);
+                            }
+                            else {
+                                fs_1["default"].renameSync(oldName, path.join(distDir_1, newName_1));
+                            }
+                        });
+                        return [2, newName_1];
+                    }
+                    return [2, zabName_1];
+                case 5: return [3, 7];
+                case 6:
+                    error_1 = _h.sent();
+                    index_1.logger.error(error_1);
+                    return [3, 7];
+                case 7: return [2];
+            }
+        });
+    });
+};
+exports.buildSupportV3Config = buildSupportV3Config;
 var build = function (workspace, mode, buildConfigOption, packages, appId) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (appId === void 0) { appId = '10000'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, curOpt, productName_1, DistDir_1, name_1, newName_1, error_1;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, _e, compress, curOpt, productName_1, DistDir_1, name_2, newName_2, error_2;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     buildOptions = {
                         path: workspace,
@@ -120,54 +193,56 @@ var build = function (workspace, mode, buildConfigOption, packages, appId) {
                         jsc: TransformType.Default
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
-                        _a = buildConfigOption || {}, js2c = _a.js2c, _b = _a.js2bin, js2bin = _b === void 0 ? true : _b, _c = _a.png2vg, png2vg = _c === void 0 ? true : _c, _d = _a.prune, prune = _d === void 0 ? true : _d;
+                        _a = buildConfigOption || {}, js2c = _a.js2c, _b = _a.js2bin, js2bin = _b === void 0 ? true : _b, _c = _a.png2vg, png2vg = _c === void 0 ? true : _c, _d = _a.prune, prune = _d === void 0 ? true : _d, _e = _a.compress, compress = _e === void 0 ? true : _e;
                         js2c = !!(js2c === 'true' || js2c === true);
                         js2bin = !!(js2bin === 'true' || js2bin === true);
                         png2vg = !!(png2vg === 'true' || png2vg === true);
                         prune = !!(prune === 'true' || prune === true);
+                        compress = !!(compress === 'true' || compress === true);
                         js2c && Object.assign(buildOptions, { jsc: TransformType.C });
                         js2bin && Object.assign(buildOptions, { jsc: TransformType.Bin });
                         Object.assign(buildOptions, {
                             png2vg: png2vg,
-                            prune: prune
+                            prune: prune,
+                            compress: compress
                         });
                     }
-                    _e.label = 1;
+                    _f.label = 1;
                 case 1:
-                    _e.trys.push([1, 6, , 7]);
+                    _f.trys.push([1, 6, , 7]);
                     index_1.logger.info("Start building package, targets: ".concat(packages.join(', '), "."));
-                    curOpt = (buildConfigOption ? buildConfigOption._ : [''])[0];
+                    curOpt = (0, lodash_1.get)(buildConfigOption, '_', [])[0];
                     if (!(mode !== BuildMode.DEV ||
                         (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 3];
                     return [4, (0, zpm_1.start)(buildOptions)];
                 case 2:
-                    productName_1 = _e.sent();
+                    productName_1 = _f.sent();
                     if (productName_1) {
                         DistDir_1 = path.join(workspace, 'dist');
-                        name_1 = productName_1.replace(/[\s]/g, '_').split('.zab');
-                        newName_1 = "".concat(appId, "-").concat(name_1[0], ".zab");
+                        name_2 = productName_1.replace(/[\s]/g, '_').split('.zab');
+                        newName_2 = "".concat(appId, "-").concat(name_2[0], ".zab");
                         rd.eachFileSync(DistDir_1, function (file) {
                             var oldName = path.join(DistDir_1, productName_1);
                             if (file !== oldName) {
                                 fs_extra_1["default"].removeSync(file);
                             }
                             else {
-                                fs_1["default"].renameSync(oldName, path.join(DistDir_1, newName_1));
+                                fs_1["default"].renameSync(oldName, path.join(DistDir_1, newName_2));
                             }
                         });
-                        productName_1 = newName_1;
+                        productName_1 = newName_2;
                     }
                     return [2, productName_1];
                 case 3:
                     if (!(mode === BuildMode.DEV)) return [3, 5];
                     return [4, (0, zpm_1.startWithoutDist)(buildOptions)];
                 case 4:
-                    _e.sent();
+                    _f.sent();
                     return [2, (0, zpm_1.getZpkBuf)(packages[0])];
                 case 5: return [3, 7];
                 case 6:
-                    error_1 = _e.sent();
-                    index_1.logger.error(error_1);
+                    error_2 = _f.sent();
+                    index_1.logger.error(error_2);
                     return [3, 7];
                 case 7: return [2];
             }
@@ -184,7 +259,7 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                     form.append('file', fs_1["default"].createReadStream(workspace));
                     form.append('app_type', appType === index_1.config.AppType.WATCHFACE ? '1' : '2');
                     form.getLength(function (err, length) { return __awaiter(void 0, void 0, void 0, function () {
-                        var protocol, code, res, error_2, _subRegionalHost, url, _a, deviceSource, appId, appName, appType_1, deviceSourceArr, targetDeviceInternalName, packageInfo, url, preview, downloadPackageReturn;
+                        var protocol, code, res, error_3, _subRegionalHost, url, _a, deviceSource, appId, appName, appType_1, deviceSourceArr, targetDeviceInternalName, packageInfo, url, preview, downloadPackageReturn;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
@@ -204,8 +279,8 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                                     code = res.code;
                                     return [3, 7];
                                 case 3:
-                                    error_2 = _b.sent();
-                                    if (!((error_2 === null || error_2 === void 0 ? void 0 : error_2.message) === '401')) return [3, 5];
+                                    error_3 = _b.sent();
+                                    if (!((error_3 === null || error_3 === void 0 ? void 0 : error_3.message) === '401')) return [3, 5];
                                     index_1.logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
                                     return [4, index_1.modules.login().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
                                             return __generator(this, function (_a) {
@@ -219,7 +294,7 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                                     _b.sent();
                                     return [3, 6];
                                 case 5:
-                                    index_1.logger.error(error_2 === null || error_2 === void 0 ? void 0 : error_2.message);
+                                    index_1.logger.error(error_3 === null || error_3 === void 0 ? void 0 : error_3.message);
                                     reject('reTry');
                                     return [2];
                                 case 6: return [3, 7];
@@ -232,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;
@@ -250,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;
@@ -264,7 +339,7 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
     });
 }); };
 exports.previewBuild = previewBuild;
-var runX = function (root, args, url, packages, logAfterFunc) { return __awaiter(void 0, void 0, void 0, function () {
+var runX = function (root, args, url, logAfterFunc) { return __awaiter(void 0, void 0, void 0, function () {
     var logger, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
     return __generator(this, function (_a) {
         logger = new index_1.MyLogger();
@@ -278,10 +353,7 @@ var runX = function (root, args, url, packages, logAfterFunc) { return __awaiter
                 switch (_b.label) {
                     case 0:
                         logger.info('rebuilding...');
-                        if (process.env._targetDeviceToBuild && !args.target) {
-                            args.target = process.env._targetDeviceToBuild;
-                        }
-                        return [4, index_1.modules.build(root, BuildMode.DEV, args, packages)];
+                        return [4, (0, exports.buildSupportV3Config)(root, BuildMode.DEV, args)];
                     case 1:
                         zpkBuffer = _b.sent();
                         if (zpkBuffer) {

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,14 +101,16 @@ 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, 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) {
+        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;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
+                    cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a, _b = args.configVersion, configVersion = _b === void 0 ? 'v2' : _b;
                     workDir = cwdPath;
-                    V1_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v1');
-                    V2_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v2');
+                    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)
@@ -199,7 +201,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                             watchfaceTemplateChoices: watchfaceTemplateChoices
                         })];
                 case 1:
-                    answer = _b.sent();
+                    answer = _c.sent();
                     answer.appType = answer.appType || AppType.APP;
                     answer.workDir = workDir;
                     choosePkg = answer.appType.toLowerCase() === AppType.APP
@@ -208,7 +210,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.info('fetching template...');
                     return [4, (0, index_1.sleep)(100)];
                 case 2:
-                    _b.sent();
+                    _c.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] }));
@@ -220,7 +222,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.log('\n');
                     return [4, (0, index_1.sleep)(50)];
                 case 3:
-                    _b.sent();
+                    _c.sent();
                     rd.eachFileSync(workDir, function (file) {
                         if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
                             fs_extra_1["default"].remove(file);
@@ -240,7 +242,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.log('Start installing dependency packages.');
                     return [4, projectPreInstall(workDir)];
                 case 4:
-                    _b.sent();
+                    _c.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, [

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]) {
@@ -59,12 +59,12 @@ var fs_1 = __importDefault(require("fs"));
 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, OSVersion, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
+    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
-        workDir = args.workDir, templateInfo = args.templateInfo, OSVersion = args.OSVersion, 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;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
-        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_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" />');
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
@@ -81,11 +81,11 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         targets = {};
         if (appType.toLowerCase() === AppType.WATCHFACE) {
             defaultWatchFaceConfig = {
-                "path": "watchface/index",
-                "main": 1,
-                "editable": 0,
-                "lockscreen": 0,
-                "photoscreen": 0
+                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');

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]) {

package/private-modules/zeppos-app-utils/dist/modules/status.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/public/template/v2/empty/page/index.js

@@ -1,7 +1,7 @@
-import { gettext } from 'i18n'
+import { getText } from '@zos/i18n'
 
 Page({
   build() {
-    console.log(gettext('example'))
+    console.log(getText('example'))
   }
 })

package/private-modules/zeppos-app-utils/dist/tools/index.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/private-modules/zeppos-app-utils/package.json

@@ -12,7 +12,7 @@
     "clean": "rm -rf node_modules && rm -rf dist"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.6.6",
+    "@zeppos/zpm": "^3.0.0",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

package/utils/pre-check.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]) {
@@ -43,17 +43,12 @@ exports.initVariable = exports.checkVersion = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var packageJson = require('package-json');
 var zeppos_app_utils_1 = require("zeppos-app-utils");
+var tools_1 = require("./tools");
 var loginStorageKey = zeppos_app_utils_1.config.getLocalConfig().loginStorageKey;
 var _a = require('../package.json'), userVersion = _a.version, userName = _a.name;
 var versionCheckTimeKey = '____inner_version_check_time';
 var versionKey = '____inner_version';
 var _b = zeppos_app_utils_1.instanceStorage.getStorage(), _c = versionCheckTimeKey, userVersionCheckTime = _b[_c], _d = versionKey, originVersion = _b[_d], _e = loginStorageKey.accountToken, _f = _b[_e], apptoken = _f === void 0 ? '' : _f, _g = loginStorageKey.userid, _h = _b[_g], userid = _h === void 0 ? '' : _h, _j = loginStorageKey.cname, _k = _b[_j], cname = _k === void 0 ? '' : _k, _l = _b.account_env, _accountEnv = _l === void 0 ? 'production' : _l;
-var versionToCode = function (version) {
-    if (!version)
-        return 0;
-    var p = version.split('.').map(function (val) { return Number(val); });
-    return p[0] * 10000 + p[1] * 100;
-};
 var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
     var versions, versionList, error_1;
     var _a;
@@ -61,7 +56,7 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
         switch (_b.label) {
             case 0:
                 _b.trys.push([0, 2, , 3]);
-                return [4, packageJson(userName, { allVersions: true, registryUrl: 'https://registry.npmjs.org/' })];
+                return [4, packageJson(userName, { allVersions: true })];
             case 1:
                 versions = (_b.sent()).versions;
                 versionList = Object.keys(versions).filter(function (val) { return !val.includes('beta'); });
@@ -83,21 +78,15 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
 var checkVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
     var originVersionCode, userVersionCode;
     return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (!(!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 24 * 60 * 60 * 1000))) return [3, 2];
-                return [4, checkOriginVersion()];
-            case 1:
-                _a.sent();
-                _a.label = 2;
-            case 2:
-                originVersionCode = versionToCode(originVersion);
-                userVersionCode = versionToCode(userVersion);
-                if (originVersionCode - userVersionCode >= 100) {
-                    zeppos_app_utils_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
-                }
-                return [2];
+        if (!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 24 * 60 * 60 * 1000)) {
+            checkOriginVersion();
+        }
+        originVersionCode = (0, tools_1.versionToCode)(originVersion);
+        userVersionCode = (0, tools_1.versionToCode)(userVersion);
+        if (originVersionCode - userVersionCode >= 100) {
+            zeppos_app_utils_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
         }
+        return [2];
     });
 }); };
 exports.checkVersion = checkVersion;

package/utils/tools.js

@@ -0,0 +1,14 @@
+"use strict";
+exports.__esModule = true;
+exports.compareVersion = exports.versionToCode = void 0;
+var versionToCode = function (version) {
+    if (!version)
+        return 0;
+    var _a = version.split('.').map(function (val) { return Number(val); }), _b = _a[0], p0 = _b === void 0 ? 0 : _b, _c = _a[1], p1 = _c === void 0 ? 0 : _c, _d = _a[2], p2 = _d === void 0 ? 0 : _d;
+    return p0 * 10000 + p1 * 100 + p2;
+};
+exports.versionToCode = versionToCode;
+var compareVersion = function (version1, version2) {
+    return (0, exports.versionToCode)(version2) - (0, exports.versionToCode)(version1);
+};
+exports.compareVersion = compareVersion;