Skip to content

Commit 79c5e02

Browse files
committed
fix(server): config wasn't added to default project
1 parent 27fa6d9 commit 79c5e02

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Diff for: templates/common/_package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "<%= _.slugify(appname) %>",
33
"version": "0.0.0",
44
"dependencies": {
5-
"express": "~3.4.3"<% if (mongo) { %>,
6-
"lodash": "~2.4.1",
7-
"mongoose": "~3.5.5"<% } %><% if (mongo && mongoPassportUser) { %>,
5+
"express": "~3.4.3",
6+
"lodash": "~2.4.1"<% if (mongo) { %>,
7+
"mongoose": "~3.5.5"<% } %><% if (mongoPassportUser) { %>,
88
"mongoose-unique-validator": "~0.3.0",
99
"connect-mongo": "~0.4.0",
1010
"passport": "latest",

Diff for: templates/express/server.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ var express = require('express')<% if (mongo) { %>,
1212
// Default node environment to development
1313
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
1414

15-
<% if (mongo) { %>// Application Config
16-
var config = require('./lib/config/config');
15+
// Application Config
16+
var config = require('./lib/config/config');<% if (mongo) { %>
1717

1818
// Connect to database
1919
var db = mongoose.connect(config.mongo.uri, config.mongo.options);
@@ -25,8 +25,8 @@ fs.readdirSync(modelsPath).forEach(function (file) {
2525
});
2626

2727
// Populate empty DB with sample data
28-
require('./lib/config/dummydata');
29-
<% } %><% if(mongoPassportUser) { %>
28+
require('./lib/config/dummydata');<% } %><% if(mongoPassportUser) { %>
29+
3030
// Passport Configuration
3131
require('./lib/config/passport')();<% } %>
3232

0 commit comments

Comments
 (0)