From f5b401a86bc6bc77d486f57b51f62a4cdcc2b4cb Mon Sep 17 00:00:00 2001 From: Marco Collovati Date: Mon, 9 Aug 2021 16:17:33 +0200 Subject: [PATCH] Fixed static file handlers --- .../java/com/github/mcollovati/vertx/vaadin/VertxVaadin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vertx-vaadin-flow-parent/vertx-vaadin-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadin.java b/vertx-vaadin-flow-parent/vertx-vaadin-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadin.java index 23def108..63f99510 100644 --- a/vertx-vaadin-flow-parent/vertx-vaadin-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadin.java +++ b/vertx-vaadin-flow-parent/vertx-vaadin-flow/src/main/java/com/github/mcollovati/vertx/vaadin/VertxVaadin.java @@ -209,7 +209,8 @@ private Router initRouter() { // Serve push javascript StaticHandler vaadinStatic = StaticHandler.create("VAADIN/static"); - StaticHandler metaInfVaadinStatic = StaticHandler.create("META-INF/resources/VAADIN/static"); + StaticHandler metaInfVaadinStatic = StaticHandler.create("META-INF/VAADIN/static"); + StaticHandler metaInfResourcesVaadinStatic = StaticHandler.create("META-INF/resources/VAADIN/static"); String pushJavascript = String.format( "META-INF/resources/VAADIN/static/push/vaadinPush%s", @@ -231,6 +232,7 @@ private Router initRouter() { vaadinRouter.route("/VAADIN/build/*").handler(StaticHandler.create("META-INF/VAADIN/build")); vaadinRouter.route("/VAADIN/static/*").handler(vaadinStatic); vaadinRouter.route("/VAADIN/static/*").handler(metaInfVaadinStatic); + vaadinRouter.route("/VAADIN/static/*").handler(metaInfResourcesVaadinStatic); vaadinRouter.routeWithRegex("^/themes\\/[\\s\\S]+?\\/").handler(metaInfVaadinStatic); vaadinRouter.routeWithRegex("/VAADIN(?!/dynamic)/.*").handler(StaticHandler.create("VAADIN")); vaadinRouter.route("/webroot/*").handler(StaticHandler.create("webroot"));