Skip to content

Commit

Permalink
Merge branch 'release/0.8.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
balthazar committed Mar 6, 2015
2 parents 35aceed + f7c1115 commit 5a5aae1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions app/templates/package.json
Expand Up @@ -41,25 +41,25 @@
},
"dependencies": {
"async": "^0.9.0",
"body-parser": "^1.11.0",
"body-parser": "^1.12.0",
"chalk": "^1.0.0",<% if (filters.auth) { %>
"composable-middleware": "^0.3.0",<% } %>
"compression": "^1.4.0",
"cookie-parser": "^1.3.3",<% if (filters.auth) { %>
"connect-mongo": "^0.7.0",<% } %>
"express": "^4.11.2",<% if (filters.auth) { %>
"express-jwt": "^1.0.0",
"express": "^4.12.2",<% if (filters.auth) { %>
"express-jwt": "^2.0.0",
"express-session": "^1.10.2",
"jsonwebtoken": "^3.2.2",<% } %>
"lodash": "^3.0.1",
"jsonwebtoken": "^4.0.0",<% } %>
"lodash": "^3.3.1",
"method-override": "^2.3.1",<% if (filters.backend === 'mongo') { %>
"mongoose": "^3.8.22",<% } %>
"morgan": "^1.5.1",<% if (filters.auth) { %>
"passport": "^0.2.1",
"passport-local": "^1.0.0",<% } %><% if (filters.backend === 'restock') { %>
"request": "^2.51.1",<% } %><% if (filters.sockets) { %>
"socket.io": "^1.3.2",<% } %>
"should": "^5.0.0",
"socket.io": "^1.3.5",<% } %>
"should": "^5.1.0",
"supertest": "^0.15.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "generator-bangular",
"version": "0.8.2",
"version": "0.8.3",
"description": "Generate and serve your project in a blink of an eye",
"license": "BSD",
"homepage": "https://github.com/42Zavattas/generator-bangular",
Expand Down
2 changes: 1 addition & 1 deletion test/test-app.js
Expand Up @@ -253,7 +253,7 @@ describe('Launching app generator tests', function () {
assert.fileContent('package.json', 'passport-local');
assert.fileContent('package.json', 'connect-mongo');

assert.fileContent('client/index.html', 'signup');
assert.fileContent('client/index.html', 'nav-bar');
assert.fileContent('bower.json', 'angular-cookies');
});
});
Expand Down

0 comments on commit 5a5aae1

Please sign in to comment.