Skip to content

Commit 8e0ab2d

Browse files
committed
refactor(server:config): use import syntax
1 parent 9513589 commit 8e0ab2d

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

app/templates/server/config/express.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@
44

55
'use strict';
66

7-
var express = require('express');
8-
var favicon = require('serve-favicon');
9-
var morgan = require('morgan');
10-
var compression = require('compression');
11-
var bodyParser = require('body-parser');
12-
var methodOverride = require('method-override');
13-
var cookieParser = require('cookie-parser');
14-
var errorHandler = require('errorhandler');
15-
var path = require('path');
16-
var lusca = require('lusca');
17-
var config = require('./environment');<% if (filters.auth) { %>
18-
var passport = require('passport');<% } %>
19-
var session = require('express-session');<% if (filters.mongoose) { %>
20-
var mongoStore = require('connect-mongo')(session);
21-
var mongoose = require('mongoose');<% } else if(filters.sequelize) { %>
22-
var sqldb = require('../sqldb');
23-
var Store = require('express-sequelize-session')(session.Store);<% } %>
7+
import express from 'express';
8+
import favicon from 'serve-favicon';
9+
import morgan from 'morgan';
10+
import compression from 'compression';
11+
import bodyParser from 'body-parser';
12+
import methodOverride from 'method-override';
13+
import cookieParser from 'cookie-parser';
14+
import errorHandler from 'errorhandler';
15+
import path from 'path';
16+
import lusca from 'lusca';
17+
import config from './environment';<% if (filters.auth) { %>
18+
import passport from 'passport';<% } %>
19+
import session from 'express-session';<% if (filters.mongoose) { %>
20+
import connectMongo from 'connect-mongo';
21+
import mongoose from 'mongoose';
22+
var mongoStore = connectMongo(session);<% } else if(filters.sequelize) { %>
23+
import sqldb from '../sqldb';
24+
import expressSequelizeSession from 'express-sequelize-session';
25+
var Store = expressSequelizeSession(session.Store);<% } %>
2426

2527
module.exports = function(app) {
2628
var env = app.get('env');

app/templates/server/config/seed(models).js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* to disable, edit config/environment/index.js, and set `seedDB: false`
44
*/
55

6-
'use strict';
7-
<% if (filters.mongooseModels) { %>
8-
var Thing = require('../api/thing/thing.model');
9-
<% if (filters.auth) { %>var User = require('../api/user/user.model');<% } %>
10-
<% } %><% if (filters.sequelizeModels) { %>
11-
var sqldb = require('../sqldb');
12-
var Thing = sqldb.Thing;
13-
<% if (filters.auth) { %>var User = sqldb.User;<% } %>
14-
<% } %>
6+
'use strict';<% if (filters.mongooseModels) { %>
7+
import Thing from '../api/thing/thing.model';<% if (filters.auth) { %>
8+
import User from '../api/user/user.model';<% } %><% } %><% if (filters.sequelizeModels) { %>
9+
import sqldb from '../sqldb';
10+
var Thing = sqldb.Thing;<% if (filters.auth) { %>
11+
var User = sqldb.User;<% } %><% } %>
12+
1513
<% if (filters.mongooseModels) { %>Thing.find({}).removeAsync()<% }
1614
if (filters.sequelizeModels) { %>Thing.sync()
1715
.then(function() {

app/templates/server/config/socketio(socketio).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
'use strict';
66

7-
var config = require('./environment');
7+
import config from './environment';
88

99
// When the user disconnects.. perform this
1010
function onDisconnect(socket) {

0 commit comments

Comments
 (0)