From d2307fda3cbbaf34e4f470e58e3b69c70d06add1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 09:15:48 +0000 Subject: [PATCH 1/4] chore(deps): bump execa from 4.1.0 to 8.0.1 Bumps [execa](https://github.com/sindresorhus/execa) from 4.1.0 to 8.0.1. - [Release notes](https://github.com/sindresorhus/execa/releases) - [Commits](https://github.com/sindresorhus/execa/compare/v4.1.0...v8.0.1) --- updated-dependencies: - dependency-name: execa dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- fork/module-to-cdn/package.json | 2 +- tools/scripts-build-cdn/package.json | 2 +- yarn.lock | 29 ++++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/fork/module-to-cdn/package.json b/fork/module-to-cdn/package.json index aedb3494834..0997448bbb5 100644 --- a/fork/module-to-cdn/package.json +++ b/fork/module-to-cdn/package.json @@ -33,7 +33,7 @@ "cdn" ], "dependencies": { - "execa": "^4.1.0", + "execa": "^8.0.1", "mkdirp": "^1.0.4", "semver": "^7.5.4" }, diff --git a/tools/scripts-build-cdn/package.json b/tools/scripts-build-cdn/package.json index 74f7ea2b19b..e273d52e392 100644 --- a/tools/scripts-build-cdn/package.json +++ b/tools/scripts-build-cdn/package.json @@ -27,7 +27,7 @@ "@yarnpkg/lockfile": "^1.1.0", "commander": "^6.2.1", "cpx2": "^3.0.2", - "execa": "^4.1.0", + "execa": "^8.0.1", "mkdirp": "^1.0.4", "queue": "^6.0.2", "rimraf": "^3.0.2", diff --git a/yarn.lock b/yarn.lock index 6a3970567d9..c36ff534320 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9432,7 +9432,7 @@ exec-sh@^0.3.2: resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== -execa@4.1.0, execa@^4.1.0: +execa@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -9490,6 +9490,21 @@ execa@^5.0.0, execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +execa@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" + integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^8.0.1" + human-signals "^5.0.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^4.1.0" + strip-final-newline "^3.0.0" + executable@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -10315,6 +10330,11 @@ get-stream@^6.0.0, get-stream@^6.0.1: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-stream@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" + integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== + get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -11045,6 +11065,11 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== +human-signals@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" + integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -17363,7 +17388,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -signal-exit@^4.0.1: +signal-exit@^4.0.1, signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== From 33ebbb817b67cad8b7521cc49f2b7ce2af965816 Mon Sep 17 00:00:00 2001 From: Sebastien Romain Date: Wed, 29 Nov 2023 08:35:41 +0100 Subject: [PATCH 2/4] Remove exec-sh package --- yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 967e2d00e6b..54cd6954cff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9529,11 +9529,6 @@ events@^3.2.0, events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -exec-sh@^0.3.2: - version "0.3.6" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" - integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== - execa@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" From 179a650ac970b1c6a7988ef7f958be861f7b66d5 Mon Sep 17 00:00:00 2001 From: Sebastien Romain Date: Wed, 29 Nov 2023 08:52:59 +0100 Subject: [PATCH 3/4] Bump execa version from 4.x to 8.x --- .changeset/angry-swans-kiss.md | 6 ++++++ fork/module-to-cdn/cache.js | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .changeset/angry-swans-kiss.md diff --git a/.changeset/angry-swans-kiss.md b/.changeset/angry-swans-kiss.md new file mode 100644 index 00000000000..ff2ded83a37 --- /dev/null +++ b/.changeset/angry-swans-kiss.md @@ -0,0 +1,6 @@ +--- +'@talend/scripts-build-cdn': minor +'@talend/module-to-cdn': minor +--- + +deps: bump execa from 4.x to 8.x diff --git a/fork/module-to-cdn/cache.js b/fork/module-to-cdn/cache.js index bedc903eee3..fe509746811 100644 --- a/fork/module-to-cdn/cache.js +++ b/fork/module-to-cdn/cache.js @@ -6,10 +6,17 @@ const fs = require('fs'); const path = require('path'); const https = require('https'); -const execa = require('execa'); +// const execa = require('execa'); const semver = require('semver'); const mkdirp = require('mkdirp'); +let execa; +import('execa').then(({default: execaModule}) => { + execa = execaModule; +}); + +// console.log(execa); + const CACHE_BASE_PATH = `${process.cwd()}/.test-cache`; const CACHE_NPM_PATH = `${CACHE_BASE_PATH}/.npm-cache-info.json`; From ee2d9aa5aa77d95e4077f90b98b4531c7b8e03ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Romain?= Date: Wed, 29 Nov 2023 08:53:52 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- fork/module-to-cdn/cache.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/fork/module-to-cdn/cache.js b/fork/module-to-cdn/cache.js index fe509746811..85d31c26d90 100644 --- a/fork/module-to-cdn/cache.js +++ b/fork/module-to-cdn/cache.js @@ -6,7 +6,6 @@ const fs = require('fs'); const path = require('path'); const https = require('https'); -// const execa = require('execa'); const semver = require('semver'); const mkdirp = require('mkdirp'); @@ -15,8 +14,6 @@ import('execa').then(({default: execaModule}) => { execa = execaModule; }); -// console.log(execa); - const CACHE_BASE_PATH = `${process.cwd()}/.test-cache`; const CACHE_NPM_PATH = `${CACHE_BASE_PATH}/.npm-cache-info.json`;