🐛 Fix builded app

Author: hirsch88

package-scripts.js

@@ -11,7 +11,7 @@ module.exports = {
          * Starts the builded app from the dist directory
          */
         start: {
-            script: 'node dist/app.js',
+            script: 'cross-env NODE_ENV=production node dist/app.js',
             description: 'Starts the builded app from the dist directory'
         },
         /**

src/env.ts

@@ -2,7 +2,7 @@ import * as dotenv from 'dotenv';
 import * as path from 'path';
 
 import * as pkg from '../package.json';
-import { getOsEnv, getOsEnvArray, normalizePort, toBool, toNumber } from './lib/env';
+import { getOsEnv, getOsPath, getOsPaths, normalizePort, toBool, toNumber } from './lib/env';
 
 /**
  * Load .env file or for tests the .env.test file.
@@ -27,15 +27,16 @@ export const env = {
         port: normalizePort(process.env.PORT || getOsEnv('APP_PORT')),
         banner: toBool(getOsEnv('APP_BANNER')),
         dirs: {
-            migrations: getOsEnvArray('TYPEORM_MIGRATIONS'),
-            migrationsDir: getOsEnv('TYPEORM_MIGRATIONS_DIR'),
-            entities: getOsEnvArray('TYPEORM_ENTITIES'),
-            subscribers: getOsEnvArray('TYPEORM_SUBSCRIBERS'),
-            controllers: getOsEnvArray('CONTROLLERS'),
-            middlewares: getOsEnvArray('MIDDLEWARES'),
-            interceptors: getOsEnvArray('INTERCEPTORS'),
-            queries: getOsEnvArray('QUERIES'),
-            mutations: getOsEnvArray('MUTATIONS'),
+            migrations: getOsPaths('TYPEORM_MIGRATIONS'),
+            migrationsDir: getOsPath('TYPEORM_MIGRATIONS_DIR'),
+            entities: getOsPaths('TYPEORM_ENTITIES'),
+            entitiesDir: getOsPath('TYPEORM_ENTITIES_DIR'),
+            controllers: getOsPaths('CONTROLLERS'),
+            middlewares: getOsPaths('MIDDLEWARES'),
+            interceptors: getOsPaths('INTERCEPTORS'),
+            subscribers: getOsPaths('SUBSCRIBERS'),
+            queries: getOsPaths('QUERIES'),
+            mutations: getOsPaths('MUTATIONS'),
         },
     },
     log: {

src/lib/env/utils.ts

@@ -1,7 +1,27 @@
+import { join } from 'path';
+
 export function getOsEnv(key: string): string {
     return process.env[key] as string;
 }
 
+export function getPath(path: string): string {
+    return (process.env.NODE_ENV === 'production')
+        ? join(process.cwd(), path.replace('src/', 'dist/').slice(0, -3) + '.js')
+        : join(process.cwd(), path);
+}
+
+export function getPaths(paths: string[]): string[] {
+    return paths.map(p => getPath(p));
+}
+
+export function getOsPath(key: string): string {
+    return getPath(getOsEnv(key));
+}
+
+export function getOsPaths(key: string): string[] {
+    return getPaths(getOsEnvArray(key));
+}
+
 export function getOsEnvArray(key: string, delimiter: string = ','): string[] {
     return process.env[key] && process.env[key].split(delimiter) || [];
 }

src/lib/graphql/importClassesFromDirectories.ts

@@ -27,7 +27,7 @@ export function importClassesFromDirectories(directories: string[], formats: str
             return formats.indexOf(path.extname(file)) !== -1 && dtsExtension !== '.d.ts';
         })
         .map(file => {
-            return require(path.join(process.cwd(), file));
+            return require(file);
         });
 
     return loadFileClasses(dirs, []);

src/loaders/eventDispatchLoader.ts

@@ -1,6 +1,5 @@
 import * as glob from 'glob';
 import { MicroframeworkLoader, MicroframeworkSettings } from 'microframework-w3tec';
-import * as path from 'path';
 
 import { env } from '../env';
 
@@ -16,7 +15,7 @@ export const eventDispatchLoader: MicroframeworkLoader = (settings: Microframewo
         patterns.forEach((pattern) => {
             glob(pattern, (err: any, files: string[]) => {
                 for (const file of files) {
-                    require(path.join(process.cwd(), file));
+                    require(file);
                 }
             });
         });

src/loaders/expressLoader.ts

@@ -1,6 +1,5 @@
 import { Application } from 'express';
 import { MicroframeworkLoader, MicroframeworkSettings } from 'microframework-w3tec';
-import * as path from 'path';
 import { createExpressServer } from 'routing-controllers';
 
 import { authorizationChecker } from '../auth/authorizationChecker';
@@ -24,9 +23,9 @@ export const expressLoader: MicroframeworkLoader = (settings: MicroframeworkSett
              * We can add options about how routing-controllers should configure itself.
              * Here we specify what controllers should be registered in our express server.
              */
-            controllers: env.app.dirs.controllers.map(controller => path.join(process.cwd(), controller)),
-            middlewares: env.app.dirs.middlewares.map(middleware => path.join(process.cwd(), middleware)),
-            interceptors: env.app.dirs.interceptors.map(interceptor => path.join(process.cwd(), interceptor)),
+            controllers: env.app.dirs.controllers,
+            middlewares: env.app.dirs.middlewares,
+            interceptors: env.app.dirs.interceptors,
 
             /**
              * Authorization features