consistent use of es6 import

buzzfeed-openlab · Sep 14, 2016 · 288d4f2 · 288d4f2
1 parent 25b66ee
commit 288d4f2
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/db/index.js b/db/index.js
@@ -3,11 +3,12 @@ import path from 'path';
 import pg from 'pg';
 import Sequelize from 'sequelize';
 import Controller from './controller';
+import config from '../config.js';
+import dbConfigs from './sequelize_config.js';
 
-const config = require('../config.js'),
-    dbConfig = require('./sequelize_config.js')[config.env],
-    basename = path.basename(module.filename),
-    modelDir = path.join(__dirname, 'models');
+const dbConfig = dbConfigs[config.env],
+      basename = path.basename(module.filename),
+      modelDir = path.join(__dirname, 'models');
 
 const db = {
     Sequelize,

diff --git a/db/models/menu-command.js b/db/models/menu-command.js
@@ -1,5 +1,5 @@
-'use strict';
-module.exports = function(sequelize, DataTypes) {
+
+export default (sequelize, DataTypes) => {
     var MenuCommand = sequelize.define('MenuCommand', {
         id: {
             type: DataTypes.INTEGER,

diff --git a/db/models/message-event.js b/db/models/message-event.js
@@ -1,4 +1,3 @@
-'use strict';
 
 export default (sequelize, DataTypes) => {
     var MessageEvent = sequelize.define('MessageEvent', {

diff --git a/db/models/message.js b/db/models/message.js
@@ -1,4 +1,3 @@
-'use strict';
 
 export default (sequelize, DataTypes) => {
     var Message = sequelize.define('Message', {

diff --git a/db/models/responses.js b/db/models/responses.js
@@ -1,3 +1,4 @@
+
 export default (sequelize, DataTypes) => {
     const Response = sequelize.define('Response', {
         id: {

diff --git a/db/models/tag.js b/db/models/tag.js
@@ -1,5 +1,5 @@
-'use strict';
-module.exports = function(sequelize, DataTypes) {
+
+export default (sequelize, DataTypes) => {
     var Tag = sequelize.define('Tag', {
         id: {
             type: DataTypes.INTEGER,

diff --git a/db/models/trigger.js b/db/models/trigger.js
@@ -1,5 +1,5 @@
-'use strict';
-module.exports = function(sequelize, DataTypes) {
+
+export default (sequelize, DataTypes) => {
     var Trigger = sequelize.define('Trigger', {
         id: {
             type: DataTypes.INTEGER,

diff --git a/db/models/users.js b/db/models/users.js
@@ -1,5 +1,5 @@
 
-module.exports = (sequelize, DataTypes) => {
+export default (sequelize, DataTypes) => {
     const User = sequelize.define('User', {
         id: {
             type: DataTypes.STRING,

diff --git a/db/sequelize_config.js b/db/sequelize_config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   development: {
     username: process.env.PGUSER || 'buzzbot',
     password: process.env.PGPASSWORD || null,