@htyf-mp/cli 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {

package/src/config.mjs

@@ -19,7 +19,7 @@ export class ProjectConfig {
       },
       [CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE]: {
         name: 'game-template',
-        tempPath: '_games_temp_'
+        tempPath: '_game_temp_'
       }
     };
   }

package/src/project-initializer.mjs

@@ -191,10 +191,27 @@ export class ProjectInitializer {
       spinner.text = '正在生成项目配置...';
       const appid = this.config.generateAppId();
       const projectConfig = this.config.createProjectConfig(appName, displayName, appid);
-
       // 写入配置文件
-      const configPath = path.join(appRootPath, 'htyf.json');
-      fs.writeFileSync(configPath, JSON.stringify(projectConfig, undefined, 2));
+      const configPath = path.join(appRootPath, template.tempPath, 'app.json');
+      let existingConfig = {};
+      
+      // 检查 app.json 是否存在
+      if (fs.existsSync(configPath)) {
+        // 如果存在，读取现有内容
+        const existingContent = fs.readFileSync(configPath, 'utf-8');
+        try {
+          existingConfig = JSON.parse(existingContent);
+        } catch (error) {
+          Logger.warn('app.json 格式错误，将创建新配置');
+          existingConfig = {};
+        }
+      }
+      
+      // 添加 htyf 字段
+      existingConfig.htyf = projectConfig;
+      
+      // 写入配置文件
+      fs.writeFileSync(configPath, JSON.stringify(existingConfig, undefined, 2));
 
       // 清理临时文件
       spinner.text = '正在清理临时文件...';
@@ -227,7 +244,7 @@ export class ProjectInitializer {
     } catch (error) {
       // 清理临时目录
       if (fs.existsSync(tmpdir)) {
-        fse.removeSync(tmpdir);
+        // fse.removeSync(tmpdir);
       }
       throw error;
     }

package/src/template-processor.mjs

@@ -47,9 +47,10 @@ export class TemplateProcessor {
     ];
 
     // 根据模板类型移除不需要的模板
-    if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO || templateType === CONSTANTS.TEMPLATE_TYPES.EXPO) {
+    if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
       pathsToRemove.push(path.join(tmpdir, 'mini-game-template'));
-    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_COCOS) {
+    } 
+    if (templateType === CONSTANTS.TEMPLATE_TYPES.APP_TEMPLATE) {
       pathsToRemove.push(path.join(tmpdir, 'mini-apps-template'));
     }
 
@@ -73,65 +74,7 @@ export class TemplateProcessor {
 
     const tempPath = path.join(appRootPath, '__TEMP__');
 
-    if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO) {
-      this.processTaroTemplate(appRootPath, tempPath, template);
-    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.EXPO) {
-      this.processExpoTemplate(appRootPath, tempPath, template);
-    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_COCOS) {
-      // 预留游戏模板处理
-      Logger.info('游戏模板处理功能开发中...');
-    }
-  }
-
-  processTaroTemplate(appRootPath, tempPath, template) {
-    Logger.info('正在处理 Taro 模板...');
-
-    // 复制模板文件
-    Object.entries(template.files).forEach(([key, fileName]) => {
-      const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
-
-      if (fs.existsSync(srcPath)) {
-        fse.copySync(srcPath, destPath);
-        Logger.debug(`已复制: ${fileName} -> ${destPath}`);
-      }
-    });
-
-    // 更新 package.json
-    const pkgPath = path.join(appRootPath, './package.json');
-    if (fs.existsSync(pkgPath)) {
-      const pkgInfo = fse.readJSONSync(pkgPath);
-      if (template.scripts) {
-        pkgInfo.scripts = {
-          ...(pkgInfo.scripts || {}),
-          ...template.scripts
-        };
-      }
-
-      // 移除不需要的脚本
-      if (pkgInfo.scripts) {
-        delete pkgInfo.scripts.web;
-        delete pkgInfo.scripts['web:dev'];
-      }
-
-      fse.writeJSONSync(pkgPath, pkgInfo, { spaces: 2 });
-      Logger.info('package.json 已更新');
-    }
   }
 
-  processExpoTemplate(appRootPath, tempPath, template) {
-    Logger.info('正在处理 Expo 模板...');
-
-    // 复制模板文件
-    Object.entries(template.files).forEach(([key, fileName]) => {
-      const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
-
-      if (fs.existsSync(srcPath)) {
-        fse.copySync(srcPath, destPath);
-        Logger.debug(`已复制: ${fileName} -> ${destPath}`);
-      }
-    });
-  }
 }