From 9e16191a82acbc51ddf96223d62e4110a4919cce Mon Sep 17 00:00:00 2001 From: Guillaume de Rouville Date: Fri, 7 Aug 2026 01:21:07 -0700 Subject: [PATCH 1/2] Drop the polyfill for the engine's findConfigDirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The engine now ships Workspace.findConfigDirs (dagger/dagger#13769): the same cwd-aware project discovery this module got from github.com/dagger/polyfill — same semantics, ported from the polyfill's own design and test matrix. Swap the call, drop the dependency, and require the engine release that ships it. This module was still pinned to v0.20.6 and used the legacy Workspace.path field, which the v1 view removed — so the version bump also ports the relative-path helper onto Workspace.cwd, the v1 spelling of the same value. The engineVersion bump and the dependency removal have to land together: the version gate is what keeps the engine's new changeset behavior scoped to migrated modules. Signed-off-by: Guillaume de Rouville --- compose.dang | 5 ++--- dagger.json | 9 ++------- docker.dang | 5 ++--- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/compose.dang b/compose.dang index 3c008ee..06d330d 100644 --- a/compose.dang +++ b/compose.dang @@ -27,8 +27,7 @@ type Compose { prefix marks an enclosing project. """ pub projects(ws: Workspace!): [ComposeProject!]! { - polyfill - .workspace(ws) + ws .findConfigDirs(configNames) .map { projectPath => ComposeProject(path: projectPath, composeImage: composeImage, configNames: configNames) @@ -49,7 +48,7 @@ type Compose { """ let relativeToCwd(ws: Workspace!, filePath: String!): String! { let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1) - let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment => + let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment => segment != "" and segment != "." } # Longest common prefix: acc only advances while every prior segment matched. diff --git a/dagger.json b/dagger.json index 57524f1..a59cb83 100644 --- a/dagger.json +++ b/dagger.json @@ -1,18 +1,13 @@ { "name": "docker", - "engineVersion": "v0.20.6", + "engineVersion": "v1.0.0-beta.10", "sdk": { "source": "dang" }, "dependencies": [ - { - "name": "polyfill", - "source": "github.com/dagger/polyfill@main", - "pin": "ec3ea84a2351b4beb06ecece951f2e5ef66509ff" - }, { "name": "proxy", "source": "./proxy" } ] -} \ No newline at end of file +} diff --git a/docker.dang b/docker.dang index 8af9f78..c5cab25 100644 --- a/docker.dang +++ b/docker.dang @@ -17,8 +17,7 @@ type Docker { marks an enclosing project. """ pub projects(ws: Workspace!): [DockerProject!]! { - polyfill - .workspace(ws) + ws .findConfigDirs(["Dockerfile"]) .map { projectPath => DockerProject(path: projectPath, lintImage: lintImage) @@ -53,7 +52,7 @@ type Docker { """ let relativeToCwd(ws: Workspace!, filePath: String!): String! { let dirSegments = filePath.trimPrefix("/").split("/").dropLast(1) - let cwdSegments = ws.path.trimPrefix("/").split("/").filter { segment => + let cwdSegments = ws.cwd.trimPrefix("/").split("/").filter { segment => segment != "" and segment != "." } # Longest common prefix: acc only advances while every prior segment matched. From 837ede55bca2fccd7f9ddb917b7f22c1239c0f89 Mon Sep 17 00:00:00 2001 From: Guillaume de Rouville Date: Tue, 11 Aug 2026 16:34:09 -0700 Subject: [PATCH 2/2] Fix proxy dependency after workspace migration --- dagger.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dagger.json b/dagger.json index a59cb83..af53617 100644 --- a/dagger.json +++ b/dagger.json @@ -7,7 +7,8 @@ "dependencies": [ { "name": "proxy", - "source": "./proxy" + "source": "https://github.com/dagger/proxy@main", + "pin": "3224e8981d8c8f04a0c238dc933b7415a2a6349f" } ] }