@@ -76,7 +76,8 @@ public class TaskUpdateImports extends NodeUpdater {
7676 private final JsonObject tokenFileData ;
7777
7878 private final boolean enablePnpm ;
79- private boolean productionMode ;
79+ private final boolean productionMode ;
80+ private final boolean useLegacyV14Bootstrap ;
8081
8182 private class UpdateMainImportsFile extends AbstractUpdateImports {
8283 private static final String EXPORT_MODULES_DEF = "export declare const addCssBlock: (block: string, before?: boolean) => void;" ;
@@ -88,9 +89,10 @@ private class UpdateMainImportsFile extends AbstractUpdateImports {
8889
8990 UpdateMainImportsFile (ClassFinder classFinder , File frontendDirectory ,
9091 File npmDirectory , File generatedDirectory ,
91- File fallBackImports , File tokenFile , boolean productionMode ) {
92+ File fallBackImports , File tokenFile , boolean productionMode ,
93+ boolean useLegacyV14Bootstrap ) {
9294 super (frontendDirectory , npmDirectory , generatedDirectory ,
93- tokenFile , productionMode );
95+ tokenFile , productionMode , useLegacyV14Bootstrap );
9496 generatedFlowImports = new File (generatedDirectory , IMPORTS_NAME );
9597 generatedFlowDefinitions = new File (generatedDirectory ,
9698 IMPORTS_D_TS_NAME );
@@ -150,6 +152,12 @@ protected Collection<String> getThemeLines() {
150152 && !"" .equals (themeDef .getName ());
151153 // There is no application theme in use, write theme includes
152154 // here. Otherwise they are written by the theme
155+ if (useLegacyV14Bootstrap && hasApplicationTheme ) {
156+ lines .add ("import {applyTheme} from 'generated/theme.js';" );
157+ lines .add ("if (window.Vaadin.theme.flowBootstrap) {" );
158+ lines .add (" applyTheme(document);" );
159+ lines .add ("}" );
160+ }
153161 if (!theme .getHeaderInlineContents ().isEmpty ()) {
154162 lines .add ("" );
155163 if (hasApplicationTheme ) {
@@ -233,10 +241,10 @@ private class UpdateFallBackImportsFile extends AbstractUpdateImports {
233241
234242 UpdateFallBackImportsFile (ClassFinder classFinder ,
235243 File frontendDirectory , File npmDirectory ,
236- File generatedDirectory , File tokenFile ,
237- boolean productionMode ) {
244+ File generatedDirectory , File tokenFile , boolean productionMode ,
245+ boolean useLegacyV14Bootstrap ) {
238246 super (frontendDirectory , npmDirectory , generatedDirectory ,
239- tokenFile , productionMode );
247+ tokenFile , productionMode , useLegacyV14Bootstrap );
240248 generatedFallBack = new File (generatedDirectory ,
241249 FrontendUtils .FALLBACK_IMPORTS_NAME );
242250 finder = classFinder ;
@@ -353,7 +361,7 @@ File getGeneratedFallbackFile() {
353361 File npmFolder , File generatedPath , File frontendDirectory ,
354362 File tokenFile , JsonObject tokenFileData , boolean enablePnpm ,
355363 String buildDir , boolean productionMode ,
356- FeatureFlags featureFlags ) {
364+ boolean useLegacyV14Bootstrap , FeatureFlags featureFlags ) {
357365 super (finder , frontendDepScanner , npmFolder , generatedPath , null ,
358366 buildDir , featureFlags );
359367 this .frontendDirectory = frontendDirectory ;
@@ -362,6 +370,7 @@ File getGeneratedFallbackFile() {
362370 this .tokenFileData = tokenFileData ;
363371 this .enablePnpm = enablePnpm ;
364372 this .productionMode = productionMode ;
373+ this .useLegacyV14Bootstrap = useLegacyV14Bootstrap ;
365374 }
366375
367376 @ Override
@@ -370,15 +379,15 @@ public void execute() {
370379 if (fallbackScanner != null ) {
371380 UpdateFallBackImportsFile fallBackUpdate = new UpdateFallBackImportsFile (
372381 finder , frontendDirectory , npmFolder , generatedFolder ,
373- tokenFile , productionMode );
382+ tokenFile , productionMode , useLegacyV14Bootstrap );
374383 fallBackUpdate .run ();
375384 fallBack = fallBackUpdate .getGeneratedFallbackFile ();
376385 updateBuildFile (fallBackUpdate );
377386 }
378387
379388 UpdateMainImportsFile mainUpdate = new UpdateMainImportsFile (finder ,
380389 frontendDirectory , npmFolder , generatedFolder , fallBack ,
381- tokenFile , productionMode );
390+ tokenFile , productionMode , useLegacyV14Bootstrap );
382391 mainUpdate .run ();
383392 }
384393
0 commit comments