feat: no run git commit when the repo is already a git repo (#144)

caohuilin · web-flow · commit 3b3641d6f38b · 2024-08-14T21:42:22.000+08:00
* feat: upgarad modern version

* feat: no run `git commit` when the repo is already a git repo
diff --git a/.changeset/sweet-spoons-boil.md b/.changeset/sweet-spoons-boil.md
@@ -0,0 +1,5 @@
+---
+'@modern-js/codesmith-api-app': minor
+---
+
+feat: no run `git commit` when the repo is already a git repo
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -64,7 +64,7 @@
   },
   //
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "javascript.format.enable": false,
diff --git a/package.json b/package.json
@@ -27,9 +27,9 @@
   },
   "engines": {
     "node": ">=14.17.6",
-    "pnpm": ">=8.0.0 <=8.6.1"
+    "pnpm": ">=8.0.0 <=9.0.0"
   },
-  "packageManager": "pnpm@8.6.1",
+  "packageManager": "pnpm@8.15.8",
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",
@@ -72,9 +72,9 @@
     ]
   },
   "devDependencies": {
-    "@modern-js/monorepo-tools": "2.37.2",
-    "@modern-js/tsconfig": "2.37.2",
-    "@modern-js-app/eslint-config": "2.37.2",
-    "@modern-js/eslint-config": "2.37.2"
+    "@modern-js/monorepo-tools": "2.58.0",
+    "@modern-js/tsconfig": "2.58.0",
+    "@modern-js-app/eslint-config": "2.58.0",
+    "@modern-js/eslint-config": "2.58.0"
   }
 }
diff --git a/packages/api/app/package.json b/packages/api/app/package.json
@@ -36,8 +36,8 @@
     "@modern-js/codesmith-api-handlebars": "workspace:*",
     "@modern-js/codesmith-api-npm": "workspace:*",
     "@modern-js/codesmith-formily": "workspace:*",
-    "@modern-js/plugin-i18n": "^2.37.2",
-    "@modern-js/utils": "^2.37.2",
+    "@modern-js/plugin-i18n": "^2.58.0",
+    "@modern-js/utils": "^2.58.0",
     "comment-json": "^4.2.3",
     "extra": "^0.2.1",
     "inquirer": "8.1.3"
@@ -47,8 +47,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
diff --git a/packages/api/app/src/index.ts b/packages/api/app/src/index.ts
@@ -156,7 +156,7 @@ export class AppAPI {
     }
 
     try {
-      if (!isMonorepoSubProject && !customNoNeedGit) {
+      if (!isMonorepoSubProject && !customNoNeedGit && !inGitRepo) {
         await this.gitApi.addAndCommit(commitMessage || 'feat: init');
         this.generatorCore.logger.info(i18n.t(localeKeys.git.success));
       }
diff --git a/packages/api/ejs/package.json b/packages/api/ejs/package.json
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/ejs": "^3.1.2",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
diff --git a/packages/api/fs/package.json b/packages/api/fs/package.json
@@ -30,15 +30,15 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.37.2"
+    "@modern-js/utils": "^2.58.0"
   },
   "peerDependencies": {
     "@modern-js/codesmith": "workspace:^2.3.6"
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"
diff --git a/packages/api/git/package.json b/packages/api/git/package.json
@@ -30,15 +30,15 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.37.2"
+    "@modern-js/utils": "^2.58.0"
   },
   "peerDependencies": {
     "@modern-js/codesmith": "workspace:^2.3.6"
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"
diff --git a/packages/api/handlebars/package.json b/packages/api/handlebars/package.json
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"
diff --git a/packages/api/json/package.json b/packages/api/json/package.json
@@ -35,8 +35,8 @@
     "declaration-update": "^0.0.2"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"
diff --git a/packages/api/npm/package.json b/packages/api/npm/package.json
@@ -31,11 +31,11 @@
   "dependencies": {
     "@swc/helpers": "0.5.1",
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/utils": "^2.37.2"
+    "@modern-js/utils": "^2.58.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -35,12 +35,12 @@
   "dependencies": {
     "@swc/helpers": "0.5.1",
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/plugin-i18n": "^2.37.2",
-    "@modern-js/utils": "^2.37.2"
+    "@modern-js/plugin-i18n": "^2.58.0",
+    "@modern-js/utils": "^2.58.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "ts-node": "^10.9.1",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.37.2",
+    "@modern-js/utils": "^2.58.0",
     "axios": "^1.6.0",
     "tar": "^6.1.13"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "@types/tar": "^4.0.5",
diff --git a/packages/easy-form/cli/package.json b/packages/easy-form/cli/package.json
@@ -31,13 +31,13 @@
   "dependencies": {
     "@swc/helpers": "0.5.1",
     "@modern-js/easy-form-core": "workspace:1.9.0",
-    "@modern-js/utils": "^2.37.2",
+    "@modern-js/utils": "^2.58.0",
     "inquirer": "8.1.3",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
diff --git a/packages/easy-form/core/package.json b/packages/easy-form/core/package.json
@@ -43,8 +43,8 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.192",
     "@types/node": "^14.18.42",
diff --git a/packages/formily/package.json b/packages/formily/package.json
@@ -32,16 +32,16 @@
     "@swc/helpers": "0.5.1",
     "@formily/json-schema": "^2.2.24",
     "@formily/validator": "^2.2.24",
-    "@modern-js/utils": "^2.37.2",
+    "@modern-js/utils": "^2.58.0",
     "inquirer": "^8.2.5"
   },
   "peerDependencies": {
     "@modern-js/codesmith": "workspace:^2.3.6"
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
diff --git a/packages/inquirer/package.json b/packages/inquirer/package.json
@@ -30,16 +30,16 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.37.2",
+    "@modern-js/utils": "^2.58.0",
     "cli-cursor": "^3.1.0",
     "inquirer": "8.1.3",
     "lodash": "^4.17.21",
     "run-async": "^2.4.1",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.37.2",
-    "@modern-js/plugin-testing": "^2.37.2",
+    "@modern-js/module-tools": "^2.58.0",
+    "@modern-js/plugin-testing": "^2.58.0",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^26.0.24",
     "@types/lodash": "^4.14.192",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@modern-js/codesmith-api-app': minor
 +---
++
 +feat: no run `git commit` when the repo is already a git repo
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ export class AppAPI {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`try {`
`159`		`- if (!isMonorepoSubProject && !customNoNeedGit) {`
	`159`	`+ if (!isMonorepoSubProject && !customNoNeedGit && !inGitRepo) {`
`160`	`160`	`await this.gitApi.addAndCommit(commitMessage \|\| 'feat: init');`
`161`	`161`	`this.generatorCore.logger.info(i18n.t(localeKeys.git.success));`
`162`	`162`	`}`