@zeppos/zeus-cli 1.0.24 → 1.0.26

package/modules/build.js

@@ -159,25 +159,25 @@ function chooseBuildPackages(mode) {
     });
 }
 exports.chooseBuildPackages = chooseBuildPackages;
-var build = function (mode, packages) {
+var build = function (mode, packages, buildConfigOption) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (packages === void 0) { packages = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var workspace, choosePackages, buildOptions, buildInfo_1, DistDir_1, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var workspace, choosePackages, buildOptions, _a, js2c, js2bin, png2vg, prune, curJscMode, buildInfo_1, DistDir_1, error_1;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     workspace = path.resolve('./');
                     if (!!packages.length) return [3 /*break*/, 2];
                     return [4 /*yield*/, chooseBuildPackages(mode)];
                 case 1:
-                    choosePackages = _a.sent();
+                    choosePackages = _b.sent();
                     if (!choosePackages || !choosePackages.length) {
                         logger.error('please choose at least one package');
                         return [2 /*return*/];
                     }
                     packages.push.apply(packages, choosePackages);
-                    _a.label = 2;
+                    _b.label = 2;
                 case 2:
                     buildOptions = {
                         path: workspace,
@@ -186,23 +186,35 @@ var build = function (mode, packages) {
                         jsc: TransformType.Default // 不开启 js => c
                     };
                     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;
+                        }
                         Object.assign(buildOptions, {
-                            png2vg: true,
-                            jsc: TransformType.C,
-                            prune: true // js转成bin之后删除js脚本（开启转 bin 之后，需要在 win 上 preview 验证一下转 C 是否正常）
+                            png2vg: png2vg,
+                            prune: prune,
+                            jsc: curJscMode
                         });
                     }
-                    _a.label = 3;
+                    _b.label = 3;
                 case 3:
-                    _a.trys.push([3, 8, , 9]);
+                    _b.trys.push([3, 8, , 9]);
                     if (!(mode === BuildMode.DEV)) return [3 /*break*/, 5];
                     return [4 /*yield*/, (0, node_js_1.startWithoutDist)(buildOptions)];
                 case 4:
-                    _a.sent();
+                    _b.sent();
                     return [2 /*return*/, (0, node_js_1.getZpkBuf)(packages[0])];
                 case 5: return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
                 case 6:
-                    buildInfo_1 = _a.sent();
+                    buildInfo_1 = _b.sent();
                     if (buildInfo_1) {
                         DistDir_1 = path.join(workspace, 'dist');
                         rd.eachFileSync(DistDir_1, function (file) {
@@ -214,7 +226,7 @@ var build = function (mode, packages) {
                     return [2 /*return*/, buildInfo_1];
                 case 7: return [3 /*break*/, 9];
                 case 8:
-                    error_1 = _a.sent();
+                    error_1 = _b.sent();
                     logger.error(error_1);
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/];
@@ -227,8 +239,8 @@ var buildDev = function (packages) {
     return (0, exports.build)(BuildMode.DEV, packages);
 };
 exports.buildDev = buildDev;
-var buildProd = function () {
-    return (0, exports.build)(BuildMode.PROD, []);
+var buildProd = function (args) {
+    return (0, exports.build)(BuildMode.PROD, [], args);
 };
 exports.buildProd = buildProd;
 var checkIsWatchFaceProject = function () {
@@ -246,7 +258,7 @@ var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, fu
                 _a = _b.sent(), apptoken = _a.apptoken, userid = _a.userid, cname = _a.cname;
                 form = new form_data_1["default"]();
                 logger.info('building preview...');
-                return [4 /*yield*/, (0, exports.build)(BuildMode.PREVIEW)];
+                return [4 /*yield*/, (0, exports.build)(BuildMode.PREVIEW, [], args)];
             case 2:
                 buildInfo = _b.sent();
                 isWatchFaceProject = checkIsWatchFaceProject();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",

package/public/template/hello-world/app.json

@@ -124,7 +124,7 @@
   },
   "i18n": {
     "en-US": {
-      "name": "Hello World"
+      "appName": "Hello World"
     }
   },
   "defaultLanguage": "en-US"

package/public/template/timer/app.json

@@ -42,7 +42,7 @@
   },
   "i18n": {
     "en-US": {
-      "name": "timer"
+      "appName": "timer"
     }
   },
   "defaultLanguage": "en-US",