From 813f7dbfc30c629e531aa49693e70146c025af2b Mon Sep 17 00:00:00 2001 From: mrdoowan Date: Sat, 13 Feb 2021 15:29:19 -0500 Subject: [PATCH] I really hope this fixes babel + dotenv --- .babelrc | 12 +----------- README.md | 1 - env.js | 1 + package-lock.json | 26 +++++++++----------------- package.json | 6 ++---- server.js | 4 ++-- 6 files changed, 15 insertions(+), 35 deletions(-) create mode 100644 env.js diff --git a/.babelrc b/.babelrc index 28ef819..69f50d5 100644 --- a/.babelrc +++ b/.babelrc @@ -1,13 +1,3 @@ { - "presets": ["env"], - "plugins": [ - ["dotenv-import", { - "moduleName": "@env", - "path": ".env", - "blacklist": null, - "whitelist": null, - "safe": false, - "allowUndefined": true - }] - ] + "presets": ["env"] } \ No newline at end of file diff --git a/README.md b/README.md index b34c223..f810c9a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ The following npm modules are used in the server: * express-http-to-https * babel-preset-env * babel-cli (-g) -* babel-plugin-dotenv-import The following npm modules are used in the client: * react diff --git a/env.js b/env.js new file mode 100644 index 0000000..d0396cf --- /dev/null +++ b/env.js @@ -0,0 +1 @@ +require('dotenv').config({ silent: true }) \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 06c20bd..0b06688 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,9 +85,9 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "aws-sdk": { - "version": "2.840.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.840.0.tgz", - "integrity": "sha512-ngesHJqb0PXYjJNnCsAX4yLkR6JFQJB+3eDGwh3mYRjcq9voix5RfbCFQT1lwWu7bcMBPCrRIA2lJkkTMYXq+A==", + "version": "2.843.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.843.0.tgz", + "integrity": "sha512-wTHKHDzblaNjWsdCuKTnfAr2zSLgN+Nc2yGpqPxnr7emEQG4V3B0gYEfV9rvv9dVq5Jw8Y1q6VNWS6k8oclnSw==", "requires": { "buffer": "4.9.2", "events": "1.1.1", @@ -279,14 +279,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-dotenv-import": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dotenv-import/-/babel-plugin-dotenv-import-2.1.0.tgz", - "integrity": "sha512-ZzCqXbp8uFnhu1lO3nBaWt+rOYpVIXSrY8DEC/oaalL6DHtYP26Ye4TpGcXxNlBD1vzOHTPHo7eNHUIseCoiwA==", - "requires": { - "dotenv": "^8.0.0" - } - }, "babel-plugin-syntax-async-functions": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", @@ -882,9 +874,9 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "caniuse-lite": { - "version": "1.0.30001179", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001179.tgz", - "integrity": "sha512-blMmO0QQujuUWZKyVrD1msR4WNDAqb/UPO1Sw2WWsQ7deoM5bJiicKnWJ1Y0NS/aGINSnKPIWBMw5luX+NDUCA==" + "version": "1.0.30001187", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz", + "integrity": "sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA==" }, "chalk": { "version": "2.4.2", @@ -1161,9 +1153,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.645", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.645.tgz", - "integrity": "sha512-T7mYop3aDpRHIQaUYcmzmh6j9MAe560n6ukqjJMbVC6bVTau7dSpvB18bcsBPPtOSe10cKxhJFtlbEzLa0LL1g==" + "version": "1.3.664", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz", + "integrity": "sha512-yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg==" }, "emoji-regex": { "version": "7.0.3", diff --git a/package.json b/package.json index 2a9ceb8..cb1bc7e 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "main": "server.js", "scripts": { "client-install": "npm install --prefix client", - "start": "babel-node server.js", - "server": "nodemon --exec babel-node server.js", + "server": "nodemon --exec babel-node server.js --require dotenv/config", "client": "cd client && npm start", "dev": "concurrently \"npm run server\" \"npm run client\"", "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client" @@ -14,8 +13,7 @@ "author": "mrdoowan", "license": "MIT", "dependencies": { - "aws-sdk": "^2.840.0", - "babel-plugin-dotenv-import": "^2.1.0", + "aws-sdk": "^2.843.0", "babel-preset-env": "^1.7.0", "bcrypt": "^5.0.0", "concurrently": "^5.3.0", diff --git a/server.js b/server.js index 24a0db8..0f61b0b 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,5 @@ // Import Routes -import dotenv from 'dotenv'; +import _ from './env'; import authV1Routes from './routes/apiV1/authRoutes.js'; import leagueV1Routes from './routes/apiV1/leagueRoutes.js'; import seasonV1Routes from './routes/apiV1/seasonRoutes.js'; @@ -10,9 +10,9 @@ import matchV1Routes from './routes/apiV1/matchRoutes.js'; import staffV1Routes from './routes/apiV1/staffRoutes.js'; import { AWS_RDS_STATUS } from './services/Constants'; import { checkRdsStatus, stopRdsInstance } from './functions/apiV1/dependencies/awsRdsHelper'; +//console.log(_.OLD_PROFILE_HID_SALT); /* Declaring npm modules */ -dotenv.config(); const express = require('express'); const app = express(); const bodyParser = require('body-parser');