Merge 5b8a415 into 2971cae

mbland · Nov 30, 2023 · 386065a · 386065a
2 parents 2971cae + 5b8a415
commit 386065a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/strcalc/src/main/frontend/rollup-plugin-handlebars-precompile.js b/strcalc/src/main/frontend/rollup-plugin-handlebars-precompile.js
@@ -43,6 +43,7 @@ const DEFAULT_EXCLUDE = 'node_modules/**'
 const PLUGIN_ID = `\0${PLUGIN_NAME}`
 const HANDLEBARS_PATH = 'handlebars/lib/handlebars.runtime'
 const IMPORT_HANDLEBARS = `import Handlebars from '${HANDLEBARS_PATH}'`
+const IMPORT_HELPERS = `import '${PLUGIN_ID}'`
 
 class PluginImpl {
   #options
@@ -74,14 +75,16 @@ class PluginImpl {
   isTemplate(id) { return this.#isTemplate(id) }
 
   compiledModule(code) {
-    const precompiled = Handlebars.precompile(code, this.#options)
-    let imports = this.#helpers.length ? [`import '${PLUGIN_ID}'`] : []
+    const compOpts = this.#options.compiler
+    const ast = Handlebars.parse(code, compOpts)
+    const tmpl = Handlebars.precompile(ast, compOpts)
 
     return {
       code: [
         IMPORT_HANDLEBARS,
-        ...imports,
-        `export default Handlebars.template(${precompiled.toString()})`
+        ...(this.#helpers.length ? [ IMPORT_HELPERS ] : []),
+        `const Template = Handlebars.template(${tmpl.toString()})`,
+        'export default Template'
       ].join('\n')
     }
   }