diff --git a/package.json b/package.json index e62b7e046..162529c0a 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "eslint-plugin-unicorn": "40.1.0", "esm-utils": "3.0.0", "jest": "27.5.1", - "execa": "6.0.0", + "execa": "6.1.0", "jest-snapshot-serializer-ansi": "1.0.0", "jest-snapshot-serializer-raw": "1.2.0", "jest-watch-typeahead": "1.0.0", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index f0429b9d3..196b35d88 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -2,7 +2,7 @@ "versions": { "string-width": "5.0.1", "mem": "9.0.2", - "execa": "6.0.0", + "execa": "6.1.0", "tempy": "2.0.0" }, "licenses": [ @@ -293,7 +293,7 @@ { "name": "npm-run-path", "maintainers": [], - "version": "5.0.1", + "version": "5.1.0", "description": "Get your PATH prepended with locally installed binaries", "repository": "sindresorhus/npm-run-path", "homepage": null, @@ -361,7 +361,7 @@ { "name": "execa", "maintainers": [], - "version": "6.0.0", + "version": "6.1.0", "description": "Process execution for humans", "repository": "sindresorhus/execa", "homepage": null, diff --git a/vendors/execa.js b/vendors/execa.js index 482584491..cae079ef2 100644 --- a/vendors/execa.js +++ b/vendors/execa.js @@ -902,6 +902,7 @@ function stripFinalNewline(input) { // node_modules/npm-run-path/index.js var import_node_process = __toESM(require("process"), 1); var import_node_path = __toESM(require("path"), 1); +var import_node_url = __toESM(require("url"), 1); // node_modules/npm-run-path/node_modules/path-key/index.js function pathKey(options = {}) { @@ -923,14 +924,15 @@ function npmRunPath(options = {}) { execPath = import_node_process.default.execPath } = options; let previous; - let cwdPath = import_node_path.default.resolve(cwd); + const cwdString = cwd instanceof URL ? import_node_url.default.fileURLToPath(cwd) : cwd; + let cwdPath = import_node_path.default.resolve(cwdString); const result = []; while (previous !== cwdPath) { result.push(import_node_path.default.join(cwdPath, "node_modules/.bin")); previous = cwdPath; cwdPath = import_node_path.default.resolve(cwdPath, ".."); } - result.push(import_node_path.default.resolve(cwd, execPath, "..")); + result.push(import_node_path.default.resolve(cwdString, execPath, "..")); return [...result, path_].join(import_node_path.default.delimiter); } function npmRunPathEnv(_a = {}) { @@ -1783,7 +1785,7 @@ function execa(file, args, options) { escapedCommand, parsed, timedOut, - isCanceled: context.isCanceled, + isCanceled: context.isCanceled || (parsed.options.signal ? parsed.options.signal.aborted : false), killed: spawned.killed }); if (!parsed.options.reject) { diff --git a/yarn.lock b/yarn.lock index 632a797bc..1547d18be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3169,19 +3169,19 @@ esutils@2.0.3, esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -execa@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-6.0.0.tgz#598b46f09ae44f5d8097a30cfb1681d0f0371503" - integrity sha512-m4wU9j4Z9nXXoqT8RSfl28JSwmMNLFF69OON8H/lL3NeU0tNpGz313bcOfYoBBHokB0dC2tMl3VUcKgHELhL2Q== +execa@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20" + integrity sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.1" human-signals "^3.0.1" is-stream "^3.0.0" merge-stream "^2.0.0" - npm-run-path "^5.0.1" + npm-run-path "^5.1.0" onetime "^6.0.0" - signal-exit "^3.0.5" + signal-exit "^3.0.7" strip-final-newline "^3.0.0" execa@^5.0.0: @@ -5017,10 +5017,10 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npm-run-path@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.0.1.tgz#748dd68ed7de377bb1f7132c7dafe657be5ab400" - integrity sha512-ybBJQUSyFwEEhqO2lXmyKOl9ucHtyZBWVM0h0FiMfT/+WKxCUZFa95qAR2X3w/w6oigN3B0b2UNHZbD+kdfD5w== +npm-run-path@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" + integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== dependencies: path-key "^4.0.0" @@ -5915,7 +5915,7 @@ sigmund@^1.0.1: resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= -signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.5: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==