Skip to content

fix: Write frontend build files into build dir when it is outside project dir (#24805) (CP: 25.0) (#24821) (CP: 24.10)#24822

Merged
vaadin-bot merged 1 commit into
24.10from
cherry-pick-24821-to-24.10-1782385164945
Jun 25, 2026
Merged

fix: Write frontend build files into build dir when it is outside project dir (#24805) (CP: 25.0) (#24821) (CP: 24.10)#24822
vaadin-bot merged 1 commit into
24.10from
cherry-pick-24821-to-24.10-1782385164945

Conversation

@vaadin-bot

Copy link
Copy Markdown
Collaborator

This PR cherry-picks changes from the original PR #24821 to branch 24.10.

Original PR description

This PR cherry-picks changes from the original PR #24805 to branch 25.0.

Original PR description

Description

When the build dir is relocated outside the project dir, vaadinPrepareFrontend wrote vaadin-dev-server-settings.json and the dev-bundle output paths under the source tree. buildFolder() is now always relative to projectDir.

Fixes #24804

Type of change

  • [ x] Bugfix
  • Feature

Checklist

  • [x ] I have read the contribution guide: https://vaadin.com/docs/latest/guide/contributing/overview/
  • [x ] I have added a description following the guideline.
  • [ x] The issue is created in the corresponding repository and I have referenced it.
  • [ x] I have added tests to ensure my change is effective and works as intended.
  • [ x] New and existing tests are passing locally with my change.
  • [ x] I have performed self-review and corrected misspellings.

…ject dir (#24805) (CP: 25.0) (#24821)

This PR cherry-picks changes from the original PR #24805 to branch 25.0.
---
#### Original PR description
> ## Description
>
> When the build dir is relocated outside the project dir,
vaadinPrepareFrontend wrote vaadin-dev-server-settings.json and the
dev-bundle output paths under the source tree. buildFolder() is now
always relative to projectDir.
>
> Fixes #24804
>
> ## Type of change
>
> - [ x] Bugfix
> - [ ] Feature
>
> ## Checklist
>
> - [x ] I have read the contribution guide:
https://vaadin.com/docs/latest/guide/contributing/overview/
> - [x ] I have added a description following the guideline.
> - [ x] The issue is created in the corresponding repository and I have
referenced it.
> - [ x] I have added tests to ensure my change is effective and works
as intended.
> - [ x] New and existing tests are passing locally with my change.
> - [ x] I have performed self-review and corrected misspellings.
>
>

Co-authored-by: Ingo Kegel <ingo.kegel@ej-technologies.com>
Co-authored-by: Marco Collovati <marco@vaadin.com>
@vaadin-bot

Copy link
Copy Markdown
Collaborator Author

This PR is eligible for auto-merging policy, so it has been approved automatically. If there are pending conditions, auto merge (with 'squash' method) has been enabled for this PR [Message is sent from bot]

@vaadin-bot vaadin-bot enabled auto-merge (squash) June 25, 2026 11:02
@vaadin-bot

Copy link
Copy Markdown
Collaborator Author

This PR is eligible for auto-merging policy, so it has been approved automatically. If there are pending conditions, auto merge (with 'squash' method) has been enabled for this PR[Message is sent from bot]

@github-actions

Copy link
Copy Markdown

Test Results

1 294 files  ± 0  1 294 suites  ±0   1h 13m 41s ⏱️ - 1m 39s
8 916 tests + 5  8 854 ✅ + 5  62 💤 ±0  0 ❌ ±0 
9 231 runs   - 12  9 162 ✅  - 12  69 💤 ±0  0 ❌ ±0 

Results for commit 3d182bb. ± Comparison against base commit 753f61d.

@vaadin-bot vaadin-bot merged commit 324e997 into 24.10 Jun 25, 2026
25 of 26 checks passed
@vaadin-bot vaadin-bot deleted the cherry-pick-24821-to-24.10-1782385164945 branch June 25, 2026 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants