Merge pull request #6 from Shift3/configEnv

Create a generic env config method

Author: FlavioShift3

.eslintrc

@@ -9,26 +9,28 @@
     ],
     "rules": {
         // 0 = off, 1 = warn, 2 = error
-        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/no-namespace": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-empty-function": "off",
         "accessor-pairs": "error",
         "array-bracket-newline": "off",
         "array-bracket-spacing": "error",
         "array-callback-return": "error",
-        "array-element-newline": "error",
+        "array-element-newline": "off",
         "arrow-body-style": "error",
         "arrow-parens": "error",
         "arrow-spacing": "error",
         "block-scoped-var": "off",
         "block-spacing": "error",
-        "brace-style": "error",
+        "brace-style": "off",
         "callback-return": "error",
         "camelcase": "error",
-        "capitalized-comments": "error",
-        "class-methods-use-this": "error",
+        "capitalized-comments": "off",
+        "class-methods-use-this": "off",
         "comma-dangle": "off",
         "comma-spacing": "error",
         "comma-style": "error",
-        "complexity": "off",
+        "complexity": "error",
         "computed-property-spacing": "error",
         "consistent-return": "error",
         "consistent-this": "error",
@@ -50,7 +52,7 @@
         "function-paren-newline": "off",
         "generator-star-spacing": "error",
         "getter-return": "error",
-        "global-require": "error",
+        "global-require": "off",
         "grouped-accessor-pairs": "error",
         "guard-for-in": "error",
         "handle-callback-err": "error",
@@ -123,7 +125,7 @@
         "no-else-return": "error",
         "no-empty": "error",
         "no-empty-character-class": "error",
-        "no-empty-function": "error",
+        "no-empty-function": "off",
         "no-empty-pattern": "error",
         "no-eq-null": "error",
         "no-eval": "error",
@@ -176,10 +178,10 @@
         "no-obj-calls": "error",
         "no-octal": "error",
         "no-octal-escape": "error",
-        "no-param-reassign": "error",
+        "no-param-reassign": "off",
         "no-path-concat": "error",
         "no-plusplus": "error",
-        "no-process-env": "error",
+        "no-process-env": "off",
         "no-process-exit": "error",
         "no-promise-executor-return": "error",
         "no-proto": "error",
@@ -209,7 +211,7 @@
         "no-ternary": "off",
         "no-this-before-super": "error",
         "no-throw-literal": "error",
-        "no-trailing-spaces": "error",
+        "no-trailing-spaces": "off",
         "no-undef": "off",
         "no-undef-init": "error",
         "no-undefined": "off",
@@ -230,8 +232,8 @@
         "no-useless-catch": "error",
         "no-useless-computed-key": "error",
         "no-useless-concat": "error",
-        "no-useless-constructor": "error",
-        "no-useless-escape": "off",
+        "no-useless-constructor": "off",
+        "no-useless-escape": "error",
         "no-useless-rename": "error",
         "no-useless-return": "error",
         "no-var": "error",
@@ -242,7 +244,7 @@
         "nonblock-statement-body-position": "error",
         "object-curly-newline": "error",
         "object-curly-spacing": "off",
-        "object-property-newline": "error",
+        "object-property-newline": "off",
         "object-shorthand": "error",
         "one-var": "off",
         "one-var-declaration-per-line": "error",
@@ -252,7 +254,7 @@
         "padding-line-between-statements": "error",
         "prefer-arrow-callback": "error",
         "prefer-const": "error",
-        "prefer-destructuring": "error",
+        "prefer-destructuring": "off",
         "prefer-exponentiation-operator": "error",
         "prefer-named-capture-group": "error",
         "prefer-numeric-literals": "error",
@@ -275,14 +277,14 @@
         "require-atomic-updates": "error",
         "require-await": "error",
         "require-jsdoc": "error",
-        "require-unicode-regexp": "off",
+        "require-unicode-regexp": "error",
         "require-yield": "error",
         "rest-spread-spacing": "error",
         "semi": "error",
         "semi-spacing": "error",
         "semi-style": "error",
         "sort-imports": "off",
-        "sort-keys": "error",
+        "sort-keys": "off",
         "sort-vars": "error",
         "space-before-blocks": "error",
         "space-before-function-paren": "off",
@@ -303,6 +305,6 @@
         "wrap-iife": "error",
         "wrap-regex": "error",
         "yield-star-spacing": "error",
-        "yoda": 2
+        "yoda": "error"
     }
 }

package.json

@@ -2,16 +2,16 @@
     "nativescript": {
         "id": "org.nativescript.spnativescript",
         "tns-android": {
-            "version": "6.5.0"
+            "version": "6.5.3"
         },
         "tns-ios": {
-            "version": "6.5.0"
+            "version": "6.5.2"
         }
     },
     "scripts": {
         "lint": "eslint . --ext .ts",
-        "android-prod":"tns build android --env.environment='prod'",
-        "ios-prod":"tns build ios --env.environment='prod'"
+        "android-prod": "tns build android --env.environment='prod'",
+        "ios-prod": "tns build ios --env.environment='prod'"
     },
     "description": "NativeScript Application",
     "license": "SEE LICENSE IN <your-license-filename>",
@@ -25,6 +25,7 @@
         "@angular/platform-browser": "8.0.0",
         "@angular/platform-browser-dynamic": "8.0.0",
         "@angular/router": "8.0.0",
+        "@types/node": "^14.0.27",
         "growl": "^1.10.5",
         "module-alias": "^2.2.2",
         "nativescript": "^6.5.0",

src/app/infrastructure/shared/config/app.config.ts

@@ -0,0 +1,19 @@
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const getConfig = (dev: any, prod: any, stage: any) => {
+
+    if (Object.prototype.hasOwnProperty.call(process.env, 'environment') &&
+        process.env.environment
+    ) {
+        switch (process.env.environment) {
+            case 'prod':
+                return prod;
+            case 'stage':
+                return stage;
+            default:
+                return dev;
+        }
+    }
+  
+    return dev;
+};
+

src/app/infrastructure/shared/config/index.ts

@@ -0,0 +1 @@
+export * from './app.config';

src/environments/environment.tns.ts

@@ -1,27 +1,6 @@
 import { environment as devEnvironment } from './environment.dev';
 import { environment as prodEnvironment } from './environment.prod';
 import { environment as stageEnvironment } from './environment.stage';
+import { getConfig } from '@infrastructure/shared/config';
 
-export const environment = (() => {
-    let envVars;
-
-    if (Object.prototype.hasOwnProperty.call(process.env, 'environment') &&
-        process.env.environment
-    ) {
-        switch (process.env.environment) {
-            case 'prod':
-                envVars = prodEnvironment;
-                break;
-            case 'stage':
-                envVars = stageEnvironment;
-                break;
-            default:
-                envVars = devEnvironment;
-        }
-    }
-    else {
-        envVars = devEnvironment;
-    }
-
-    return envVars;
-})();
+export const environment = getConfig(devEnvironment, prodEnvironment, stageEnvironment);

src/environments/environment.ts

@@ -4,5 +4,5 @@ const sentryDSN = 'https://xxxx@sentry.io/9999999';
 
 export const environment = {
     sentryDSN,
-    ...env
+    ...env.environment
 };

tsconfig.json

@@ -30,7 +30,7 @@
             "@features/*": [
                 "./app/features/*"
             ],
-            "@infrastructure*": [
+            "@infrastructure/*": [
                 "./app/infrastructure/*"
             ]
         }