Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependency execa to v4.1.0 #30248

Draft
wants to merge 16 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters
- /^release\/\d+\.\d+\.\d+$/
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- 'update-v8-snapshot-cache-on-develop'
- 'ryanm/chore/fix-full-snapshot'
- 'renovate/execa-4.x'
- 'publish-binary'

# usually we don't build Mac app - it takes a long time
Expand All @@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-full-snapshot', << pipeline.git.branch >> ]
- equal: [ 'renovate/execa-4.x', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-full-snapshot', << pipeline.git.branch >> ]
- equal: [ 'renovate/execa-4.x', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-full-snapshot', << pipeline.git.branch >> ]
- equal: [ 'renovate/execa-4.x', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-vue": "7.18.0",
"execa": "4.0.0",
"execa": "4.1.0",
"filesize": "10.1.1",
"fs-extra": "9.1.0",
"getenv": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/data-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dedent": "^0.7.0",
"ejs": "^3.1.10",
"endent": "2.0.1",
"execa": "1.0.0",
"execa": "4.1.0",
"front-matter": "^4.0.2",
"fs-extra": "8.1.0",
"getenv": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"bluebird": "3.5.3",
"debug": "^4.3.4",
"execa": "4.0.0",
"execa": "4.1.0",
"fs-extra": "9.1.0",
"lodash": "^4.17.21",
"plist": "3.1.0",
Expand Down
10 changes: 8 additions & 2 deletions packages/server/lib/exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,21 @@ module.exports = {
log('and is running command:', options.cmd)
log('in folder:', projectRoot)

return execa.shell(cmd, { cwd, env, shell })
return execa(cmd, { cwd, env, shell })
.then((result) => {
// do we want to return all fields returned by execa?
result.shell = shell
result.cmd = cmd
result.code = result.exitCode

return result
}).then(pickMainProps)
.catch(pickMainProps) // transform rejection into an object
.catch((result) => {
result.code = result.exitCode

return result
})
.then(pickMainProps) // transform rejection into an object
.then(trimStdio)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/server/lib/util/shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const sourceShellCommand = function (cmd, shell) {
}

const findBash = () => {
return execa.shell('which bash')
return execa('which bash', { shell: true })
.then((val) => val.stdout)
}

Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"electron-context-menu": "3.6.1",
"errorhandler": "1.5.1",
"evil-dns": "0.2.0",
"execa": "1.0.0",
"execa": "4.1.0",
"express": "4.21.0",
"fetch-retry-ts": "^1.3.1",
"find-process": "1.4.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/server/test/scripts/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ console.log('specfiles:', run)
console.log('test command:')
console.log(cmd)

const child = execa.shell(cmd, { env, stdio: 'inherit' })
const child = execa(cmd, { shell: true, env, stdio: 'inherit' })

child.on('exit', (code, signal) => {
child.on('exit', (exitCode, signal) => {
if (signal) {
console.error(`tests exited with signal ${signal}`)
}

process.exit(code === null ? 1 : code)
process.exit(exitCode === null ? 1 : exitCode)
})
6 changes: 4 additions & 2 deletions packages/server/test/unit/util/suppress_warnings_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const SUPPRESS_WARNING = `require('${__dirname}/../../../lib/util/suppress_warni

describe('lib/util/suppress_warnings', function () {
it('tls.connect emits warning if NODE_TLS_REJECT_UNAUTHORIZED=0 and not suppressed', function () {
return execa.shell(`node -e "${TLS_CONNECT}"`, {
return execa(`node -e "${TLS_CONNECT}"`, {
shell: true,
env: {
'NODE_TLS_REJECT_UNAUTHORIZED': '0',
},
Expand All @@ -22,7 +23,8 @@ describe('lib/util/suppress_warnings', function () {

it('tls.connect does not emit warning if NODE_TLS_REJECT_UNAUTHORIZED=0 and suppressed', function () {
// test 2 sequential tls.connects
return execa.shell(`node -e "${SUPPRESS_WARNING} ${TLS_CONNECT} ${TLS_CONNECT}"`, {
return execa(`node -e "${SUPPRESS_WARNING} ${TLS_CONNECT} ${TLS_CONNECT}"`, {
shell: true,
env: {
'NODE_TLS_REJECT_UNAUTHORIZED': '0',
},
Expand Down
2 changes: 1 addition & 1 deletion system-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"dedent": "^0.7.0",
"dockerode": "3.3.1",
"esbuild": "^0.15.3",
"execa": "4",
"execa": "4.1.0",
"express": "4.19.2",
"express-session": "1.16.1",
"express-useragent": "1.0.15",
Expand Down
17 changes: 1 addition & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15455,7 +15455,7 @@ [email protected], execa@^1.0.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"

execa@4, execa@4.1.0:
[email protected]:
version "4.1.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
Expand All @@ -15470,21 +15470,6 @@ execa@4, [email protected]:
signal-exit "^3.0.2"
strip-final-newline "^2.0.0"

[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf"
integrity sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==
dependencies:
cross-spawn "^7.0.0"
get-stream "^5.0.0"
human-signals "^1.1.1"
is-stream "^2.0.0"
merge-stream "^2.0.0"
npm-run-path "^4.0.0"
onetime "^5.1.0"
signal-exit "^3.0.2"
strip-final-newline "^2.0.0"

[email protected]:
version "5.0.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
Expand Down
Loading