fix: prevent addon stylesheet links from being removed during CSS live reload#23892
Merged
fix: prevent addon stylesheet links from being removed during CSS live reload#23892
Conversation
…e reload During CSS live reload, `PublicResourcesLiveUpdater` pushed null content for addon stylesheets not found in local source roots, and `removeOldLinks()` in vaadin-dev-tools used substring matching (`.includes()`) which could incorrectly remove unrelated `<link>` tags. Server-side changes: - Add jar-resources folder as a watched source root in `DevModeHandlerManagerImpl` so addon CSS changes are detected - Skip pushing null updates for stylesheets that exist on the classpath (e.g. from addon JARs) in `PublicResourcesLiveUpdater` - Use `ResourceProvider` to check classpath existence before deciding to remove a stylesheet - Strip `frontend/` prefix in `PublicStyleSheetBundler` when resolving addon stylesheets against jar-resources roots, since `TaskCopyFrontendFiles` removes that prefix during copy Client-side change: - Replace `.includes(path)` with path-suffix matching in `removeOldLinks()` to only remove links whose href ends with `'/' + path` or exactly equals `path`, after stripping query strings and fragments Fixes #23880
|
Test Results 1 384 files 1 384 suites 1h 27m 11s ⏱️ Results for commit 315327f. ♻️ This comment has been updated with latest results. |
mshabarov
approved these changes
Mar 20, 2026
vaadin-bot
pushed a commit
that referenced
this pull request
Mar 20, 2026
…e reload (#23892) During CSS live reload, `PublicResourcesLiveUpdater` pushed null content for addon stylesheets not found in local source roots, and `removeOldLinks()` in vaadin-dev-tools used substring matching (`.includes()`) which could incorrectly remove unrelated `<link>` tags. Server-side changes: - Add jar-resources folder as a watched source root in `DevModeHandlerManagerImpl` so addon CSS changes are detected - Skip pushing null updates for stylesheets that exist on the classpath (e.g. from addon JARs) in `PublicResourcesLiveUpdater` - Use `ResourceProvider` to check classpath existence before deciding to remove a stylesheet - Strip `frontend/` prefix in `PublicStyleSheetBundler` when resolving addon stylesheets against jar-resources roots, since `TaskCopyFrontendFiles` removes that prefix during copy Client-side change: - Replace `.includes(path)` with path-suffix matching in `removeOldLinks()` to only remove links whose href ends with `'/' + path` or exactly equals `path`, after stripping query strings and fragments Fixes #23880
Collaborator
|
Hi @mcollovati and @mshabarov, when i performed cherry-pick to this commit to 25.0, i have encountered the following issue. Can you take a look and pick it manually? |
vaadin-bot
added a commit
that referenced
this pull request
Mar 20, 2026
…e reload (#23892) (#23960) During CSS live reload, `PublicResourcesLiveUpdater` pushed null content for addon stylesheets not found in local source roots, and `removeOldLinks()` in vaadin-dev-tools used substring matching (`.includes()`) which could incorrectly remove unrelated `<link>` tags. Server-side changes: - Add jar-resources folder as a watched source root in `DevModeHandlerManagerImpl` so addon CSS changes are detected - Skip pushing null updates for stylesheets that exist on the classpath (e.g. from addon JARs) in `PublicResourcesLiveUpdater` - Use `ResourceProvider` to check classpath existence before deciding to remove a stylesheet - Strip `frontend/` prefix in `PublicStyleSheetBundler` when resolving addon stylesheets against jar-resources roots, since `TaskCopyFrontendFiles` removes that prefix during copy Client-side change: - Replace `.includes(path)` with path-suffix matching in `removeOldLinks()` to only remove links whose href ends with `'/' + path` or exactly equals `path`, after stripping query strings and fragments Fixes #23880 Co-authored-by: Marco Collovati <marco@vaadin.com>
mcollovati
added a commit
that referenced
this pull request
Mar 24, 2026
…e reload (#23892) During CSS live reload, `PublicResourcesLiveUpdater` pushed null content for addon stylesheets not found in local source roots, and `removeOldLinks()` in vaadin-dev-tools used substring matching (`.includes()`) which could incorrectly remove unrelated `<link>` tags. Server-side changes: - Add jar-resources folder as a watched source root in `DevModeHandlerManagerImpl` so addon CSS changes are detected - Skip pushing null updates for stylesheets that exist on the classpath (e.g. from addon JARs) in `PublicResourcesLiveUpdater` - Use `ResourceProvider` to check classpath existence before deciding to remove a stylesheet - Strip `frontend/` prefix in `PublicStyleSheetBundler` when resolving addon stylesheets against jar-resources roots, since `TaskCopyFrontendFiles` removes that prefix during copy Client-side change: - Replace `.includes(path)` with path-suffix matching in `removeOldLinks()` to only remove links whose href ends with `'/' + path` or exactly equals `path`, after stripping query strings and fragments Fixes #23880
mshabarov
pushed a commit
that referenced
this pull request
Mar 25, 2026
…e reload (#23892) (CP: 25.0) (#23981) * fix: prevent addon stylesheet links from being removed during CSS live reload (#23892) During CSS live reload, `PublicResourcesLiveUpdater` pushed null content for addon stylesheets not found in local source roots, and `removeOldLinks()` in vaadin-dev-tools used substring matching (`.includes()`) which could incorrectly remove unrelated `<link>` tags. Server-side changes: - Add jar-resources folder as a watched source root in `DevModeHandlerManagerImpl` so addon CSS changes are detected - Skip pushing null updates for stylesheets that exist on the classpath (e.g. from addon JARs) in `PublicResourcesLiveUpdater` - Use `ResourceProvider` to check classpath existence before deciding to remove a stylesheet - Strip `frontend/` prefix in `PublicStyleSheetBundler` when resolving addon stylesheets against jar-resources roots, since `TaskCopyFrontendFiles` removes that prefix during copy Client-side change: - Replace `.includes(path)` with path-suffix matching in `removeOldLinks()` to only remove links whose href ends with `'/' + path` or exactly equals `path`, after stripping query strings and fragments Fixes #23880 * fix test
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
During CSS live reload,
PublicResourcesLiveUpdaterpushed null content for addon stylesheets not found in local source roots, andremoveOldLinks()in vaadin-dev-tools used substring matching (.includes()) which could incorrectly remove unrelated<link>tags.Server-side changes:
DevModeHandlerManagerImplso addon CSS changes are detectedPublicResourcesLiveUpdaterResourceProviderto check classpath existence before deciding to remove a stylesheetfrontend/prefix inPublicStyleSheetBundlerwhen resolving addon stylesheets against jar-resources roots, sinceTaskCopyFrontendFilesremoves that prefix during copyClient-side change:
.includes(path)with path-suffix matching inremoveOldLinks()to only remove links whose href ends with'/' + pathor exactly equalspath, after stripping query strings and fragmentsFixes #23880