@4399ywkf/cli 0.0.7 → 0.0.8

package/bin/cli.js

@@ -75,10 +75,24 @@ function printFinalInstructions(projectName) {
 
 function cloneRepository(repoUrl, destination) {
   return new Promise((resolve, reject) => {
-    const command = `git clone ${repoUrl} ${destination}`;
-    exec(command, (error, stdout, stderr) => {
+    // 确保URL格式正确，移除可能的末尾斜杠
+    const cleanUrl = repoUrl.replace(/\/$/, "");
+    const command = `git clone ${cleanUrl} ${destination}`;
+
+    // 设置子进程选项
+    const options = {
+      cwd: process.cwd(),
+      env: process.env,
+      stdio: "pipe",
+    };
+
+    exec(command, options, (error, stdout, stderr) => {
       if (error) {
-        reject(`Error cloning repository: ${stderr}`);
+        console.error(`命令执行失败: ${command}`);
+        console.error(`错误代码: ${error.code}`);
+        console.error(`错误信息: ${error.message}`);
+        console.error(`stderr: ${stderr}`);
+        reject(`Error cloning repository: ${stderr || error.message}`);
       } else {
         resolve(`Repository cloned successfully: ${stdout}`);
       }
@@ -244,33 +258,44 @@ program
 
     // 模拟异步获取模版数据
     const templates = {
-      webpack: {
-        main: [
-          {
-            value:
-              "https://ywgit.gz4399.com/ywkf/webpack-mainApplicate_demo.git",
-            name: "webpack-mainApplicate_demo",
-          },
-        ],
-        sub: [
-          {
-            value:
-              "https://ywgit.gz4399.com/ywkf/webpack-subApplicate_demo.git",
-            name: "webpack-subApplicate_demo",
-          },
-        ],
+      microFrontend: {
+        webpack: {
+          main: [
+            {
+              value:
+                "https://ywgit.gz4399.com/ywkf/webpack-mainApplicate_demo.git",
+              name: "webpack-mainApplicate_demo",
+            },
+          ],
+          sub: [
+            {
+              value:
+                "https://ywgit.gz4399.com/ywkf/webpack-subApplicate_demo.git",
+              name: "webpack-subApplicate_demo",
+            },
+          ],
+        },
+        vite: {
+          main: [
+            {
+              value:
+                "https://ywgit.gz4399.com/ywkf/vite-mainApplicate_demo.git",
+              name: "vite-mainApplicate_demo",
+            },
+          ],
+          sub: [
+            {
+              value: "https://ywgit.gz4399.com/ywkf/vite-subApplicate_demo.git",
+              name: "vite-subApplicate_demo",
+            },
+          ],
+        },
       },
-      vite: {
-        main: [
-          {
-            value: "https://ywgit.gz4399.com/ywkf/vite-mainApplicate_demo.git",
-            name: "vite-mainApplicate_demo",
-          },
-        ],
-        sub: [
+      standalone: {
+        nextjs: [
           {
-            value: "https://ywgit.gz4399.com/ywkf/vite-subApplicate_demo",
-            name: "vite-subApplicate_demo",
+            value: "https://ywgit.gz4399.com/ywkf/next-dome.git",
+            name: "next-demo",
           },
         ],
       },
@@ -297,68 +322,154 @@ program
     }
     printInfo(`项目名称：${chalk.bold(projectName)}`);
 
-    // 2. 选择工具类型
-    const { toolType } = await inquirer.prompt({
+    // 2. 选择架构类型
+    const { architectureType } = await inquirer.prompt({
       type: "list",
-      name: "toolType",
-      message: chalk.cyan("🔧 请选择工具类型："),
+      name: "architectureType",
+      message: chalk.cyan("🏗️  请选择架构类型："),
       choices: [
         {
-          name: `${chalk.blue("📦 Webpack")} - 成熟稳定的打包工具`,
-          value: "webpack",
+          name: `${chalk.blue("🧩 微前端架构")} - 支持主应用和子应用`,
+          value: "microFrontend",
+        },
+        {
+          name: `${chalk.green("📱 独立应用")} - 单体应用架构`,
+          value: "standalone",
         },
-        { name: `${chalk.green("⚡ Vite")} - 快速的构建工具`, value: "vite" },
-      ],
-    });
-    printInfo(`工具类型：${chalk.bold(toolType)}`);
-
-    // 3. 选择应用方向
-    const { appDirection } = await inquirer.prompt({
-      type: "list",
-      name: "appDirection",
-      message: chalk.cyan("🎯 请选择应用方向："),
-      choices: [
-        { name: `${chalk.magenta("🏠 主应用")} - 微前端主应用`, value: "main" },
-        { name: `${chalk.yellow("🧩 子应用")} - 微前端子应用`, value: "sub" },
       ],
     });
     printInfo(
-      `应用方向：${chalk.bold(appDirection === "main" ? "主应用" : "子应用")}`
+      `架构类型：${chalk.bold(
+        architectureType === "microFrontend" ? "微前端架构" : "独立应用"
+      )}`
     );
 
-    // 4. 选择模版
     let projectTemplate;
-
-    if (options.template) {
-      const foundTemplate = templates[toolType][appDirection].find(
-        (template) => template.name === options.template
+    let toolType, appDirection;
+
+    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" ? "主应用" : "子应用")}`
       );
-      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[toolType][appDirection];
+      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: `${chalk.white(t.name)}`,
+              value: t.value,
+            })),
+          });
+          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 (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: `${chalk.white(t.name)}`,
-            value: t.value,
-          })),
-        });
-        projectTemplate = template;
+      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;
+        }
       }
     }
 
@@ -391,7 +502,7 @@ program
     });
     loading.start();
 
-    // 5. 开始下载模版
+    // 6. 开始下载模版
     try {
       const result = await cloneRepository(projectTemplate, dest);
       loading.succeed();
@@ -405,7 +516,11 @@ program
       }
 
       // 新添加：如果是 webpack 子应用，进行环境配置
-      if (toolType === "webpack" && appDirection === "sub") {
+      if (
+        architectureType === "microFrontend" &&
+        toolType === "webpack" &&
+        appDirection === "sub"
+      ) {
         console.log(); // 空行
         await configureWebpackSubApp(dest, projectName);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/cli",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "运维开发部脚手架",
   "main": "index.js",
   "bin": {
@@ -16,15 +16,16 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@changesets/cli": "^2.29.5",
+    "boxen": "^5.1.2",
+    "chalk": "^4.1.2",
     "child_process": "^1.0.2",
     "commander": "^10.0.1",
     "download-git-repo": "^3.0.2",
+    "figlet": "^1.5.2",
     "fs-extra": "^11.1.1",
     "inquirer": "^8.2.5",
-    "ora": "^5.4.1",
-    "chalk": "^4.1.2",
-    "boxen": "^5.1.2",
-    "figlet": "^1.5.2"
+    "ora": "^5.4.1"
   },
   "files": [
     "bin"