@zeppos/zeus-cli 1.1.7 → 1.1.8

package/modules/build.js

@@ -162,16 +162,16 @@ exports.chooseBuildPackages = chooseBuildPackages;
 var build = function (mode, buildConfigOption) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var workspace, packages, choosePackages, buildOptions, _a, js2c, js2bin, png2vg, prune, curJscMode, curOpt, productName_1, DistDir_1, appId, name_1, newName_1, error_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var workspace, packages, choosePackages, buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, curOpt, productName_1, DistDir_1, appId, name_1, newName_1, error_1;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     workspace = path.resolve('./');
                     process.env._targetDeviceToBuild = (buildConfigOption === null || buildConfigOption === void 0 ? void 0 : buildConfigOption.target) || '';
                     packages = [];
                     return [4, chooseBuildPackages(mode)];
                 case 1:
-                    choosePackages = _b.sent();
+                    choosePackages = _e.sent();
                     if (!choosePackages || !choosePackages.length) {
                         logger.error('please choose at least one package.');
                         return [2];
@@ -187,32 +187,26 @@ var build = function (mode, buildConfigOption) {
                         jsc: TransformType.Default
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
-                        _a = buildConfigOption || {}, js2c = _a.js2c, js2bin = _a.js2bin, png2vg = _a.png2vg, prune = _a.prune;
-                        js2c = js2c === 'false' ? false : true;
-                        js2bin = ((js2bin === 'true') || (js2bin === true)) ? true : false;
-                        png2vg = ((png2vg === 'false') && (png2vg !== undefined)) ? false : true;
-                        prune = ((prune === 'false') && (prune !== undefined)) ? false : true;
-                        curJscMode = js2c && js2bin ? TransformType.Bin : TransformType.C;
-                        if (js2bin && !js2c) {
-                            curJscMode = TransformType.Bin;
-                        }
-                        else if ((!js2bin && !js2c) || !js2c) {
-                            curJscMode = TransformType.Default;
-                        }
+                        _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;
+                        js2c = !!((js2c === 'true') || (js2c === true));
+                        js2bin = !!((js2bin === 'true') || (js2bin === true));
+                        png2vg = !!((png2vg === 'true') || (png2vg === true));
+                        prune = !!((prune === 'true') || (prune === true));
+                        js2c && Object.assign(buildOptions, { jsc: TransformType.C });
+                        js2bin && Object.assign(buildOptions, { jsc: TransformType.Bin });
                         Object.assign(buildOptions, {
                             png2vg: png2vg,
-                            prune: prune,
-                            jsc: curJscMode
+                            prune: prune
                         });
                     }
-                    _b.label = 2;
+                    _e.label = 2;
                 case 2:
-                    _b.trys.push([2, 7, , 8]);
+                    _e.trys.push([2, 7, , 8]);
                     curOpt = (buildConfigOption ? buildConfigOption._ : [''])[0];
                     if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 4];
                     return [4, (0, node_js_1.start)(buildOptions)];
                 case 3:
-                    productName_1 = _b.sent();
+                    productName_1 = _e.sent();
                     if (productName_1) {
                         DistDir_1 = path.join(workspace, 'dist');
                         appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
@@ -234,11 +228,11 @@ var build = function (mode, buildConfigOption) {
                     if (!(mode === BuildMode.DEV)) return [3, 6];
                     return [4, (0, node_js_1.startWithoutDist)(buildOptions)];
                 case 5:
-                    _b.sent();
+                    _e.sent();
                     return [2, (0, node_js_1.getZpkBuf)(packages[0])];
                 case 6: return [3, 8];
                 case 7:
-                    error_1 = _b.sent();
+                    error_1 = _e.sent();
                     logger.error(error_1);
                     return [3, 8];
                 case 8: return [2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -41,7 +41,7 @@
     "webpack": "^5.52.0"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.3.10",
+    "@zeppos/zpm": "^2.4.0",
     "axios": "^0.23.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",