express-generator-typescript 2.4.15 → 2.4.18

package/lib/express-generator-typescript.js

@@ -20,13 +20,14 @@ const PROJECT_FOLDER_PATH = './project-files';
 // Project-folder dependencies
 const DEPENDENCIES = 'express dotenv morgan cookie-parser jet-logger ' +
   'module-alias express-async-errors helmet jsonfile inserturlparams ' + 
-  'ts-command-line-args jet-paths moment',
+  'jet-paths moment',
   DEPENDENCIES_AUTH = ' bcrypt jsonwebtoken',
   DEV_DEPENDENCIES = 'ts-node typescript nodemon find jasmine supertest ' +
     '@types/node @types/express @types/jasmine @types/find @types/morgan  ' +
     '@types/cookie-parser @types/supertest fs-extra tsconfig-paths ' +
     '@types/jsonfile @typescript-eslint/eslint-plugin eslint ' +
-    '@typescript-eslint/parser @types/fs-extra eslint-plugin-node',
+    '@typescript-eslint/parser @types/fs-extra eslint-plugin-node ' + 
+    'ts-command-line-args',
   DEV_DEPENDENCIES_AUTH = ' @types/bcrypt @types/jsonwebtoken';
 
 // "ncp" options

package/lib/project-files/.eslintignore

@@ -1 +1,2 @@
 src/public/
+dotenv.config.js

package/lib/project-files/README.md

