Skip to content

fix: prevent deletion of app-shell-imports by frontend cleanup task#24118

Merged
mcollovati merged 1 commit intomainfrom
issues/24108-prevent_deletion_of_appshellimports
Apr 15, 2026
Merged

fix: prevent deletion of app-shell-imports by frontend cleanup task#24118
mcollovati merged 1 commit intomainfrom
issues/24108-prevent_deletion_of_appshellimports

Conversation

@mcollovati
Copy link
Copy Markdown
Collaborator

TaskRemoveOldFrontendGeneratedFiles deletes files in the frontend generated folder that are not recognized as known generated files. The app-shell-imports.js and app-shell-imports.d.ts files were missing from the known files list, causing them to be deleted when vaadinPrepareFrontend runs without the index generation task, for example when IntelliJ IDEA triggers a Gradle compilation while the dev server is running with hot deploy.

Add APP_SHELL_IMPORTS_NAME and APP_SHELL_IMPORTS_D_TS_NAME to the known files list. Also improve test coverage by verifying all known file types, including Hilla generated files.

Related to #24108

`TaskRemoveOldFrontendGeneratedFiles` deletes files in the frontend
generated folder that are not recognized as known generated files.
The `app-shell-imports.js` and `app-shell-imports.d.ts` files were
missing from the known files list, causing them to be deleted when
`vaadinPrepareFrontend` runs without the index generation task,
for example when IntelliJ IDEA triggers a Gradle compilation while
the dev server is running with hot deploy.

Add `APP_SHELL_IMPORTS_NAME` and `APP_SHELL_IMPORTS_D_TS_NAME` to
the known files list. Also improve test coverage by verifying all
known file types, including Hilla generated files.

Related to #24108
@mcollovati mcollovati added target/25.0 Cherry-pick to 25.0 branch target/25.1 labels Apr 14, 2026
@sonarqubecloud
Copy link
Copy Markdown

@github-actions
Copy link
Copy Markdown

Test Results

 1 391 files   1 391 suites   1h 13m 48s ⏱️
 9 997 tests  9 926 ✅ 71 💤 0 ❌
10 472 runs  10 392 ✅ 80 💤 0 ❌

Results for commit 0e823ef.

@mcollovati mcollovati added this pull request to the merge queue Apr 15, 2026
Merged via the queue into main with commit 6b1d622 Apr 15, 2026
31 checks passed
@mcollovati mcollovati deleted the issues/24108-prevent_deletion_of_appshellimports branch April 15, 2026 10:44
vaadin-bot pushed a commit that referenced this pull request Apr 15, 2026
…24118)

`TaskRemoveOldFrontendGeneratedFiles` deletes files in the frontend
generated folder that are not recognized as known generated files. The
`app-shell-imports.js` and `app-shell-imports.d.ts` files were missing
from the known files list, causing them to be deleted when
`vaadinPrepareFrontend` runs without the index generation task, for
example when IntelliJ IDEA triggers a Gradle compilation while the dev
server is running with hot deploy.

Add `APP_SHELL_IMPORTS_NAME` and `APP_SHELL_IMPORTS_D_TS_NAME` to the
known files list. Also improve test coverage by verifying all known file
types, including Hilla generated files.

Related to #24108
@vaadin-bot
Copy link
Copy Markdown
Collaborator

Hi @mcollovati and @mcollovati, 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?
Error Message:
Error: Command failed: git cherry-pick 6b1d622
error: could not apply 6b1d622... fix: prevent deletion of app-shell-imports by frontend cleanup task (#24118)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

vaadin-bot added a commit that referenced this pull request Apr 15, 2026
…24118) (CP: 25.1) (#24124)

This PR cherry-picks changes from the original PR #24118 to branch 25.1.
---
#### Original PR description
> `TaskRemoveOldFrontendGeneratedFiles` deletes files in the frontend
generated folder that are not recognized as known generated files. The
`app-shell-imports.js` and `app-shell-imports.d.ts` files were missing
from the known files list, causing them to be deleted when
`vaadinPrepareFrontend` runs without the index generation task, for
example when IntelliJ IDEA triggers a Gradle compilation while the dev
server is running with hot deploy.
> 
> Add `APP_SHELL_IMPORTS_NAME` and `APP_SHELL_IMPORTS_D_TS_NAME` to the
known files list. Also improve test coverage by verifying all known file
types, including Hilla generated files.
> 
> Related to #24108

Co-authored-by: Marco Collovati <marco@vaadin.com>
mcollovati added a commit that referenced this pull request Apr 15, 2026
…24118)

`TaskRemoveOldFrontendGeneratedFiles` deletes files in the frontend
generated folder that are not recognized as known generated files. The
`app-shell-imports.js` and `app-shell-imports.d.ts` files were missing
from the known files list, causing them to be deleted when
`vaadinPrepareFrontend` runs without the index generation task, for
example when IntelliJ IDEA triggers a Gradle compilation while the dev
server is running with hot deploy.

Add `APP_SHELL_IMPORTS_NAME` and `APP_SHELL_IMPORTS_D_TS_NAME` to the
known files list. Also improve test coverage by verifying all known file
types, including Hilla generated files.

Related to #24108
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants