Use the published @ndcode/build_cache, @ndcode/json_cache, @ndcode/jst modules

diff --git a/Server.js b/Server.js
index 54ec6e7..8f6f809 100644 (file)
--- a/Server.js
+++ b/Server.js
@@ -1,10 +1,10 @@
-let BuildCache = require('BuildCache')
-let JSONCache = require('JSONCache')
+let BuildCache = require('@ndcode/build_cache')
+let JSONCache = require('@ndcode/json_cache')
 let Site = require('./Site')
 let assert = require('assert')
 let emailjs = require('emailjs')
 let fs = require('fs')
-let js_template = require('js_template')
+let jst = require('@ndcode/jst')
 let less = require('less/lib/less-node')
 var stream_buffers = require('stream-buffers')
 let url = require('url')
@@ -62,7 +62,7 @@ Server.prototype.get_json = function(pathname) {
 }
 
 Server.prototype.get_jst = function(dirname, pathname) {
-  return /*await*/ js_template(dirname, dirname, pathname, {_server: this})
+  return /*await*/ jst(dirname, dirname, pathname, {_server: this})
 }
 
 Server.prototype.get_less = function(dirname, pathname) {

diff --git a/SiteRoot.js b/SiteRoot.js
index a3d981b..be7adcd 100644 (file)
--- a/SiteRoot.js
+++ b/SiteRoot.js
@@ -1,7 +1,6 @@
 let Site = require('./Site')
 let assert = require('assert')
 let fs = require('fs')
-let js_template = require('js_template')
 let util = require('util')
 
 let fs_readFile = util.promisify(fs.readFile)

diff --git a/package.json b/package.json
index c6be85d..45d67c9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -5,8 +5,9 @@
   "main": "index.js",
   "directories": {},
   "dependencies": {
-    "BuildCache": "/home/nick/src/build_cache.git/BuildCache-v1.0.0.tgz",
-    "JSONCache": "/home/nick/src/json_cache.git/JSONCache-v1.0.0.tgz",
+    "@ndcode/build_cache": "^0.1.0",
+    "@ndcode/json_cache": "^0.1.0",
+    "@ndcode/jst": "^0.1.1",
     "babel-cli": "^6.26.0",
     "commander": "^2.18.0",
     "cookie": "^0.3.1",
@@ -14,15 +15,13 @@
     "fs": "^0.0.1-security",
     "http": "^0.0.0",
     "https": "^1.0.0",
-    "js_template": "/home/nick/src/js_template.git/acorn/js_template-v6.0.2.tgz",
     "less": "^3.8.1",
     "querystring": "^0.2.0",
     "socket.io": "^2.1.1",
     "stream-buffers": "^3.0.2",
     "url": "^0.11.0",
     "xdate": "^0.8.2",
-    "yauzl": "^2.10.0",
-    "zetjs": "/home/nick/src/zettair.git/src/zetjs/zetjs-v1.0.0.tgz"
+    "yauzl": "^2.10.0"
   },
   "devDependencies": {},
   "scripts": {},

diff --git a/site/index.html.jst b/site/index.html.jst
index 072e682..5658c72 100644 (file)
--- a/site/index.html.jst
+++ b/site/index.html.jst
@@ -11,6 +11,6 @@ return async env => {
         }
       }
     ),
-    'index.jst'
+    'index.html.jst'
   )
 }