Skip to content

Commit cb74c46

Browse files
authored
refactor: Split FrontendUtils into build and runtime (#22956)
The internal package methods are ok to use during runtime and the FrontendBuildUtils can only be used by the frontend build
1 parent 2bb4dd5 commit cb74c46

File tree

153 files changed

+729
-549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+729
-549
lines changed

flow-lit-template/src/main/java/com/vaadin/flow/component/littemplate/internal/LitTemplateParserImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
import com.vaadin.flow.di.ResourceProvider;
4040
import com.vaadin.flow.internal.AnnotationReader;
4141
import com.vaadin.flow.internal.FileIOUtils;
42+
import com.vaadin.flow.internal.FrontendUtils;
4243
import com.vaadin.flow.internal.Pair;
4344
import com.vaadin.flow.server.Constants;
4445
import com.vaadin.flow.server.DependencyFilter;
4546
import com.vaadin.flow.server.VaadinService;
46-
import com.vaadin.flow.server.frontend.FrontendUtils;
4747
import com.vaadin.flow.shared.ui.Dependency;
4848
import com.vaadin.flow.shared.ui.LoadMode;
4949

flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
import com.vaadin.flow.component.dependency.JavaScript;
5555
import com.vaadin.flow.component.dependency.JsModule;
5656
import com.vaadin.flow.component.dependency.NpmPackage;
57+
import com.vaadin.flow.internal.FrontendUtils;
5758
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
5859
import com.vaadin.flow.plugin.base.PluginAdapterBase;
5960
import com.vaadin.flow.plugin.base.PluginAdapterBuild;
6061
import com.vaadin.flow.server.Constants;
6162
import com.vaadin.flow.server.InitParameters;
6263
import com.vaadin.flow.server.frontend.ExecutionFailedException;
6364
import com.vaadin.flow.server.frontend.FrontendTools;
64-
import com.vaadin.flow.server.frontend.FrontendUtils;
6565
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
6666
import com.vaadin.flow.server.frontend.installer.Platform;
6767
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
@@ -72,7 +72,6 @@
7272
import static com.vaadin.flow.server.Constants.META_INF;
7373
import static com.vaadin.flow.server.Constants.VAADIN_SERVLET_RESOURCES;
7474
import static com.vaadin.flow.server.Constants.VAADIN_WEBAPP_RESOURCES;
75-
import static com.vaadin.flow.server.frontend.FrontendUtils.FRONTEND;
7675

7776
/**
7877
* Goal that builds the dev frontend bundle to be used in Express Build mode.
@@ -179,7 +178,8 @@ public class BuildDevBundleMojo extends AbstractMojo
179178
/**
180179
* A directory with project's frontend source files.
181180
*/
182-
@Parameter(defaultValue = "${project.basedir}/src/main/" + FRONTEND)
181+
@Parameter(defaultValue = "${project.basedir}/src/main/"
182+
+ FrontendUtils.FRONTEND)
183183
private File frontendDirectory;
184184

185185
@Parameter(property = InitParameters.NPM_EXCLUDE_WEB_COMPONENTS, defaultValue = "false")

flow-plugins/flow-gradle-plugin/src/functionalTest/kotlin/com/vaadin/gradle/VaadinSmokeTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import kotlin.test.expect
2525
import com.vaadin.flow.internal.JacksonUtils
2626
import com.vaadin.flow.internal.StringUtil
2727
import com.vaadin.flow.server.InitParameters
28-
import com.vaadin.flow.server.frontend.FrontendUtils
29-
import tools.jackson.databind.JsonNode
28+
import com.vaadin.flow.internal.FrontendUtils
29+
import tools.jackson.databind.JsonNode
3030
import org.gradle.testkit.runner.BuildResult
3131
import org.gradle.testkit.runner.TaskOutcome
3232
import org.junit.Before

flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/PrepareFrontendOutputProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.vaadin.flow.gradle
1818
import java.io.File
1919
import com.vaadin.flow.plugin.base.BuildFrontendUtil
2020
import com.vaadin.flow.server.Constants
21-
import com.vaadin.flow.server.frontend.FrontendUtils
21+
import com.vaadin.flow.internal.FrontendUtils
2222
import org.gradle.api.provider.Property
2323
import org.gradle.api.tasks.OutputDirectory
2424
import org.gradle.api.tasks.OutputFile

flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinBuildFrontendTask.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import com.vaadin.flow.plugin.base.BuildFrontendUtil
2020
import com.vaadin.flow.server.Constants
2121
import com.vaadin.flow.server.InitParameters
2222
import com.vaadin.flow.server.frontend.BundleValidationUtil
23-
import com.vaadin.flow.server.frontend.FrontendUtils
23+
import com.vaadin.flow.server.frontend.FrontendBuildUtils
2424
import com.vaadin.flow.server.frontend.Options
2525
import com.vaadin.flow.server.frontend.TaskCleanFrontendFiles
2626
import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner
2727
import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner.FrontendDependenciesScannerFactory
28+
import com.vaadin.flow.internal.FrontendUtils
2829
import com.vaadin.pro.licensechecker.LicenseChecker
2930
import com.vaadin.pro.licensechecker.MissingLicenseKeyException
3031
import org.gradle.api.DefaultTask
@@ -151,7 +152,7 @@ public abstract class VaadinBuildFrontendTask : DefaultTask() {
151152
* @return `true` to remove created files, `false` to keep the files
152153
*/
153154
protected open fun cleanFrontendFiles(): Boolean {
154-
if (FrontendUtils.isHillaUsed(BuildFrontendUtil.getFrontendDirectory(adapter.get()),
155+
if (FrontendBuildUtils.isHillaUsed(BuildFrontendUtil.getFrontendDirectory(adapter.get()),
155156
adapter.get().classFinder)) {
156157
/*
157158
* Override this to not clean generated frontend files after the

flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import com.vaadin.flow.server.Constants
2323
import com.vaadin.flow.server.InitParameters
2424
import com.vaadin.flow.server.frontend.FrontendTools
2525
import com.vaadin.flow.server.frontend.FrontendToolsSettings
26-
import com.vaadin.flow.server.frontend.FrontendUtils
26+
import com.vaadin.flow.internal.FrontendUtils
27+
import com.vaadin.flow.server.frontend.installer.NodeInstaller
2728
import com.vaadin.flow.server.frontend.installer.Platform
2829
import groovy.lang.Closure
2930
import groovy.lang.DelegatesTo

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildFrontendMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
import com.vaadin.flow.component.dependency.JavaScript;
3535
import com.vaadin.flow.component.dependency.JsModule;
3636
import com.vaadin.flow.component.dependency.NpmPackage;
37+
import com.vaadin.flow.internal.FrontendUtils;
3738
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
3839
import com.vaadin.flow.plugin.base.PluginAdapterBuild;
3940
import com.vaadin.flow.server.Constants;
4041
import com.vaadin.flow.server.InitParameters;
4142
import com.vaadin.flow.server.frontend.BundleValidationUtil;
4243
import com.vaadin.flow.server.frontend.ExecutionFailedException;
43-
import com.vaadin.flow.server.frontend.FrontendUtils;
4444
import com.vaadin.flow.server.frontend.Options;
4545
import com.vaadin.flow.server.frontend.TaskCleanFrontendFiles;
4646
import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner;

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,20 @@
4646
import org.apache.maven.project.MavenProject;
4747
import org.codehaus.plexus.build.BuildContext;
4848

49+
import com.vaadin.flow.internal.FrontendUtils;
4950
import com.vaadin.flow.internal.StringUtil;
5051
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
5152
import com.vaadin.flow.plugin.base.PluginAdapterBase;
5253
import com.vaadin.flow.server.Constants;
5354
import com.vaadin.flow.server.InitParameters;
5455
import com.vaadin.flow.server.frontend.FrontendTools;
55-
import com.vaadin.flow.server.frontend.FrontendUtils;
5656
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
5757
import com.vaadin.flow.server.frontend.installer.Platform;
5858
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
5959
import com.vaadin.flow.server.scanner.ReflectionsClassFinder;
6060

6161
import static com.vaadin.flow.server.Constants.VAADIN_SERVLET_RESOURCES;
6262
import static com.vaadin.flow.server.Constants.VAADIN_WEBAPP_RESOURCES;
63-
import static com.vaadin.flow.server.frontend.FrontendUtils.FRONTEND;
64-
import static com.vaadin.flow.server.frontend.FrontendUtils.GENERATED;
6563

6664
/**
6765
* The base class of Flow Mojos in order to compute correctly the modes.
@@ -92,7 +90,8 @@ public abstract class FlowModeAbstractMojo extends AbstractMojo
9290
/**
9391
* A directory with project's frontend source files.
9492
*/
95-
@Parameter(defaultValue = "${project.basedir}/src/main/" + FRONTEND)
93+
@Parameter(defaultValue = "${project.basedir}/src/main/"
94+
+ FrontendUtils.FRONTEND)
9695
private File frontendDirectory;
9796

9897
/**
@@ -476,7 +475,7 @@ public File generatedTsFolder() {
476475
if (generatedTsFolder != null) {
477476
return generatedTsFolder;
478477
}
479-
return new File(frontendDirectory(), GENERATED);
478+
return new File(frontendDirectory(), FrontendUtils.GENERATED);
480479
}
481480

482481
@Override

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/GenerateNpmBOMMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.apache.maven.shared.invoker.MavenInvocationException;
3333

3434
import com.vaadin.flow.di.Lookup;
35+
import com.vaadin.flow.internal.FrontendUtils;
3536
import com.vaadin.flow.server.frontend.ExecutionFailedException;
36-
import com.vaadin.flow.server.frontend.FrontendUtils;
3737
import com.vaadin.flow.server.frontend.NodeTasks;
3838
import com.vaadin.flow.server.frontend.Options;
3939
import com.vaadin.flow.server.frontend.scanner.ClassFinder;

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/PrepareFrontendMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.maven.plugins.annotations.Mojo;
2424
import org.apache.maven.plugins.annotations.ResolutionScope;
2525

26+
import com.vaadin.flow.internal.FrontendUtils;
2627
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
27-
import com.vaadin.flow.server.frontend.FrontendUtils;
2828

2929
/**
3030
* This goal checks that node and npm tools are installed and creates or updates

0 commit comments

Comments
 (0)