Skip to content

Fix container engine config#9689

Merged
emily-shen merged 4 commits intomainfrom
fix-containerEngine
Jun 24, 2025
Merged

Fix container engine config#9689
emily-shen merged 4 commits intomainfrom
fix-containerEngine

Conversation

@emily-shen
Copy link
Contributor

@emily-shen emily-shen commented Jun 20, 2025

this wasn't correctly being passed to miniflare - also added some tests.
This key is set under dev in the wrangler config because its not relevant to prod and only applies to local dev. We also have enable_containers that is set in the same place.


  • Tests
    • TODO (before merge)
    • Tests included
    • Tests not necessary because:
  • Wrangler / Vite E2E Tests CI Job required? (Use "e2e" label or ask maintainer to run separately)
    • I don't know
    • Required
    • Not required because:
  • Public documentation
  • Wrangler V3 Backport
    • TODO (before merge)
    • Wrangler PR:
    • Not necessary because: new feature

@changeset-bot
Copy link

changeset-bot bot commented Jun 20, 2025

🦋 Changeset detected

Latest commit: d66c0b3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 5 packages
Name Type
miniflare Patch
wrangler Patch
@cloudflare/pages-shared Patch
@cloudflare/vite-plugin Patch
@cloudflare/vitest-pool-workers Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-project-automation github-project-automation bot moved this to Untriaged in workers-sdk Jun 20, 2025
@emily-shen emily-shen changed the base branch from main to carmen/registry-link-image June 20, 2025 08:34
@pkg-pr-new
Copy link

pkg-pr-new bot commented Jun 20, 2025

create-cloudflare

npm i https://pkg.pr.new/create-cloudflare@9689

@cloudflare/kv-asset-handler

npm i https://pkg.pr.new/@cloudflare/kv-asset-handler@9689

miniflare

npm i https://pkg.pr.new/miniflare@9689

@cloudflare/pages-shared

npm i https://pkg.pr.new/@cloudflare/pages-shared@9689

@cloudflare/unenv-preset

npm i https://pkg.pr.new/@cloudflare/unenv-preset@9689

@cloudflare/vite-plugin

npm i https://pkg.pr.new/@cloudflare/vite-plugin@9689

@cloudflare/vitest-pool-workers

npm i https://pkg.pr.new/@cloudflare/vitest-pool-workers@9689

@cloudflare/workers-editor-shared

npm i https://pkg.pr.new/@cloudflare/workers-editor-shared@9689

wrangler

npm i https://pkg.pr.new/wrangler@9689

commit: d66c0b3

Base automatically changed from carmen/registry-link-image to main June 20, 2025 16:37
@emily-shen emily-shen force-pushed the fix-containerEngine branch 2 times, most recently from f4d3e3c to d444918 Compare June 23, 2025 09:58
@emily-shen emily-shen marked this pull request as ready for review June 23, 2025 10:12
@emily-shen emily-shen requested a review from a team as a code owner June 23, 2025 10:12
@github-actions
Copy link
Contributor

Failed to automatically backport this PR's changes to Wrangler v3. Please manually create a PR targeting the v3-maintenance branch with your changes. Thank you for helping us keep Wrangler v3 supported!

Depending on your changes, running git rebase --onto v3-maintenance main fix-containerEngine might be a good starting point.

Notes:

  • your PR branch should be named v3-backport-9689
  • add the skip-v3-pr label to the current PR to stop this workflow from failing

@emily-shen emily-shen force-pushed the fix-containerEngine branch from 1a8010e to d1137ee Compare June 23, 2025 14:57
@emily-shen emily-shen added e2e Run wrangler + vite-plugin e2e tests on a PR skip-v3-pr labels Jun 23, 2025
Copy link
Member

@dario-piotrowicz dario-piotrowicz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 🙂

const config = await runWranglerUntilConfig("dev");
expect(config.dev.containerEngine).toEqual("test.sock");
});
it("should be able to be set by env var", async () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
it("should be able to be set by env var", async () => {
it("should be able to be set by env var", async () => {

container_engine: "test.sock",
},
});
fs.writeFileSync("index.js", `export default {};`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nit 😅

Suggested change
fs.writeFileSync("index.js", `export default {};`);
fs.writeFileSync("index.js", "export default {};");

writeWranglerConfig({
main: "index.js",
});
fs.writeFileSync("index.js", `export default {};`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nit 😅

Suggested change
fs.writeFileSync("index.js", `export default {};`);
fs.writeFileSync("index.js", "export default {};");

port: 8888,
},
});
fs.writeFileSync("index.js", `export default {};`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fs.writeFileSync("index.js", `export default {};`);
fs.writeFileSync("index.js", "export default {};");

@github-project-automation github-project-automation bot moved this from Untriaged to Approved in workers-sdk Jun 24, 2025
@emily-shen
Copy link
Contributor Author

so sorry it'll be really good to get this in the release so i'm gonna ignore your nits 🧡 🧡 🧡 feel free to make an issue and i'll clean up later

@emily-shen emily-shen added this pull request to the merge queue Jun 24, 2025
Merged via the queue into main with commit b137a6f Jun 24, 2025
24 checks passed
@emily-shen emily-shen deleted the fix-containerEngine branch June 24, 2025 10:48
@github-project-automation github-project-automation bot moved this from Approved to Done in workers-sdk Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

e2e Run wrangler + vite-plugin e2e tests on a PR

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants