Change endpoint use checking

vaadin · Dec 19, 2024 · c9b5c97 · c9b5c97
1 parent bccb42b
commit c9b5c97
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendUtils.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendUtils.java
@@ -1382,22 +1382,18 @@ public static boolean isHillaUsed(File frontendDirectory,
 
     /**
      * Checks if Hilla's endpoints, i.e. {@code BrowserCallable} or
-     * {@code Endpoint} annotated classes, or/and Hilla views are used in a
-     * project.
+     * {@code Endpoint} annotated classes are used in the project.
      *
      * @param options
      *            frontend build options
-     * @return {@code true} if Hilla views and/or Hilla endpoints are used,
-     *         {@code false} otherwise
+     * @return {@code true} if Hilla endpoints are used, {@code false} otherwise
      */
     public static boolean areEndpointsUsed(Options options) {
         Lookup lookup = options.getLookup();
         EndpointUsageDetector endpointUsageDetector = lookup
                 .lookup(EndpointUsageDetector.class);
-        return isHillaUsed(options.getFrontendDirectory(),
-                options.getClassFinder())
-                || (endpointUsageDetector != null
-                        && endpointUsageDetector.areEndpointsUsed(options));
+        return endpointUsageDetector != null
+                && endpointUsageDetector.areEndpointsUsed(options);
     }
 
     private static boolean isRoutesContentUsingHillaViews(

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java
@@ -613,7 +613,9 @@ private JsonObject generateVersionsFromPackageJson(JsonObject packageJson)
      */
     private void putHillaComponentsDependencies(
             Map<String, String> dependencies, String packageJsonKey) {
-        if (FrontendUtils.areEndpointsUsed(options)) {
+        if (FrontendUtils.isHillaUsed(options.getFrontendDirectory(),
+                options.getClassFinder())
+                || FrontendUtils.areEndpointsUsed(options)) {
             if (options.isReactEnabled()) {
                 dependencies.putAll(readDependenciesIfAvailable(
                         "hilla/components/react", packageJsonKey));