Merge pull request #40 from kethinov/2.0.2

2.0.2

Author: kethinov

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.2
+
+- Fixed regression that caused middleware support to break routes without middleware.
+- Updated dependencies.
+
 ## 2.0.1
 
 - Added support for middleware on routes.

README.md

@@ -1,4 +1,4 @@
-[![npm](https://img.shields.io/npm/v/single-page-express.svg)](https://www.npmjs.com/package/single-page-express) 📄 **single-page-express**
+📄 **single-page-express** [![npm](https://img.shields.io/npm/v/single-page-express.svg)](https://www.npmjs.com/package/single-page-express)
 
 A client-side implementation of the [Express](http://expressjs.com) route API. It works by hijacking links and form submits, then providing a direct imitation of the Express route API to handle "requests" (click or submit events) and issue "responses" in the form of DOM updates.
 

package-lock.json

@@ -8,7 +8,7 @@
       "url": "https://github.com/rooseveltframework/single-page-express/graphs/contributors"
     }
   ],
-  "version": "2.0.1",
+  "version": "2.0.2",
   "files": [
     "dist",
     "*.md"

package.json

@@ -85,12 +85,8 @@ function singlePageExpress (options) {
 
   // registers a route and handles middleware
   function routeHandler (method, middleware, route, callback) {
-    let callbackWithMiddlewareExecutingFirst = callback // by default no middleware executes
-    if (!callback) {
-      // handle 2 args; this is when no middleware is supplied
-      callback = route
-      route = middleware
-    } else callbackWithMiddlewareExecutingFirst = (req, res) => middleware(req, res, () => callback(req, res)) // handle 3 args; this is when middleware is supplied
+    let callbackWithMiddlewareExecutingFirst = middleware
+    if (callback) callbackWithMiddlewareExecutingFirst = (req, res) => middleware(req, res, () => callback(req, res))
     registerRoute(method, route, callbackWithMiddlewareExecutingFirst)
   }