Merge pull request #1235 from DaftMonk/server-import-syntax

kingcody · kingcody · commit 261d7fdcd2af · 2015-09-02T17:16:44.000-04:00
Server import syntax
diff --git a/app/templates/protractor.conf.js b/app/templates/protractor.conf.js
@@ -64,7 +64,8 @@ var config = {
     serverConfig: require('./server/config/environment')
   },
 
-  onPrepare: function() {<% if (filters.mocha) { %>
+  onPrepare: function() {
+    require('babel-core/register');<% if (filters.mocha) { %>
     // Load Mocha and Chai + plugins
     require('./mocha.conf');
 
diff --git a/app/templates/server/api/user(auth)/index.js b/app/templates/server/api/user(auth)/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var express = require('express');
-var controller = require('./user.controller');
-var auth = require('../../auth/auth.service');
+import express from 'express';
+import controller from './user.controller';
+import auth from '../../auth/auth.service';
 
 var router = express.Router();
 
diff --git a/app/templates/server/api/user(auth)/user.controller.js b/app/templates/server/api/user(auth)/user.controller.js
@@ -1,11 +1,10 @@
 'use strict';
 <% if (filters.mongooseModels) { %>
-var User = require('./user.model');<% } %><% if (filters.sequelizeModels) { %>
-var sqldb = require('../../sqldb');
-var User = sqldb.User;<% } %>
-var passport = require('passport');
-var config = require('../../config/environment');
-var jwt = require('jsonwebtoken');
+import User from './user.model';<% } %><% if (filters.sequelizeModels) { %>
+import {User} from '../../sqldb';<% } %>
+import passport from 'passport';
+import config from '../../config/environment';
+import jwt from 'jsonwebtoken';
 
 function validationError(res, statusCode) {
   statusCode = statusCode || 422;
diff --git a/app/templates/server/api/user(auth)/user.events.js b/app/templates/server/api/user(auth)/user.events.js
@@ -4,9 +4,9 @@
 
 'use strict';
 
-var EventEmitter = require('events').EventEmitter;<% if (filters.mongooseModels) { %>
-var User = require('./user.model');<% } if (filters.sequelizeModels) { %>
-var User = require('../../sqldb').User;<% } %>
+import {EventEmitter} from 'events';<% if (filters.mongooseModels) { %>
+import User from './user.model';<% } if (filters.sequelizeModels) { %>
+import {User} from '../../sqldb';<% } %>
 var UserEvents = new EventEmitter();
 
 // Set max event listeners (0 == unlimited)
diff --git a/app/templates/server/api/user(auth)/user.integration.js b/app/templates/server/api/user(auth)/user.integration.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var app = require('../..');<% if (filters.mongooseModels) { %>
-var User = require('./user.model');<% } %><% if (filters.sequelizeModels) { %>
-var User = require('../../sqldb').User;<% } %>
-var request = require('supertest');
+import app from '../..';<% if (filters.mongooseModels) { %>
+import User from './user.model';<% } %><% if (filters.sequelizeModels) { %>
+import {User} from '../../sqldb';<% } %>
+import request from 'supertest';
 
 describe('User API:', function() {
   var user;
diff --git a/app/templates/server/api/user(auth)/user.model(mongooseModels).js b/app/templates/server/api/user(auth)/user.model(mongooseModels).js
@@ -1,8 +1,8 @@
 'use strict';
 
+import crypto from 'crypto';
 var mongoose = require('bluebird').promisifyAll(require('mongoose'));
-var Schema = mongoose.Schema;
-var crypto = require('crypto');<% if (filters.oauth) { %>
+var Schema = mongoose.Schema;<% if (filters.oauth) { %>
 var authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
 
 var UserSchema = new Schema({
diff --git a/app/templates/server/api/user(auth)/user.model(sequelizeModels).js b/app/templates/server/api/user(auth)/user.model(sequelizeModels).js
@@ -1,6 +1,6 @@
 'use strict';
 
-var crypto = require('crypto');<% if (filters.oauth) { %>
+import crypto from 'crypto';<% if (filters.oauth) { %>
 var authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
 
 var validatePresenceOf = function(value) {
diff --git a/app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js b/app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js
@@ -1,7 +1,7 @@
 'use strict';
 
-var app = require('../..');
-var User = require('./user.model');
+import app from '../..';
+import User from './user.model';
 var user;
 var genUser = function() {
   user = new User({
diff --git a/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js b/app/templates/server/api/user(auth)/user.model.spec(sequelizeModels).js
@@ -1,7 +1,7 @@
 'use strict';
 
-var app = require('../..');
-var User = require('../../sqldb').User;
+import app from '../..';
+import {User} from '../../sqldb';
 var user;
 var genUser = function() {
   user = User.build({
diff --git a/app/templates/server/app.js b/app/templates/server/app.js
@@ -7,10 +7,11 @@
 // Set default node environment to development
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-var express = require('express');<% if (filters.mongoose) { %>
-var mongoose = require('mongoose');<% } %><% if (filters.sequelize) { %>
-var sqldb = require('./sqldb');<% } %>
-var config = require('./config/environment');
+import express from 'express';<% if (filters.mongoose) { %>
+import mongoose from 'mongoose';<% } %><% if (filters.sequelize) { %>
+import sqldb from './sqldb';<% } %>
+import config from './config/environment';
+import http from 'http';
 <% if (filters.mongoose) { %>
 // Connect to MongoDB
 mongoose.connect(config.mongo.uri, config.mongo.options);
@@ -24,7 +25,7 @@ if (config.seedDB) { require('./config/seed'); }
 <% } %>
 // Setup server
 var app = express();
-var server = require('http').createServer(app);<% if (filters.socketio) { %>
+var server = http.createServer(app);<% if (filters.socketio) { %>
 var socketio = require('socket.io')(server, {
   serveClient: config.env !== 'production',
   path: '/socket.io-client'
diff --git a/app/templates/server/auth(auth)/auth.service.js b/app/templates/server/auth(auth)/auth.service.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var passport = require('passport');
-var config = require('../config/environment');
-var jwt = require('jsonwebtoken');
-var expressJwt = require('express-jwt');
-var compose = require('composable-middleware');<% if (filters.mongooseModels) { %>
-var User = require('../api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
-var User = require('../sqldb').User;<% } %>
+import passport from 'passport';
+import config from '../config/environment';
+import jwt from 'jsonwebtoken';
+import expressJwt from 'express-jwt';
+import compose from 'composable-middleware';<% if (filters.mongooseModels) { %>
+import User from '../api/user/user.model';<% } %><% if (filters.sequelizeModels) { %>
+import {User} from'../sqldb';<% } %>
 var validateJwt = expressJwt({
   secret: config.secrets.session
 });
diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/index.js b/app/templates/server/auth(auth)/facebook(facebookAuth)/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var express = require('express');
-var passport = require('passport');
-var auth = require('../auth.service');
+import express from 'express';
+import passport from 'passport';
+import auth from '../auth.service';
 
 var router = express.Router();
 
diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js b/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js
@@ -1,5 +1,5 @@
-var passport = require('passport');
-var FacebookStrategy = require('passport-facebook').Strategy;
+import passport from 'passport';
+import {Strategy as FacebookStrategy} from 'passport-facebook';
 
 exports.setup = function(User, config) {
   passport.use(new FacebookStrategy({
diff --git a/app/templates/server/auth(auth)/google(googleAuth)/index.js b/app/templates/server/auth(auth)/google(googleAuth)/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var express = require('express');
-var passport = require('passport');
-var auth = require('../auth.service');
+import express from 'express';
+import passport from 'passport';
+import auth from '../auth.service';
 
 var router = express.Router();
 
diff --git a/app/templates/server/auth(auth)/google(googleAuth)/passport.js b/app/templates/server/auth(auth)/google(googleAuth)/passport.js
@@ -1,5 +1,5 @@
-var passport = require('passport');
-var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
+import passport from 'passport';
+import {OAuth2Strategy as GoogleStrategy} from 'passport-google-oauth';
 
 exports.setup = function(User, config) {
   passport.use(new GoogleStrategy({
diff --git a/app/templates/server/auth(auth)/index.js b/app/templates/server/auth(auth)/index.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var express = require('express');
-var passport = require('passport');
-var config = require('../config/environment');<% if (filters.mongooseModels) { %>
-var User = require('../api/user/user.model');<% } %><% if (filters.sequelizeModels) { %>
-var User = require('../sqldb').User;<% } %>
+import express from 'express';
+import passport from 'passport';
+import config from '../config/environment';<% if (filters.mongooseModels) { %>
+import User from '../api/user/user.model';<% } %><% if (filters.sequelizeModels) { %>
+import {User} from '../sqldb';<% } %>
 
 // Passport Configuration
 require('./local/passport').setup(User, config);<% if (filters.facebookAuth) { %>
diff --git a/app/templates/server/auth(auth)/local/index.js b/app/templates/server/auth(auth)/local/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var express = require('express');
-var passport = require('passport');
-var auth = require('../auth.service');
+import express from 'express';
+import passport from 'passport';
+import auth from '../auth.service';
 
 var router = express.Router();
 
diff --git a/app/templates/server/auth(auth)/local/passport.js b/app/templates/server/auth(auth)/local/passport.js
@@ -1,5 +1,5 @@
-var passport = require('passport');
-var LocalStrategy = require('passport-local').Strategy;
+import passport from 'passport';
+import {Strategy as LocalStrategy} from 'passport-local';
 
 function localAuthenticate(User, email, password, done) {
   <% if (filters.mongooseModels) { %>User.findOneAsync({
diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/index.js b/app/templates/server/auth(auth)/twitter(twitterAuth)/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var express = require('express');
-var passport = require('passport');
-var auth = require('../auth.service');
+import express from 'express';
+import passport from 'passport';
+import auth from '../auth.service';
 
 var router = express.Router();
 
diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js b/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js
@@ -1,7 +1,7 @@
-exports.setup = function(User, config) {
-  var passport = require('passport');
-  var TwitterStrategy = require('passport-twitter').Strategy;
+import passport from 'passport';
+import {Strategy as TwitterStrategy} from 'passport-twitter';
 
+exports.setup = function(User, config) {
   passport.use(new TwitterStrategy({
     consumerKey: config.twitter.clientID,
     consumerSecret: config.twitter.clientSecret,
diff --git a/app/templates/server/config/express.js b/app/templates/server/config/express.js
@@ -4,23 +4,25 @@
 
 'use strict';
 
-var express = require('express');
-var favicon = require('serve-favicon');
-var morgan = require('morgan');
-var compression = require('compression');
-var bodyParser = require('body-parser');
-var methodOverride = require('method-override');
-var cookieParser = require('cookie-parser');
-var errorHandler = require('errorhandler');
-var path = require('path');
-var lusca = require('lusca');
-var config = require('./environment');<% if (filters.auth) { %>
-var passport = require('passport');<% } %>
-var session = require('express-session');<% if (filters.mongoose) { %>
-var mongoStore = require('connect-mongo')(session);
-var mongoose = require('mongoose');<% } else if(filters.sequelize) { %>
-var sqldb = require('../sqldb');
-var Store = require('express-sequelize-session')(session.Store);<% } %>
+import express from 'express';
+import favicon from 'serve-favicon';
+import morgan from 'morgan';
+import compression from 'compression';
+import bodyParser from 'body-parser';
+import methodOverride from 'method-override';
+import cookieParser from 'cookie-parser';
+import errorHandler from 'errorhandler';
+import path from 'path';
+import lusca from 'lusca';
+import config from './environment';<% if (filters.auth) { %>
+import passport from 'passport';<% } %>
+import session from 'express-session';<% if (filters.mongoose) { %>
+import connectMongo from 'connect-mongo';
+import mongoose from 'mongoose';
+var mongoStore = connectMongo(session);<% } else if(filters.sequelize) { %>
+import sqldb from '../sqldb';
+import expressSequelizeSession from 'express-sequelize-session';
+var Store = expressSequelizeSession(session.Store);<% } %>
 
 module.exports = function(app) {
   var env = app.get('env');
diff --git a/app/templates/server/config/seed(models).js b/app/templates/server/config/seed(models).js
@@ -3,15 +3,13 @@
  * to disable, edit config/environment/index.js, and set `seedDB: false`
  */
 
-'use strict';
-<% if (filters.mongooseModels) { %>
-var Thing = require('../api/thing/thing.model');
-<% if (filters.auth) { %>var User = require('../api/user/user.model');<% } %>
-<% } %><% if (filters.sequelizeModels) { %>
-var sqldb = require('../sqldb');
-var Thing = sqldb.Thing;
-<% if (filters.auth) { %>var User = sqldb.User;<% } %>
-<% } %>
+'use strict';<% if (filters.mongooseModels) { %>
+import Thing from '../api/thing/thing.model';<% if (filters.auth) { %>
+import User from '../api/user/user.model';<% } %><% } %><% if (filters.sequelizeModels) { %>
+import sqldb from '../sqldb';
+var Thing = sqldb.Thing;<% if (filters.auth) { %>
+var User = sqldb.User;<% } %><% } %>
+
 <% if (filters.mongooseModels) { %>Thing.find({}).removeAsync()<% }
    if (filters.sequelizeModels) { %>Thing.sync()
   .then(function() {
diff --git a/app/templates/server/config/socketio(socketio).js b/app/templates/server/config/socketio(socketio).js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-var config = require('./environment');
+import config from './environment';
 
 // When the user disconnects.. perform this
 function onDisconnect(socket) {
diff --git a/app/templates/server/routes.js b/app/templates/server/routes.js
@@ -4,8 +4,8 @@
 
 'use strict';
 
-var errors = require('./components/errors');
-var path = require('path');
+import errors from './components/errors';
+import path from 'path';
 
 module.exports = function(app) {
 
diff --git a/app/templates/server/sqldb(sequelize)/index.js b/app/templates/server/sqldb(sequelize)/index.js
@@ -4,10 +4,9 @@
 
 'use strict';
 
-var path = require('path');
-var config = require('../config/environment');
-
-var Sequelize = require('sequelize');
+import path from 'path';
+import config from '../config/environment';
+import Sequelize from 'sequelize';
 
 var db = {
   Sequelize: Sequelize,
