Merge branch 'master' into semverDep

Author: dwyfrequency

package.json

@@ -143,7 +143,7 @@
     "protractor": "5.4.2",
     "request": "2.88.2",
     "semver": "7.3.7",
-    "simple-git": "3.5.0",
+    "simple-git": "3.7.1",
     "sinon": "9.2.4",
     "sinon-chai": "3.7.0",
     "source-map-loader": "1.1.3",

scripts/ci-test/tasks.ts

@@ -19,7 +19,7 @@ import { resolve } from 'path';
 import { existsSync } from 'fs';
 import { exec } from 'child-process-promise';
 import chalk from 'chalk';
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import { TestConfig } from './testConfig';
 const root = resolve(__dirname, '../..');
 const git = simpleGit(root);

scripts/ci/check_changeset.ts

@@ -19,7 +19,7 @@ import { resolve } from 'path';
 import { existsSync } from 'fs';
 import { exec } from 'child-process-promise';
 import chalk from 'chalk';
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import fs from 'mz/fs';
 
 const root = resolve(__dirname, '..');

scripts/ci/detect-doc-changes.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import { spawn } from 'child-process-promise';
 import * as tmp from 'tmp';
 

scripts/format/format.ts

@@ -18,7 +18,7 @@
 import { doPrettier } from './prettier';
 import { doLicense } from './license';
 import { resolve } from 'path';
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import chalk from 'chalk';
 import glob from 'glob';
 import { join } from 'path';

scripts/release/utils/git.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import { projectRoot as root } from '../../utils';
 import { exec } from 'child-process-promise';
 import ora from 'ora';

scripts/utils.ts

@@ -16,7 +16,7 @@
  */
 
 import { dirname, resolve } from 'path';
-import simpleGit from 'simple-git/promise';
+import simpleGit from 'simple-git';
 import { exec } from 'child-process-promise';
 import { readFile as _readFile } from 'fs';
 import { promisify } from 'util';

yarn.lock

@@ -14760,10 +14760,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7"
   integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==
 
-simple-git@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz#3c3538f4d7a1b3c8f3904412b12740bdcad9c8b1"
-  integrity sha512-fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==
+simple-git@3.7.1:
+  version "3.7.1"
+  resolved "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz#cb85c59da4da3d69792d206dd28cfbd803941fac"
+  integrity sha512-+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     "@kwsites/promise-deferred" "^1.1.1"