Implement: ES6 modules syntax

app.js

@@ -1,12 +1,12 @@
-const bodyParser = require('body-parser');
-const cookieParser = require('cookie-parser');
-const express = require('express');
-const exphbs = require('express-handlebars');
-const favicon = require('serve-favicon');
-const logger = require('morgan');
-const path = require('path');
-const routes = require('./server/routes/index');
-const sassMiddleware = require('node-sass-middleware');
+import bodyParser from 'body-parser';
+import cookieParser from 'cookie-parser';
+import express from 'express';
+import exphbs from 'express-handlebars';
+import favicon from 'serve-favicon';
+import logger from 'morgan';
+import path from 'path';
+import sassMiddleware from 'node-sass-middleware';
+import { router } from './server/routes';
 
 const app = express();
 const hbs = exphbs.create({ defaultLayout: 'main', extname: '.html' })
@@ -31,7 +31,7 @@ app.use(
 );
 app.use(express.static(path.join(__dirname, './client', 'public')));
 
-app.use('/', routes);
+app.use('/', router);
 
 // Catch 404 and forward to error handler
 app.use(function (req, res, next) {

bin/www

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // Module dependencies.
-const app = require('../app');
+const app = require('../init');
 const http = require('http');
 
 // Normalize a port into a number, string, or false.

config.js

@@ -1,3 +1,3 @@
 const connectionString = process.env.DATABASE_URL || 'postgres://localhost:5432/theatrebase_nodejs';
 
-module.exports = connectionString;
+export { connectionString };

init.js

@@ -0,0 +1,3 @@
+require('./setup');
+
+module.exports = require('./app');

lib/query.js

@@ -1,8 +1,7 @@
-const pg = require('pg');
-const path = require('path');
-const connectionString = require(path.join(__dirname, '../', 'config'));
+import pg from 'pg';
+import { connectionString } from '../config';
 
-module.exports = function (queryText, callback) {
+export default function (queryText, callback) {
 	pg.connect(connectionString, function (err, client, release) {
 		if (err) return callback(err);
 
@@ -16,4 +15,4 @@ module.exports = function (queryText, callback) {
 			return callback(null, rows);
 		});
 	});
-};
+}

package.json

@@ -9,6 +9,8 @@
 	"author": "https://github.com/andygout",
 	"license": "MS-RSL",
 	"dependencies": {
+		"babel-plugin-transform-es2015-modules-commonjs": "^6.16.0",
+		"babel-register": "^6.16.3",
 		"body-parser": "^1.10.2",
 		"cookie-parser": "^1.3.3",
 		"debug": "^2.1.1",

server/controllers/index.js

@@ -0,0 +1,3 @@
+import * as productions from './productions';
+
+export { productions }

server/controllers/productions/create.js

@@ -1,7 +1,7 @@
-const format = require('pg-format');
-const query = require('../../../lib/query');
+import format from 'pg-format';
+import query from '../../../lib/query';
 
-module.exports = (req, res, next) => {
+export default function (req, res, next) {
 	const data = {
 		title: format.literal(req.body.title)
 	};
@@ -12,4 +12,4 @@ module.exports = (req, res, next) => {
 		if (err) return next(err);
 		res.redirect(`/productions/${production.id}`);
 	});
-};
+}

server/controllers/productions/delete.js

@@ -1,7 +1,7 @@
-const format = require('pg-format');
-const query = require('../../../lib/query');
+import format from 'pg-format';
+import query from '../../../lib/query';
 
-module.exports = (req, res, next) => {
+export default function (req, res, next) {
 	const id = format.literal(req.params.id);
 
 	const queryText = `DELETE FROM productions WHERE id=${id}`;
@@ -10,4 +10,4 @@ module.exports = (req, res, next) => {
 		if (err) return next(err);
 		res.redirect('/');
 	});
-};
+}

server/controllers/productions/edit.js

@@ -1,7 +1,7 @@
-const format = require('pg-format');
-const query = require('../../../lib/query');
+import format from 'pg-format';
+import query from '../../../lib/query';
 
-module.exports = (req, res, next) => {
+export default function (req, res, next) {
 	const id = format.literal(req.params.id);
 
 	const queryText = `SELECT * FROM productions WHERE id=${id}`;
@@ -17,4 +17,4 @@ module.exports = (req, res, next) => {
 
 		res.render('form', Object.assign({}, content, production));
 	});
-};
+}

server/controllers/productions/index.js

