@htyf-mp/cli 0.3.12-alpha.8 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.3.12-alpha.8",
+  "version": "0.4.1",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5cc8ce86a85855cdc42d26940185dd63bc758b6b"
+  "gitHead": "0acb01b5020e4dd31d993ff5afa87008e1200de9"
 }

package/src/config.mjs

@@ -13,6 +13,10 @@ export class ProjectConfig {
     };
 
     this.templates = {
+      [CONSTANTS.TEMPLATE_TYPES.TARO_TEMPLATE]: {
+        name: 'taro-template',
+        tempPath: '_taro_temp_'
+      },
       [CONSTANTS.TEMPLATE_TYPES.APP_TEMPLATE]: {
         name: 'app-template',
         tempPath: '_apps_temp_'
@@ -21,10 +25,6 @@ export class ProjectConfig {
         name: 'game-template',
         tempPath: '_game_temp_'
       },
-      [CONSTANTS.TEMPLATE_TYPES.WEB_TEMPLATE]: {
-        name: 'web-template',
-        tempPath: '_web_temp_'
-      }
     };
   }
 

package/src/constants.mjs

@@ -25,9 +25,9 @@ export const CONSTANTS = {
     CODING: 'https://e.coding.net/dagouzhi/hongtangyun_mobile/htyf-cli.git'
   },
   TEMPLATE_TYPES: {
+    TARO_TEMPLATE: 'taro-template',
     APP_TEMPLATE: 'app-template',
     GAME_TEMPLATE: 'game-template',
-    WEB_TEMPLATE: 'web-template',
   }
 };
 

package/src/project-initializer.mjs

@@ -198,10 +198,10 @@ export class ProjectInitializer {
       let appType = 'app';
       if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
         appType = 'game';
-      } else if (templateType === CONSTANTS.TEMPLATE_TYPES.WEB_TEMPLATE) {
-        appType = 'web';
       } else if (templateType === CONSTANTS.TEMPLATE_TYPES.APP_TEMPLATE) {
         appType = 'app';
+      } else if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO_TEMPLATE) {
+        appType = 'app';
       }
       projectConfig.type = appType;
       // 写入配置文件
@@ -281,6 +281,11 @@ export class ProjectInitializer {
 
         if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
           commands.push(chalk.white('  npm install'));
+        } else if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO_TEMPLATE) {
+          commands.push(
+            chalk.white('  npm install'),
+            chalk.white('  npm run dev:htyf')
+          );
         } else {
           commands.push(
             chalk.white('  npm install'),

package/src/template-processor.mjs

@@ -3,7 +3,6 @@ import path from 'path';
 import fse from 'fs-extra';
 import { execa } from 'execa';
 import { Logger } from './logger.mjs';
-import { CONSTANTS } from './constants.mjs';
 
 /**
  * 模板处理器类
@@ -46,18 +45,17 @@ export class TemplateProcessor {
       path.join(tmpdir, 'README.md')
     ];
 
-    // 根据模板类型移除不需要的模板
-    if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
-      pathsToRemove.push(path.join(tmpdir, 'mini-game-template'));
-    } 
-    if (templateType === CONSTANTS.TEMPLATE_TYPES.APP_TEMPLATE) {
-      pathsToRemove.push(path.join(tmpdir, 'mini-apps-template'));
-    }
-    if (templateType === CONSTANTS.TEMPLATE_TYPES.WEB_TEMPLATE) {
-      pathsToRemove.push(
-        path.join(tmpdir, 'mini-apps-template'),
-        path.join(tmpdir, 'mini-game-template')
-      );
+    const cliTemplatesDir = path.join(tmpdir, 'packages/cli');
+    const selectedTemplate = this.config.templates[templateType];
+    if (selectedTemplate) {
+      const selectedPath = path.join(cliTemplatesDir, selectedTemplate.tempPath);
+      Object.values(this.config.templates).forEach((template) => {
+        const templatePath = path.join(cliTemplatesDir, template.tempPath);
+        if (templatePath !== selectedPath) {
+          pathsToRemove.push(templatePath);
+        }
+      });
+      pathsToRemove.push(path.join(selectedPath, '.git'));
     }
 
     pathsToRemove.forEach(pathToRemove => {