From f18e31f650a5d70f9d23357de26ea6fe28429acd Mon Sep 17 00:00:00 2001 From: Anton Platonov Date: Wed, 29 May 2024 12:53:44 +0300 Subject: [PATCH] fix(engine-runtime): skip generating endpoints in prepare-frontend --- .../hilla/internal/EndpointGeneratorTaskFactoryImpl.java | 4 ++-- .../java/com/vaadin/hilla/internal/NodeTasksEndpointTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/java/engine-runtime/src/main/java/com/vaadin/hilla/internal/EndpointGeneratorTaskFactoryImpl.java b/packages/java/engine-runtime/src/main/java/com/vaadin/hilla/internal/EndpointGeneratorTaskFactoryImpl.java index a163b70c19..9df5487cb2 100644 --- a/packages/java/engine-runtime/src/main/java/com/vaadin/hilla/internal/EndpointGeneratorTaskFactoryImpl.java +++ b/packages/java/engine-runtime/src/main/java/com/vaadin/hilla/internal/EndpointGeneratorTaskFactoryImpl.java @@ -52,7 +52,7 @@ private static FrontendTools buildTools(Options options) { @Override public TaskGenerateEndpoint createTaskGenerateEndpoint(Options options) { - if (!options.isDevBundleBuild() && !options.isFrontendHotdeploy() + if (!options.isRunNpmInstall() && !options.isDevBundleBuild() && !options.isProductionMode()) { // Skip for prepare-frontend phase and in production server return new SkipTaskGenerateEndpoint(); @@ -69,7 +69,7 @@ public TaskGenerateEndpoint createTaskGenerateEndpoint(Options options) { @Override public TaskGenerateOpenAPI createTaskGenerateOpenAPI(Options options) { - if (!options.isDevBundleBuild() && !options.isFrontendHotdeploy() + if (!options.isRunNpmInstall() && !options.isDevBundleBuild() && !options.isProductionMode()) { // Skip for prepare-frontend phase and in production server return new SkipTaskGenerateOpenAPI(); diff --git a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/NodeTasksEndpointTest.java b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/NodeTasksEndpointTest.java index 7fc7ebd500..8156952355 100644 --- a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/NodeTasksEndpointTest.java +++ b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/NodeTasksEndpointTest.java @@ -45,6 +45,7 @@ public void setUp() throws IOException { .resolve(getFrontendDirectory()).toFile()) .withProductionMode(false) .withBuildDirectory(getBuildDirectory()) + .withFrontendHotdeploy(true).withRunNpmInstall(false) .enablePackagesUpdate(false).enableImportsUpdate(false) .withEmbeddableWebComponents(false) .withFrontendGeneratedFolder( @@ -80,7 +81,7 @@ public void should_GenerateEndpointFilesInProductionBuildTask() @Test public void should_GenerateEndpointFilesInDevServerTask() throws Exception { - options = options.withFrontendHotdeploy(true); + options = options.withRunNpmInstall(true); new NodeTasks(options).execute(); assertEndpointFiles(true);