-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Fix ScriptTagHelper regression by checking for existing content before processing importmaps #63155
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
96d658b
Initial plan
Copilot 9a91938
Fix script tag importmap regression - preserve user content when no a…
Copilot 15776b3
Fix ScriptTagHelper importmap regression by checking for existing con…
Copilot 2b331d8
Merge remote-tracking branch 'origin/main' into copilot/fix-58973
MackinnonBuck c0960f3
Manual fixes
MackinnonBuck 6490384
Handle other tag helper setting content
MackinnonBuck 701dd19
Update PublicAPI.Unshipped.txt
MackinnonBuck 8035738
Use `ProcessAsync()` in tests
MackinnonBuck 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is the right fix.
If the goal is to do nothing if there is already content on the script, then what should happen is:
var originalContent = await output.GetChildContentAsync()
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that we still want to process all
<script type="importmap"></script>
but the fix is only to avoid replacing existing content if there's already data the developer put it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot @MackinnonBuck
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in commit 15776b3. I've implemented the approach you suggested:
await output.GetChildContentAsync()
to get existing contentIsEmptyOrWhiteSpace
The fix now properly processes all
<script type="importmap"></script>
tags but avoids replacing existing content when developers have provided their own importmap data. I've maintained backward compatibility by keeping the originalProcess
method that calls the newProcessAsync
method.