Sets up babel

- Adds babel setup
- Moves app.js to server folder
- Moves bin folder to server folder

Author: Raywire

.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["@babel/preset-env", {
+      "useBuiltIns": "usage",
+      "corejs": 3,
+    }]
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}

.gitignore

@@ -4,4 +4,5 @@ package-lock.json
 .env
 .nyc_output
 coverage
-.DS_Store
+.DS_Store
+build

app.json

@@ -0,0 +1,32 @@
+{
+  "name": "postgres-express-node",
+  "scripts": {},
+  "env": {
+    "NODE_ENV": {
+      "required": true
+    },
+    "PORT": {
+      "required": true
+    },
+    "SECRET_KEY": {
+      "required": true
+    },
+    "DATABASE_URL": {
+      "required": true
+    }
+  },
+  "formation": {
+    "web": {
+      "quantity": 1
+    }
+  },
+  "addons": [
+    "heroku-postgresql"
+  ],
+  "buildpacks": [
+    {
+      "url": "heroku/nodejs"
+    }
+  ],
+  "stack": "heroku-18"
+}

package.json

@@ -2,11 +2,12 @@
   "name": "postgres-express-node",
   "version": "1.0.0",
   "description": "Setting up a todo list backend",
-  "main": "index.js",
+  "main": "build/bin/www",
   "scripts": {
-    "start": "node ./bin/www",
-    "start:dev": "nodemon ./bin/www",
-    "test": "NODE_ENV=test npm run reset:db && NODE_ENV=test nyc mocha --timeout 5000 server/tests/**/*.spec.js",
+    "start": "node build/bin/www",
+    "start:dev": "nodemon --exec babel-node -- server/bin/www",
+    "build": "rm -rf build && babel server -d build --copy-files",
+    "test": "NODE_ENV=test npm run reset:db && NODE_ENV=test nyc mocha --require @babel/register --timeout 5000 server/tests/**/*.spec.js",
     "migrate": "sequelize db:migrate",
     "reset:db": "sequelize db:migrate:undo:all && npm run migrate",
     "coveralls-coverage": "nyc report --reporter=text-lcov | coveralls",
@@ -23,6 +24,7 @@
       "**/*.spec.js",
       "coverage",
       "dist",
+      "build",
       "server/tests",
       "server/migrations",
       ".eslintrc.js"
@@ -37,9 +39,11 @@
   "author": "Ryan Wire",
   "license": "ISC",
   "dependencies": {
+    "@babel/runtime": "^7.5.5",
     "bcrypt": "^3.0.6",
     "body-parser": "^1.19.0",
     "celebrate": "^10.0.1",
+    "core-js": "^3.2.1",
     "cors": "^2.8.5",
     "dotenv": "^8.0.0",
     "express": "^4.17.1",
@@ -52,6 +56,12 @@
     "sequelize": "^5.8.9"
   },
   "devDependencies": {
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/node": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/register": "^7.5.5",
     "chai": "^4.2.0",
     "chai-http": "^4.3.0",
     "coveralls": "^3.0.6",

app.js renamed to server/app.js

@@ -1,17 +1,16 @@
-const express = require('express');
-const cors = require('cors');
-const logger = require('morgan');
-const bodyParser = require('body-parser');
-const passport = require('passport');
-require('dotenv').config();
-const joiErrors = require('./server/middlewares/joiErrors');
+import express from 'express';
+import cors from 'cors';
+import logger from 'morgan';
+import bodyParser from 'body-parser';
+import passport from 'passport';
+import dotenv from 'dotenv';
+import joiErrors from './middlewares/joiErrors';
 
 // Require our routes and passport into the application
-const todosRouter = require('./server/routes').todosRouter();
-const authRouter = require('./server/routes').authRouter();
-const usersRouter = require('./server/routes').usersRouter();
-const { passportAuth } = require('./server/config/passport');
+import { todosRouter, authRouter, usersRouter } from './routes';
+import { passportAuth } from './config/passport';
 
+dotenv.config();
 passportAuth(passport);
 
 const apiPrefix = '/api';
@@ -33,9 +32,9 @@ app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 
 app.use(apiPrefix, passport.authenticate('jwt', { session: false }));
-app.use(apiPrefix, usersRouter);
-app.use(apiPrefix, todosRouter);
-app.use(authRouter);
+app.use(apiPrefix, usersRouter());
+app.use(apiPrefix, todosRouter());
+app.use(authRouter());
 
 app.use(joiErrors);
 

bin/www renamed to server/bin/www

@@ -2,7 +2,7 @@ const chai = require('chai');
 
 const { expect } = chai;
 const chaiHttp = require('chai-http');
-const app = require('../../../app');
+const app = require('../../app');
 const { deleteTestUser } = require('../utils');
 
 chai.use(chaiHttp);

server/tests/integration/authRouter.spec.js

@@ -2,7 +2,7 @@ const chai = require('chai');
 
 const { expect } = chai;
 const chaiHttp = require('chai-http');
-const app = require('../../../app');
+const app = require('../../app');
 
 chai.use(chaiHttp);
 

server/tests/integration/server.spec.js

@@ -2,11 +2,14 @@ const chai = require('chai');
 
 const { expect } = chai;
 const chaiHttp = require('chai-http');
-const app = require('../../../app');
+const app = require('../../app');
 const { deleteTestUser, tokenInvalid } = require('../utils');
 
 chai.use(chaiHttp);
 
+let token;
+let res2;
+
 describe('TodoRouter', () => {
   before(async () => {
     await chai
@@ -80,7 +83,7 @@ describe('TodoRouter', () => {
     it('Should return 200 when a single todo is fetched', async () => {
       const res = await chai
         .request(app).get(`/api/todos/${res2.body.id}`)
-        .set('Authorization', `Bearer ${token}`)
+        .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(200);
       expect(res.body).to.include.keys('id', 'title', 'UserId', 'updatedAt', 'createdAt');
@@ -89,7 +92,7 @@ describe('TodoRouter', () => {
     it('Should return 200 when all todos are fetched', async () => {
       const res = await chai
         .request(app).get('/api/todos/')
-        .set('Authorization', `Bearer ${token}`)
+        .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(200);
       expect(res.body.data).to.be.a('array');
@@ -98,7 +101,7 @@ describe('TodoRouter', () => {
     it('Should return 200 when all todos are fetched with pagination query params', async () => {
       const res = await chai
         .request(app).get('/api/todos/?limit=1&page=1')
-        .set('Authorization', `Bearer ${token}`)
+        .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(200);
       expect(res.body.data).to.be.a('array');
@@ -107,7 +110,7 @@ describe('TodoRouter', () => {
     it('Should return 200 when all todos are fetched with incorrect(negative) page query param', async () => {
       const res = await chai
         .request(app).get('/api/todos/?page=-1')
-        .set('Authorization', `Bearer ${token}`)
+        .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(200);
       expect(res.body.data).to.be.a('array');
@@ -116,7 +119,7 @@ describe('TodoRouter', () => {
     it('Should return 200 when all todos are fetched with incorrect(negative) limit query param', async () => {
       const res = await chai
         .request(app).get('/api/todos/?limit=-1')
-        .set('Authorization', `Bearer ${token}`)
+        .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(200);
       expect(res.body.data).to.be.a('array');
@@ -150,7 +153,7 @@ describe('TodoRouter', () => {
     it('Should return 404 when a todo does not exist', async () => {
       const res = await chai
         .request(app)
-        .delete(`/api/todos/10000`)
+        .delete('/api/todos/10000')
         .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(404);
@@ -160,15 +163,15 @@ describe('TodoRouter', () => {
 
   describe('Todo Items actions', () => {
     it('Should return 201 when a todo item is created successfully', async () => {
-      const res2 = await chai
+      const res3 = await chai
         .request(app)
         .post('/api/todos')
         .set('Authorization', `Bearer ${token}`)
         .send({ title: 'I took Killgrave down' });
 
       const res = await chai
         .request(app)
-        .post(`/api/todos/${res2.body.id}/items`)
+        .post(`/api/todos/${res3.body.id}/items`)
         .set('Authorization', `Bearer ${token}`)
         .send({ content: 'I beat the hell out of Luke Cage' });
 
@@ -177,21 +180,21 @@ describe('TodoRouter', () => {
     });
 
     it('Should return 204 when a todo item is deleted successfully', async () => {
-      const res2 = await chai
+      const resCreate = await chai
         .request(app)
         .post('/api/todos')
         .set('Authorization', `Bearer ${token}`)
         .send({ title: 'I took Killgrave down' });
 
       const res3 = await chai
         .request(app)
-        .post(`/api/todos/${res2.body.id}/items`)
+        .post(`/api/todos/${resCreate.body.id}/items`)
         .set('Authorization', `Bearer ${token}`)
         .send({ content: 'I beat the hell out of Luke Cage' });
 
       const res = await chai
         .request(app)
-        .delete(`/api/todos/${res2.body.id}/items/${res3.body.id}`)
+        .delete(`/api/todos/${resCreate.body.id}/items/${res3.body.id}`)
         .set('Authorization', `Bearer ${token}`);
 
       expect(res).to.have.status(204);

server/tests/integration/todoRouter.spec.js

@@ -2,11 +2,14 @@ const chai = require('chai');
 
 const { expect } = chai;
 const chaiHttp = require('chai-http');
-const app = require('../../../app');
+const app = require('../../app');
 const { deleteTestUser } = require('../utils');
 
 chai.use(chaiHttp);
 
+let token;
+let userId;
+
 describe('A user', () => {
   before(async () => {
     await chai
@@ -38,5 +41,4 @@ describe('A user', () => {
       expect(res).to.have.status(200);
     });
   });
-
 });