cmyr-template-cli 1.36.0 → 1.37.0

package/dist/plopfile.js

@@ -56,7 +56,6 @@ var REMOTES = [
   "https://ghproxy.com/https://github.com",
   "https://gh.ddlc.top/https://github.com",
   "https://gh.flyinbug.top/gh/https://github.com",
-  "https://gh.con.sh/https://github.com",
   "https://cors.isteed.cc/github.com",
   "https://ghps.cc/https://github.com",
   "https://download.nuaa.cf",
@@ -138,7 +137,8 @@ var TEMPLATES_META_LIST = [
     runtime: "browser",
     vueVersion: 3,
     docker: false,
-    priority: 0
+    priority: 0,
+    tags: ["vite"]
   },
   // {
   //     name: 'vite3-template',
@@ -154,7 +154,8 @@ var TEMPLATES_META_LIST = [
     runtime: "browser",
     vueVersion: 2,
     docker: false,
-    priority: 0
+    priority: 0,
+    tags: ["vite"]
   },
   // {
   //     name: 'vite2-template',
@@ -180,13 +181,23 @@ var TEMPLATES_META_LIST = [
   //     docker: false,
   //     priority: 0,
   // },
+  {
+    name: "tauri-template",
+    language: "vue",
+    runtime: "browser",
+    vueVersion: 3,
+    docker: false,
+    priority: 0,
+    tags: ["tauri", "vite"]
+  },
   {
     name: "electron-vite-template",
     language: "vue",
     runtime: "browser",
     vueVersion: 3,
     docker: false,
-    priority: 0
+    priority: 0,
+    tags: ["electron", "vite"]
   },
   // {
   //     name: 'electron-vue-template',
@@ -229,7 +240,8 @@ var TEMPLATES_META_LIST = [
     runtime: "browser",
     vueVersion: 0,
     docker: false,
-    priority: 0
+    priority: 0,
+    tags: ["vite"]
   },
   {
     name: "react-template",
@@ -262,7 +274,8 @@ var TEMPLATES_META_LIST = [
     runtime: "nodejs",
     vueVersion: 0,
     docker: true,
-    priority: 0
+    priority: 0,
+    tags: ["express"]
   },
   // {
   //     name: 'koa2-template',
@@ -371,7 +384,7 @@ var TEMPLATES_META_LIST = [
     javaVersion: 17,
     docker: true,
     priority: 0,
-    tags: ["spring-boot"]
+    tags: ["spring-boot-v3"]
   }
 ];
 
@@ -839,17 +852,11 @@ async function initRemoteGitRepo(projectPath, answers) {
             if (templateMeta.docker) {
               keywords.push("docker");
             }
-            if (templateMeta?.language) {
-              keywords.push(templateMeta?.language);
-            }
             if (templateMeta?.runtime) {
               keywords.push(templateMeta?.runtime);
             }
-            if (templateMeta?.vueVersion === 3) {
-              keywords.push("vue3");
-            }
-            if (templateMeta.tags?.length) {
-              keywords.push(...templateMeta.tags);
+            if (templateMeta?.language) {
+              keywords.push(templateMeta?.language);
             }
             await replaceGithubRepositoryTopics(authToken, {
               owner,
@@ -1135,6 +1142,22 @@ async function getProjectInfo(projectPath, answers) {
     const pkg = await getProjectJson(projectPath);
     const nodeVersion = await getLtsNodeVersion() || "20";
     const node = Number(nodeVersion) - 4;
+    let keywords = [
+      ...answers.keywords || []
+    ];
+    if (templateMeta.docker) {
+      keywords.push("docker");
+    }
+    if (templateMeta?.language) {
+      keywords.push(templateMeta?.language);
+    }
+    if (templateMeta?.vueVersion === 3) {
+      keywords.push("vue3");
+    }
+    if (templateMeta.tags?.length) {
+      keywords.push(...templateMeta.tags);
+    }
+    keywords = (0, import_lodash.uniq)(keywords).map((e) => kebabCase(e));
     const packageName = isPrivateScopePackage ? `@${scopeName}/${name}` : name;
     const engines = (0, import_lodash.merge)({}, pkg?.engines, { node: `>=${node}` });
     const version = pkg?.version || "0.1.0";
@@ -1146,7 +1169,6 @@ async function getProjectInfo(projectPath, answers) {
     const lintCommand = pkg?.scripts?.lint && `${packageManager} run lint`;
     const commitCommand = pkg?.scripts?.commit && `${packageManager} run commit`;
     const mainFile = pkg?.main;
-    answers.config = config;
     const githubUsername = config?.GITHUB_USERNAME || author;
     const giteeUsername = config?.GITEE_USERNAME;
     const weiboUsername = config?.WEIBO_USERNAME;
@@ -1171,6 +1193,7 @@ async function getProjectInfo(projectPath, answers) {
     const authorWebsite = isOpenSource ? await getAuthorWebsiteFromGithubAPI(githubUsername) : "";
     const projectInfos = {
       ...answers,
+      keywords,
       currentYear: (/* @__PURE__ */ new Date()).getFullYear(),
       name,
       description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.36.0",
+  "version": "1.37.0",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "@types/lodash": "^4.14.165",
     "@types/node": "^22.0.0",
     "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "7.18.0",
+    "@typescript-eslint/parser": "8.24.0",
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^5.0.0",
     "conventional-changelog-cmyr-config": "^2.1.1",

package/templates/.editorconfig

@@ -22,5 +22,6 @@ trim_trailing_whitespace = false
 end_of_line = lf
 [package.json]
 indent_size = 2
+insert_final_newline = false
 [*.yml]
 indent_size = 2

package/templates/.github/workflows/release.yml

@@ -3,10 +3,10 @@ on:
   push:
     branches:
       - master
-# 仅取消针对当前工作流正在进行的作业或运行
+# 仅针对当前工作流正在进行的作业或运行
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: false # Release 作业不取消，因为要确保版本发布成功
 jobs:
   release:
     name: Release