3737import com .vaadin .flow .server .ExecutionFailedException ;
3838import com .vaadin .flow .server .InitParameters ;
3939import com .vaadin .flow .server .frontend .FrontendTools ;
40+ import com .vaadin .flow .server .frontend .FrontendToolsSettings ;
4041import com .vaadin .flow .server .frontend .FrontendUtils ;
4142import com .vaadin .flow .server .frontend .NodeTasks ;
4243import com .vaadin .flow .server .frontend .scanner .ClassFinder ;
@@ -117,10 +118,9 @@ public static void prepareFrontend(PluginAdapterBase adapter)
117118 throws IOException , ExecutionFailedException , URISyntaxException {
118119
119120 final URI nodeDownloadRootURI = adapter .nodeDownloadRoot ();
120- FrontendTools tools = new FrontendTools (
121- adapter .npmFolder ().getAbsolutePath (),
122- () -> FrontendUtils .getVaadinHomeDirectory ().getAbsolutePath (),
123- adapter .nodeVersion (), nodeDownloadRootURI );
121+
122+ FrontendToolsSettings settings = getFrontendToolsSettings (adapter );
123+ FrontendTools tools = new FrontendTools (settings );
124124 tools .validateNodeAndNpmVersion ();
125125
126126 try {
@@ -147,6 +147,7 @@ public static void prepareFrontend(PluginAdapterBase adapter)
147147 .runNpmInstall (false )
148148 .withNodeVersion (adapter .nodeVersion ())
149149 .withNodeDownloadRoot (nodeDownloadRootURI )
150+ .setNodeAutoUpdate (adapter .nodeAutoUpdate ())
150151 .withHomeNodeExecRequired (
151152 adapter .requireHomeNodeExec ());
152153 // If building a jar project copy jar artifact contents now as we
@@ -170,6 +171,20 @@ public static void prepareFrontend(PluginAdapterBase adapter)
170171
171172 }
172173
174+ private static FrontendToolsSettings getFrontendToolsSettings (
175+ PluginAdapterBase adapter ) throws URISyntaxException {
176+ FrontendToolsSettings settings = new FrontendToolsSettings (
177+ adapter .npmFolder ().getAbsolutePath (),
178+ () -> FrontendUtils .getVaadinHomeDirectory ().getAbsolutePath ());
179+ settings .setNodeDownloadRoot (adapter .nodeDownloadRoot ());
180+ settings .setNodeVersion (adapter .nodeVersion ());
181+ settings .setAutoUpdate (adapter .nodeAutoUpdate ());
182+ settings .setUseGlobalPnpm (adapter .useGlobalPnpm ());
183+ settings .setForceAlternativeNode (adapter .requireHomeNodeExec ());
184+
185+ return settings ;
186+ }
187+
173188 /**
174189 * Propagates the BuildInfo.
175190 *
@@ -298,7 +313,8 @@ public static void runNodeUpdater(PluginAdapterBuild adapter)
298313 .withHomeNodeExecRequired (
299314 adapter .requireHomeNodeExec ())
300315 .withNodeVersion (adapter .nodeVersion ())
301- .withNodeDownloadRoot (nodeDownloadRootURI ).build ()
316+ .withNodeDownloadRoot (nodeDownloadRootURI )
317+ .setNodeAutoUpdate (adapter .nodeAutoUpdate ()).build ()
302318 .execute ();
303319 } catch (ExecutionFailedException exception ) {
304320 throw exception ;
@@ -338,13 +354,9 @@ public static void runWebpack(PluginAdapterBase adapter) throws IOException,
338354 webpackExecutable .getAbsolutePath ()));
339355 }
340356
341- final URI nodeDownloadRootURI ;
342- nodeDownloadRootURI = adapter .nodeDownloadRoot ();
343357 String nodePath ;
344- FrontendTools tools = new FrontendTools (
345- adapter .npmFolder ().getAbsolutePath (),
346- () -> FrontendUtils .getVaadinHomeDirectory ().getAbsolutePath (),
347- adapter .nodeVersion (), nodeDownloadRootURI );
358+ FrontendToolsSettings settings = getFrontendToolsSettings (adapter );
359+ FrontendTools tools = new FrontendTools (settings );
348360 if (adapter .requireHomeNodeExec ()) {
349361 nodePath = tools .forceAlternativeNodeExecutable ();
350362 } else {
0 commit comments