Use of eventemitter3 instead of events module. Fixed javascript-o…

…bfuscator#452
dgilling · Dec 20, 2019 · c00fd38 · c00fd38
1 parent dfbb41b
commit c00fd38
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,13 @@
 Change Log
 
-===
+v0.18.8
+---
+* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/452
+
 v0.18.7
 ---
 * Fixed https://github.com/javascript-obfuscator/gulp-javascript-obfuscator/issues/22 
 
-===
 v0.18.6
 ---
 * Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/355 

diff --git a/dist/index.browser.js b/dist/index.browser.js
diff --git a/dist/index.cli.js b/dist/index.cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "0.18.7",
+  "version": "0.18.8",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",
@@ -29,6 +29,7 @@
     "escodegen-wallaby": "1.6.27",
     "espree": "^6.1.2",
     "estraverse": "4.3.0",
+    "eventemitter3": "4.0.0",
     "inversify": "5.0.1",
     "js-string-escape": "1.0.1",
     "md5": "2.2.1",

diff --git a/src/event-emitters/ObfuscationEventEmitter.ts b/src/event-emitters/ObfuscationEventEmitter.ts
@@ -1,9 +1,8 @@
 import { decorate, injectable } from 'inversify';
+import EventEmitter from 'eventemitter3';
 
 import { IObfuscationEventEmitter } from '../interfaces/event-emitters/IObfuscationEventEmitter';
 
-import { EventEmitter } from 'events';
-
 decorate(injectable(), EventEmitter);
 
 @injectable()

diff --git a/src/interfaces/event-emitters/IObfuscationEventEmitter.d.ts b/src/interfaces/event-emitters/IObfuscationEventEmitter.d.ts
@@ -1,8 +1,13 @@
-import EventEmitter = NodeJS.EventEmitter;
-
 import { ObfuscationEvent } from '../../enums/event-emitters/ObfuscationEvent';
 
-export interface IObfuscationEventEmitter extends EventEmitter {
+export interface IObfuscationEventEmitter {
+    /**
+     * @param {ObfuscationEvent} event
+     * @param args
+     * @returns {boolean}
+     */
+    emit (event: ObfuscationEvent, ...args: any[]): boolean;
+
     /**
      * @param event
      * @param listener

diff --git a/yarn.lock b/yarn.lock
@@ -2268,6 +2268,11 @@ eventemitter3@^2.0.2:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
   integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
 
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"