Update simple-git 1.116.0 -> 3.10.0 (#137232)

* Updates simple-git to 3.10.0

* Replaces deprecated simple-git imports. Adds needed null check for git status.

* Updated simple-git package dep with caret.
This commit is contained in:
Jeramy Soucy 2022-07-28 14:35:04 -04:00 committed by GitHub
parent 84c7baca46
commit 662adf84c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 9 deletions

View file

@ -1210,7 +1210,7 @@
"rxjs-marbles": "^5.0.6",
"sass-loader": "^10.3.1",
"selenium-webdriver": "^4.3.1",
"simple-git": "1.116.0",
"simple-git": "^3.10.0",
"sinon": "^7.4.2",
"sort-package-json": "^1.53.1",
"source-map": "^0.7.3",

View file

@ -12,7 +12,7 @@ import os from 'os';
import crypto from 'crypto';
import chalk from 'chalk';
import simpleGit from 'simple-git/promise';
import simpleGit from 'simple-git';
import { ToolingLog } from '@kbn/tooling-log';
import { installArchive } from './install_archive';
@ -81,6 +81,10 @@ async function sourceInfo(cwd: string, license: string, log: ToolingLog = defaul
const { task, ext } = archiveForPlatform(os.platform(), license);
const status = await git.status();
const branch = status.current;
if (branch === null) {
throw new Error(`${cwd} git status is null`);
}
const sha = (await git.revparse(['HEAD'])).trim();
log.info('on %s at %s', chalk.bold(branch), chalk.bold(sha));

View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import SimpleGit from 'simple-git/promise';
import SimpleGit from 'simple-git';
import { REPO_ROOT } from '@kbn/utils';
import { File } from '../file';

View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import SimpleGit from 'simple-git/promise';
import SimpleGit from 'simple-git';
import { run } from '@kbn/dev-cli-runner';
import { createFlagError, combineErrors } from '@kbn/dev-cli-errors';

View file

@ -3875,6 +3875,18 @@
version "0.0.0"
uid ""
"@kwsites/file-exists@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==
dependencies:
debug "^4.1.1"
"@kwsites/promise-deferred@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
"@leichtgewicht/ip-codec@^2.0.1":
version "2.0.4"
resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
@ -26050,12 +26062,14 @@ simple-get@^4.0.0, simple-get@^4.0.1:
once "^1.3.1"
simple-concat "^1.0.0"
simple-git@1.116.0:
version "1.116.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.116.0.tgz#ea6e533466f1e0152186e306e004d4eefa6e3e00"
integrity sha512-Pbo3tceqMYy0j3U7jzMKabOWcx5+67GdgQUjpK83XUxGhA+1BX93UPvlWNzbCRoFwd7EJTyDSCC2XCoT4NTLYQ==
simple-git@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.10.0.tgz#f20031dd121d3c49e215ef0186a102bece3f89b2"
integrity sha512-2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw==
dependencies:
debug "^4.0.1"
"@kwsites/file-exists" "^1.1.1"
"@kwsites/promise-deferred" "^1.1.1"
debug "^4.3.4"
simple-swizzle@^0.2.2:
version "0.2.2"