From 209727198c11daaad486b7feda10e1ac883ca595 Mon Sep 17 00:00:00 2001 From: Vaadin Bot Date: Tue, 15 Oct 2024 15:37:29 +0200 Subject: [PATCH] fix: force hotdeploy with hilla (#20251) (#20254) * fix: force hotdeploy with hilla * default to false Co-authored-by: Teppo Kurki --- .../com/vaadin/flow/server/AbstractConfiguration.java | 10 ++++++---- .../flow/server/PropertyDeploymentConfiguration.java | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/flow-server/src/main/java/com/vaadin/flow/server/AbstractConfiguration.java b/flow-server/src/main/java/com/vaadin/flow/server/AbstractConfiguration.java index b8e4d2cf537..1f2494c1a2e 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/AbstractConfiguration.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/AbstractConfiguration.java @@ -43,8 +43,8 @@ public interface AbstractConfiguration extends Serializable { boolean isProductionMode(); /** - * Get if the dev server should be enabled. false by default as a - * development bundle is used. + * Get if the dev server should be enabled. Defaults to true if Hilla is in + * use, otherwise defaults to false to enable dev bundle. * * @return true if dev server should be used * @deprecated Use {@link #getMode()} instead @@ -53,9 +53,11 @@ public interface AbstractConfiguration extends Serializable { default boolean frontendHotdeploy() { if (isProductionMode()) { return false; + } else if (FrontendUtils.isHillaUsed(getFrontendFolder())) { + return true; + } else { + return getBooleanProperty(InitParameters.FRONTEND_HOTDEPLOY, false); } - return getBooleanProperty(InitParameters.FRONTEND_HOTDEPLOY, - FrontendUtils.isHillaUsed(getFrontendFolder())); } default File getFrontendFolder() { diff --git a/flow-server/src/main/java/com/vaadin/flow/server/PropertyDeploymentConfiguration.java b/flow-server/src/main/java/com/vaadin/flow/server/PropertyDeploymentConfiguration.java index 385ff4ca8e9..48bade34761 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/PropertyDeploymentConfiguration.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/PropertyDeploymentConfiguration.java @@ -152,8 +152,11 @@ public boolean isProductionMode() { @Override public boolean frontendHotdeploy() { if (isOwnProperty(FRONTEND_HOTDEPLOY)) { - return getBooleanProperty(FRONTEND_HOTDEPLOY, - FrontendUtils.isHillaUsed(getFrontendFolder())); + if (FrontendUtils.isHillaUsed(getFrontendFolder())) { + return true; + } else { + return getBooleanProperty(FRONTEND_HOTDEPLOY, false); + } } return parentConfig.frontendHotdeploy(); }