Update to js_template.git commit 19bdeb6 silly
authorNick Downing <downing.nick@gmail.com>
Mon, 15 Oct 2018 00:18:32 +0000 (11:18 +1100)
committerNick Downing <downing.nick@gmail.com>
Mon, 15 Oct 2018 00:18:32 +0000 (11:18 +1100)
site.js

diff --git a/site.js b/site.js
index 9956234..8e2fcd6 100644 (file)
--- a/site.js
+++ b/site.js
@@ -126,37 +126,34 @@ let app = async (site, site_root, req, res, protocol) => {
     case 'html':
       temp = page + '.jst'
       try {
-        let _env = {
-          cookies: cookie.parse(req.headers.cookie || ''),
-          lang: 'en',
-          method: req.method,
-          page: page,
-          query: parsed_url.query,
-          read_stream: req,
-          resources: resources,
-          set_cookie: (key, value, expires, path) => {
-            res.setHeader(
-              'Set-Cookie',
-              key +
-              '=' +
-              value +
-              '; expires=' +
-              expires +
-              '; path=' +
-              path +
-              ';'
-            )
-          },
-          site: site,
-          site_root: site_root
-        }
         let _out = []
-        let _req = async path => /*await*/ js_template(
-          site_root,
-          site_root,
-          path
+        await (await js_template(site_root, site_root, temp))(
+          {
+            cookies: cookie.parse(req.headers.cookie || ''),
+            lang: 'en',
+            method: req.method,
+            page: page,
+            query: parsed_url.query,
+            read_stream: req,
+            resources: resources,
+            set_cookie: (key, value, expires, path) => {
+              res.setHeader(
+                'Set-Cookie',
+                key +
+                '=' +
+                value +
+                '; expires=' +
+                expires +
+                '; path=' +
+                path +
+                ';'
+              )
+            },
+            site: site,
+            site_root: site_root
+          },
+          _out
         )
-        await (await _req(temp))(_env, _out, _req)
         let data = Buffer.from(_out.join(''))
         console.log(
           site,