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

Bring in reusable theme feature and tests #10197

Merged
merged 5 commits into from
Mar 8, 2021
Merged

Conversation

caalador
Copy link
Contributor

@caalador caalador commented Mar 5, 2021

part of #9983

mshabarov and others added 4 commits March 5, 2021 11:25
Adds a tests for checking that the document.css file is injected to the document scope and not injected to embedded element shadow root.

Fixes #9552
Now there is a possibility to use the
"documentCss" key in theme.json to
inject npm css into the document rool level
element.

This is mostly for embedded web components
as they do not target document by default

Fixes #9533

* Use more targeted bookkeeping for globalCss

Have a full map on where the global css
has been injected to so that if we add for
shadow roots we don't add to document,
but we are able to add to other shadow roots.
# Conflicts:
#	flow-server/src/main/java/com/vaadin/flow/server/AppShellRegistry.java
#	flow-server/src/test/java/com/vaadin/flow/server/startup/VaadinAppShellInitializerTest.java
The file-loader didn't handle otf extensions so having a otf font-face
failed the build.

Fixes #9683
Resolves #9585
# Conflicts:
#	flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskCopyFrontendFiles.java
#	flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskUpdateThemeImport.java
#	flow-tests/pom.xml
@caalador caalador requested a review from tanbt March 5, 2021 09:27
Add a reusable theme module for embedded tests.
Add module to test using reusable theme from
dependency with embedded application.

Fixes: #9828
# Conflicts:
#	flow-tests/test-embedding/pom.xml
@caalador caalador force-pushed the issues/9983_reusable_theme branch from 9bb34cb to 12bdbfc Compare March 5, 2021 09:48
@vaadin-bot
Copy link
Collaborator

SonarQube analysis reported 50 issues

  • MINOR 1 minor
  • INFO 49 info

Top 10 extra issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

  1. MINOR Constants.java#L61: Remove this use of "SERVLET_PARAMETER_BOWER_MODE"; it is deprecated. rule
  2. INFO Constants.java#L45: Do not forget to remove this deprecated code someday. rule
  3. INFO Constants.java#L53: Do not forget to remove this deprecated code someday. rule
  4. INFO Constants.java#L61: Do not forget to remove this deprecated code someday. rule
  5. INFO Constants.java#L76: Do not forget to remove this deprecated code someday. rule
  6. INFO Constants.java#L83: Do not forget to remove this deprecated code someday. rule
  7. INFO Constants.java#L90: Do not forget to remove this deprecated code someday. rule
  8. INFO Constants.java#L98: Do not forget to remove this deprecated code someday. rule
  9. INFO Constants.java#L106: Do not forget to remove this deprecated code someday. rule
  10. INFO Constants.java#L114: Do not forget to remove this deprecated code someday. rule

@caalador caalador requested a review from pleku March 8, 2021 07:59
Copy link
Contributor

@pleku pleku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question

@pleku
Copy link
Contributor

pleku commented Mar 8, 2021

This probably needs to be squashed ? Not all commits in history follow the messaage syntax

@caalador
Copy link
Contributor Author

caalador commented Mar 8, 2021

Well they are as they were in master.
Should have noted when cherry picking.

@pleku
Copy link
Contributor

pleku commented Mar 8, 2021

It could be fixed by f-p but the release notes will need to be cleaned up a bit anyway so I don't think it matters so much

@pleku pleku merged commit c10f170 into 2.6 Mar 8, 2021
@pleku pleku deleted the issues/9983_reusable_theme branch March 8, 2021 12:58
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.

4 participants