Skip to content
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

fix: import parent theme lumoImports in dev bundle mode #20325

Merged
merged 4 commits into from
Oct 29, 2024

Conversation

tltv
Copy link
Member

@tltv tltv commented Oct 23, 2024

Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567

Copy link

github-actions bot commented Oct 23, 2024

Test Results

1 114 files  ± 0  1 114 suites  ±0   1h 20m 54s ⏱️ +17s
7 082 tests + 2  7 033 ✅ + 2  49 💤 ±0  0 ❌ ±0 
7 426 runs   - 22  7 365 ✅  - 22  61 💤 ±0  0 ❌ ±0 

Results for commit cba2a35. ± Comparison against base commit 376b0c0.

♻️ This comment has been updated with latest results.

@tltv tltv marked this pull request as ready for review October 24, 2024 09:02
Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567
Catch and debug log IllegalArgumentException possibly thrown from potentialFile.toPath() in Windows. Url's in css like 'https://fonts.googleapis.com/css?family=Itim' shouldn't be considered as copyable asset files.
@tltv tltv force-pushed the fix/19567-import-globals-for-parent-theme branch from d3366a0 to cba2a35 Compare October 24, 2024 09:49
Copy link

sonarcloud bot commented Oct 24, 2024

@mshabarov mshabarov merged commit df499c6 into 24.4 Oct 29, 2024
26 checks passed
@mshabarov mshabarov deleted the fix/19567-import-globals-for-parent-theme branch October 29, 2024 12:35
vaadin-bot pushed a commit that referenced this pull request Oct 29, 2024
* fix: import parent theme lumoImports in dev bundle mode

Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567

* test: fix test

* test: fix test

* chore: catch IllegalArgumentException in CssBundler

Catch and debug log IllegalArgumentException possibly thrown from potentialFile.toPath() in Windows. Url's in css like 'https://fonts.googleapis.com/css?family=Itim' shouldn't be considered as copyable asset files.
@vaadin-bot
Copy link
Collaborator

Hi @tltv and @mshabarov, when i performed cherry-pick to this commit to 24.3, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick df499c6
error: could not apply df499c6... fix: import parent theme lumoImports in dev bundle mode (#20325)
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 pushed a commit that referenced this pull request Oct 29, 2024
* fix: import parent theme lumoImports in dev bundle mode

Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567

* test: fix test

* test: fix test

* chore: catch IllegalArgumentException in CssBundler

Catch and debug log IllegalArgumentException possibly thrown from potentialFile.toPath() in Windows. Url's in css like 'https://fonts.googleapis.com/css?family=Itim' shouldn't be considered as copyable asset files.
vaadin-bot added a commit that referenced this pull request Oct 29, 2024
)

* fix: import parent theme lumoImports in dev bundle mode

Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567

* test: fix test

* test: fix test

* chore: catch IllegalArgumentException in CssBundler

Catch and debug log IllegalArgumentException possibly thrown from potentialFile.toPath() in Windows. Url's in css like 'https://fonts.googleapis.com/css?family=Itim' shouldn't be considered as copyable asset files.

Co-authored-by: Tomi Virtanen <[email protected]>
mshabarov pushed a commit that referenced this pull request Oct 30, 2024
)

* fix: import parent theme lumoImports in dev bundle mode

Adds missing css imports for parent theme when given in parent theme.json with lumoImports property and running with dev bundle.

Fixes: #19567

* test: fix test

* test: fix test

* chore: catch IllegalArgumentException in CssBundler

Catch and debug log IllegalArgumentException possibly thrown from potentialFile.toPath() in Windows. Url's in css like 'https://fonts.googleapis.com/css?family=Itim' shouldn't be considered as copyable asset files.

Co-authored-by: Tomi Virtanen <[email protected]>
@vaadin-bot
Copy link
Collaborator

This ticket/PR has been released with Vaadin 24.4.15.

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