express-generator-typescript 2.1.5 → 2.1.7

package/lib/project-files/build.ts

@@ -15,8 +15,6 @@ import childProcess from 'child_process';
     // Copy front-end files
     await copy('./src/public', './dist/public');
     await copy('./src/views', './dist/views');
-    // Copy production env file
-    await copy('./src/pre-start/env/production.env', './dist/pre-start/env/production.env');
     // Copy back-end files
     await exec('tsc --build tsconfig.prod.json', './');
   } catch (err) {

package/lib/project-files/{src/pre-start/env → env}/development.env

@@ -3,7 +3,7 @@ NODE_ENV=development
 
 
 ## Server ##
-PORT=3001
+PORT=3000
 HOST=localhost
 
 

package/lib/project-files/package.json

@@ -23,7 +23,7 @@
   "_moduleAliases": {
     "@services": "dist/services",
     "@repos": "dist/repos",
-    "@entities": "dist/entities",
+    "@models": "dist/models",
     "@shared": "dist/shared",
     "@server": "dist/server",
     "@routes": "dist/routes",

package/lib/project-files/src/{pre-start/index.ts → pre-start.ts}

@@ -9,7 +9,8 @@ import dotenv from 'dotenv';
 import commandLineArgs from 'command-line-args';
 
 
-// Setup command line options
+// **** Setup command line options **** //
+
 const options = commandLineArgs([
   {
     name: 'env',
@@ -19,9 +20,11 @@ const options = commandLineArgs([
   },
 ]);
 
-// Set the env file
+
+// **** Set the env file **** //
+
 const result2 = dotenv.config({
-  path: path.join(__dirname, `env/${String(options.env)}.env`),
+  path: path.join(__dirname, `../env/${String(options.env)}.env`),
 });
 
 if (result2.error) {

package/lib/project-files/src/repos/mock-orm.ts

@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
 import jsonfile from 'jsonfile';
+
 import { IUser } from '@models/user-model';
 
 
 // **** Variables **** //
 
-const dbFilePath = 'src/repos/database.json';
+const dbFileName = 'database.json';
 
 
 // **** Types **** //
@@ -22,14 +23,14 @@ interface IDb {
  * Fetch the json from the file.
  */
 function openDb(): Promise<IDb> {
-  return jsonfile.readFile(dbFilePath);
+  return jsonfile.readFile(__dirname + '/' + dbFileName);
 }
 
 /**
  * Update the file.
  */
 function saveDb(db: IDb): Promise<void> {
-  return jsonfile.writeFile(dbFilePath, db);
+  return jsonfile.writeFile((__dirname + '/' + dbFileName), db);
 }
 
 

package/lib/project-files/src/routes/auth-routes.ts

@@ -1,7 +1,7 @@
 import StatusCodes from 'http-status-codes';
 
 import authService from '@services/auth-service';
-import envVars from 'src/shared/env-vars';
+import envVars from '@shared/env-vars';
 import { IReq, IRes } from '@shared/types';
 
 

package/lib/project-files/src/routes/middleware.ts

@@ -2,7 +2,7 @@ import StatusCodes from 'http-status-codes';
 import { Request, Response, NextFunction, RequestHandler } from 'express';
 import { JwtPayload } from 'jsonwebtoken';
 
-import envVars from 'src/shared/env-vars';
+import envVars from '@shared/env-vars';
 import jwtUtil from '@util/jwt-util';
 import { IUser, UserRoles } from '@models/user-model';
 import { ParamInvalidError, ValidatorFnError } from '@shared/errors';
@@ -35,7 +35,7 @@ export interface ISessionUser extends JwtPayload {
 // **** Functions **** //
 
 /**
- * Middleware to verify if user logged in.
+ * Middleware to verify user logged in and is an an admin.
  */
 export async function adminMw(
   req: Request,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",