@zeppos/zeus-cli 1.7.4 → 1.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "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.7.2",
-    "@zeppos/zpm": "^3.2.4",
+    "@zeppos/zpm": "^3.2.5",
     "axios": "1.8.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",

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

@@ -77,6 +77,7 @@ exports.runX = exports.previewBuild = exports.build = exports.buildSupportV3Conf
 var zpm_1 = require("@zeppos/zpm");
 var rd = __importStar(require("rd"));
 var fs_1 = __importDefault(require("fs"));
+var os_1 = __importDefault(require("os"));
 var path = __importStar(require("path"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var form_data_1 = __importDefault(require("form-data"));
@@ -118,6 +119,54 @@ var gitignoreDefaultItem = [
     '*.njsproj',
     '*.sln',
 ];
+function getSimulatorPath() {
+    var platform = os_1["default"].platform();
+    var newPath;
+    if (platform === 'win32')
+        newPath = process.env.APPDATA || '';
+    else
+        newPath = path.join(os_1["default"].homedir(), '.config');
+    return path.join(newPath, 'simulator');
+}
+function getSimulatorAppsPath(projectName, appId) {
+    var simulatorPath = getSimulatorPath();
+    var appsPath = path.join(simulatorPath, 'apps');
+    if (projectName && appId)
+        return path.join(appsPath, projectName + appId);
+    return appsPath;
+}
+function updateLastAppInfo(projectName, appId, userProjectPath) {
+    var simulatorDir = getSimulatorPath();
+    var lastAppInfoPath = path.join(simulatorDir, 'last_app_info.json');
+    var simAppPath = getSimulatorAppsPath(projectName, appId);
+    var newAppInfo = {
+        sim_app_path: simAppPath,
+        user_app_path: userProjectPath,
+        project_name: projectName,
+        app_id: appId,
+        last_updated: new Date().toISOString()
+    };
+    var needsUpdate = true;
+    if (fs_1["default"].existsSync(lastAppInfoPath)) {
+        try {
+            var existingContent = fs_1["default"].readFileSync(lastAppInfoPath, 'utf8');
+            var existingInfo = JSON.parse(existingContent);
+            if (existingInfo.sim_app_path === newAppInfo.sim_app_path &&
+                existingInfo.user_app_path === newAppInfo.user_app_path) {
+                needsUpdate = false;
+                return existingInfo;
+            }
+        }
+        catch (error) {
+            console.log('Error reading existing app info, will overwrite:', error.message);
+        }
+    }
+    if (needsUpdate) {
+        fs_1["default"].mkdirSync(simulatorDir, { recursive: true });
+        fs_1["default"].writeFileSync(lastAppInfoPath, JSON.stringify(newAppInfo, null, 2));
+    }
+    return newAppInfo;
+}
 var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (buildConfigOption === void 0) { buildConfigOption = {}; }
@@ -172,7 +221,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                     }
                     if (buildConfigOption.renameWithAppId) {
                         distDir_1 = path.join(workspace, 'dist');
-                        name_1 = zabName_1.replace(/[\s]/g, '_').split('.zab');
+                        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);
@@ -213,7 +262,7 @@ 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, _e = _a.compress, compress = _e === void 0 ? true : _e, _f = _a.ip, ip = _f === void 0 ? (mode === BuildMode.PROD) : _f;
+                        _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, _f = _a.ip, ip = _f === void 0 ? mode === BuildMode.PROD : _f;
                         js2c = (0, tools_1.booleanString)(js2c);
                         js2bin = (0, tools_1.booleanString)(js2bin);
                         js2c && Object.assign(buildOptions, { jsc: TransformType.C });
@@ -230,14 +279,13 @@ var build = function (workspace, mode, buildConfigOption, packages, appId) {
                     _g.trys.push([1, 6, , 7]);
                     index_1.logger.info("Start building package, targets: ".concat(packages.join(', '), "."));
                     curOpt = (0, lodash_1.get)(buildConfigOption, '_', [])[0];
-                    if (!(mode !== BuildMode.DEV ||
-                        (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 3];
+                    if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 3];
                     return [4, (0, zpm_1.start)(buildOptions)];
                 case 2:
                     productName_1 = _g.sent();
                     if (productName_1) {
                         DistDir_1 = path.join(workspace, 'dist');
-                        name_2 = productName_1.replace(/[\s]/g, '_').split('.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);
@@ -380,6 +428,7 @@ var runX = function (root, args, url, logAfterFunc) { return __awaiter(void 0, v
                             _a = (0, index_1.getDeviceInfoFromAppJson)(root), targetDeviceInternalName = _a.targetDeviceInternalName, appId = _a.appId, devices = _a.deviceSourceArr;
                             projectName = path.parse(process.cwd()).base;
                             simulator.upload(zpkBuffer, projectName, targetDeviceInternalName, appId, devices);
+                            updateLastAppInfo(projectName, appId, root);
                         }
                         else {
                             logger.error('build error');

package/private-modules/zeppos-app-utils/package.json

@@ -13,7 +13,7 @@
     "dev": "nodemon -e ts,tsx --exec \"rimraf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
   },
   "dependencies": {
-    "@zeppos/zpm": "^3.2.4",
+    "@zeppos/zpm": "^3.2.5",
     "axios": "1.8.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",