|
22 | 22 |
|
23 | 23 | import com.vaadin.experimental.FeatureFlags; |
24 | 24 | import com.vaadin.flow.server.PwaConfiguration; |
| 25 | +import com.vaadin.flow.server.frontend.FrontendUtils; |
| 26 | +import com.vaadin.flow.server.frontend.Options; |
25 | 27 | import com.vaadin.flow.theme.AbstractTheme; |
26 | 28 | import com.vaadin.flow.theme.ThemeDefinition; |
27 | 29 |
|
@@ -87,15 +89,33 @@ public FrontendDependenciesScanner createScanner( |
87 | 89 | boolean allDependenciesScan, ClassFinder finder, |
88 | 90 | boolean generateEmbeddableWebComponents, |
89 | 91 | FeatureFlags featureFlags) { |
| 92 | + return createScanner(allDependenciesScan, finder, |
| 93 | + generateEmbeddableWebComponents, featureFlags, true); |
| 94 | + } |
| 95 | + |
| 96 | + public FrontendDependenciesScanner createScanner( |
| 97 | + boolean allDependenciesScan, ClassFinder finder, |
| 98 | + boolean generateEmbeddableWebComponents, |
| 99 | + FeatureFlags featureFlags, boolean reactEnabled) { |
90 | 100 | if (allDependenciesScan) { |
91 | 101 | // this dep scanner can't distinguish embeddable web component |
92 | 102 | // frontend related annotations |
93 | 103 | return new FullDependenciesScanner(finder, featureFlags); |
94 | 104 | } else { |
95 | 105 | return new FrontendDependencies(finder, |
96 | | - generateEmbeddableWebComponents, featureFlags); |
| 106 | + generateEmbeddableWebComponents, featureFlags, |
| 107 | + reactEnabled); |
97 | 108 | } |
98 | 109 | } |
| 110 | + |
| 111 | + public FrontendDependenciesScanner createScanner(Options options) { |
| 112 | + boolean reactEnabled = options.isReactEnabled() && FrontendUtils |
| 113 | + .isReactRouterRequired(options.getFrontendDirectory()); |
| 114 | + return createScanner(!options.isUseByteCodeScanner(), |
| 115 | + options.getClassFinder(), |
| 116 | + options.isGenerateEmbeddableWebComponents(), |
| 117 | + options.getFeatureFlags(), reactEnabled); |
| 118 | + } |
99 | 119 | } |
100 | 120 |
|
101 | 121 | /** |
|
0 commit comments