1.8.3 release: fixed wrapping of require calls with conditional comments

javascript-obfuscator · Jul 28, 2020 · 4301d9b · 4301d9b
1 parent 76f6bd7
commit 4301d9b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/declarations/ESTree.d.ts b/declarations/ESTree.d.ts
@@ -0,0 +1,8 @@
+import * as ESTree from 'estree';
+
+declare module 'estree' {
+    export interface BaseNode {
+        start?: number;
+        end?: number;
+    }
+}
diff --git a/loader/index.ts b/loader/index.ts
@@ -29,10 +29,10 @@ class WebpackObfuscatorLoaderHelper {
 
         estraverse.traverse(astTree, {
             enter: (node: ESTree.Node): void => {
-                if (WebpackObfuscatorLoaderHelper.isRequire(node) && node.range) {
+                if (WebpackObfuscatorLoaderHelper.isRequire(node) && node.start && node.end) {
                     entries.push({
-                        start: node.range[0],
-                        end: node.range[1],
+                        start: node.start,
+                        end: node.end,
                     });
                 }
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "webpack-obfuscator",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "description": "javascript-obfuscator plugin for Webpack",
     "keywords": [
         "obfuscator",