3838
3939import com .vaadin .experimental .FeatureFlags ;
4040import com .vaadin .flow .di .Lookup ;
41+ import com .vaadin .flow .internal .hilla .EndpointRequestUtil ;
4142import com .vaadin .flow .server .Constants ;
4243import com .vaadin .flow .server .frontend .scanner .ClassFinder ;
4344import com .vaadin .flow .server .frontend .scanner .FrontendDependencies ;
@@ -63,12 +64,14 @@ public class NodeUpdaterTest {
6364
6465 private ClassFinder finder ;
6566
67+ private Options options ;
68+
6669 @ Before
6770 public void setUp () throws IOException {
6871 npmFolder = temporaryFolder .newFolder ();
6972 FeatureFlags featureFlags = Mockito .mock (FeatureFlags .class );
7073 finder = Mockito .mock (ClassFinder .class );
71- Options options = new Options (Mockito .mock (Lookup .class ), npmFolder )
74+ options = new Options (Mockito .mock (Lookup .class ), npmFolder )
7275 .withBuildDirectory (TARGET ).withFeatureFlags (featureFlags );
7376
7477 nodeUpdater = new NodeUpdater (finder ,
@@ -467,6 +470,90 @@ public void testGetPlatformPinnedDependencies_VaadinAndVaadinCoreVersionsArePres
467470 Assert .assertTrue (pinnedVersions .hasKey ("@vaadin/vaadin-grid-pro" ));
468471 }
469472
473+ @ Test
474+ public void getDefaultDependencies_reactRouterIsUsed_addsHillaReactComponents () {
475+ boolean reactRouterEnabled = options .isReactRouterEnabled ();
476+ try (MockedStatic <FrontendUtils > mock = Mockito
477+ .mockStatic (FrontendUtils .class )) {
478+ mock .when (() -> FrontendUtils .isHillaUsed (Mockito .any (File .class )))
479+ .thenReturn (true );
480+ options .withReactRouter (true );
481+ Map <String , String > defaultDeps = nodeUpdater
482+ .getDefaultDependencies ();
483+ Assert .assertFalse (
484+ "Lit component added unexpectedly for react-router" ,
485+ defaultDeps .containsKey ("@vaadin/hilla-lit-form" ));
486+ Assert .assertTrue (
487+ "React component should be added when react-router is used" ,
488+ defaultDeps .containsKey ("@vaadin/hilla-react-auth" ));
489+ Assert .assertTrue (
490+ defaultDeps .containsKey ("@vaadin/hilla-react-crud" ));
491+ Assert .assertTrue (
492+ defaultDeps .containsKey ("@vaadin/hilla-react-form" ));
493+
494+ Map <String , String > defaultDevDeps = nodeUpdater
495+ .getDefaultDevDependencies ();
496+ Assert .assertFalse (
497+ "Lit dev dependency added unexpectedly for react-router" ,
498+ defaultDevDeps .containsKey ("lit-dev-dependency" ));
499+ Assert .assertTrue (
500+ "React dev dependency should be added when react-router is used" ,
501+ defaultDevDeps .containsKey ("react-dev-dependency" ));
502+ } finally {
503+ options .withReactRouter (reactRouterEnabled );
504+ }
505+ }
506+
507+ @ Test
508+ public void getDefaultDependencies_vaadinRouterIsUsed_addsHillaLitComponents () {
509+ boolean reactRouterEnabled = options .isReactRouterEnabled ();
510+ try (MockedStatic <FrontendUtils > mock = Mockito
511+ .mockStatic (FrontendUtils .class )) {
512+ mock .when (() -> FrontendUtils .isHillaUsed (Mockito .any (File .class )))
513+ .thenReturn (true );
514+ options .withReactRouter (false );
515+ Map <String , String > defaultDeps = nodeUpdater
516+ .getDefaultDependencies ();
517+ Assert .assertTrue (
518+ "Lit component should be when vaadin-router is used" ,
519+ defaultDeps .containsKey ("@vaadin/hilla-lit-form" ));
520+ Assert .assertFalse (
521+ "React component added unexpectedly for vaadin-router" ,
522+ defaultDeps .containsKey ("@vaadin/hilla-react-form" ));
523+
524+ Map <String , String > defaultDevDeps = nodeUpdater
525+ .getDefaultDevDependencies ();
526+ Assert .assertFalse (
527+ "React dev dependency added unexpectedly for vaadin-router" ,
528+ defaultDevDeps .containsKey ("react-dev-dependency" ));
529+ Assert .assertTrue (
530+ "Lit dev dependency should be added when vaadin-router is used" ,
531+ defaultDevDeps .containsKey ("lit-dev-dependency" ));
532+ } finally {
533+ options .withReactRouter (reactRouterEnabled );
534+ }
535+ }
536+
537+ @ Test
538+ public void getDefaultDependencies_hillaIsNotUsed_doesntAddHillaComponents () {
539+ Map <String , String > defaultDeps = nodeUpdater .getDefaultDependencies ();
540+ Assert .assertFalse (
541+ "Lit component added unexpectedly when Hilla isn't used" ,
542+ defaultDeps .containsKey ("@vaadin/hilla-lit-form" ));
543+ Assert .assertFalse (
544+ "React component added unexpectedly when Hilla isn't used" ,
545+ defaultDeps .containsKey ("@vaadin/hilla-react-auth" ));
546+
547+ Map <String , String > defaultDevDeps = nodeUpdater
548+ .getDefaultDevDependencies ();
549+ Assert .assertFalse (
550+ "React dev dependency added unexpectedly when Hilla isn't used" ,
551+ defaultDevDeps .containsKey ("react-dev-dependency" ));
552+ Assert .assertFalse (
553+ "Lit dev dependency added unexpectedly when Hilla isn't used" ,
554+ defaultDevDeps .containsKey ("lit-dev-dependency" ));
555+ }
556+
470557 private String getPolymerVersion (JsonObject object ) {
471558 JsonObject deps = object .get ("dependencies" );
472559 String version = deps .getString ("@polymer/polymer" );
0 commit comments