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: update manifest/eTags on asset file content change #6736

Merged
merged 6 commits into from
Sep 19, 2024

Conversation

emily-shen
Copy link
Contributor

@emily-shen emily-shen commented Sep 17, 2024

What this PR solves / how to test

Fixes WC-2713

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: unreleased feat

@emily-shen emily-shen requested a review from a team as a code owner September 17, 2024 16:27
Copy link

changeset-bot bot commented Sep 17, 2024

🦋 Changeset detected

Latest commit: e1de055

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

This PR includes changesets to release 4 packages
Name Type
miniflare Patch
@cloudflare/pages-shared Patch
@cloudflare/vitest-pool-workers Patch
wrangler 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

@workers-devprod workers-devprod added the e2e Run e2e tests on a PR label Sep 17, 2024
Copy link
Contributor

github-actions bot commented Sep 17, 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/10938198386/npm-package-wrangler-6736

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

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

Or you can use npx with this latest build directly:

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

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


[email protected] includes the following runtime dependencies:

Package Constraint Resolved
miniflare workspace:* 3.20240909.3
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
Member

@GregBrimble GregBrimble left a comment

Choose a reason for hiding this comment

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

image

// This way the 'content hash' still updates on file change, so the eTag also updates,
// and we don't incorrectly get a 304.
contentHash: await hashPath(
encodeFilePath(relativeFilepath, path.sep) + modifiedTime.toString()
Copy link
Member

Choose a reason for hiding this comment

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

oh clever! I was going to hash the whole thing à la prod, but this saves an expensive computation!

packages/miniflare/src/plugins/assets/index.ts Outdated Show resolved Hide resolved
packages/wrangler/e2e/dev.test.ts Outdated Show resolved Hide resolved
@edmundhung edmundhung merged commit 2ddbb65 into main Sep 19, 2024
24 checks passed
@edmundhung edmundhung deleted the emily/dev-with-etags branch September 19, 2024 10:42
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
None yet
Development

Successfully merging this pull request may close these issues.

5 participants