fix(core): make app.js optional as initially intended (#3510)

ArkEcosystem · Feb 19, 2020 · 9f5785e · 9f5785e
1 parent bf16abd
commit 9f5785e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/packages/core/bin/config/testnet/app.js b/packages/core/bin/config/testnet/app.js
@@ -36,4 +36,4 @@ module.exports = {
             },
         },
     },
-}
+};
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -33,16 +33,26 @@ export const updateEnvironmentVariables = (envFile: string, variables: Environme
 };
 
 export const getCliConfig = (
-    options: Record<string, any>,
+    flags: Record<string, any>,
     paths: envPaths.Paths,
     defaultValue = {},
 ): Record<string, any> => {
-    const configPath: string = `${paths.config}/app.js`;
-    if (!existsSync(configPath)) {
+    const configPaths: string[] = [`${paths.config}/app.js`, resolve(__dirname, `../bin/config/${flags.network}/app.js`)];
+
+    let configPath: string;
+    for (const path of configPaths) {
+        if (existsSync(path)) {
+            configPath = path;
+
+            break;
+        }
+    }
+
+    if (!configPath) {
         return defaultValue;
     }
 
-    const key: string = `cli.${options.suffix}.run.plugins`;
+    const key: string = `cli.${flags.suffix}.run.plugins`;
     const configuration = require(resolve(configPath));
     if (!dottie.exists(configuration, key)) {
         return defaultValue;
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,4 @@ module.exports = { @@
                 },
             },
         },
-    }
+    };