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.

Sign up for GitHub

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

Jump to bottom

Css from node_modules, theme resources #10183

Merged
merged 2 commits into from
Mar 4, 2021
Merged

Css from node_modules, theme resources #10183

merged 2 commits into from
Mar 4, 2021

Conversation

caalador
Copy link
Contributor

@caalador caalador commented Mar 3, 2021

Part of #9983

@caalador
feat: Enable importing CSS from node_modules (#9543)
af3a276 
Enable using CSS files from installed node_modules by adding 'importCss' to theme/my-theme/theme.json.

Fixes #9410
@caalador caalador requested a review from tanbt March 3, 2021 11:11
@caalador
fix: theme files can now be referenced as theme/theme-name (#9590)
2c9ca7e 
Theme files are now copied under theme/[theme-name]
and can be referenced by theme/them-name/path/file.ff
even though they are located at VAADIN/static

Fixes: #9405 and #9535
# Conflicts:
#	flow-server/src/main/java/com/vaadin/flow/server/DevModeHandler.java
#	flow-server/src/main/java/com/vaadin/flow/server/StaticFileServer.java
@caalador caalador force-pushed the issues/9983_importCss_resources branch from 0cb9840 to 2c9ca7e Compare March 3, 2021 11:59
@vaadin-bot
Copy link
Collaborator

SonarQube analysis reported 6 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. MAJOR DevModeHandler.java#L450: Refactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed. rule
  2. MAJOR DevModeHandler.java#L455: Invoke method(s) only conditionally. rule
  3. MAJOR DevModeHandler.java#L457: Invoke method(s) only conditionally. rule
  4. MAJOR DevModeHandler.java#L459: Invoke method(s) only conditionally. rule
  5. MAJOR DevModeHandler.java#L674: Either re-interrupt this method or rethrow the "InterruptedException". rule
  6. MAJOR DevModeHandlerTest.java#L524: Remove this use of "Thread.sleep()". rule

@caalador caalador requested a review from mshabarov March 4, 2021 09:32
@tanbt tanbt removed their request for review March 4, 2021 11:49
@mshabarov mshabarov merged commit e1180aa into 2.6 Mar 4, 2021
@mshabarov mshabarov deleted the issues/9983_importCss_resources branch March 4, 2021 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mshabarov mshabarov mshabarov approved these changes

Assignees
No one assigned
Labels
+0.1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caalador @vaadin-bot @mshabarov