From 163249f2c11ea0210c937c6889c57f9567b6ca09 Mon Sep 17 00:00:00 2001 From: Yoshioka Tsuneo Date: Wed, 24 Jun 2015 14:23:24 +0900 Subject: [PATCH 1/4] Update mongoose/connect-mongo to latest to deploy on Heroku On default package.json, heroku deployment fails. Just updating mongoose/connect-mongo package solves the issue for Heroku deployment. --- app/templates/_package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/_package.json b/app/templates/_package.json index fc374be27..88541b924 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -15,7 +15,7 @@ "lodash": "~2.4.1",<% if(filters.jade) { %> "jade": "~1.2.0",<% } %><% if(filters.html) { %> "ejs": "~0.8.4",<% } %><% if(filters.mongoose) { %> - "mongoose": "~3.8.8",<% } %><% if(filters.auth) { %> + "mongoose": "~4.0.3",<% } %><% if(filters.auth) { %> "jsonwebtoken": "^5.0.0", "express-jwt": "^3.0.0", "passport": "~0.2.0", @@ -24,7 +24,7 @@ "passport-twitter": "latest",<% } %><% if(filters.googleAuth) { %> "passport-google-oauth": "latest",<% } %> "composable-middleware": "^0.3.0", - "connect-mongo": "^0.4.1"<% if(filters.socketio) { %>, + "connect-mongo": "^0.8.1"<% if(filters.socketio) { %>, "socket.io": "^1.0.6", "socket.io-client": "^1.0.6", "socketio-jwt": "^3.0.0"<% } %> From 3a63454beb96249339af557698f6f54d71202f46 Mon Sep 17 00:00:00 2001 From: Antoine Pairet Date: Tue, 30 Jun 2015 20:28:46 +0200 Subject: [PATCH 2/4] Fix Grunfile.js ngAnnotate task src Fix Grunfile.js ngAnnotate task src from `*/**.js` to `**/*.js` --- app/templates/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 96a662066..6685f5108 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -349,7 +349,7 @@ module.exports = function (grunt) { files: [{ expand: true, cwd: '.tmp/concat', - src: '*/**.js', + src: '**/*.js', dest: '.tmp/concat' }] } From f8f32f4f67938a5f7416e2a07d7b24d71a12585f Mon Sep 17 00:00:00 2001 From: Andrew Koroluk Date: Tue, 7 Jul 2015 10:41:54 -0400 Subject: [PATCH 3/4] feat(readme): add david-dm badge & move badges to new line --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 21169c3fb..1fa4c1899 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,5 @@ -# AngularJS Full-Stack generator [![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack) +# AngularJS Full-Stack generator +[![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) ![](https://david-dm.org/daftmonk/generator-angular-fullstack.png) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack) > Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node - lets you quickly set up a project following best practices. From 2233ee9262d60a27b5d329c4540bbd0df94558d5 Mon Sep 17 00:00:00 2001 From: kingcody Date: Wed, 8 Jul 2015 05:38:01 -0400 Subject: [PATCH 4/4] chore(gen): simplify package.json templating --- app/templates/_package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/templates/_package.json b/app/templates/_package.json index 8e344238b..e0c4cd63b 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -7,17 +7,18 @@ "morgan": "~1.0.0", "body-parser": "~1.5.0", "method-override": "~1.0.0", - "serve-favicon": "~2.0.1", "cookie-parser": "~1.0.1", "express-session": "~1.0.2", "errorhandler": "~1.0.0", "compression": "~1.0.1", + "composable-middleware": "^0.3.0", "lodash": "~2.4.1",<% if(filters.babel) { %> "babel-core": "^5.6.4",<% } %><% if (filters.jade) { %> "jade": "~1.2.0",<% } %><% if (filters.html) { %> "ejs": "~0.8.4",<% } %><% if (filters.mongoose) { %> "mongoose": "~4.0.3", - "mongoose-bird": "~0.0.1",<% } %><% if (filters.sequelize) { %> + "mongoose-bird": "~0.0.1", + "connect-mongo": "^0.8.1",<% } %><% if (filters.sequelize) { %> "sequelize": "^2.0.0-rc2", "sqlite3": "~3.0.2",<% } %><% if (filters.auth) { %> "jsonwebtoken": "^5.0.0", @@ -26,12 +27,11 @@ "passport-local": "~0.1.6",<% } %><% if (filters.facebookAuth) { %> "passport-facebook": "latest",<% } %><% if (filters.twitterAuth) { %> "passport-twitter": "latest",<% } %><% if (filters.googleAuth) { %> - "passport-google-oauth": "latest",<% } %> - "composable-middleware": "^0.3.0"<% if (filters.mongoose) { %>, - "connect-mongo": "^0.8.1"<% } %><% if (filters.socketio) { %>, + "passport-google-oauth": "latest",<% } %><% if (filters.socketio) { %> "socket.io": "^1.0.6", "socket.io-client": "^1.0.6", - "socketio-jwt": "^3.0.0"<% } %> + "socketio-jwt": "^3.0.0",<% } %> + "serve-favicon": "~2.0.1" }, "devDependencies": { "grunt": "~0.4.4",