From 871919c83850901af1dde487f1d1e66e65b049ca Mon Sep 17 00:00:00 2001 From: Jonasz Bigda Date: Wed, 7 Oct 2020 21:18:09 +0200 Subject: [PATCH] Started switching to CommonJS import to require --- app.mjs => app.js | 6 ++--- config/index.js | 26 ++++++++++---------- loaders/express.js | 26 +++++++++++--------- loaders/index.js | 8 +++--- loaders/mongoose.js | 14 ++++++++--- package.json | 3 +-- web.config | 59 --------------------------------------------- 7 files changed, 47 insertions(+), 95 deletions(-) rename app.mjs => app.js (75%) delete mode 100644 web.config diff --git a/app.mjs b/app.js similarity index 75% rename from app.mjs rename to app.js index c288fe6..b2690f4 100644 --- a/app.mjs +++ b/app.js @@ -1,8 +1,8 @@ -import * as config from "./config/index.js"; +const config = require("./config/index.js"); const { port, dbPass, cookiesSecret } = config; -import express from "express"; +const express = require("express"); const app = express(); -import loaders from "./loaders/index.js"; +const loaders = require("./loaders/index.js"); // // Server init function // diff --git a/config/index.js b/config/index.js index a4fff87..cf5d39e 100644 --- a/config/index.js +++ b/config/index.js @@ -1,15 +1,15 @@ -import dotenv from "dotenv"; +const dotenv = require("dotenv"); dotenv.config(); -export const port = process.env.PORT; -export const dbPass = process.env.DB_PASS; -export const dbUser = process.env.DB_USER; -export const dbHost = process.env.DB_HOST; -export const dbPort = process.env.DB_PORT; -export const dbName = process.env.DB_NAME; -export const cookiesSecret = process.env.COOKIES_SECRET; -export const jwtSecret = process.env.JWT_SECRET; -export const CRM_KEY = process.env.CRM_KEY; -export const CRM_USER = process.env.CRM_USER; -export const CRM_EMAIL = process.env.CRM_EMAIL; -export const MAIL_PASS = process.env.MAIL_PASS; +exports.port = process.env.PORT; +exports.dbPass = process.env.DB_PASS; +exports.dbUser = process.env.DB_USER; +exports.dbHost = process.env.DB_HOST; +exports.dbPort = process.env.DB_PORT; +exports.dbName = process.env.DB_NAME; +exports.cookiesSecret = process.env.COOKIES_SECRET; +exports.jwtSecret = process.env.JWT_SECRET; +exports.CRM_KEY = process.env.CRM_KEY; +exports.CRM_USER = process.env.CRM_USER; +exports.CRM_EMAIL = process.env.CRM_EMAIL; +exports.MAIL_PASS = process.env.MAIL_PASS; diff --git a/loaders/express.js b/loaders/express.js index 3fe6e29..d3b3412 100644 --- a/loaders/express.js +++ b/loaders/express.js @@ -1,18 +1,18 @@ -import bodyParser from "body-parser"; -import cors from "cors"; -import rateLimiter from "express-rate-limit"; -import helmet from "helmet"; -import routeDish from "../routes/routeDish.js"; -import routeRestaurant from "../routes/routeRestaurant.js"; -import routeUser from "../routes/routeUser.js"; -import routeSearch from "../routes/routeSearch.js"; -import routeImg from "../routes/routeImg.js"; -import routePayments from "../routes/routePayments.js"; +const bodyParser = require("body-parser"); +const cors = require("cors"); +const rateLimiter = require("express-rate-limit"); +const helmet = require("helmet"); +const routeDish = require("../routes/routeDish.js"); +const routeRestaurant = require("../routes/routeRestaurant.js"); +const routeUser = require("../routes/routeUser.js"); +const routeSearch = require("../routes/routeSearch.js"); +const routeImg = require("../routes/routeImg.js"); +const routePayments = require("../routes/routePayments.js"); -export default ({ app, secret }) => { +const loadExpress = ({ app, secret }) => { const limiter = rateLimiter({ windowMs: 15 * 60 * 1000, //time window - max: 100, //requests from a single IP for a time window + max: 100, //requests = a single IP for a time window }); app.use(cors({ exposedHeaders: "x-auth-token" })); @@ -32,3 +32,5 @@ export default ({ app, secret }) => { return app; }; + +module.exports = loadExpress; diff --git a/loaders/index.js b/loaders/index.js index 2da5e8e..62c85a3 100644 --- a/loaders/index.js +++ b/loaders/index.js @@ -1,9 +1,11 @@ -import expressLoader from "./express.js"; -import mongooseLoader from "./mongoose.js"; +const expressLoader = require("./express.js"); +const mongooseLoader = require("./mongoose.js"); -export default async ({ expressApp, secret }) => { +const loaders = async ({ expressApp, secret }) => { const mongoConnection = await mongooseLoader(); console.log("Mongoose Loaded"); await expressLoader({ app: expressApp, secret: secret }); console.log("Express Initialized"); }; + +module.exports = loaders; diff --git a/loaders/mongoose.js b/loaders/mongoose.js index 2ba1d5b..ffb8339 100644 --- a/loaders/mongoose.js +++ b/loaders/mongoose.js @@ -1,7 +1,13 @@ -import mongoose from "mongoose"; -import { dbPass, dbUser, dbHost, dbPort, dbName } from "../config/index.js"; +const mongoose = require("mongoose"); +const { + dbPass, + dbUser, + dbHost, + dbPort, + dbName, +} = require("../config/index.js"); -export default async () => { +const loadMongoose = async () => { const connection = await mongoose.connect( "mongodb://" + dbHost + @@ -25,3 +31,5 @@ export default async () => { } ); }; + +module.exports = loadMongoose; diff --git a/package.json b/package.json index eb826bc..dad9c11 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,11 @@ "name": "menui_backend", "version": "1.0.0", "description": "backend for Menui", - "main": "app.mjs", + "main": "app.js", "scripts": { "test": "jest" }, "keywords": [], - "type": "module", "author": "Jonasz Bigda", "license": "ISC", "dependencies": { diff --git a/web.config b/web.config deleted file mode 100644 index c9350d9..0000000 --- a/web.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file