IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump execa to v2.1.0 (#32543)

Browse Source 
* chore(toolkit): bump execa to v2 to fix vulnerability issue

* chore(toolkit): update usage of execa
This commit is contained in:
Jack Westbrook
2021-04-01 12:38:53 +02:00
committed by GitHub
parent bf524c91e6
commit b714cdf395
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-toolkit/package.json
+1 -2
View File
@@ -33,7 +33,6 @@
"@grafana/tsconfig": "^1.0.0-rc1",
"@grafana/ui": "7.5.0-pre.0",
"@types/command-exists": "^1.2.0",
"@types/execa": "^0.9.0",
"@types/expect-puppeteer": "3.3.1",
"@types/fs-extra": "^8.1.0",
"@types/inquirer": "^6.0.3",
@@ -63,7 +62,7 @@
"eslint-plugin-jsdoc": "31.6.1",
"eslint-plugin-prettier": "3.3.1",
"eslint-plugin-react-hooks": "4.2.0",
"execa": "^1.0.0",
"execa": "^2.0.0",
"expect-puppeteer": "4.1.1",
"file-loader": "5.0.2",
"fork-ts-checker-webpack-plugin": "1.0.0",
packages/grafana-toolkit/src/cli/tasks/plugin.utils.ts
+7 -4
View File
@@ -14,14 +14,17 @@ const DEFAULT_EMAIL_ADDRESS = 'eng@grafana.com';
const DEFAULT_USERNAME = 'CircleCI Automation';
const releaseNotes = async (): Promise<string> => {
const { stdout } = await execa.shell(`awk 'BEGIN {FS="##"; RS="##"} FNR==3 {print "##" $1; exit}' CHANGELOG.md`);
const { stdout } = await execa(`awk 'BEGIN {FS="##"; RS="##"} FNR==3 {print "##" $1; exit}' CHANGELOG.md`, {
shell: true,
});
return stdout;
};
const checkoutBranch = async (branchName: string): Promise<Command> => {
const currentBranch = await execa.shell(`git rev-parse --abbrev-ref HEAD`);
const branchesAvailable = await execa.shell(
`(git branch -a | grep "${branchName}$" | grep -v remote) || echo 'No release found'`
const currentBranch = await execa(`git rev-parse --abbrev-ref HEAD`, { shell: true });
const branchesAvailable = await execa(
`(git branch -a | grep "${branchName}$" | grep -v remote) || echo 'No release found'`,
{ shell: true }
);
if (currentBranch.stdout !== branchName) {