From 3e50b9cbd6f6b15aa36298c0f1723385c6ea98fb Mon Sep 17 00:00:00 2001 From: Remy Suen Date: Tue, 22 Jul 2025 13:01:39 -0400 Subject: [PATCH 1/2] Update the Dockerfile Language Server to 0.14.1 Signed-off-by: Remy Suen --- CHANGELOG.md | 6 +++++ package-lock.json | 56 ++++++++++++++++++++++++++++++++++------------- package.json | 2 +- 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 014a6e1..ddc2884 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Docker DX extension will be documented in this file. +## [Unreleased] + +### Fixed + +- fix Dockerfile Language Server crash with tabbed heredoc delimiters ([#171](https://github.com/docker/vscode-extension/issues/171)) + ## [0.13.0] - 2025-07-17 ### Added diff --git a/package-lock.json b/package-lock.json index b55072a..1424f77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@bugsnag/js": "~8.2.0", "dockerfile-ast": "0.7.0", - "dockerfile-language-server-nodejs": "0.14.0", + "dockerfile-language-server-nodejs": "0.14.1", "vscode-languageclient": "9.0.1" }, "devDependencies": { @@ -2893,13 +2893,13 @@ } }, "node_modules/dockerfile-language-server-nodejs": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.14.0.tgz", - "integrity": "sha512-zbHDuaVHJrgnInOp+bGnMENikCDNGdEad8ro7WndQLGdRKjMC6Gndw2UKTv4WVlJTeAzwp8cOiu1VHkB4nmGgg==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.14.1.tgz", + "integrity": "sha512-50bvRWmAemwJ9VJD2LIQYiKHyL1pW5WoA1Q7keJ4wT+fCGCVxz59kIJY3GXnnlTSXHh9niv3Wc4pFtmXfmILMg==", "license": "MIT", "dependencies": { - "dockerfile-language-service": "0.15.0", - "dockerfile-utils": "0.16.2", + "dockerfile-language-service": "0.15.1", + "dockerfile-utils": "0.16.3", "vscode-languageserver": "~8.0.0", "vscode-languageserver-textdocument": "~1.0.8" }, @@ -2911,13 +2911,13 @@ } }, "node_modules/dockerfile-language-service": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.15.0.tgz", - "integrity": "sha512-DvfabBrOQWhPzFtO6GvuEyv4ojdh3sr7+0uPc+TM+azJRrd7+zWvf6F8/AFVfmd2Kvdl9nvikmKIwSLEp0Wowg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.15.1.tgz", + "integrity": "sha512-0iQBvt/3u8x6ZgYag7QyYPSY2M6Hfn0zB2soywAFZ5THX/13FGk+Vmksqw+a1l+uPDiA+yV7trUedKQ5R0A2aA==", "license": "MIT", "dependencies": { - "dockerfile-ast": "0.7.0", - "dockerfile-utils": "0.16.2", + "dockerfile-ast": "0.7.1", + "dockerfile-utils": "0.16.3", "vscode-languageserver-textdocument": "1.0.8", "vscode-languageserver-types": "3.17.3" }, @@ -2925,6 +2925,19 @@ "node": "*" } }, + "node_modules/dockerfile-language-service/node_modules/dockerfile-ast": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.1.tgz", + "integrity": "sha512-oX/A4I0EhSkGqrFv0YuvPkBUSYp1XiY8O8zAKc8Djglx8ocz+JfOr8gP0ryRMC2myqvDLagmnZaU9ot1vG2ijw==", + "license": "MIT", + "dependencies": { + "vscode-languageserver-textdocument": "^1.0.8", + "vscode-languageserver-types": "^3.17.3" + }, + "engines": { + "node": "*" + } + }, "node_modules/dockerfile-language-service/node_modules/vscode-languageserver-textdocument": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", @@ -2938,12 +2951,12 @@ "license": "MIT" }, "node_modules/dockerfile-utils": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.16.2.tgz", - "integrity": "sha512-0BHCYRYm5uk/xdL6jv1vLDxJ+FY812sQumRMkLB33f4FRB9VZsDk6ckUeSWlYOWHP9/VhmM0colmpXT/j2OTzA==", + "version": "0.16.3", + "resolved": "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.16.3.tgz", + "integrity": "sha512-BslaqRR6PzCnhu+toDbkVAjq0B0CEgrCltk+enJ/xwCmvAHB1QqpO9QhXVIzMg/iSuD4tzS0Ex9n4Ik5ffI7pA==", "license": "MIT", "dependencies": { - "dockerfile-ast": "0.7.0", + "dockerfile-ast": "0.7.1", "vscode-languageserver-textdocument": "^1.0.8", "vscode-languageserver-types": "^3.17.3" }, @@ -2954,6 +2967,19 @@ "node": "*" } }, + "node_modules/dockerfile-utils/node_modules/dockerfile-ast": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.1.tgz", + "integrity": "sha512-oX/A4I0EhSkGqrFv0YuvPkBUSYp1XiY8O8zAKc8Djglx8ocz+JfOr8gP0ryRMC2myqvDLagmnZaU9ot1vG2ijw==", + "license": "MIT", + "dependencies": { + "vscode-languageserver-textdocument": "^1.0.8", + "vscode-languageserver-types": "^3.17.3" + }, + "engines": { + "node": "*" + } + }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", diff --git a/package.json b/package.json index 457e78e..843c2ea 100644 --- a/package.json +++ b/package.json @@ -252,7 +252,7 @@ "dependencies": { "@bugsnag/js": "~8.2.0", "dockerfile-ast": "0.7.0", - "dockerfile-language-server-nodejs": "0.14.0", + "dockerfile-language-server-nodejs": "0.14.1", "vscode-languageclient": "9.0.1" }, "devDependencies": { From bbfa2dea946c743f9d98f0c3796b66317bc568fa Mon Sep 17 00:00:00 2001 From: Remy Suen Date: Tue, 22 Jul 2025 13:13:26 -0400 Subject: [PATCH 2/2] Update dockerfile-ast to 0.7.1 Signed-off-by: Remy Suen --- package-lock.json | 34 ++++------------------------------ package.json | 2 +- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1424f77..0e4d6b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@bugsnag/js": "~8.2.0", - "dockerfile-ast": "0.7.0", + "dockerfile-ast": "0.7.1", "dockerfile-language-server-nodejs": "0.14.1", "vscode-languageclient": "9.0.1" }, @@ -2880,9 +2880,9 @@ } }, "node_modules/dockerfile-ast": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.0.tgz", - "integrity": "sha512-HYpjuL0IEC2lYflTpWD0RLNSZYhQxLwYRYsoEjnCP7nu/OlFx1BVrU6X/Y8ETVsa2hojhG2OTJVxleH5Wrlq+Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.1.tgz", + "integrity": "sha512-oX/A4I0EhSkGqrFv0YuvPkBUSYp1XiY8O8zAKc8Djglx8ocz+JfOr8gP0ryRMC2myqvDLagmnZaU9ot1vG2ijw==", "license": "MIT", "dependencies": { "vscode-languageserver-textdocument": "^1.0.8", @@ -2925,19 +2925,6 @@ "node": "*" } }, - "node_modules/dockerfile-language-service/node_modules/dockerfile-ast": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.1.tgz", - "integrity": "sha512-oX/A4I0EhSkGqrFv0YuvPkBUSYp1XiY8O8zAKc8Djglx8ocz+JfOr8gP0ryRMC2myqvDLagmnZaU9ot1vG2ijw==", - "license": "MIT", - "dependencies": { - "vscode-languageserver-textdocument": "^1.0.8", - "vscode-languageserver-types": "^3.17.3" - }, - "engines": { - "node": "*" - } - }, "node_modules/dockerfile-language-service/node_modules/vscode-languageserver-textdocument": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", @@ -2967,19 +2954,6 @@ "node": "*" } }, - "node_modules/dockerfile-utils/node_modules/dockerfile-ast": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.7.1.tgz", - "integrity": "sha512-oX/A4I0EhSkGqrFv0YuvPkBUSYp1XiY8O8zAKc8Djglx8ocz+JfOr8gP0ryRMC2myqvDLagmnZaU9ot1vG2ijw==", - "license": "MIT", - "dependencies": { - "vscode-languageserver-textdocument": "^1.0.8", - "vscode-languageserver-types": "^3.17.3" - }, - "engines": { - "node": "*" - } - }, "node_modules/doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", diff --git a/package.json b/package.json index 843c2ea..850b5c3 100644 --- a/package.json +++ b/package.json @@ -251,7 +251,7 @@ }, "dependencies": { "@bugsnag/js": "~8.2.0", - "dockerfile-ast": "0.7.0", + "dockerfile-ast": "0.7.1", "dockerfile-language-server-nodejs": "0.14.1", "vscode-languageclient": "9.0.1" },