@@ -1,10 +1,9 @@
-const query = require('../../../lib/query');
+import newRoute from './new';
+import createRoute from './create';
+import editRoute from './edit';
+import updateRoute from './update';
+import deleteRoute from './delete';
+import showRoute from './show';
+import listRoute from './list';
 
-module.exports = (req, res, next) => {
-	const queryText = 'SELECT * FROM productions ORDER BY id ASC';
-
-	query(queryText, function (err, productions) {
-		if (err) return next(err);
-		res.render('index', { content: JSON.stringify(productions) });
-	});
-};
+export { newRoute, createRoute, editRoute, updateRoute, deleteRoute, showRoute, listRoute }

server/controllers/productions/list.js

@@ -0,0 +1,10 @@
+import query from '../../../lib/query';
+
+export default function (req, res, next) {
+	const queryText = 'SELECT * FROM productions ORDER BY id ASC';
+
+	query(queryText, function (err, productions) {
+		if (err) return next(err);
+		res.render('index', { content: JSON.stringify(productions) });
+	});
+}

server/controllers/productions/new.js

@@ -1,11 +1,11 @@
-const query = require('../../../lib/query');
+import query from '../../../lib/query';
 
-module.exports = (req, res) => {
+export default function (req, res) {
 	const content = {
 		pageTitle: 'New production',
 		formAction: '/productions',
 		submitValue: 'Create production'
 	}
 
 	res.render('form', content);
-};
+}

server/controllers/productions/show.js

@@ -1,7 +1,7 @@
-const format = require('pg-format');
-const query = require('../../../lib/query');
+import format from 'pg-format';
+import query from '../../../lib/query';
 
-module.exports = (req, res, next) => {
+export default function (req, res, next) {
 	const id = format.literal(req.params.id);
 
 	const queryText = `SELECT * FROM productions WHERE id=${id}`;
@@ -10,4 +10,4 @@ module.exports = (req, res, next) => {
 		if (err) return next(err);
 		res.render('show', production);
 	});
-};
+}

server/controllers/productions/update.js

@@ -1,7 +1,7 @@
-const format = require('pg-format');
-const query = require('../../../lib/query');
+import format from 'pg-format';
+import query from '../../../lib/query';
 
-module.exports = (req, res, next) => {
+export default function (req, res, next) {
 	const id = req.params.id;
 
 	const data = {
@@ -15,4 +15,4 @@ module.exports = (req, res, next) => {
 		if (err) return next(err);
 		res.redirect(`/productions/${id}`);
 	});
-};
+}

server/models/database.js

@@ -1,6 +1,5 @@
-const pg = require('pg');
-const path = require('path');
-const connectionString = require(path.join(__dirname, '../', '../', 'config'));
+import pg from 'pg';
+import connectionString from '../../config';
 
 const client = new pg.Client(connectionString);
 client.connect();

server/routes/index.js

@@ -1,5 +1,6 @@
-const express = require('express');
-const methodOverride = require('method-override');
+import express from 'express';
+import methodOverride from 'method-override';
+import * as controllers from '../controllers';
 
 const router = express.Router();
 
@@ -12,15 +13,15 @@ router.use(methodOverride(function (req, res) {
 }));
 
 // Home
-router.get('/', require('../controllers/productions/index'));
+router.get('/', controllers.productions.listRoute);
 
 // Productions
-router.get('/productions/new', require('../controllers/productions/new'));
-router.post('/productions', require('../controllers/productions/create'));
-router.get('/productions/:id/edit', require('../controllers/productions/edit'));
-router.post('/productions/:id', require('../controllers/productions/update'));
-router.delete('/productions/:id', require('../controllers/productions/delete'));
-router.get('/productions/:id', require('../controllers/productions/show'));
-router.get('/productions', require('../controllers/productions/index'));
+router.get('/productions/new', controllers.productions.newRoute);
+router.post('/productions', controllers.productions.createRoute);
+router.get('/productions/:id/edit', controllers.productions.editRoute);
+router.post('/productions/:id', controllers.productions.updateRoute);
+router.delete('/productions/:id', controllers.productions.deleteRoute);
+router.get('/productions/:id', controllers.productions.showRoute);
+router.get('/productions', controllers.productions.listRoute);
 
-module.exports = router;
+export { router };

setup.js

@@ -0,0 +1,3 @@
+require('babel-register')({
+	plugins: ["transform-es2015-modules-commonjs"]
+});