public / jst_server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3946c67)
Rename package ndserver(.js) to jst_server(.js), *.js to *.jst, adopt Node 10
authorNick Downing <downing.nick@gmail.com>
Sun, 14 Oct 2018 22:40:52 +0000 (09:40 +1100)
committerNick Downing <downing.nick@gmail.com>
Sun, 14 Oct 2018 23:29:53 +0000 (10:29 +1100)
jst_server.js [moved from ndserver.js with 100% similarity] patch | blob | history
package.json patch | blob | history
resources.js patch | blob | history
server.js patch | blob | history
site.js patch | blob | history

diff --git a/ndserver.js b/jst_server.js
similarity index 100%
rename from ndserver.js
rename to jst_server.js
diff --git a/package.json b/package.json
index 406edf4..55e40e8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
 {
-  "name": "ndserver",
+  "name": "jst_server",
   "version": "1.0.0",
   "description": "Web server using JavaScript template system",
-  "main": "ndserver.js",
+  "main": "jst_server.js",
   "directories": {},
   "dependencies": {
+    "babel-cli": "^6.26.0",
     "build_cache": "file:../build_cache.git/build_cache-1.0.0.tgz",
     "commander": "^2.18.0",
     "cookie": "^0.3.1",
diff --git a/resources.js b/resources.js
index acb6bc6..5669e2d 100644 (file)
--- a/resources.js
+++ b/resources.js
@@ -25,7 +25,7 @@ let get_email = path => build_cache_email.get(
 )
 
 let build_cache_js = new BuildCache()
-let get_js = path => build_cache_js.get(
+let get_jst = path => build_cache_js.get(
   path,
   async result => {
     console.log('compiling', path)
@@ -74,7 +74,7 @@ let get_less = (path, site_root, dir_name) => build_cache_less.get(
       }
     )
     result.deps.concat(render.imports)
-    result.value = new Buffer(render.css, 'utf-8')
+    result.value = Buffer.from(render.css)
   }
 )
 
@@ -163,7 +163,7 @@ let json_cache = new JSONCache()
 json_cache.diag = true
 
 exports.get_email = get_email
-exports.get_js = get_js
+exports.get_jst = get_jst
 exports.get_json = get_json
 exports.get_less = get_less
 exports.get_text = get_text
diff --git a/server.js b/server.js
index beeaa7a..cfc64ac 100644 (file)
--- a/server.js
+++ b/server.js
@@ -21,7 +21,7 @@ let serve = (res, status, mime_type, data) => {
 
 let die = res => {
   let body = '<html><body>Page not found</body></html>'
-  serve(res, 404, config.mime_type_html, new Buffer(body, 'utf8'))
+  serve(res, 404, config.mime_type_html, Buffer.from(body))
 }
 
 let redirect = (res, location) => {
@@ -63,7 +63,7 @@ let app = async (req, res, protocol) => {
     let message = (err.stack || err.message).toString()
     console.error(message)
     let body = '<html><body><pre>' + message + '</pre></body></html>'
-    serve(res, 500, config.mime_type_html, new Buffer(body, 'utf8'))
+    serve(res, 500, config.mime_type_html, Buffer.from(body, 'utf8'))
   }
 }
 
diff --git a/site.js b/site.js
index a67c397..0b247a5 100644 (file)
--- a/site.js
+++ b/site.js
@@ -123,7 +123,7 @@ let app = async (site, site_root, req, res, protocol) => {
 
     switch (file_type) {
     case 'html':
-      temp = page + '.js'
+      temp = page + '.jst'
       try {
         let buffers = []
         let env = {
@@ -159,11 +159,11 @@ let app = async (site, site_root, req, res, protocol) => {
           ) + path
           switch (type) {
           case undefined:
-            return /*await*/ (await resources.get_js(path))(env, out, get)
+            return /*await*/ (await resources.get_jst(path))(env, out, get)
           case 'email':
             return /*await*/ resources.get_email(path)
-          case 'js':
-            return /*await*/ resources.get_js(path)
+          case 'jst':
+            return /*await*/ resources.get_jst(path)
           case 'json':
             return /*await*/ resources.get_json(path)
           case 'text':
Web server using JavaScript template system