-
Notifications
You must be signed in to change notification settings - Fork 404
fix: collect virtual module CSS in vite dev #2039
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
Open
katywings
wants to merge
4
commits into
main
Choose a base branch
from
fix-virtual-css
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d7de8ed
test: implement virtual css test
katywings 28e9822
fix: resolve modules with vite fetchModule during dev style collection
katywings 983c75e
fix: patch virtual module null byte in data-vite-dev-id
katywings d1a23f5
chore: add changeset
katywings File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@solidjs/start": patch | ||
| --- | ||
|
|
||
| Fixed virtual module CSS not being collected in vite dev. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import { Plugin } from "vite"; | ||
|
|
||
| const id = "virtual:virtualModule.css"; | ||
| const resolvedId = "\0" + id; | ||
|
|
||
| const virtualCSS = () => | ||
| ({ | ||
| name: "css-fixture-virtual-css", | ||
| resolveId(source) { | ||
| if (source === id) return resolvedId; | ||
| }, | ||
| load(id) { | ||
| if (id.startsWith(resolvedId)) | ||
| return `.virtualCss { background-color: var(--color-success); }`; | ||
| }, | ||
| }) satisfies Plugin; | ||
|
|
||
| export default virtualCSS; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
packages/start/src/server/assets/PatchVirtualDevStyles.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /** | ||
| * Patches the data-vite-dev-id attribute for style tags of virtual modules | ||
| * | ||
| * Per Vite's convention, virtual module ids are prefixed with \0 (null byte): | ||
| * https://vite.dev/guide/api-plugin#virtual-modules-convention | ||
| * | ||
| * However this null byte cannot be server rendered properly. | ||
| * Vite client runtime then fails to find style's with wrong null bytes, | ||
| * and instead inserts duplicate style's. | ||
| * | ||
| * This patch replaces the serializable /@id/__x00__ with the proper null byte, | ||
| * and has to run before Vite's client runtime: | ||
| * https://github.com/vitejs/vite/blob/130e7181a55c524383c63bbfb1749d0ff7185cad/packages/vite/src/client/client.ts#L529 | ||
| * | ||
| * TODO: This should be solved in Vite directly! | ||
| */ | ||
| const patch = function () { | ||
| document.querySelectorAll<HTMLElement>("style[data-vite-dev-id]").forEach(function (el) { | ||
| el.setAttribute("data-vite-dev-id", el.dataset.viteDevId!.replace("/@id/__x00__", "\0")); | ||
| }); | ||
| }; | ||
|
|
||
| const serializedPatch = `(${patch.toString()})();`; | ||
|
|
||
| const PatchVirtualDevStyles = (props: { nonce?: string }) => { | ||
| if (!import.meta.env.PROD) { | ||
| return <script nonce={props.nonce} innerHTML={serializedPatch} />; | ||
| } | ||
| }; | ||
|
|
||
| export default PatchVirtualDevStyles; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.