update

RubyLouvre · Nov 17, 2016 · 784b299 · 784b299
1 parent 3305d8a
commit 784b299
Show file tree

Hide file tree

Showing 4 changed files with 6,536 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -1,6 +1,6 @@
 import Koa from 'koa'
 const views = require('koa-views');
-const avalon = require('./dist/avalon');
+const avalon = require('./dist/avalon2.2');
 const fs = require('fs');
 const path = require('path');
 import convert from 'koa-convert'
@@ -22,7 +22,7 @@ var page = fs.readFileSync('./src/aaa.html', 'utf-8');
 
 
 //渲染器
-var serveRender = require('./dist/serverRender')
+var serveRender = require('./dist/serverRender2.2')
 
 var obj = serveRender(vm, page)
 
@@ -37,13 +37,16 @@ for(var i in obj.templates){
 var files = JSON.stringify(obj.templates)
 
 
-
-var script = '<!document html><html><head><script src="./avalon.js"><\/script>' +
-        '<script> avalon.serverTemplates= ' + files + '<\/script>' +
-        '<script src="./vm.js"><\/script></head><body></body></html>'
+var header = '<!document html><html><head>'+
+            '<script src="./avalon2.2.js"><\/script>'+
+
+            '<script src="./vm.js"><\/script>'+
+            '<script> avalon.serverTemplates= ' + files + '<\/script>' +
+            '</head><body>'
+var footer = '</body></html>'
 
 app.use(async function(ctx){
-     await (ctx.body = script + obj.html)
+     await (ctx.body = (header+ obj.html+ footer))
 })
 
 

diff --git a/app_1.js b/app_1.js
@@ -0,0 +1,54 @@
+import Koa from 'koa'
+const views = require('koa-views');
+const avalon = require('./dist/avalon');
+const fs = require('fs');
+const path = require('path');
+import convert from 'koa-convert'
+const minify = require('html-minifier').minify;
+
+import koaStaticPlus from 'koa-static-plus'
+
+const app = new Koa()
+
+app.use(koaStaticPlus(path.join(__dirname, '/dist'), {
+        pathPrefix: ''
+}))
+
+
+//当前页面VM
+var vm = require('./src/vm')
+//当前页面模板
+var page = fs.readFileSync('./src/aaa.html', 'utf-8');
+
+
+//渲染器
+var serveRender = require('./dist/serverRender')
+
+var obj = serveRender(vm, page)
+
+for(var i in obj.templates){
+   obj.templates[i] = minify(obj.templates[i],{
+       collapseInlineTagWhitespace: true,
+       collapseWhitespace:true
+   })
+
+}
+
+var files = JSON.stringify(obj.templates)
+
+
+
+var script = '<!document html><html><head><script src="./avalon.js"><\/script>' +
+        '<script> avalon.serverTemplates= ' + files + '<\/script>' +
+        '<script src="./vm.js"><\/script></head><body></body></html>'
+
+app.use(async function(ctx){
+     await (ctx.body = script + obj.html)
+})
+
+
+
+app.listen(3000, () => console.log('server started 3000'))
+
+export default app
+