jessebrault/ssg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix bug with compileUnit not seeing all ssg-gradle found classpath.

Browse Source
This commit is contained in:
Jesse Brault 2025-05-31 23:07:06 -05:00
parent 82a8be76b5
commit ab5b678920
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy
View File

@ -71,7 +71,7 @@ class DefaultStaticSiteGenerator implements StaticSiteGenerator {
} }
protected WvcCompiler getWvcCompiler() { protected WvcCompiler getWvcCompiler() {
new WvcCompiler(new SimpleComponentTemplateClassFactory(this.groovyClassLoader)) new WvcCompiler(this.groovyClassLoader, new SimpleComponentTemplateClassFactory(this.groovyClassLoader))
} }
protected WebViewComponentContext makeContext( protected WebViewComponentContext makeContext(

21
api/src/main/groovy/com/jessebrault/ssg/view/WvcCompiler.groovy
View File

@ -12,6 +12,22 @@ import groowt.view.component.web.compiler.DefaultWebViewComponentTemplateCompile
@TupleConstructor @TupleConstructor
class WvcCompiler { class WvcCompiler {
private static class SsgWvcTemplateCompileUnit extends DefaultWebViewComponentTemplateCompileUnit {
SsgWvcTemplateCompileUnit(
String descriptiveName,
Class<? extends ViewComponent> forClass,
ComponentTemplateSource source,
String defaultPackageName,
GroovyClassLoader groovyClassLoader
) {
super(descriptiveName, forClass, source, defaultPackageName)
this.groovyCompilationUnit.setClassLoader(groovyClassLoader)
}
}
final GroovyClassLoader groovyClassLoader
final ComponentTemplateClassFactory templateClassFactory final ComponentTemplateClassFactory templateClassFactory
Either<Diagnostic, ComponentTemplate> compileTemplate( Either<Diagnostic, ComponentTemplate> compileTemplate(
@ -25,11 +41,12 @@ class WvcCompiler {
)) ))
} }
def source = ComponentTemplateSource.of(templateUrl) def source = ComponentTemplateSource.of(templateUrl)
def compileUnit = new DefaultWebViewComponentTemplateCompileUnit( def compileUnit = new SsgWvcTemplateCompileUnit(
source.descriptiveName, source.descriptiveName,
componentClass, componentClass,
source, source,
componentClass.packageName componentClass.packageName,
this.groovyClassLoader
) )
def compileResult = compileUnit.compile() def compileResult = compileUnit.compile()
def templateClass = templateClassFactory.getTemplateClass(compileResult) def templateClass = templateClassFactory.getTemplateClass(compileResult)