Skip to content

Commit 3dc38a6

Browse files
authored
fix: React file not added when reactEnabled false (#19845)
* fix: React file not added when reactEnabled false Do not add the outlet file if react is not enabled as the required react node files are not available. Fixes #19842 * React is also disabled if vaadin-router is used.
1 parent e71b834 commit 3dc38a6

5 files changed

Lines changed: 39 additions & 9 deletions

File tree

‎flow-plugins/flow-plugin-base/src/main/java/com/vaadin/flow/plugin/base/BuildFrontendUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ public static boolean validateLicenses(PluginAdapterBase adapter) {
579579
}
580580

581581
FrontendDependenciesScanner scanner = new FrontendDependenciesScanner.FrontendDependenciesScannerFactory()
582-
.createScanner(false, adapter.getClassFinder(), true, null);
582+
.createScanner(false, adapter.getClassFinder(), true, null,
583+
adapter.isReactEnabled());
583584
List<Product> commercialComponents = findCommercialFrontendComponents(
584585
scanner, statsJsonContent);
585586
commercialComponents.addAll(findCommercialJavaComponents(adapter));

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,14 @@ public NodeTasks(Options options) {
113113

114114
Set<String> webComponentTags = new HashSet<>();
115115

116-
final FeatureFlags featureFlags = options.getFeatureFlags();
117-
118116
if (options.isFrontendHotdeploy()) {
119117
UsageStatistics.markAsUsed("flow/hotdeploy", null);
120118
}
121119

122120
if (options.isEnablePackagesUpdate() || options.isEnableImportsUpdate()
123121
|| options.isEnableConfigUpdate()) {
124122
frontendDependencies = new FrontendDependenciesScanner.FrontendDependenciesScannerFactory()
125-
.createScanner(!options.isUseByteCodeScanner(), classFinder,
126-
options.isGenerateEmbeddableWebComponents(),
127-
featureFlags);
123+
.createScanner(options);
128124

129125
if (options.isProductionMode()) {
130126
boolean needBuild = BundleValidationUtil.needsBuild(options,

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,12 @@ public Options withFeatureFlags(FeatureFlags featureFlags) {
707707
return this;
708708
}
709709

710-
protected FeatureFlags getFeatureFlags() {
710+
/**
711+
* Get the available feature flags.
712+
*
713+
* @return FeatureFlags object
714+
*/
715+
public FeatureFlags getFeatureFlags() {
711716
if (featureFlags == null) {
712717
featureFlags = new FeatureFlags(lookup);
713718
if (javaResourceFolder != null) {

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendDependencies.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ public FrontendDependencies(ClassFinder finder,
143143
public FrontendDependencies(ClassFinder finder,
144144
boolean generateEmbeddableWebComponents,
145145
FeatureFlags featureFlags) {
146+
this(finder, generateEmbeddableWebComponents, null, true);
147+
}
148+
149+
public FrontendDependencies(ClassFinder finder,
150+
boolean generateEmbeddableWebComponents, FeatureFlags featureFlags,
151+
boolean reactEnabled) {
146152
super(finder, featureFlags);
147153
log().info(
148154
"Scanning classes to find frontend configurations and dependencies...");
@@ -162,7 +168,9 @@ public FrontendDependencies(ClassFinder finder,
162168
visitEntryPoint(entryPoints.get(themeClass.getName()));
163169
}
164170
}
165-
computeReactClasses(finder);
171+
if (reactEnabled) {
172+
computeReactClasses(finder);
173+
}
166174
computePackages();
167175
computePwaConfiguration();
168176
aggregateEntryPointInformation();

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/scanner/FrontendDependenciesScanner.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
import com.vaadin.experimental.FeatureFlags;
2424
import com.vaadin.flow.server.PwaConfiguration;
25+
import com.vaadin.flow.server.frontend.FrontendUtils;
26+
import com.vaadin.flow.server.frontend.Options;
2527
import com.vaadin.flow.theme.AbstractTheme;
2628
import com.vaadin.flow.theme.ThemeDefinition;
2729

@@ -87,15 +89,33 @@ public FrontendDependenciesScanner createScanner(
8789
boolean allDependenciesScan, ClassFinder finder,
8890
boolean generateEmbeddableWebComponents,
8991
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) {
90100
if (allDependenciesScan) {
91101
// this dep scanner can't distinguish embeddable web component
92102
// frontend related annotations
93103
return new FullDependenciesScanner(finder, featureFlags);
94104
} else {
95105
return new FrontendDependencies(finder,
96-
generateEmbeddableWebComponents, featureFlags);
106+
generateEmbeddableWebComponents, featureFlags,
107+
reactEnabled);
97108
}
98109
}
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+
}
99119
}
100120

101121
/**

0 commit comments

Comments
 (0)