Skip to content

Commit e365a59

Browse files
authored
fix: fix path depending on frontent folder (#18873)
Check if the frontend folder is absolute or not so that we do not end up with a path like: `C:\Users\user\example\C:\Users\user\example\.\frontend\generated/`
1 parent ba8e6f5 commit e365a59

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎vaadin-dev-server/src/main/java/com/vaadin/base/devserver/startup/DevModeInitializer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ public static DevModeHandler initDevModeHandler(Set<Class<?>> classes,
275275

276276
String frontendGeneratedFolderName = config.getStringProperty(
277277
PROJECT_FRONTEND_GENERATED_DIR_TOKEN,
278-
Paths.get(baseDir.getAbsolutePath(), frontendFolder, GENERATED)
279-
.toString());
278+
new File(frontendFolder).isAbsolute()
279+
? Paths.get(frontendFolder, GENERATED).toString()
280+
: Paths.get(baseDir.getAbsolutePath(), frontendFolder,
281+
GENERATED).toString());
280282
File frontendGeneratedFolder = new File(frontendGeneratedFolderName);
281283
File jarFrontendResourcesFolder = new File(frontendGeneratedFolder,
282284
FrontendUtils.JAR_RESOURCES_FOLDER);

0 commit comments

Comments
 (0)