From d2156143633e1ba19ced00cfaaf2025bd9b18163 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 28 Oct 2026 10:50:47 +0100 Subject: [PATCH 1/3] Override basic-ftp and serialize-javascript, prepare 0.89.1 Add a yarn resolution for basic-ftp ^6.2.3 (get-uri still requires ^5) and raise the serialize-javascript resolution to ^7.1.3 to address Dependabot alerts #128 and #130. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 13 +++++++++++++ package.json | 5 +++-- yarn.lock | 16 ++++++++-------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dcbac73a..e55068623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ Notable changes. +## October 2026 + +### [0.89.1] +- Fix registry inspection for valid `tag@digest` image references. (https://github.com/devcontainers/cli/pull/1311) +- Fix relative symlink resolution in the install script. (https://github.com/devcontainers/cli/pull/1244) +- Dependency updates: + - Bump basic-ftp from 5.3.1 to 6.2.3 (via resolution, get-uri still requires 5.x). (PR_PLACEHOLDER) + - Bump shell-quote from 1.9.0 to 1.11.0. (https://github.com/devcontainers/cli/pull/1337) + - Bump follow-redirects from 1.16.0 to 1.16.1. (https://github.com/devcontainers/cli/pull/1336) + - Bump ip-address from 10.5.0 to 10.7.5. (https://github.com/devcontainers/cli/pull/1343) + - Bump brace-expansion to 1.1.21, 2.1.7 and 5.0.12. (https://github.com/devcontainers/cli/pull/1342) + - Bump js-yaml from 4.3.1 to 4.3.2. (https://github.com/devcontainers/cli/pull/1329) + ## August 2026 ### [0.89.0] diff --git a/package.json b/package.json index ed05dce90..3e561d15c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@devcontainers/cli", "description": "Dev Containers CLI", - "version": "0.89.0", + "version": "0.89.1", "bin": { "devcontainer": "devcontainer.js" }, @@ -104,6 +104,7 @@ "yargs": "~17.7.2" }, "resolutions": { - "serialize-javascript": "^7.0.5" + "basic-ftp": "^6.2.3", + "serialize-javascript": "^7.1.3" } } diff --git a/yarn.lock b/yarn.lock index fc5dea3df..978cb7953 100644 --- a/yarn.lock +++ b/yarn.lock @@ -646,10 +646,10 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -basic-ftp@^5.0.2: - version "5.3.1" - resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.3.1.tgz#3148ee9af43c0522514a4f973fecb1d3cbb6d71e" - integrity sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw== +basic-ftp@^5.0.2, basic-ftp@^6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-6.2.3.tgz#452e25a101380a8c69cdf94d7da17e7fe7bccbaa" + integrity sha512-T7GYtQ2eKJUN5YORG7A8u2WfB9JMN0a4/wl3MI64qq2qTRfa3FXzoNq0DDojZDkDyStcL+TkfKsz4JHEZx5kGQ== bl@^5.0.0: version "5.1.0" @@ -2635,10 +2635,10 @@ semver@^7.7.3, semver@^7.7.4: resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a" integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA== -serialize-javascript@^6.0.2, serialize-javascript@^7.0.5: - version "7.0.5" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.0.5.tgz#c798cc0552ffbb08981914a42a8756e339d0d5b1" - integrity sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw== +serialize-javascript@^6.0.2, serialize-javascript@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.1.4.tgz#477af55bdec0d831fa3b209245f673217fd27380" + integrity sha512-FqlEuoTq/zRmA4Lg6aOqyH3lCHbUtCB0bmHCeFniX2GBdDqMJM3FwdvEhlE5Pim1dlt2FfBdVPmUNNiGhhKqpw== set-function-length@^1.2.2: version "1.2.2" From 4e1847b77502007bb391b2d8831f08e1f9daaf59 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 28 Oct 2026 10:51:13 +0100 Subject: [PATCH 2/3] Add PR link to changelog Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e55068623..a8ef24c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Notable changes. - Fix registry inspection for valid `tag@digest` image references. (https://github.com/devcontainers/cli/pull/1311) - Fix relative symlink resolution in the install script. (https://github.com/devcontainers/cli/pull/1244) - Dependency updates: - - Bump basic-ftp from 5.3.1 to 6.2.3 (via resolution, get-uri still requires 5.x). (PR_PLACEHOLDER) + - Bump basic-ftp from 5.3.1 to 6.2.3 (via resolution, get-uri still requires 5.x). (https://github.com/devcontainers/cli/pull/1345) - Bump shell-quote from 1.9.0 to 1.11.0. (https://github.com/devcontainers/cli/pull/1337) - Bump follow-redirects from 1.16.0 to 1.16.1. (https://github.com/devcontainers/cli/pull/1336) - Bump ip-address from 10.5.0 to 10.7.5. (https://github.com/devcontainers/cli/pull/1343) From a22c7386bc7ec253600210f7369322ed4881d327 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 28 Oct 2026 11:02:14 +0100 Subject: [PATCH 3/3] Prepare 0.90.0 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ef24c30..174214383 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Notable changes. ## October 2026 -### [0.89.1] +### [0.90.0] - Fix registry inspection for valid `tag@digest` image references. (https://github.com/devcontainers/cli/pull/1311) - Fix relative symlink resolution in the install script. (https://github.com/devcontainers/cli/pull/1244) - Dependency updates: diff --git a/package.json b/package.json index 3e561d15c..a7a7f2f50 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@devcontainers/cli", "description": "Dev Containers CLI", - "version": "0.89.1", + "version": "0.90.0", "bin": { "devcontainer": "devcontainer.js" },