Skip to content

feat: build-frontent to propagate build info #22726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

feat: build-frontent to propagate build info #22726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildFrontendMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ protected void executeInternal()
throws MojoExecutionException, MojoFailureException {
long start = System.nanoTime();

if (!BuildFrontendUtil.getTokenFile(this).exists()) {
// if not prepare-frontend token file exists propagate build info
// to token file
File tokenFile = BuildFrontendUtil.propagateBuildInfo(this);
}

Options options = new Options(null, getClassFinder(), npmFolder())
.withFrontendDirectory(frontendDirectory())
.withFrontendGeneratedFolder(generatedTsFolder());
Expand Down
7 changes: 5 additions & 2 deletions ...s/flow-maven-plugin/src/test/java/com/vaadin/flow/plugin/maven/BuildFrontendMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public void setup() throws Exception {
"flow_resources");

defaultJavaSource = new File(".", "src/test/java");
File defaultJavaResource = new File(".", "src/test/resources");
openApiJsonFile = new File(npmFolder,
"target/classes/com/vaadin/hilla/openapi.json");
generatedTsFolder = new File(npmFolder, "src/main/frontend/generated");
Expand Down Expand Up @@ -185,6 +186,8 @@ public void setup() throws Exception {
"src/main/resources/application.properties"));
ReflectionUtils.setVariableValueInObject(mojo, "javaSourceFolder",
defaultJavaSource);
ReflectionUtils.setVariableValueInObject(mojo, "javaResourceFolder",
defaultJavaResource);
ReflectionUtils.setVariableValueInObject(mojo, "generatedTsFolder",
generatedTsFolder);
ReflectionUtils.setVariableValueInObject(mojo, "nodeVersion",
Expand Down Expand Up @@ -671,11 +674,11 @@ public void commercialComponent_noLicenseKey_commercialBannerNotEnabled_buildFai
}

@Test
public void noTokenFile_noTokenFileShouldBeCreated()
public void noTokenFile_tokenFileShouldBeCreated()
throws MojoExecutionException, MojoFailureException {
mojo.execute();

Assert.assertFalse(tokenFile.exists());
Assert.assertTrue(tokenFile.exists());
}

@Test
Expand Down
Loading