Fixed require of external user config file #2

CHANGELOG.md

@@ -2,7 +2,7 @@ Change Log
 ===
 v0.10.1
 ---
-* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/76.
+* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/76
 
 v0.10.0
 ---

src/cli/utils/CLIUtils.ts

@@ -78,11 +78,15 @@ export class CLIUtils {
      * @returns {Object}
      */
     public static getUserConfig (configPath: string): Object {
-        const nativeRequire: Function = typeof __non_webpack_require__ === 'function'
-            ? __non_webpack_require__
-            : require;
+        let config: Object;
 
-        return nativeRequire(configPath);
+        try {
+            config = require(configPath);
+        } catch (e) {
+            config = __non_webpack_require__(configPath);
+        }
+
+        return config;
     }
 
     /**

test/index.spec.ts

@@ -29,7 +29,7 @@ import './unit-tests/utils/Utils.spec';
  * Functional tests
  */
 import './functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec';
-import './functional-tests/javascript-obfuscator-cli/JavaScriptObfuscatorCLI.spec';
+import './functional-tests/cli/JavaScriptObfuscatorCLI.spec';
 import './functional-tests/javascript-obfuscator-internal/JavaScriptObfuscatorInternal.spec';
 import './functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec';
 import './functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec';