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: error when asset binding is provided without user worker #6798

Merged
merged 4 commits into from
Sep 23, 2024

Conversation

emily-shen
Copy link
Contributor

What this PR solves / how to test

Fixes WC-2744

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: no e2e's for this yet :(
  • 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: unreleased feat

@emily-shen emily-shen requested a review from a team as a code owner September 23, 2024 10:19
Copy link

changeset-bot bot commented Sep 23, 2024

🦋 Changeset detected

Latest commit: cdc9f71

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 Sep 23, 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/10994091735/npm-package-wrangler-6798

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

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

Or you can use npx with this latest build directly:

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

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


wrangler@3.78.7 includes the following runtime dependencies:

Package Constraint Resolved
miniflare workspace:* 3.20240909.4
workerd 1.20240909.0 1.20240909.0
workerd --version 1.20240909.0 2024-09-09

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

Copy link
Contributor

@petebacondarwin petebacondarwin left a comment

Choose a reason for hiding this comment

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

Nice. Just a typo.

packages/wrangler/src/experimental-assets.ts Outdated Show resolved Hide resolved
@@ -392,7 +398,8 @@ export function verifyMutuallyExclusiveAssetsArgsOrConfig(
(args.legacyAssets || config.legacy_assets)
) {
throw new UserError(
"Cannot use Experimental Assets and Legacy Assets in the same Worker."
"Cannot use Experimental Assets and Legacy Assets in the same Worker.\n" +
"Please remove either the `site` or `experimental_assets` field from your configuration file."
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"Please remove either the `site` or `experimental_assets` field from your configuration file."
"Please remove either the `legacy_assets` or `experimental_assets` field from your configuration file."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the wrangler.toml key for sites/legacy assets is sites

@edmundhung edmundhung merged commit 7d7f19a into main Sep 23, 2024
22 checks passed
@edmundhung edmundhung deleted the emily/validate-asset-binding branch September 23, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants