chore(package): upgrade to mongoose 5

angular-fullstack · Jun 17, 2018 · 94673ec · 94673ec
1 parent fb469cf
commit 94673ec
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/templates/app/_package.json b/templates/app/_package.json
@@ -29,7 +29,7 @@
     "babel-runtime": "^6.18.0",<% if(filters.pug) { %>
     "pug": "^2.0.0",<% } %><% if(filters.html) { %>
     "ejs": "^2.5.3",<% } %><% if(filters.mongoose) { %>
-    "mongoose": "^4.13.14",
+    "mongoose": "^5.1.5",
     "bluebird": "^3.3.3",
     "connect-mongo": "^2.0.1",<% } %><% if(filters.sequelize) { %>
     "sequelize": "^3.23.6",

diff --git a/templates/app/protractor.conf.js b/templates/app/protractor.conf.js
@@ -90,7 +90,7 @@ var config = {
 
     // Setup mongo for tests
     var mongoose = require('mongoose');
-    mongoose.connect(serverConfig.mongo.uri, serverConfig.mongo.options); // Connect to database<% } %>
+    return mongoose.connect(serverConfig.mongo.uri, serverConfig.mongo.options); // Connect to database<% } %>
   }
 };
 

diff --git a/templates/app/server/app.js b/templates/app/server/app.js
@@ -16,7 +16,7 @@ import seedDatabaseIfNeeded from './config/seed';<% } %>
 
 <% if (filters.mongoose) { %>
 // Connect to MongoDB
-mongoose.connect(config.mongo.uri, config.mongo.options);
+const mongooseConnectionPromise = mongoose.connect(config.mongo.uri, config.mongo.options);
 mongoose.connection.on('error', function(err) {
     console.error('MongoDB connection error: ' + err);
     process.exit(-1); // eslint-disable-line no-process-exit
@@ -53,6 +53,7 @@ wsInitPromise
     .then(primus => {
         app.primus = primus;
     })<% if(filters.models) { %>
+    .then(() => mongooseConnectionPromise)
     .then(seedDatabaseIfNeeded)<% } %>
     .then(startServer)
     .catch(err => {

diff --git a/templates/app/server/config/environment/development.js b/templates/app/server/config/environment/development.js
@@ -6,6 +6,7 @@
 module.exports = {<% if (filters.mongoose) { %>
     // MongoDB connection options
     mongo: {
+        useMongoClient: true,
         uri: process.env.MONGODB_URI || 'mongodb://localhost/<%= lodash.slugify(appname) %>-dev'
     },<% } if (filters.sequelize) { %>
 

diff --git a/templates/app/server/config/environment/production.js b/templates/app/server/config/environment/production.js
@@ -16,6 +16,7 @@ module.exports = {
 
     // MongoDB connection options
     mongo: {
+        useMongoClient: true,
         uri: process.env.MONGODB_URI
             || process.env.MONGOHQ_URL
             || process.env.OPENSHIFT_MONGODB_DB_URL + process.env.OPENSHIFT_APP_NAME

diff --git a/templates/app/server/config/environment/test.js b/templates/app/server/config/environment/test.js
@@ -6,6 +6,7 @@
 module.exports = {
     // MongoDB connection options
     mongo: {
+        useMongoClient: true,
         uri: 'mongodb://localhost/<%= lodash.slugify(appname) %>-test'
     },
     sequelize: {