Skip to content

Fix rearrangeMiddleware and support Express4 #60 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
azhang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix rearrangeMiddleware and support Express4 #60 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ exports = module.exports = server;
exports.use = function() {
app.use.apply(app, arguments);
};

// For Express 4, for grunt-express to access middleware stack
exports._router = app._router;
```

When `server` option is not set, `express` task will generate a plain `connect` object for you.
Expand Down
19 changes: 17 additions & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,25 @@ exports.makeServerTaskName = function makeServerTaskName(serverName, kind) {
return 'express_' + serverName + '_' + kind;
}

// Sort middlewares by priority without changing order of middlewares
// without specified priority.
exports.rearrangeMiddleware = function rearrangeMiddleware(server) {
server.stack = (server.stack || []).sortBy(function(mw) {
return mw.handle.middlewarePriority || 99;
// middleware stack located at server._router for Express4
if (server._router) server = server._router;

var prioritySpecified = (server.stack || []).filter(function(mw) {
return (typeof mw.handle.middlewarePriority !== "undefined");
});

var priorityUnspecified = (server.stack || []).filter(function(mw) {
return (typeof mw.handle.middlewarePriority === "undefined");
});

prioritySpecified = prioritySpecified.sortBy(function(mw) {
return mw.handle.middlewarePriority;
});

server.stack = prioritySpecified.concat(priorityUnspecified);
}

exports.watchModule = function watchModule(watcher) {
Expand Down