Upgraded modules to koa@next and remove koa-views workaround

chentsulin · Mar 30, 2016 · b8d56a7 · b8d56a7
1 parent 53c0748
commit b8d56a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -6,16 +6,15 @@
   "dependencies": {
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-stage-2": "^6.5.0",
-    "co": "^4.6.0",
     "koa": "^2.0.0",
-    "koa-bodyparser": "^2.0.1",
+    "koa-bodyparser": "^3.0.0",
     "koa-convert": "^1.2.0",
     "koa-logger": "^2.0.0",
     "koa-router": "^7.0.1",
     "koa-session": "^3.3.1",
-    "koa-static": "^2.0.0",
-    "koa-views": "^4.1.0",
-    "nunjucks": "^2.3.0"
+    "koa-static": "^3.0.0",
+    "koa-views": "^5.0.1",
+    "nunjucks": "^2.4.1"
   },
   "devDependencies": {
     "babel-cli": "^6.6.5",

diff --git a/app/templates/server.js b/app/templates/server.js
@@ -1,4 +1,3 @@
-import co from 'co';
 import Koa from 'koa';
 import bodyParser from 'koa-bodyparser';
 import logger from 'koa-logger';
@@ -11,20 +10,16 @@ import router from './router';
 const app = new Koa();
 
 app.use(finalHandler());
-app.use(convert(views(`${__dirname}/views`, {
+app.use(views(`${__dirname}/views`, {
   map: {
     html: 'nunjucks'
   }
-})));
-app.use(async (ctx, next) => {
-  ctx.render = co.wrap(ctx.render);
-  await next();
-});
+}));
 app.use(logger());
-app.use(convert(bodyParser()));
+app.use(bodyParser());
 app.keys = ['some secret hurr'];
 app.use(convert(session(app)));
-app.use(convert(serve('public')));
+app.use(serve('public'));
 app
   .use(router.routes())
   .use(router.allowedMethods());