Skip to content

feat(containers-shared): Move isDockerfile utility function to containers-shared #9577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jun 12, 2025
Merged

feat(containers-shared): Move isDockerfile utility function to containers-shared #9577

merged 2 commits into from
Jun 12, 2025

Conversation

CarmenPopoviciu
Copy link
Contributor

@CarmenPopoviciu CarmenPopoviciu commented Jun 12, 2025 •
edited
Loading

As part of DEVX-1966, we are moving the isDockerfile utility function and its corresponding tests to containers-shared. To support running tests for this package, this PR also adds some of the necessary vitest config.

Fixes DEVX-1966

  • 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
    • TODO (before merge)
    • Cloudflare docs PR(s):
    • Documentation not necessary because: just a refactor
  • Wrangler V3 Backport
    • TODO (before merge)
    • Wrangler PR:
    • Not necessary because: this is an experimental feature still

@CarmenPopoviciu CarmenPopoviciu requested review from a team as code owners June 12, 2025 12:10
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Jun 12, 2025 •
edited
Loading

⚠️ No Changeset found

Latest commit: 86e97b1

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

@github-project-automation github-project-automation bot moved this to Untriaged in workers-sdk Jun 12, 2025
@CarmenPopoviciu CarmenPopoviciu added the e2e Run wrangler + vite-plugin e2e tests on a PR label Jun 12, 2025
@pkg-pr-new pkg.pr.new
Copy link

pkg-pr-new bot commented Jun 12, 2025 •
edited
Loading

create-cloudflare

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

@cloudflare/kv-asset-handler

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

miniflare

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

@cloudflare/pages-shared

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

@cloudflare/unenv-preset

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

@cloudflare/vite-plugin

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

@cloudflare/vitest-pool-workers

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

@cloudflare/workers-editor-shared

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

wrangler

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

commit: 86e97b1

CarmenPopoviciu
CarmenPopoviciu commented Jun 12, 2025
View reviewed changes
packages/containers-shared/src/utils.ts
// TODO: move this into config validation
if (existsSync(image)) {
if (isDir(image)) {
throw new Error(
Copy link
Contributor Author

@CarmenPopoviciu CarmenPopoviciu Jun 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

all these were UserErrors, but I replaced them with Error instead, since I believe it makes more sense to uncouple this utility function from any wrangler specific error type. Nothing has changed in the code that calls this fn however, so no try...catch. If we need to throw a UserError specifically, I'll adapt the code in wrangler, but wanted to get thoughts first 🙏

CarmenPopoviciu
CarmenPopoviciu commented Jun 12, 2025
View reviewed changes
emily-shen
emily-shen approved these changes Jun 12, 2025
View reviewed changes
Copy link
Contributor

@emily-shen emily-shen left a comment

Choose a reason for hiding this comment

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

lgtm

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

do we need a changeset here?

@CarmenPopoviciu
Copy link
Contributor Author

do we need a changeset here?

answering my own question, but no, because no user facing changes, just refactoring

@CarmenPopoviciu CarmenPopoviciu added this pull request to the merge queue Jun 12, 2025
Merged via the queue into main with commit 3db206d Jun 12, 2025
22 checks passed
@CarmenPopoviciu CarmenPopoviciu deleted the carmen/registry-link-image branch June 12, 2025 17:09
@github-project-automation github-project-automation bot moved this from Approved to Done in workers-sdk Jun 12, 2025
jseba added a commit to jseba/workers-sdk that referenced this pull request Jun 14, 2025
@jseba
Merge branch 'main' of ssh://github.com/cloudflare/workers-sdk into HEAD
50e2835 
* 'main' of ssh://github.com/cloudflare/workers-sdk: (213 commits)
  fix(vite-plugin-cloudflare): allow unknown entrypoint on startup (cloudflare#9583)
  add warning about env not specified to potentially risky wrangler commands (cloudflare#9344)
  test: correctly delete test d1 databases (cloudflare#9598)
  Add details to v3 maintenance worflow error message (cloudflare#9602)
  drop unused `WRANGLER_UNENV_RESOLVE_PATHS` env var (cloudflare#9593)
  warn instead of erroring if no exposed ports. and remove unused dev_exposed_ports (cloudflare#9573)
  fix(wrangler): point to the right doc location (replaces cloudflare#9353) (cloudflare#9592)
  [vitest-pool-worker] Add `type: module` in package.json (cloudflare#9595)
  Enable HTML handling for HTML files in the public directory (cloudflare#9548)
  switch from go container to js (cloudflare#9588)
  containers: switch to Cloudflare container registry (cloudflare#9564)
  performance improvement: restart a mixed mode session only if the worker's remote bindings have changed (cloudflare#9536)
  ci: delete more orphaned resources from e2e tests (cloudflare#9580)
  test: remove `verifyBuildScript` logic from c3 e2e tests (cloudflare#9504)
  fix(vite-plugin): ensure node compat globals are injected before any imports (cloudflare#9581)
  feat(containers-shared): Move `isDockerfile` utility function to `containers-shared` (cloudflare#9577)
  allow `startWorker` to accept `false` as an `inspector` option (to disable the inspector server) (cloudflare#9550)
  Update capnp generated code from the workerd.capnp (cloudflare#9582)
  Bump `@cloudflare/unenv-preset` to 2.3.3 (cloudflare#9566)
  test: make custom build bundling tests more robust (cloudflare#9494)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emily-shen emily-shen emily-shen approved these changes

Assignees
No one assigned
Labels
e2e Run wrangler + vite-plugin e2e tests on a PR no-changeset-required
Projects
workers-sdk
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@CarmenPopoviciu @emily-shen