@wagq/wa-cli 0.6.15 → 0.6.16

package/lib/init/after.js

@@ -41,16 +41,12 @@ const initHusky = (packageName) => {
     log.error("Husky 命令安装失败: \n" + error);
   }
   try {
+    execSync('echo "npx lint-staged" > .husky/pre-commit', execConfig);
     execSync(
-      'npx --no-install husky add .husky/pre-commit "npx lint-staged"',
+      'echo "npx --no -- commitlint --edit ${1}" > .husky/commit-msg',
       execConfig
     );
-    execSync(
-      "npx --no-install husky add .husky/commit-msg  'npx --no -- commitlint --edit ${1}'",
-      execConfig
-    );
-    log.info("Husky 初始化完成");
-    execSync(`code ${packageName}`, { cwd: cmdPath });
+    log.info(`Husky 初始化完成, 可打开${packageName}查看`);
   } catch (error) {
     log.error("Husky 命令写入失败: \n" + error);
   }
@@ -58,8 +54,9 @@ const initHusky = (packageName) => {
 
 const firstCommit = async (packageName) => {
   const execConfig = { cwd: `${cmdPath}/${packageName}` };
+  await execSync("git init", execConfig);
   await execSync("git add .", execConfig);
-  await execSync("git commit -m 'feat: 初始化项目' --no-verify", execConfig);
+  await execSync(`git commit -m "feat: 初始化项目" --no-verify`, execConfig);
 };
 
 const installLibrary = async (packageName) => {

package/lib/init/index.js

@@ -12,12 +12,26 @@ const uniAppBin = "npm create unibest";
 const urls = {
   vue单页面后台: { remote: "sdmu-gaoqi/vite-vue" },
   vue多页面项目: { remote: "sdmu-gaoqi/vite-vue-multiple" },
+  React: { key: "react" },
   vite: { bin: viteBin },
-  'uniapp(unibest)': { bin: uniAppBin },
+  "uniapp(unibest)": { bin: uniAppBin },
   "vscode插件-vue版": { remote: "sdmu-gaoqi/vscode-plugin#vue" },
   "vscode插件-react版": { remote: "sdmu-gaoqi/vscode-plugin#react" },
-  'umi': { bin: 'npx create-umi@latest' }
+  umi: { bin: "npx create-umi@latest" },
 };
+
+const reactRepoMap = {
+  SPA: {
+    remote: "direct:https://gitee.com/wa_6/template-vite-react.git#template",
+  },
+  微前端基座: {
+    remote: "direct:https://gitee.com/GQ-og/templat-qk-main.git#template",
+  },
+  微前端子应用: {
+    remote: "direct:https://gitee.com/GQ-og/template-qk-module.git#template",
+  },
+};
+
 const modeOptions = Object.keys(urls);
 
 const initQuestions = () => [
@@ -34,24 +48,44 @@ const nameOptions = () => [
     type: "input",
     name: "libraryName",
     message: `请输入项目名`,
-  }
-] // 项目nam
+  },
+]; // 项目nam
+
+const reactOptions = [
+  {
+    type: "list",
+    name: "reactMode",
+    message: `请选择分支`,
+    choices: Object.keys(reactRepoMap),
+  },
+];
 
 const init = async () => {
   try {
     const { selectMode } = await Prompt.default.prompt(initQuestions());
-    const { remote, bin } = urls?.[selectMode];
-    const needName = !!remote
+    const { remote, bin, key } = urls?.[selectMode];
+    let repoRemote = remote;
+    const isReact = key === "react";
+    const needName = !!remote || isReact;
+    const cloneOptions = {};
+
+    if (isReact) {
+      const { reactMode } = await Prompt.default.prompt(reactOptions);
+      repoRemote = reactRepoMap[reactMode].remote;
+      cloneOptions.clone = true;
+    }
 
-    if(needName) {
+    if (needName) {
       const { libraryName } = await Prompt.default.prompt(nameOptions());
+      if (!repoRemote) {
+        log.error("仓库正在建设中,请先选择其他模板");
+      }
       await check(libraryName);
-      await clone(remote, libraryName);
+      await clone(repoRemote, libraryName, cloneOptions);
       await after(libraryName, selectMode);
-    }
-    else {
-      const info = `准备从${selectMode}创建`
-      log.info(info)
+    } else {
+      const info = `准备从${selectMode}创建`;
+      log.info(info);
       execSync(bin, {
         stdio: "inherit",
         cwd: process.cwd(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wagq/wa-cli",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {