Skip to content

Commit 6b49ba3

Browse files
committed
feat(app): directly promisify mongoose
Changes: * Remove `mongoose-bird` dependency * Add `bluebird` dependency * Use `bluebird.promisifyAll` when requiring `mongoose` for models see https://github.com/petkaantonov/bluebird/blob/master/API.md#promisification
1 parent 385ca93 commit 6b49ba3

File tree

7 files changed

+7
-8
lines changed

7 files changed

+7
-8
lines changed

app/templates/_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"jade": "~1.2.0",<% } %><% if (filters.html) { %>
1818
"ejs": "~0.8.4",<% } %><% if (filters.mongoose) { %>
1919
"mongoose": "^4.1.2",
20-
"mongoose-bird": "~0.0.1",
20+
"bluebird": "^2.9.34",
2121
"connect-mongo": "^0.8.1",<% } %><% if (filters.sequelize) { %>
2222
"sequelize": "^3.5.1",
2323
"sqlite3": "~3.0.2",<% } %><% if (filters.auth) { %>

app/templates/protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var config = {
8282
var serverConfig = config.params.serverConfig;<% if (filters.mongoose) { %>
8383

8484
// Setup mongo for tests
85-
var mongoose = require('mongoose-bird')();
85+
var mongoose = require('mongoose');
8686
mongoose.connect(serverConfig.mongo.uri, serverConfig.mongo.options); // Connect to database<% } %>
8787
}
8888
};

app/templates/server/api/user(auth)/user.model(mongooseModels).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var mongoose = require('mongoose-bird')();
3+
var mongoose = require('bluebird').promisifyAll(require('mongoose'));
44
var Schema = mongoose.Schema;
55
var crypto = require('crypto');<% if (filters.oauth) { %>
66
var authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>

app/templates/server/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
99

1010
var express = require('express');<% if (filters.mongoose) { %>
11-
var mongoose = require('mongoose-bird')();<% } %><% if (filters.sequelize) { %>
11+
var mongoose = require('mongoose');<% } %><% if (filters.sequelize) { %>
1212
var sqldb = require('./sqldb');<% } %>
1313
var config = require('./config/environment');
1414
<% if (filters.mongoose) { %>

app/templates/server/auth(auth)/auth.service.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
2-
<% if (filters.mongooseModels) { %>
3-
var mongoose = require('mongoose-bird')();<% } %>
2+
43
var passport = require('passport');
54
var config = require('../config/environment');
65
var jwt = require('jsonwebtoken');

app/templates/server/config/express.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var config = require('./environment');<% if (filters.auth) { %>
1717
var passport = require('passport');<% } %><% if (filters.twitterAuth) { %>
1818
var session = require('express-session');<% if (filters.mongoose) { %>
1919
var mongoStore = require('connect-mongo')(session);
20-
var mongoose = require('mongoose-bird')();<% } %><% } %>
20+
var mongoose = require('mongoose');<% } %><% } %>
2121

2222
module.exports = function(app) {
2323
var env = app.get('env');

endpoint/templates/basename.model(mongooseModels).js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var mongoose = require('mongoose-bird')();
3+
var mongoose = require('bluebird').promisifyAll(require('mongoose'));
44
var Schema = mongoose.Schema;
55

66
var <%= classedName %>Schema = new Schema({

0 commit comments

Comments
 (0)