Skip to content
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.

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

Fix dev-env logging #6909

Merged
merged 11 commits into from
Oct 7, 2024
Merged

Fix dev-env logging #6909

merged 11 commits into from
Oct 7, 2024

Conversation

penalosa
Copy link
Contributor

@penalosa penalosa commented Oct 7, 2024

What this PR solves / how to test

Fixes N/A

Various fixes for logging in --x-dev-env, primarily to ensure the hotkeys don't wipe useful output:

  • Ensure all direct console logging is through logger.console() so that the hotkeys are correctly rendered
  • Ensure esbuild doesn't log directly to the console when guessing the format of a worker
  • Ensure hotkeys are unregistered when DevEnv is torndown
  • Ensure devEnv.teardown() is called when startDev() encounters a thrown error

Author has addressed the following

  • Tests
    • TODO (before merge)
    • Tests included
    • Tests not necessary because:
  • E2E Tests CI Job required? (Use "e2e" label or ask maintainer to run separately)
    • I don't know
    • Required
    • Not required because:
  • Changeset (Changeset guidelines)
    • TODO (before merge)
    • Changeset included
    • Changeset not necessary because:
  • Public documentation
    • TODO (before merge)
    • Cloudflare docs PR(s):
    • Documentation not necessary because: bufix

@penalosa penalosa requested a review from a team as a code owner October 7, 2024 13:02
Copy link

changeset-bot bot commented Oct 7, 2024

🦋 Changeset detected

Latest commit: f2bd048

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

This PR includes changesets to release 2 packages
Name Type
wrangler 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

Copy link
Contributor

github-actions bot commented Oct 7, 2024

A wrangler prerelease is available for testing. You can install this latest build in your project with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-wrangler-6909

You can reference the automatically updated head of this PR with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/prs/6909/npm-package-wrangler-6909

Or you can use npx with this latest build directly:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-wrangler-6909 dev path/to/script.js
Additional artifacts:
npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-create-cloudflare-6909 --no-auto-update
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-cloudflare-kv-asset-handler-6909
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-miniflare-6909
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-cloudflare-pages-shared-6909
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-cloudflare-vitest-pool-workers-6909
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-cloudflare-workers-editor-shared-6909
npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/11220052476/npm-package-cloudflare-workers-shared-6909

Note that these links will no longer work once the GitHub Actions artifact expires.


wrangler@3.80.0 includes the following runtime dependencies:

Package Constraint Resolved
miniflare workspace:* 3.20240925.0
workerd 1.20240925.0 1.20240925.0
workerd --version 1.20240925.0 2024-09-25

Please ensure constraints are pinned, and miniflare/workerd minor versions match.

@penalosa penalosa added the e2e Run e2e tests on a PR label Oct 7, 2024
@@ -636,6 +634,12 @@ export async function startDev(args: StartDevOptions) {
unregisterHotKeys = registerDevHotKeys(devEnv, args);
}

devEnv.once("teardown", async () => {
const teardownRegistry = await teardownRegistryPromise;
await teardownRegistry(devEnv.config.latestConfig?.name);
Copy link
Contributor

Choose a reason for hiding this comment

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

If args.disableDevRegistry, then I think teardownRegistry will be undefined here.

Copy link
Contributor

@andyjessop andyjessop left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@penalosa penalosa merged commit 82180a7 into main Oct 7, 2024
19 checks passed
@penalosa penalosa deleted the penalosa/fix-dev-env-logging branch October 7, 2024 16:54
@workers-devprod workers-devprod mentioned this pull request Oct 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
e2e Run e2e tests on a PR
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants