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.

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

fix: ensure req.url matches moduleByEtag URL to avoid incorrect 304 r… #17997

Merged
merged 5 commits into from
Sep 10, 2024
Merged

fix: ensure req.url matches moduleByEtag URL to avoid incorrect 304 r… #17997

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1befecb
fix: ensure req.url matches moduleByEtag URL to avoid incorrect 304 r…
coderwei99 Sep 2, 2024
1141df8
chore: merge main
patak-dev Sep 9, 2024
62894d0
chore: update
patak-dev Sep 9, 2024
4e2f651
chore: update
patak-dev Sep 9, 2024
5c44a48
chore: update
patak-dev Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/vite/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2156,11 +2156,11 @@ Repository: lukeed/mrmime

## ms
License: MIT
Repository: zeit/ms
Repository: vercel/ms

> The MIT License (MIT)
>
> Copyright (c) 2016 Zeit, Inc.
> Copyright (c) 2020 Vercel, Inc.
>
> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -2447,7 +2447,7 @@ Repository: alexeyraspopov/picocolors

> ISC License
>
> Copyright (c) 2021 Alexey Raspopov, Kostiantyn Denysov, Anton Verinov
> Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov
>
> Permission to use, copy, modify, and/or distribute this software for any
> purpose with or without fee is hereby granted, provided that the above
Expand Down
5 changes: 4 additions & 1 deletion packages/vite/src/node/server/middlewares/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ export function cachedTransformMiddleware(
const ifNoneMatch = req.headers['if-none-match']
if (ifNoneMatch) {
const moduleByEtag = environment.moduleGraph.getModuleByEtag(ifNoneMatch)
if (moduleByEtag?.transformResult?.etag === ifNoneMatch) {
if (
moduleByEtag?.transformResult?.etag === ifNoneMatch &&
moduleByEtag?.url === req.url
) {
// For CSS requests, if the same CSS file is imported in a module,
// the browser sends the request for the direct CSS request with the etag
// from the imported CSS module. We ignore the etag in this case.
Expand Down
Loading