update isomorphic-git version

Author: EryouHao

package.json

@@ -33,7 +33,7 @@
     "feed": "^2.0.4",
     "fs-extra": "^7.0.1",
     "gray-matter": "^4.0.1",
-    "isomorphic-git": "^0.78.3",
+    "isomorphic-git": "1.0.0-beta.19",
     "junk": "^3.1.0",
     "less": "^3.9.0",
     "lowdb": "^1.0.0",

src/server/deploy.ts

@@ -1,9 +1,11 @@
 import fs from 'fs'
 import moment from 'moment'
 // @ts-ignore
-import * as git from 'isomorphic-git/dist/for-node/isomorphic-git/index'
+import * as git from 'isomorphic-git/dist'
 import Model from './model'
 
+const { http } = require('isomorphic-git/dist/http')
+
 export default class Deploy extends Model {
   outputDir: string = `${this.appDir}/output`
 
@@ -48,13 +50,13 @@ export default class Deploy extends Model {
       }
       if (!isRepo) {
         await git.init({ fs, dir: this.outputDir })
-        await git.config({
+        await git.setConfig({
           fs,
           dir: this.outputDir,
           path: 'user.name',
           value: setting.username,
         })
-        await git.config({
+        await git.setConfig({
           fs,
           dir: this.outputDir,
           path: 'user.email',
@@ -91,7 +93,7 @@ export default class Deploy extends Model {
     if (isRepo) {
       result = await this.commonPush()
     } else {
-      result = await this.firstPush()
+      // result = await this.firstPush()
     }
     return result
   }
@@ -103,19 +105,19 @@ export default class Deploy extends Model {
 
     try {
       await git.init({ fs, dir: this.outputDir })
-      await git.config({
+      await git.setConfig({
         fs,
         dir: this.outputDir,
         path: 'user.name',
         value: setting.username,
       })
-      await git.config({
+      await git.setConfig({
         fs,
         dir: this.outputDir,
         path: 'user.email',
         value: setting.email,
       })
-      await git.add({ fs, dir: this.outputDir, filepath: './*' })
+      await git.add({ fs, dir: this.outputDir, filepath: '.' })
       await git.commit({
         fs,
         dir: this.outputDir,
@@ -126,16 +128,17 @@ export default class Deploy extends Model {
       })
       // await git.fastCheckout({ fs, dir: this.outputDir, ref: setting.branch })
       await this.checkCurrentBranch()
-      const pushRes = await git.push({
-        fs,
-        dir: this.outputDir,
-        remote: 'origin',
-        ref: setting.branch,
-        force: true,
-      })
+      // const pushRes = await git.push({
+      //   fs,
+      //   dir: this.outputDir,
+      //   remote: 'origin',
+      //   ref: setting.branch,
+      //   force: true,
+      //   http,
+      // })
       return {
         success: true,
-        data: pushRes,
+        // data: pushRes,
         message: '',
         localBranchs,
       }
@@ -172,17 +175,18 @@ export default class Deploy extends Model {
 
       await this.checkCurrentBranch()
 
-      const pushRes = await git.push({
-        fs,
-        dir: this.outputDir,
-        remote: 'origin',
-        ref: setting.branch,
-        force: true,
-      })
-      console.log('pushRes', pushRes)
+      // const pushRes = await git.push({
+      //   fs,
+      //   dir: this.outputDir,
+      //   remote: 'origin',
+      //   ref: setting.branch,
+      //   force: true,
+      //   http,
+      // })
+      // console.log('pushRes', pushRes)
       return {
         success: true,
-        data: pushRes,
+        // data: pushRes,
         message: '',
         localBranchs,
       }
@@ -211,7 +215,7 @@ export default class Deploy extends Model {
         await git.branch({ fs, dir: this.outputDir, ref: setting.branch })
       }
 
-      await git.fastCheckout({ fs, dir: this.outputDir, ref: setting.branch })
+      await git.checkout({ fs, dir: this.outputDir, ref: setting.branch })
     }
   }
 }

yarn.lock

@@ -5171,11 +5171,6 @@ globalthis@^1.0.0:
     function-bind "^1.1.1"
     object-keys "^1.0.12"
 
-globalyzer@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.4.tgz#bc8e273afe1ac7c24eea8def5b802340c5cc534f"
-  integrity sha512-LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA==
-
 globby@^6.1.0:
   version "6.1.0"
   resolved "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -5211,11 +5206,6 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-globrex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
-  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -6118,18 +6108,16 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
-isomorphic-git@^0.78.3:
-  version "0.78.3"
-  resolved "https://registry.yarnpkg.com/isomorphic-git/-/isomorphic-git-0.78.3.tgz#563d60f5f73868ba13701a33047fe356bacdca1f"
-  integrity sha512-3c8uqIg9tBBXFwypdlIo7yPM1x3uc7mNt4qbUvG2NPt8QYN1OFWo0MDNgHYfRIQWsgd8aux/qC3QnKyVqaq0TQ==
+isomorphic-git@1.0.0-beta.19:
+  version "1.0.0-beta.19"
+  resolved "https://registry.yarnpkg.com/isomorphic-git/-/isomorphic-git-1.0.0-beta.19.tgz#421f0ae9de00c3ff967726f8eb5a0602929110ad"
+  integrity sha512-kJPF9R0HUdJmZcRWyYDH0ac2U3fCggScpU1Yn9kMZH8z+QEcNkCARPwH+bAKhaAYIQeb1ln3hufrGpAm/Ba8Gg==
   dependencies:
     async-lock "^1.1.0"
     clean-git-ref "^2.0.1"
     crc-32 "^1.2.0"
     diff3 "0.0.3"
     git-apply-delta "0.0.7"
-    globalyzer "^0.1.4"
-    globrex "^0.1.2"
     ignore "^5.1.4"
     marky "^1.2.1"
     minimisted "^2.0.0"