@4399ywkf/cli 0.0.19 → 0.0.20

package/dist/cli.js

@@ -85,7 +85,7 @@ const chalk = require$$7;
 const boxen = require$$8;
 const figlet = require$$9;
 const pkgInfo = {
-  version: "0.0.19",
+  version: "0.0.20",
 };
 
 // 美化输出函数
@@ -118,7 +118,7 @@ function printWarning(message) {
   console.log(chalk.yellow("⚠️  " + message));
 }
 
-function printFinalInstructions(projectName) {
+function printFinalInstructions(projectName, architectureType, appDirection) {
   console.log();
   console.log(
     boxen(
@@ -352,302 +352,228 @@ program
     }
     printInfo(`项目名称：${chalk.bold(projectName)}`);
 
-    // 添加预设选择（移到这里）
-    const { usePreset } = await inquirer.prompt({
-      type: "confirm",
-      name: "usePreset",
-      message: chalk.cyan("🎯 是否使用推荐预设？"),
-      default: true,
+    const { architectureType } = await inquirer.prompt({
+      type: "list",
+      name: "architectureType",
+      message: chalk.cyan("🏗️  请选择架构类型："),
+      choices: [
+        {
+          name: `${chalk.blue("🧩 微前端架构")} - 支持主应用和子应用`,
+          value: "microFrontend",
+        },
+        {
+          name: `${chalk.green("📱 独立应用")} - 单体应用架构`,
+          value: "standalone",
+        },
+      ],
     });
-
-    let architectureType, toolType, appDirection;
-
-    if (usePreset) {
-      // 预设选择逻辑
-      const { preset } = await inquirer.prompt({
+    printInfo(
+      `架构类型：${chalk.bold(
+        architectureType === "microFrontend" ? "微前端架构" : "独立应用"
+      )}`
+    );
+
+    let projectTemplate, toolType, appDirection;
+
+    if (architectureType === "microFrontend") {
+      // 微前端架构流程
+      // 3. 选择工具类型
+      const { toolType: toolTypeResult } = await inquirer.prompt({
         type: "list",
-        name: "preset",
-        message: chalk.cyan("📋 请选择预设："),
+        name: "toolType",
+        message: chalk.cyan("🔧 请选择工具类型："),
         choices: [
           {
-            name: `${chalk.blue("🏠 Webpack 主应用")} - 企业级微前端主应用`,
-            value: {
-              architecture: "microFrontend",
-              tool: "webpack",
-              direction: "main",
-            },
-          },
-          {
-            name: `${chalk.green("🧩 Webpack 子应用")} - 业务子应用`,
-            value: {
-              architecture: "microFrontend",
-              tool: "webpack",
-              direction: "sub",
-            },
-          },
-          {
-            name: `${chalk.magenta("⚡ Vite 主应用")} - 高性能微前端主应用`,
-            value: {
-              architecture: "microFrontend",
-              tool: "vite",
-              direction: "main",
-            },
-          },
-          {
-            name: `${chalk.cyan("🔧 Vite 子应用")} - 高性能微前端子应用`,
-            value: {
-              architecture: "microFrontend",
-              tool: "vite",
-              direction: "sub",
-            },
+            name: `${chalk.blue("📦 Webpack")} - 成熟稳定的打包工具`,
+            value: "webpack",
           },
           {
-            name: `${chalk.yellow("📱 Next.js 应用")} - 全栈应用`,
-            value: { architecture: "standalone", framework: "nextjs" },
-          },
-          {
-            name: `${chalk.gray("⚙️  自定义配置")} - 手动选择所有选项`,
-            value: null,
+            name: `${chalk.green("⚡ Vite")} - 快速的构建工具`,
+            value: "vite",
           },
         ],
       });
+      toolType = toolTypeResult;
+      printInfo(`工具类型：${chalk.bold(toolType)}`);
 
-      if (preset) {
-        architectureType = preset.architecture;
-        toolType = preset.tool;
-        appDirection = preset.direction;
-        printSuccess(`使用预设：${chalk.bold("快速配置")}`);
-      }
-    }
-
-    // 如果没有使用预设，或者选择了自定义配置，继续原有的选择流程
-    if (!usePreset || !preset) {
-      // 2. 选择架构类型
-      const { architectureType: selectedArchitecture } = await inquirer.prompt({
+      // 4. 选择应用方向
+      const { appDirection: appDirectionResult } = await inquirer.prompt({
         type: "list",
-        name: "architectureType",
-        message: chalk.cyan("🏗️  请选择架构类型："),
+        name: "appDirection",
+        message: chalk.cyan("🎯 请选择应用方向："),
         choices: [
           {
-            name: `${chalk.blue("🧩 微前端架构")} - 支持主应用和子应用`,
-            value: "microFrontend",
+            name: `${chalk.magenta("🏠 主应用")} - 微前端主应用`,
+            value: "main",
           },
           {
-            name: `${chalk.green("📱 独立应用")} - 单体应用架构`,
-            value: "standalone",
+            name: `${chalk.yellow("🧩 子应用")} - 微前端子应用`,
+            value: "sub",
           },
         ],
       });
-      architectureType = selectedArchitecture;
+      appDirection = appDirectionResult;
+
       printInfo(
-        `架构类型：${chalk.bold(
-          architectureType === "microFrontend" ? "微前端架构" : "独立应用"
-        )}`
+        `应用方向：${chalk.bold(appDirection === "main" ? "主应用" : "子应用")}`
       );
 
-      let projectTemplate;
-
-      if (architectureType === "microFrontend") {
-        // 微前端架构流程
-        // 3. 选择工具类型
-        const toolTypeResult = await inquirer.prompt({
-          type: "list",
-          name: "toolType",
-          message: chalk.cyan("🔧 请选择工具类型："),
-          choices: [
-            {
-              name: `${chalk.blue("📦 Webpack")} - 成熟稳定的打包工具`,
-              value: "webpack",
-            },
-            {
-              name: `${chalk.green("⚡ Vite")} - 快速的构建工具`,
-              value: "vite",
-            },
-          ],
-        });
-        toolType = toolTypeResult.toolType;
-        printInfo(`工具类型：${chalk.bold(toolType)}`);
-
-        // 4. 选择应用方向
-        const appDirectionResult = await inquirer.prompt({
-          type: "list",
-          name: "appDirection",
-          message: chalk.cyan("🎯 请选择应用方向："),
-          choices: [
-            {
-              name: `${chalk.magenta("🏠 主应用")} - 微前端主应用`,
-              value: "main",
-            },
-            {
-              name: `${chalk.yellow("🧩 子应用")} - 微前端子应用`,
-              value: "sub",
-            },
-          ],
-        });
-        appDirection = appDirectionResult.appDirection;
-        printInfo(
-          `应用方向：${chalk.bold(
-            appDirection === "main" ? "主应用" : "子应用"
-          )}`
-        );
-
-        // 5. 选择模版
-        if (options.template) {
-          const foundTemplate = templates.microFrontend[toolType][
-            appDirection
-          ].find((template) => template.name === options.template);
-          if (foundTemplate) {
-            projectTemplate = foundTemplate.value;
-            printSuccess(`使用指定模版：${chalk.bold(options.template)}`);
-          } else {
-            printWarning(`未找到指定模版 "${options.template}"，请重新选择`);
-          }
+      // 5. 选择模版
+      if (options.template) {
+        const foundTemplate = templates.microFrontend[toolType][
+          appDirection
+        ].find((template) => template.name === options.template);
+        if (foundTemplate) {
+          projectTemplate = foundTemplate.value;
+          printSuccess(`使用指定模版：${chalk.bold(options.template)}`);
+        } else {
+          printWarning(`未找到指定模版 "${options.template}"，请重新选择`);
         }
+      }
 
-        if (!projectTemplate) {
-          const availableTemplates =
-            templates.microFrontend[toolType][appDirection];
-
-          // 如果只有一个模版，直接使用它
-          if (availableTemplates.length === 1) {
-            projectTemplate = availableTemplates[0].value;
-          } else {
-            // 多个模版时让用户选择
-            const { template } = await inquirer.prompt({
-              type: "list",
-              name: "template",
-              message: chalk.cyan("📋 请选择模版："),
-              choices: availableTemplates.map((t) => ({
-                name: [
-                  `${t.recommended ? chalk.green("⭐") : "  "} ${chalk.white(
-                    t.name
-                  )}`,
-                  `   ${chalk.gray(t.description)}`,
-                  `   ${chalk.blue(`特性: ${t.features.join(", ")}`)}`,
-                ].join("\n"),
-                value: t.value,
-                short: t.name,
-              })),
-              pageSize: 10,
-            });
-            projectTemplate = template;
-          }
-        }
-      } else {
-        // 独立应用架构流程
-        // 3. 选择框架类型
-        const { frameworkType } = await inquirer.prompt({
-          type: "list",
-          name: "frameworkType",
-          message: chalk.cyan("⚛️  请选择框架类型："),
-          default: "nextjs",
-          choices: [
-            {
-              name: `${chalk.black("▲")} ${chalk.white(
-                "Next.js"
-              )} - React 全栈框架`,
-              value: "nextjs",
-            },
-            // 可以在这里添加更多独立应用框架
-          ],
-        });
-        printInfo(`框架类型：${chalk.bold(frameworkType)}`);
-
-        // 4. 选择模版
-        if (options.template) {
-          const foundTemplate = templates.standalone[frameworkType].find(
-            (template) => template.name === options.template
-          );
-          if (foundTemplate) {
-            projectTemplate = foundTemplate.value;
-            printSuccess(`使用指定模版：${chalk.bold(options.template)}`);
-          } else {
-            printWarning(`未找到指定模版 "${options.template}"，请重新选择`);
-          }
+      if (!projectTemplate) {
+        const availableTemplates =
+          templates.microFrontend[toolType][appDirection];
+
+        // 如果只有一个模版，直接使用它
+        if (availableTemplates.length === 1) {
+          projectTemplate = availableTemplates[0].value;
+        } else {
+          // 多个模版时让用户选择
+          const { template } = await inquirer.prompt({
+            type: "list",
+            name: "template",
+            message: chalk.cyan("📋 请选择模版："),
+            choices: availableTemplates.map((t) => ({
+              name: [
+                `${t.recommended ? chalk.green("⭐") : "  "} ${chalk.white(
+                  t.name
+                )}`,
+                `   ${chalk.gray(t.description)}`,
+                `   ${chalk.blue(`特性: ${t.features.join(", ")}`)}`,
+              ].join("\n"),
+              value: t.value,
+              short: t.name,
+            })),
+            pageSize: 10,
+          });
+          projectTemplate = template;
         }
+      }
+    } else {
+      // 独立应用架构流程
+      // 3. 选择框架类型
+      const { frameworkType } = await inquirer.prompt({
+        type: "list",
+        name: "frameworkType",
+        message: chalk.cyan("⚛️  请选择框架类型："),
+        default: "nextjs",
+        choices: [
+          {
+            name: `${chalk.black("▲")} ${chalk.white(
+              "Next.js"
+            )} - React 全栈框架`,
+            value: "nextjs",
+          },
+          // 可以在这里添加更多独立应用框架
+        ],
+      });
+      printInfo(`框架类型：${chalk.bold(frameworkType)}`);
 
-        if (!projectTemplate) {
-          const availableTemplates = templates.standalone[frameworkType];
-
-          // 如果只有一个模版，直接使用它
-          if (availableTemplates.length === 1) {
-            projectTemplate = availableTemplates[0].value;
-            printInfo(`使用模版：${chalk.bold(availableTemplates[0].name)}`);
-          } else {
-            // 多个模版时让用户选择
-            const { template } = await inquirer.prompt({
-              type: "list",
-              name: "template",
-              message: chalk.cyan("📋 请选择模版："),
-              choices: availableTemplates.map((t) => ({
-                name: `${chalk.white(t.name)}`,
-                value: t.value,
-              })),
-            });
-            projectTemplate = template;
-          }
+      // 4. 选择模版
+      if (options.template) {
+        const foundTemplate = templates.standalone[frameworkType].find(
+          (template) => template.name === options.template
+        );
+        if (foundTemplate) {
+          projectTemplate = foundTemplate.value;
+          printSuccess(`使用指定模版：${chalk.bold(options.template)}`);
+        } else {
+          printWarning(`未找到指定模版 "${options.template}"，请重新选择`);
         }
       }
 
-      console.log(); // 空行
+      if (!projectTemplate) {
+        const availableTemplates = templates.standalone[frameworkType];
 
-      // 获取目标文件夹路径
-      const dest = path.join(process.cwd(), projectName);
-      // 判断文件夹是否存在，存在就交互询问用户是否覆盖
-      if (fs.existsSync(dest)) {
-        printWarning(`目录 "${projectName}" 已存在！`);
-        const { force } = await inquirer.prompt({
-          type: "confirm",
-          name: "force",
-          message: chalk.yellow("⚠️  是否覆盖现有目录？"),
-          default: false,
-        });
-        if (force) {
-          fs.removeSync(dest);
-          printSuccess("已删除现有目录");
+        // 如果只有一个模版，直接使用它
+        if (availableTemplates.length === 1) {
+          projectTemplate = availableTemplates[0].value;
+          printInfo(`使用模版：${chalk.bold(availableTemplates[0].name)}`);
         } else {
-          printInfo("操作已取消");
-          process.exit(1);
+          // 多个模版时让用户选择
+          const { template } = await inquirer.prompt({
+            type: "list",
+            name: "template",
+            message: chalk.cyan("📋 请选择模版："),
+            choices: availableTemplates.map((t) => ({
+              name: `${chalk.white(t.name)}`,
+              value: t.value,
+            })),
+          });
+          projectTemplate = template;
         }
       }
+    }
 
-      // 开始loading
-      const loading = ora({
-        text: "正在下载模版...",
-        spinner: "bouncingBar",
+    console.log(); // 空行
+
+    // 获取目标文件夹路径
+    const dest = path.join(process.cwd(), projectName);
+    // 判断文件夹是否存在，存在就交互询问用户是否覆盖
+    if (fs.existsSync(dest)) {
+      printWarning(`目录 "${projectName}" 已存在！`);
+      const { force } = await inquirer.prompt({
+        type: "confirm",
+        name: "force",
+        message: chalk.yellow("⚠️  是否覆盖现有目录？"),
+        default: false,
       });
-      loading.start();
-
-      // 6. 开始下载模版
-      try {
-        const result = await cloneRepository(projectTemplate, dest);
-        loading.succeed();
-        printSuccess("模版下载成功！");
-
-        // 删除.git文件夹
-        const gitDir = path.join(dest, ".git");
-        if (fs.existsSync(gitDir)) {
-          fs.removeSync(gitDir);
-          printSuccess("已清理 .git 文件夹");
-        }
+      if (force) {
+        fs.removeSync(dest);
+        printSuccess("已删除现有目录");
+      } else {
+        printInfo("操作已取消");
+        process.exit(1);
+      }
+    }
 
-        // 新添加：如果是 webpack 子应用，进行环境配置
-        if (
-          architectureType === "microFrontend" &&
-          toolType === "webpack" &&
-          appDirection === "sub"
-        ) {
-          console.log(); // 空行
-          await configureWebpackSubApp(dest, projectName);
-        }
+    // 开始loading
+    const loading = ora({
+      text: "正在下载模版...",
+      spinner: "bouncingBar",
+    });
+    loading.start();
+
+    // 6. 开始下载模版
+    try {
+      const result = await cloneRepository(projectTemplate, dest);
+      loading.succeed();
+      printSuccess("模版下载成功！");
+
+      // 删除.git文件夹
+      const gitDir = path.join(dest, ".git");
+      if (fs.existsSync(gitDir)) {
+        fs.removeSync(gitDir);
+        printSuccess("已清理 .git 文件夹");
+      }
 
+      // 新添加：如果是 webpack 子应用，进行环境配置
+      if (
+        architectureType === "microFrontend" &&
+        toolType === "webpack" &&
+        appDirection === "sub"
+      ) {
         console.log(); // 空行
-        printFinalInstructions(projectName);
-      } catch (error) {
-        loading.fail();
-        printError("模版下载失败：" + error);
-        process.exit(1);
+        await configureWebpackSubApp(dest, projectName);
       }
+
+      console.log(); // 空行
+      printFinalInstructions(projectName, architectureType, appDirection);
+    } catch (error) {
+      loading.fail();
+      printError("模版下载失败：" + error);
+      process.exit(1);
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/cli",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "运维开发部脚手架",
   "main": "dist/index.js",
   "bin": {