Merge pull request #52 from InkApplications/script-updates

Update script config
InkApplications · Oct 6, 2024 · c473239 · c473239
2 parents 26f522e + 61e25dc
commit c473239
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/render-static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/InkUiScript.kt b/render-static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/InkUiScript.kt
@@ -11,6 +11,7 @@ import kotlin.script.experimental.api.*
 import kotlin.script.experimental.host.toScriptSource
 import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
 import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
+import kotlin.script.experimental.jvmhost.createJvmEvaluationConfigurationFromTemplate
 
 @KotlinScript(
     fileExtension = "inkui.kts",
@@ -121,7 +122,7 @@ abstract class InkUiScript(
             val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<InkUiScript> {
                 defaultImports(*customImports)
             }
-            val evaluationConfiguration =  ScriptEvaluationConfiguration {
+            val evaluationConfiguration = createJvmEvaluationConfigurationFromTemplate<InkUiScript> {
                 constructorArgs(scriptFile, customRenderers, customImports)
             }
             return BasicJvmScriptingHost().eval(
@@ -140,7 +141,7 @@ abstract class InkUiScript(
             val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<PartialScript> {
                 defaultImports(*customImports)
             }
-            val evaluationConfiguration =  ScriptEvaluationConfiguration {
+            val evaluationConfiguration = createJvmEvaluationConfigurationFromTemplate<PartialScript> {
                 constructorArgs(parent)
             }
             return BasicJvmScriptingHost().eval(

diff --git a/render-static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/PartialScript.kt b/render-static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/PartialScript.kt
@@ -3,7 +3,7 @@ package ink.ui.render.statichtml
 import kotlin.script.experimental.annotations.KotlinScript
 
 @KotlinScript(
-    fileExtension = "inkui.kts",
+    fileExtension = "inkui.part.kts",
     compilationConfiguration = InkUiConfig::class
 )
 abstract class PartialScript(