Skip to content

Commit 0283492

Browse files
authored
fix: Use less strict regexp for export validation (#19203)
Fixes #19181
1 parent 8551004 commit 0283492

2 files changed

Lines changed: 80 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ function build() {
8989
// routes building
9090
.build();'
9191
OR
92+
'export { router } = ...
93+
// Some other code here
94+
export { routes } = ...'
95+
OR
9296
'export const routes = [...serverSideRoutes] as RouteObject[];'
9397
""";
9498

@@ -111,8 +115,10 @@ function build() {
111115
private static final Pattern FALLBACK_COMPONENT_PATTERN = Pattern.compile(
112116
"import\\s+(\\w+)\\s+from\\s+(\"|'|`)Frontend\\/generated\\/flow\\/Flow(\\.js)?\\2;[\\s\\S]+withFallback\\(\\s*\\1\\s*\\)");
113117

118+
// matches "export const { router, routes }" or "export { router, routes }"
119+
// or "export { router } export { routes }"
114120
private static final Pattern ROUTES_EXPORT_PATTERN = Pattern.compile(
115-
"export\\s+const\\s+(\\{[\\s\\S]*(router[\\s\\S]*routes|routes[\\s\\S]*router)[\\s\\S]*}|routes)");
121+
"export\\s+(const\\s+)?(\\{[\\s\\S]*(router[\\s\\S]*routes|routes[\\s\\S]*router)[\\s\\S]*}|routes)");
116122

117123
/**
118124
* Create a task to generate <code>index.js</code> if necessary.

‎flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateReactFilesTest.java‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,79 @@ public void frontendCustomReactFilesAreCleanedAndBackUppedWhenReactIsDisabled()
478478
new File(frontend, "routes.tsx.flowBackup").exists());
479479
}
480480

481+
@Test
482+
public void routesContainExport_noConst_noExceptionThrown()
483+
throws IOException, ExecutionFailedException {
484+
String content = """
485+
import { RouterConfigurationBuilder } from '@vaadin/hilla-file-router/runtime.js';
486+
import Flow from 'Frontend/generated/flow/Flow';
487+
488+
const { router, originalRoutes } = new RouterConfigurationBuilder();
489+
.withFallback(Flow)
490+
.build();
491+
492+
const routes = originalRoutes;
493+
export { router, routes }
494+
""";
495+
496+
FileUtils.write(routesTsx, content, StandardCharsets.UTF_8);
497+
498+
TaskGenerateReactFiles task = new TaskGenerateReactFiles(options);
499+
500+
task.execute();
501+
}
502+
503+
@Test
504+
public void routesContainExport_twoSingleExports_noExceptionThrown()
505+
throws IOException, ExecutionFailedException {
506+
String content = """
507+
import { RouterConfigurationBuilder } from '@vaadin/hilla-file-router/runtime.js';
508+
import Flow from 'Frontend/generated/flow/Flow';
509+
510+
const { router, originalRoutes } = new RouterConfigurationBuilder();
511+
.withFallback(Flow)
512+
.build();
513+
514+
const routes = originalRoutes;
515+
export { routes }
516+
router = anotherRouter;
517+
export {router}
518+
""";
519+
520+
FileUtils.write(routesTsx, content, StandardCharsets.UTF_8);
521+
522+
TaskGenerateReactFiles task = new TaskGenerateReactFiles(options);
523+
524+
task.execute();
525+
}
526+
527+
@Test
528+
public void routesContainExport_oneSingleExport_exceptionThrown()
529+
throws IOException, ExecutionFailedException {
530+
String content = """
531+
import { RouterConfigurationBuilder } from '@vaadin/hilla-file-router/runtime.js';
532+
import Flow from 'Frontend/generated/flow/Flow';
533+
534+
const { router, originalRoutes } = new RouterConfigurationBuilder();
535+
.withFallback(Flow)
536+
.build();
537+
538+
const routes = originalRoutes;
539+
export { routes }
540+
""";
541+
542+
FileUtils.write(routesTsx, content, StandardCharsets.UTF_8);
543+
544+
TaskGenerateReactFiles task = new TaskGenerateReactFiles(options);
545+
546+
Exception exception = Assert.assertThrows(
547+
ExecutionFailedException.class, () -> task.execute());
548+
Assert.assertEquals(
549+
String.format(TaskGenerateReactFiles.MISSING_ROUTES_EXPORT,
550+
routesTsx.getPath()),
551+
exception.getMessage());
552+
}
553+
481554
@Tag("div")
482555
@Route("test")
483556
private class TestRoute extends Component {

0 commit comments

Comments
 (0)