Minimal update to js_template.git commit 19bdeb6, still supplies our own _req()

diff --git a/resources.js b/resources.js
index 313d774..a492da6 100644 (file)
--- a/resources.js
+++ b/resources.js
@@ -2,7 +2,6 @@ let BuildCache = require('build_cache')
 let emailjs = require('emailjs')
 let fs = require('fs')
 let JSONCache = require('json_cache')
-let js_template = require('js_template')
 let less = require('less/lib/less-node')
 var stream_buffers = require('stream-buffers')
 let util = require('util')
@@ -24,15 +23,6 @@ let get_email = path => build_cache_email.get(
   }
 )
 
-let build_cache_js = new BuildCache()
-let get_jst = path => build_cache_js.get(
-  path,
-  async result => {
-    console.log('compiling', path)
-    result.value = await js_template(path)
-  }
-)
-
 // this is for read-only JSON files
 // they will be reloaded from disk if modified
 let build_cache_json = new BuildCache()
@@ -163,7 +153,6 @@ let json_cache = new JSONCache()
 json_cache.diag = true
 
 exports.get_email = get_email
-exports.get_jst = get_jst
 exports.get_json = get_json
 exports.get_less = get_less
 exports.get_text = get_text

diff --git a/site.js b/site.js
index f2978e6..9956234 100644 (file)
--- a/site.js
+++ b/site.js
@@ -1,7 +1,8 @@
 let assert = require('assert')
+let config = require('./config')
 let cookie = require('cookie')
 let fs = require('fs')
-let config = require('./config')
+let js_template = require('js_template')
 let resources = require('./resources')
 let server = require('./server')
 let util = require('util')
@@ -150,12 +151,10 @@ let app = async (site, site_root, req, res, protocol) => {
           site_root: site_root
         }
         let _out = []
-        let _req = async path => /*await*/ resources.get_jst(
-          (
-            path.length > 0 && path.charAt(0) === '/' ?
-            site_root :
-            site_root + dir_name + '/'
-          ) + path
+        let _req = async path => /*await*/ js_template(
+          site_root,
+          site_root,
+          path
         )
         await (await _req(temp))(_env, _out, _req)
         let data = Buffer.from(_out.join(''))