lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.8.0",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/sirv-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sirv-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A lightweight CLI program to serve static sites~!",
   "repository": "lukeed/sirv",
   "license": "MIT",
@@ -24,7 +24,7 @@
     "kleur": "^3.0.0",
     "local-access": "^1.0.1",
     "sade": "^1.4.0",
-    "sirv": "^0.4.0",
+    "sirv": "^0.4.1",
     "tinydate": "^1.0.0"
   }
 }

packages/sirv/index.js

@@ -23,12 +23,10 @@ function toAssume(uri, extns) {
 }
 
 function find(uri, extns) {
-	if (!!~uri.lastIndexOf('.')) return FILES[uri];
 	let i=0, data, arr=toAssume(uri, extns);
 	for (; i < arr.length; i++) {
-		if (data=FILES[arr[i]]) break;
+		if (data = FILES[arr[i]]) return data;
 	}
-	return data;
 }
 
 function is404(req, res) {
@@ -80,18 +78,18 @@ module.exports = function (dir, opts={}) {
 
 	if (opts.dev) {
 		return function (req, res, next) {
-			let uri = decodeURIComponent(req.path || req.pathname || parser(req).pathname);
-			let arr = uri.includes('.') ? [uri] : toAssume(uri, extensions);
-			let file = arr.map(x => join(dir, x)).find(fs.existsSync);
-			if (!file) return next ? next() : isNotFound(req, res);
-
-			let stats = fs.statSync(file);
-			setHeaders(res, uri, stats);
-			send(req, res, file, stats, {
-				'Content-Type': mime.getType(file),
-				'Last-Modified': stats.mtime.toUTCString(),
-				'Content-Length': stats.size,
-			});
+			let stats, file, uri=decodeURIComponent(req.path || req.pathname || parser(req).pathname);
+			let arr = [uri].concat(toAssume(uri, extensions)).map(x => join(dir, x)).filter(fs.existsSync);
+			while (file = arr.shift()) {
+				stats = fs.statSync(file);
+				if (stats.isDirectory()) continue;
+				setHeaders(res, uri, stats);
+				send(req, res, file, stats, {
+					'Content-Type': mime.getType(file),
+					'Last-Modified': stats.mtime.toUTCString(),
+					'Content-Length': stats.size,
+				});
+			}
 		}
 	}
 
@@ -117,7 +115,7 @@ module.exports = function (dir, opts={}) {
 
 	return function (req, res, next) {
 		let pathname = decodeURIComponent(req.path || req.pathname || parser(req).pathname);
-		let data = find(pathname, extensions);
+		let data = FILES[pathname] || find(pathname, extensions);
 		if (!data) return next ? next() : isNotFound(req, res);
 
 		setHeaders(res, pathname, data.stats);

packages/sirv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sirv",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "The optimized & lightweight middleware for serving requests to static assets",
   "repository": "lukeed/sirv",
   "license": "MIT",