Merge pull request #34 from equake/master

fix to work with connect >= 3.0 and serve-static
devtyr · Sep 22, 2014 · e8db512 · e8db512
2 parents e3c6ea3 + 02fdac9
commit e8db512
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/server.js b/lib/server.js
@@ -5,6 +5,7 @@
  */
 
 var connect = require('connect');
+var serveStatic = require('serve-static');
 var url = require('url');
 var qs = require('qs');
 var path = require('path');
@@ -18,7 +19,7 @@ mu.root = settings.templatePath;
 
 main.use('/node_modules/xcharts/build/xcharts.min.js', utils.serveFile(path.join(settings.root, '/node_modules/xcharts/build/xcharts.min.js'), {'Cache-Control':  'public, max-age=' + (84600 * 365), 'Content-Length' : '0', 'Content-Type' : ''}));
 main.use('/node_modules/xcharts/build/xcharts.min.css', utils.serveFile(path.join(settings.root, '/node_modules/xcharts/build/xcharts.min.css'), {'Cache-Control':  'public, max-age=' + (84600 * 365), 'Content-Length' : '0', 'Content-Type' : ''}));
-main.use('/static', connect.static(path.join(settings.root, 'static'), {maxAge: 86400000 * 365 }));
+main.use('/static', serveStatic(path.join(settings.root, 'static'), {maxAge: 86400000 * 365 }));
 
 main.use('/', function(req, res, next) {
 

diff --git a/package.json b/package.json
@@ -23,7 +23,8 @@
     "optimist": ">=0.3.4",
     "xcharts": ">=0.1.3",
     "mime": ">=1.2.7",
-    "connect": ">=2.7.2",
+    "connect": ">=3",
+    "serve-static": ">=1",
     "qs": ">=0.5.3",
     "url": ">=0.7.9",
     "mu2": ">=0.5.17"