Skip to content

Commit 91b29c7

Browse files
sanex3339sanex3339
committed
Fixed require of external user config file javascript-obfuscator#2 
1 parent 15c755e commit 91b29c7

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Change Log
22
===
33
v0.10.1
44
---
5-
* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/76.
5+
* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/76
66

77
v0.10.0
88
---

‎dist/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/cli/utils/CLIUtils.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,15 @@ export class CLIUtils {
7878
* @returns {Object}
7979
*/
8080
public static getUserConfig (configPath: string): Object {
81-
const nativeRequire: Function = typeof __non_webpack_require__ === 'function'
82-
? __non_webpack_require__
83-
: require;
81+
let config: Object;
8482

85-
return nativeRequire(configPath);
83+
try {
84+
config = require(configPath);
85+
} catch (e) {
86+
config = __non_webpack_require__(configPath);
87+
}
88+
89+
return config;
8690
}
8791

8892
/**

test/functional-tests/javascript-obfuscator-cli/JavaScriptObfuscatorCLI.spec.ts renamed to test/functional-tests/cli/JavaScriptObfuscatorCLI.spec.ts

File renamed without changes.

‎test/index.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import './unit-tests/utils/Utils.spec';
2929
* Functional tests
3030
*/
3131
import './functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec';
32-
import './functional-tests/javascript-obfuscator-cli/JavaScriptObfuscatorCLI.spec';
32+
import './functional-tests/cli/JavaScriptObfuscatorCLI.spec';
3333
import './functional-tests/javascript-obfuscator-internal/JavaScriptObfuscatorInternal.spec';
3434
import './functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec';
3535
import './functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec';

0 commit comments

Comments
 (0)