diff --git a/be/.gitignore b/be/.gitignore index 653851a..2f6c1d2 100644 --- a/be/.gitignore +++ b/be/.gitignore @@ -1,2 +1,3 @@ # Keep environment variables out of version control .env +/src/logs/**/* \ No newline at end of file diff --git a/be/app.js b/be/app.js index b2edb21..43a556d 100644 --- a/be/app.js +++ b/be/app.js @@ -12,6 +12,7 @@ import cookieParser from 'cookie-parser' import { ErrorMiddleware } from './src/middlewares/error.middleware.js' import swaggerJSDoc from 'swagger-jsdoc' import swaggerUi from 'swagger-ui-express' +import url from 'url' loadEnv() @@ -26,9 +27,9 @@ export class App { this.proxied_api_url = PROXIED_API_URL || '' this.proxied_api_token = PROXIED_API_TOKEN || '' + this.initializeRoutes(routes) this.initializeFrontend() this.initializeMiddlewares() - this.initializeRoutes(routes) this.initializeSwagger() this.initializeErrorHandling() } @@ -48,14 +49,16 @@ export class App { initializeFrontend() { // Use build folder for static files - this.app.use(express.static('build')) + if (this.env === 'production') { + this.app.use(express.static('build')) + } this.app.get('/env', exposeEnvMiddleware(loadPublicEnv)) // TODO ADD ERROR HANDLING FOR UNKNOWN ROUTES - // const __dirname = url.fileURLToPath(new URL('.', import.meta.url)) - // this.app.get('*', (req, res) => - // res.sendFile(path.join(__dirname, '../', '/build/index.html')) - // ) + const __dirname = url.fileURLToPath(new URL('.', import.meta.url)) + this.app.get('*', (req, res) => + res.sendFile(path.join(__dirname, '../', '/build/index.html')) + ) } initializeProxy() { diff --git a/be/src/logs/debug/.2d4e98cb4ea87ae3de3f8dc7b4cbe62d4b581ce8-audit.json b/be/src/logs/debug/.2d4e98cb4ea87ae3de3f8dc7b4cbe62d4b581ce8-audit.json deleted file mode 100644 index 2bef4d5..0000000 --- a/be/src/logs/debug/.2d4e98cb4ea87ae3de3f8dc7b4cbe62d4b581ce8-audit.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "keep": { - "days": false, - "amount": 30 - }, - "auditLog": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/debug/.2d4e98cb4ea87ae3de3f8dc7b4cbe62d4b581ce8-audit.json", - "files": [ - { - "date": 1680283470991, - "name": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/debug/2023-03-31.log", - "hash": "47469af57a8e4db5544727a2111eb9f0929f986923a8142128e50f379d17f159" - }, - { - "date": 1680532502015, - "name": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/debug/2023-04-03.log", - "hash": "301b3224ebdea6ad86064d386b0ee1c9cce1962421235933a2dee710269ef639" - } - ], - "hashType": "sha256" -} diff --git a/be/src/logs/debug/2023-03-31.log b/be/src/logs/debug/2023-03-31.log deleted file mode 100644 index d6262c6..0000000 --- a/be/src/logs/debug/2023-03-31.log +++ /dev/null @@ -1,44 +0,0 @@ -2023-03-31 11:24:31 info: ================================= -2023-03-31 11:24:31 info: ======= ENV: development ======= -2023-03-31 11:24:31 info: 🚀 App listening on the port 8080 -2023-03-31 11:24:31 info: ================================= -2023-03-31 11:24:36 info: ================================= -2023-03-31 11:24:36 info: ======= ENV: development ======= -2023-03-31 11:24:36 info: 🚀 App listening on the port 8080 -2023-03-31 11:24:36 info: ================================= -2023-03-31 11:26:56 info: ================================= -2023-03-31 11:26:56 info: ======= ENV: development ======= -2023-03-31 11:26:56 info: 🚀 App listening on the port 8080 -2023-03-31 11:26:56 info: ================================= -2023-03-31 11:28:30 info: ================================= -2023-03-31 11:28:30 info: ======= ENV: development ======= -2023-03-31 11:28:30 info: 🚀 App listening on the port 8080 -2023-03-31 11:28:30 info: ================================= -2023-03-31 11:29:21 info: ================================= -2023-03-31 11:29:21 info: ======= ENV: development ======= -2023-03-31 11:29:21 info: 🚀 App listening on the port 8080 -2023-03-31 11:29:21 info: ================================= -2023-03-31 11:30:29 info: ================================= -2023-03-31 11:30:29 info: ======= ENV: development ======= -2023-03-31 11:30:29 info: 🚀 App listening on the port 8080 -2023-03-31 11:30:29 info: ================================= -2023-03-31 11:30:43 info: ================================= -2023-03-31 11:30:43 info: ======= ENV: development ======= -2023-03-31 11:30:43 info: 🚀 App listening on the port 8080 -2023-03-31 11:30:43 info: ================================= -2023-03-31 11:31:20 info: ================================= -2023-03-31 11:31:20 info: ======= ENV: development ======= -2023-03-31 11:31:20 info: 🚀 App listening on the port 8080 -2023-03-31 11:31:20 info: ================================= -2023-03-31 11:31:37 info: ================================= -2023-03-31 11:31:37 info: ======= ENV: development ======= -2023-03-31 11:31:37 info: 🚀 App listening on the port 8080 -2023-03-31 11:31:37 info: ================================= -2023-03-31 11:32:40 info: ================================= -2023-03-31 11:32:40 info: ======= ENV: development ======= -2023-03-31 11:32:40 info: 🚀 App listening on the port 8080 -2023-03-31 11:32:40 info: ================================= -2023-03-31 11:32:43 info: ================================= -2023-03-31 11:32:43 info: ======= ENV: development ======= -2023-03-31 11:32:43 info: 🚀 App listening on the port 8080 -2023-03-31 11:32:43 info: ================================= diff --git a/be/src/logs/error/.7e1b863f9ff7797c364507bacef15ab4047f882e-audit.json b/be/src/logs/error/.7e1b863f9ff7797c364507bacef15ab4047f882e-audit.json deleted file mode 100644 index ba83a3c..0000000 --- a/be/src/logs/error/.7e1b863f9ff7797c364507bacef15ab4047f882e-audit.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "keep": { - "days": false, - "amount": 30 - }, - "auditLog": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/error/.7e1b863f9ff7797c364507bacef15ab4047f882e-audit.json", - "files": [ - { - "date": 1680283470992, - "name": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/error/2023-03-31.log", - "hash": "63ee4835a78f367d4c0b4c9e253af82c36f4a92e8d192c92036e0a86171de51f" - }, - { - "date": 1680532502016, - "name": "/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/logs/error/2023-04-03.log", - "hash": "98bd56c300ee148e676ae5635f1aa5a59d9a036f1acbd9f168f328f855972c23" - } - ], - "hashType": "sha256" -} diff --git a/be/src/logs/error/2023-03-31.log b/be/src/logs/error/2023-03-31.log deleted file mode 100644 index adbdcb0..0000000 --- a/be/src/logs/error/2023-03-31.log +++ /dev/null @@ -1,20 +0,0 @@ -2023-03-31 11:31:49 error: uncaughtException: ErrorMiddleware is not defined -ReferenceError: ErrorMiddleware is not defined - at App.initializeErrorHandling (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:119:18) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:37:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:10:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) - at async handleMainPromise (node:internal/modules/run_main:65:12) -2023-03-31 11:31:56 error: uncaughtException: ErrorMiddleware is not defined -ReferenceError: ErrorMiddleware is not defined - at App.initializeErrorHandling (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:119:18) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:37:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:10:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) - at async handleMainPromise (node:internal/modules/run_main:65:12) diff --git a/be/src/logs/error/2023-04-03.log b/be/src/logs/error/2023-04-03.log deleted file mode 100644 index a50f72c..0000000 --- a/be/src/logs/error/2023-04-03.log +++ /dev/null @@ -1,185 +0,0 @@ -2023-04-03 08:35:02 error: uncaughtException: Cannot read properties of undefined (reading 'forEach') -TypeError: Cannot read properties of undefined (reading 'forEach') - at App.initializeRoutes (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:98:12) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:30:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:10:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) - at async handleMainPromise (node:internal/modules/run_main:65:12) -2023-04-03 08:54:40 error: [GET] /api/users >> StatusCode:: 500, Message:: this.user.findAllUser is not a function -2023-04-03 08:56:35 error: [GET] /api/users >> StatusCode:: 500, Message:: Cannot read properties of undefined (reading 'findAllUser') -2023-04-03 08:58:01 error: uncaughtException: user is not defined -ReferenceError: user is not defined - at getUsers (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/controllers/users.controller.js:9:17) - at Layer.handle [as handle_request] (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/layer.js:95:5) - at next (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/route.js:144:13) - at Route.dispatch (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/route.js:114:3) - at Layer.handle [as handle_request] (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/layer.js:95:5) - at /Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:284:15 - at Function.process_params (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:346:12) - at next (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:280:10) - at Function.handle (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:175:3) - at router (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:47:12) -2023-04-03 08:58:26 error: [GET] /api/users >> StatusCode:: 500, Message:: this.user.findAllUser is not a function -2023-04-03 08:58:49 error: uncaughtException: this.user.findAllUser is not a function -TypeError: this.user.findAllUser is not a function - at getUsers (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/src/controllers/users.controller.js:9:27) - at Layer.handle [as handle_request] (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/layer.js:95:5) - at next (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/route.js:144:13) - at Route.dispatch (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/route.js:114:3) - at Layer.handle [as handle_request] (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/layer.js:95:5) - at /Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:284:15 - at Function.process_params (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:346:12) - at next (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:280:10) - at Function.handle (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:175:3) - at router (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/express/lib/router/index.js:47:12) -2023-04-03 08:59:15 error: [GET] /api/users >> StatusCode:: 500, Message:: this.user.findAllUser is not a function -2023-04-03 08:59:41 error: [GET] /api/users >> StatusCode:: 500, Message:: this.user.findAllUser is not a function -2023-04-03 09:03:54 error: [POST] /api/users >> StatusCode:: 500, Message:: -Invalid `prisma.user.findUnique()` invocation: - -{ - where: { - email: undefined, -? id?: String - } -} - -Argument where of type UserWhereUniqueInput needs at least one argument. Available args are listed in green. - -Note: Lines with ? are optional. - -2023-04-03 09:04:45 error: [POST] /api/users >> StatusCode:: 500, Message:: -Invalid `prisma.user.findUnique()` invocation: - -{ - where: { - email: undefined, -? id?: String - } -} - -Argument where of type UserWhereUniqueInput needs at least one argument. Available args are listed in green. - -Note: Lines with ? are optional. - -2023-04-03 09:13:21 error: uncaughtException: swaggerJSDoc is not defined -ReferenceError: swaggerJSDoc is not defined - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:117:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:31:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) - at async handleMainPromise (node:internal/modules/run_main:65:12) -2023-04-03 09:31:26 error: uncaughtException: Invalid URL -TypeError [ERR_INVALID_URL]: Invalid URL - at new NodeError (node:internal/errors:393:5) - at URL.onParseError (node:internal/url:565:9) - at new URL (node:internal/url:645:5) - at new URL (node:internal/url:642:22) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:109:41) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) -2023-04-03 09:31:31 error: uncaughtException: Invalid URL -TypeError [ERR_INVALID_URL]: Invalid URL - at new NodeError (node:internal/errors:393:5) - at URL.onParseError (node:internal/url:565:9) - at new URL (node:internal/url:645:5) - at new URL (node:internal/url:642:22) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:109:41) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) -2023-04-03 09:31:40 error: uncaughtException: Invalid URL -TypeError [ERR_INVALID_URL]: Invalid URL - at new NodeError (node:internal/errors:393:5) - at URL.onParseError (node:internal/url:565:9) - at new URL (node:internal/url:645:5) - at new URL (node:internal/url:642:22) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:109:41) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) -2023-04-03 09:50:51 error: uncaughtException: EISDIR: illegal operation on a directory, read -Error: EISDIR: illegal operation on a directory, read - at Object.readSync (node:fs:748:3) - at tryReadSync (node:fs:448:20) - at Object.readFileSync (node:fs:494:19) - at extractAnnotations (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/utils.js:54:26) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:200:9) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:125:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) -2023-04-03 09:50:56 error: uncaughtException: Cannot read properties of undefined (reading 'schemas') -TypeError: Cannot read properties of undefined (reading 'schemas') - at organize (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:157:32) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:320:7) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:125:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) -2023-04-03 09:52:09 error: uncaughtException: Cannot read properties of undefined (reading 'schemas') -TypeError: Cannot read properties of undefined (reading 'schemas') - at organize (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:157:32) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:320:7) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:125:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) -2023-04-03 09:52:32 error: uncaughtException: Cannot read properties of undefined (reading 'schemas') -TypeError: Cannot read properties of undefined (reading 'schemas') - at organize (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:157:32) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:320:7) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:125:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) - at async Promise.all (index 0) - at async ESMLoader.import (node:internal/modules/esm/loader:530:24) - at async loadESM (node:internal/process/esm_loader:91:5) -2023-04-03 09:55:17 error: uncaughtException: EISDIR: illegal operation on a directory, read -Error: EISDIR: illegal operation on a directory, read - at Object.readSync (node:fs:748:3) - at tryReadSync (node:fs:448:20) - at Object.readFileSync (node:fs:494:19) - at extractAnnotations (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/utils.js:54:26) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:200:9) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:124:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) -2023-04-03 10:10:40 error: uncaughtException: EISDIR: illegal operation on a directory, read -Error: EISDIR: illegal operation on a directory, read - at Object.readSync (node:fs:748:3) - at tryReadSync (node:fs:448:20) - at Object.readFileSync (node:fs:494:19) - at extractAnnotations (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/utils.js:54:26) - at build (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/specification.js:200:9) - at module.exports (/Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/node_modules/swagger-jsdoc/src/lib.js:32:10) - at App.initializeSwagger (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:134:19) - at new App (file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/app.js:33:10) - at file:///Users/owenroth/Desktop/LPL/projects/veritext-replacement-template/be/server.js:8:13 - at ModuleJob.run (node:internal/modules/esm/module_job:193:25) diff --git a/.eslintignore b/fe/.eslintignore similarity index 100% rename from .eslintignore rename to fe/.eslintignore diff --git a/.eslintrc.js b/fe/.eslintrc.js similarity index 67% rename from .eslintrc.js rename to fe/.eslintrc.js index b88e1aa..147390f 100644 --- a/.eslintrc.js +++ b/fe/.eslintrc.js @@ -3,8 +3,8 @@ module.exports = { settings: { 'import/resolver': { webpack: { - config: __dirname + '/fe/config/webpack.config.development.js', + config: __dirname + '/config/webpack.config.development.js', }, }, }, -} +} \ No newline at end of file diff --git a/fe/config/application.template.yml b/fe/config/application.template.yml index 495d749..fbe22d9 100644 --- a/fe/config/application.template.yml +++ b/fe/config/application.template.yml @@ -1,20 +1,42 @@ -# BE -# PORT -PORT: 8080 +development: + # ENV + NODE_ENV: development -# DATABASE -# DATABASE_URL: mysql://root:password@localhost:3306/dev + # FE + API_URL: http://localhost:8080/api/v1 -# TOKEN -# SECRET_KEY: secretKey + # BE + PORT: 8080 -# LOG -LOG_FORMAT: dev -LOG_DIR: ../logs + # LOG + LOG_FORMAT: dev + LOG_DIR: ../logs -# CORS -ORIGIN: "*" -CREDENTIALS: true + # CORS + ORIGIN: "*" + CREDENTIALS: true -# DATABASE -DATABASE_URL: your-database-url \ No newline at end of file + # DATABASE + DATABASE_URL: your-local-postgres-url + +# production: +# # ENV +# ENV: production + +# # FE +# API_URL: + +# # BE +# PORT: + +# # LOG +# LOG_FORMAT: dev +# LOG_DIR: ../logs + +# # CORS +# ORIGIN: +# CREDENTIALS: true + +# # DATABASE +# DATABASE_URL: your-production-postgres-url +# SHADOW_DATABASE_URL: your-production-shadow-postgres-url \ No newline at end of file diff --git a/fe/config/webpack.config.development.js b/fe/config/webpack.config.development.js index f5c6a77..d2b2dc9 100644 --- a/fe/config/webpack.config.development.js +++ b/fe/config/webpack.config.development.js @@ -18,6 +18,7 @@ process.traceDeprecation = true module.exports = { devServer: { + port: 3000, allowedHosts: 'all', client: { logging: 'none', @@ -31,7 +32,6 @@ module.exports = { }, historyApiFallback: true, hot: true, - port: 'auto', // Create API proxy in case we need it. proxy: { '/proxy': { diff --git a/fe/package.json b/fe/package.json index 309c728..81d9852 100644 --- a/fe/package.json +++ b/fe/package.json @@ -14,10 +14,7 @@ "generate-bundle-stats": "webpack --config config/webpack.config.production.js --profile --json > .webpack-stats.json", "lint": "eslint src/ --fix --max-warnings=0", "seed:test": "echo 'No script specified, seed skipped'", - "start": "yarn && yarn build:development", - "test:unit": "jest", - "test": "yarn && node scripts/test-suite.mjs", - "server": "yarn --cwd ../be node server.js" + "start": "yarn && yarn build:development" }, "dependencies": { "@babel/core": "^7.16.0", @@ -72,13 +69,16 @@ "webpack-cli": "^5.0.1" }, "devDependencies": { + "@launchpadlab/eslint-config": "^2.7.0", "@launchpadlab/lp-subsection-generator": "^7.2.1", "chalk": "^5.2.0", "cli-prompt": "^0.6.0", "cypress": "^12.1.0", + "eslint": "^7.32.0", + "eslint-webpack-plugin": "^3.1.1", "jest": "^29.3.1", "react-dev-utils": "^12.0.1", "webpack-bundle-analyzer": "^4.5.0", "webpack-dev-server": "^4.7.4" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index b9a1c6e..7ca1670 100644 --- a/package.json +++ b/package.json @@ -9,16 +9,14 @@ "fe:test": "yarn --cwd fe test", "fe:build": "yarn --cwd fe build", "be:server": "node ./be/server.js", - "dev": "nodemon ./be/server.js", + "dev": "concurrently \"yarn fe:start\" \"yarn be:server\"", "test:integration": "cypress run", "test": "yarn && node scripts/test-suite.mjs", "prepare": "husky install" }, "devDependencies": { - "@launchpadlab/eslint-config": "^2.7.0", "@launchpadlab/prettier-config": "^1.0.0", - "eslint": "^8.37.0", - "eslint-webpack-plugin": "^4.0.0", + "concurrently": "^8.0.1", "husky": "^8.0.3", "lint-staged": "^13.2.0", "prettier": "^2.8.7" @@ -30,8 +28,7 @@ ], "fe/src/**/*.{json,scss}": "prettier --write", "be/**/*.{js,json}": [ - "prettier --write", - "eslint --fix" + "prettier --write" ] } } diff --git a/yarn.lock b/yarn.lock index cdfb7b4..4aec3e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -65,6 +65,13 @@ dependencies: "@babel/highlight" "7.0.0-beta.44" +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" @@ -355,7 +362,7 @@ esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/highlight@^7.18.6": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== @@ -1281,53 +1288,31 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@eslint-community/eslint-utils@^4.2.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.4.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724" - integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ== - -"@eslint/eslintrc@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02" - integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" - debug "^4.3.2" - espree "^9.5.1" - globals "^13.19.0" - ignore "^5.2.0" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" + js-yaml "^3.13.1" + minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@eslint/js@8.37.0": - version "8.37.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.37.0.tgz#cf1b5fa24217fe007f6487a26d765274925efa7d" - integrity sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A== - -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== dependencies: - "@humanwhocodes/object-schema" "^1.2.1" + "@humanwhocodes/object-schema" "^1.2.0" debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + minimatch "^3.0.4" -"@humanwhocodes/object-schema@^1.2.1": +"@humanwhocodes/object-schema@^1.2.0": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== @@ -1767,7 +1752,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -1958,7 +1943,7 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/eslint@^8.4.10": +"@types/eslint@^7.29.0 || ^8.4.1": version "8.37.0" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1" integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ== @@ -2365,7 +2350,7 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.2: +acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -2375,7 +2360,12 @@ acorn-walk@^8.0.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -2444,7 +2434,7 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -3466,6 +3456,21 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concurrently@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.0.1.tgz#80c0591920a9fa3e68ba0dd8aa6eac8487eb904c" + integrity sha512-Sh8bGQMEL0TAmAm2meAXMjcASHZa7V0xXQVDBLknCPa9TPtkY9yYs+0cnGGgfdkW0SV1Mlg+hVGfXcoI8d3MJA== + dependencies: + chalk "^4.1.2" + date-fns "^2.29.3" + lodash "^4.17.21" + rxjs "^7.8.0" + shell-quote "^1.8.0" + spawn-command "0.0.2-1" + supports-color "^8.1.1" + tree-kill "^1.2.2" + yargs "^17.7.1" + connect-history-api-fallback@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" @@ -3775,7 +3780,7 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-fns@^2.24.0, date-fns@^2.28.0: +date-fns@^2.24.0, date-fns@^2.28.0, date-fns@^2.29.3: version "2.29.3" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== @@ -3792,7 +3797,7 @@ debug@2.6.9, debug@^2.6.0, debug@^2.6.8: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -4125,7 +4130,7 @@ enhanced-resolve@~0.9.0: memory-fs "^0.2.0" tapable "^0.1.8" -enquirer@^2.3.6: +enquirer@^2.3.5, enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -4358,7 +4363,7 @@ eslint-scope@3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@5.1.1: +eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -4366,96 +4371,95 @@ eslint-scope@5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" + eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0: +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" - integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-webpack-plugin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-4.0.0.tgz#f77f37b2bbb8ad5c4197b5e55f5f2a49365a1a81" - integrity sha512-eM9ccGRWkU+btBSVfABRn8CjT7jZ2Q+UV/RfErMDVCFXpihEbvajNrLltZpwTAcEoXSqESGlEPIUxl7PoDlLWw== +eslint-webpack-plugin@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz#1978cdb9edc461e4b0195a20da950cf57988347c" + integrity sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w== dependencies: - "@types/eslint" "^8.4.10" - jest-worker "^29.4.1" + "@types/eslint" "^7.29.0 || ^8.4.1" + jest-worker "^28.0.2" micromatch "^4.0.5" normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.37.0: - version "8.37.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.37.0.tgz#1f660ef2ce49a0bfdec0b0d698e0b8b627287412" - integrity sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.2" - "@eslint/js" "8.37.0" - "@humanwhocodes/config-array" "^0.11.8" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" - debug "^4.3.2" + debug "^4.0.1" doctrine "^3.0.0" + enquirer "^2.3.5" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.4.0" - espree "^9.5.1" - esquery "^1.4.2" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-sdsl "^4.1.4" - js-yaml "^4.1.0" + js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.1.2" + minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" - strip-ansi "^6.0.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" strip-json-comments "^3.1.0" + table "^6.0.9" text-table "^0.2.0" + v8-compile-cache "^2.0.3" -espree@^9.5.1: - version "9.5.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4" - integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg== +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== dependencies: - acorn "^8.8.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.0" + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.4.2: +esquery@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== @@ -4995,6 +4999,11 @@ function.prototype.name@^1.1.2, function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== + functions-have-names@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" @@ -5080,7 +5089,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1, glob-parent@^6.0.2: +glob-parent@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -5155,7 +5164,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.19.0: +globals@^13.6.0, globals@^13.9.0: version "13.20.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== @@ -5215,11 +5224,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== - gzip-size@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" @@ -5524,6 +5528,11 @@ ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + ignore@^5.2.0: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" @@ -5792,7 +5801,7 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.2, is-path-inside@^3.0.3: +is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== @@ -6350,7 +6359,16 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jest-worker@^29.4.1, jest-worker@^29.5.0: +jest-worker@^28.0.2: + version "28.1.3" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" + integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest-worker@^29.5.0: version "29.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA== @@ -6375,11 +6393,6 @@ js-cookie@^2.1.4: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== -js-sdsl@^4.1.4: - version "4.4.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430" - integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg== - js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -6711,6 +6724,11 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + lodash.update@^4.3.0: version "4.10.2" resolved "https://registry.yarnpkg.com/lodash.update/-/lodash.update-4.10.2.tgz#9da9985cf06646f5226bca8e276d58bee0db8796" @@ -7690,6 +7708,11 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -8189,6 +8212,11 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" +regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + regexpu-core@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" @@ -8469,7 +8497,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.8: version "7.3.8" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== @@ -8577,7 +8605,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3: +shell-quote@^1.7.3, shell-quote@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== @@ -8705,6 +8733,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spawn-command@0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg== + spdy-transport@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" @@ -8986,6 +9019,17 @@ symbol-observable@^1.0.4: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +table@^6.0.9: + version "6.8.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" + integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + tapable@^0.1.8: version "0.1.10" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" @@ -9168,6 +9212,11 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -9404,6 +9453,11 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + v8-to-istanbul@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" @@ -9804,7 +9858,7 @@ yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.3.1: +yargs@^17.3.1, yargs@^17.7.1: version "17.7.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==