@@ -5,22 +5,18 @@ This project was created with [express-generator-typescript](https://github.com/
 
 ## Available Scripts
 
-### `npm run dev`
+### `npm run dev` or `npm run dev:hot` (hot reloading)
 
 Run the server in development mode.
 
-### `npm test`
+### `npm test` or `npm run test:hot` (hot reloading)
 
-Run all unit-tests with hot-reloading.
+Run all unit-tests.
 
 ### `npm test -- --testFile="name of test file" (i.e. --testFile=Users).`
 
 Run a single unit-test.
 
-### `npm run test:no-reloading`
-
-Run all unit-tests without hot-reloading.
-
 ### `npm run lint`
 
 Check for linting errors.
@@ -33,10 +29,6 @@ Build the project for production.
 
 Run the production build (Must be built first).
 
-### `npm start -- --env="name of env file" (default is production).`
-
-Run production build with a different env file.
-
 
 ## Additional Notes
 

package/lib/project-files/dotenv.config.js

@@ -0,0 +1,16 @@
+var dotenv = require('dotenv');
+var path = require('path');
+
+
+// Check the env
+var NODE_ENV = process.env.NODE_ENV || 'development';
+
+// Configure the file
+const result2 = dotenv.config({
+  path: path.join(__dirname, `./env/${NODE_ENV}.env`),
+});
+
+// Check for errors
+if (result2.error) {
+  throw result2.error;
+}

package/lib/project-files/nodemon.json

@@ -0,0 +1,10 @@
+{
+  "watch": [
+    "src"
+  ],
+  "ext": "ts, html",
+  "ignore": [
+    "src/public"
+  ],
+  "exec": "npm run dev"
+}

package/lib/project-files/nodemon.spec.json

@@ -0,0 +1,6 @@
+{
+  "watch": ["spec"],
+  "ext": "spec.ts",
+  "ignore": ["spec/support"],
+  "exec": "npm run test"
+}

package/lib/project-files/package.json

@@ -2,23 +2,15 @@
   "name": "express-typescript-example",
   "version": "0.0.0",
   "scripts": {
+    "_ts": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register -r ./dotenv.config.js",
     "build": "npx ts-node build.ts",
+    "dev": "npm run _ts -- ./src",
+    "dev:hot": "nodemon",
     "lint": "npx eslint --ext .ts src/",
     "lint:tests": "npx eslint --ext .ts spec/",
-    "start": "node -r module-alias/register ./dist --env=production",
-    "dev": "nodemon",
-    "test": "nodemon --config ./spec/nodemon.json",
-    "test:no-reloading": "npx ts-node --files -r tsconfig-paths/register ./spec"
-  },
-  "nodemonConfig": {
-    "watch": [
-      "src"
-    ],
-    "ext": "ts, html",
-    "ignore": [
-      "src/public"
-    ],
-    "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src"
+    "start": "NODE_ENV=production node -r module-alias/register -r ./dotenv.config.js ./dist",
+    "test": "NODE_ENV=test npm run _ts -- ./spec",
+    "test:hot": "nodemon --config ./nodemon.spec.json"
   },
   "_moduleAliases": {
     "@src": "dist"
@@ -40,8 +32,7 @@
     "jsonwebtoken": "^8.5.1",
     "module-alias": "^2.2.2",
     "moment": "^2.30.1",
-    "morgan": "^1.10.0",
-    "ts-command-line-args": "^2.4.2"
+    "morgan": "^1.10.0"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
@@ -64,6 +55,7 @@
     "jasmine": "^4.3.0",
     "nodemon": "^2.0.19",
     "supertest": "^6.3.4",
+    "ts-command-line-args": "^2.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
     "typescript": "^4.8.2"

package/lib/project-files/spec/index.ts

@@ -1,40 +1,19 @@
-import dotenv from 'dotenv';
 import find from 'find';
 import Jasmine from 'jasmine';
 import { parse } from 'ts-command-line-args';
 import logger from 'jet-logger';
 
 
-// **** Types **** //
-
-interface IArgs {
-  testFile: string;
-}
-
-
-// **** Setup **** //
-
-// ** Init ** //
-
-// NOTE: MUST BE FIRST!! Load env vars
-const result2 = dotenv.config({
-  path: './env/test.env',
-});
-if (result2.error) {
-  throw result2.error;
-}
-
 // Setup command line options. 
-const args = parse<IArgs>({
+const args = parse<{
+  testFile: string;
+}>({
   testFile: {
     type: String,
     defaultValue: '',
   },
 });
 
-
-// ** Start Jasmine ** //
-
 // Init Jasmine
 const jasmine = new Jasmine();
 jasmine.exitOnCompletion = false;

package/lib/project-files/src/index.ts

@@ -1,4 +1,3 @@
-import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
 import EnvVars from '@src/common/EnvVars';

package/lib/project-files-auth/.eslintignore

@@ -1 +1,2 @@
 src/public/
+dotenv.config.js

package/lib/project-files-auth/README.md

@@ -5,22 +5,18 @@ This project was created with [express-generator-typescript](https://github.com/
 
 ## Available Scripts
 
-### `npm run dev`
+### `npm run dev` or `npm run dev:hot` (hot reloading)
 
 Run the server in development mode.
 
-### `npm test`
+### `npm test` or `npm run test:hot` (hot reloading)
 
-Run all unit-tests with hot-reloading.
+Run all unit-tests.
 
 ### `npm test -- --testFile="name of test file" (i.e. --testFile=Users).`
 
 Run a single unit-test.
 
-### `npm run test:no-reloading`
-
-Run all unit-tests without hot-reloading.
-
 ### `npm run lint`
 
 Check for linting errors.
@@ -33,10 +29,6 @@ Build the project for production.
 
 Run the production build (Must be built first).
 
-### `npm start -- --env="name of env file" (default is production).`
-
-Run production build with a different env file.
-
 
 ## Additional Notes
 

package/lib/project-files-auth/build.ts

@@ -14,11 +14,11 @@ import childProcess from 'child_process';
   try {
     // Remove current build
     await remove('./dist/');
+    // Copy back-end files
+    await exec('tsc --build tsconfig.prod.json', './');
     // Copy front-end files
     await copy('./src/public', './dist/public');
     await copy('./src/views', './dist/views');
-    // Copy back-end files
-    await exec('tsc --build tsconfig.prod.json', './');
   } catch (err) {
     logger.err(err);
     process.exit(1);

package/lib/project-files-auth/dotenv.config.js

@@ -0,0 +1,16 @@
+var dotenv = require('dotenv');
+var path = require('path');
+
+
+// Check the env
+var NODE_ENV = process.env.NODE_ENV || 'development';
+
+// Configure the file
+const result2 = dotenv.config({
+  path: path.join(__dirname, `./env/${NODE_ENV}.env`),
+});
+
+// Check for errors
+if (result2.error) {
+  throw result2.error;
+}

package/lib/project-files-auth/nodemon.json

@@ -0,0 +1,10 @@
+{
+  "watch": [
+    "src"
+  ],
+  "ext": "ts, html",
+  "ignore": [
+    "src/public"
+  ],
+  "exec": "npm run dev"
+}

package/lib/project-files-auth/nodemon.spec.json

@@ -0,0 +1,6 @@
+{
+  "watch": ["spec"],
+  "ext": "spec.ts",
+  "ignore": ["spec/support"],
+  "exec": "npm run test"
+}

package/lib/project-files-auth/package.json

@@ -2,23 +2,15 @@
   "name": "express-typescript-example",
   "version": "0.0.0",
   "scripts": {
+    "_ts": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register -r ./dotenv.config.js",
     "build": "npx ts-node build.ts",
+    "dev": "npm run _ts -- ./src",
+    "dev:hot": "nodemon",
     "lint": "npx eslint --ext .ts src/",
     "lint:tests": "npx eslint --ext .ts spec/",
-    "start": "node -r module-alias/register ./dist --env=production",
-    "dev": "nodemon",
-    "test": "nodemon --config ./spec/nodemon.json",
-    "test:no-reloading": "npx ts-node --files -r tsconfig-paths/register ./spec"
-  },
-  "nodemonConfig": {
-    "watch": [
-      "src"
-    ],
-    "ext": "ts, html",
-    "ignore": [
-      "src/public"
-    ],
-    "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src"
+    "start": "NODE_ENV=production node -r module-alias/register -r ./dotenv.config.js ./dist",
+    "test": "NODE_ENV=test npm run _ts -- ./spec",
+    "test:hot": "nodemon --config ./nodemon.spec.json"
   },
   "_moduleAliases": {
     "@src": "dist"
@@ -40,8 +32,7 @@
     "jsonwebtoken": "^8.5.1",
     "module-alias": "^2.2.2",
     "moment": "^2.30.1",
-    "morgan": "^1.10.0",
-    "ts-command-line-args": "^2.4.2"
+    "morgan": "^1.10.0"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
@@ -64,6 +55,7 @@
     "jasmine": "^4.3.0",
     "nodemon": "^2.0.19",
     "supertest": "^6.3.4",
+    "ts-command-line-args": "^2.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.0",
     "typescript": "^4.8.2"

package/lib/project-files-auth/spec/index.ts

@@ -1,40 +1,19 @@
-import dotenv from 'dotenv';
 import find from 'find';
 import Jasmine from 'jasmine';
 import { parse } from 'ts-command-line-args';
 import logger from 'jet-logger';
 
 
-// **** Types **** //
-
-interface IArgs {
-  testFile: string;
-}
-
-
-// **** Setup **** //
-
-// ** Init ** //
-
-// NOTE: MUST BE FIRST!! Load env vars
-const result2 = dotenv.config({
-  path: './env/test.env',
-});
-if (result2.error) {
-  throw result2.error;
-}
-
 // Setup command line options. 
-const args = parse<IArgs>({
+const args = parse<{
+  testFile: string;
+}>({
   testFile: {
     type: String,
     defaultValue: '',
   },
 });
 
-
-// ** Start Jasmine ** //
-
 // Init Jasmine
 const jasmine = new Jasmine();
 jasmine.exitOnCompletion = false;

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

@@ -1,4 +1,3 @@
-import './pre-start'; // Must be the first import
 import logger from 'jet-logger';
 
 import EnvVars from '@src/common/EnvVars';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.4.15",
+  "version": "2.4.18",
   "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",

package/lib/project-files/spec/nodemon.json

@@ -1,6 +0,0 @@
-{
-  "watch": ["spec"],
-  "ext": "spec.ts",
-  "ignore": ["spec/support"],
-  "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./spec"
-}

package/lib/project-files/src/pre-start.ts

@@ -1,37 +0,0 @@
-/**
- * Pre-start is where we want to place things that must run BEFORE the express 
- * server is started. This is useful for environment variables, command-line 
- * arguments, and cron-jobs.
- */
-
-// NOTE: DO NOT IMPORT ANY SOURCE CODE HERE
-import path from 'path';
-import dotenv from 'dotenv';
-import { parse } from 'ts-command-line-args';
-
-
-// **** Types **** //
-
-interface IArgs {
-  env: string;
-}
-
-
-// **** Setup **** //
-
-// Command line arguments
-const args = parse<IArgs>({
-  env: {
-    type: String,
-    defaultValue: 'development',
-    alias: 'e',
-  },
-});
-
-// Set the env file
-const result2 = dotenv.config({
-  path: path.join(__dirname, `../env/${args.env}.env`),
-});
-if (result2.error) {
-  throw result2.error;
-}

package/lib/project-files-auth/src/pre-start.ts

@@ -1,37 +0,0 @@
-/**
- * Pre-start is where we want to place things that must run BEFORE the express 
- * server is started. This is useful for environment variables, command-line 
- * arguments, and cron-jobs.
- */
-
-// NOTE: DO NOT IMPORT ANY SOURCE CODE HERE
-import path from 'path';
-import dotenv from 'dotenv';
-import { parse } from 'ts-command-line-args';
-
-
-// **** Types **** //
-
-interface IArgs {
-  env: string;
-}
-
-
-// **** Setup **** //
-
-// Command line arguments
-const args = parse<IArgs>({
-  env: {
-    type: String,
-    defaultValue: 'development',
-    alias: 'e',
-  },
-});
-
-// Set the env file
-const result2 = dotenv.config({
-  path: path.join(__dirname, `../env/${args.env}.env`),
-});
-if (result2.error) {
-  throw result2.error;
-}