.travis.yml

@@ -1,13 +1,16 @@
 language: node_js
 node_js:
-  - "8"
+  - "10"
+  - "12"
+  - "stable"
 
 before_script:
   - npm run setup
   - npm run build
 
 script:
-  - npm run test
+  - npm run test:plugin
+  - npm run test:loader
 
 after_success:
   - git config --global user.email "travis@travis-ci.org"

README.md

@@ -1,12 +1,14 @@
-# javascript-obfuscator plugin and loader for Webpack
+# javascript-obfuscator plugin and loader for Webpack@5
 
 [![npm version](https://badge.fury.io/js/webpack-obfuscator.svg)](https://badge.fury.io/js/webpack-obfuscator)
 
 ### Installation
 
-Install the package with NPM and add it to your devDependencies:
+This plugin requires Webpack@5. If you depend on Webpack@4, please use [version 2](https://github.com/javascript-obfuscator/webpack-obfuscator/tree/2.6.0) of the plugin.
 
-`npm install --save-dev webpack-obfuscator`
+Install the plugin with NPM and add it to your devDependencies:
+
+`npm install --save-dev javascript-obfuscator webpack-obfuscator`
 
 ### Plugin usage:
 
@@ -53,8 +55,6 @@ Type: `Object` Default: `null`
 
 Options for [javascript-obfuscator](https://github.com/javascript-obfuscator/javascript-obfuscator). Should be passed exactly like described on their page.
 
-**Warning:** right now plugin does not support `sourceMap` and `sourceMapMode` options!
-
 ### excludes (plugin only)
 Type: `Array` or `String` Default: `[]`
 
@@ -92,7 +92,7 @@ module.exports = {
 Can be used to bypass obfuscation of some files.
 
 ### License
-Copyright (C) 2020 [Timofey Kachalov](http://github.com/sanex3339).
+Copyright (C) 2022 [Timofey Kachalov](http://github.com/sanex3339).
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

declarations/loaderUtils.d.ts

@@ -0,0 +1,3 @@
+declare module 'loader-utils' {
+    export function getOptions<T>(loaderContext: { query: string }): T;
+}

loader/index.ts

@@ -1,118 +1,38 @@
 "use strict";
 
-import JavaScriptObfuscator  from 'javascript-obfuscator';
-import estraverse from 'estraverse';
-import * as ESTree from 'estree';
+import JavaScriptObfuscator, {ObfuscatorOptions} from 'javascript-obfuscator';
 import loaderUtils from 'loader-utils';
-import * as acorn from 'acorn';
+import * as path from 'path';
 
-class WebpackObfuscatorLoaderHelper {
-    /**
-     * @type {acorn.Options['sourceType'][]}
-     */
-    private static readonly sourceTypes: acorn.Options['sourceType'][] = [
-        'script',
-        'module'
-    ];
-
-    /**
-     * @param {string} sourceCode
-     * @returns {string}
-     */
-    public static getCommentedSource (sourceCode: string): string {
-        // Parses source code and collects require expression nodes
-        const entries: {
-            start: number;
-            end: number;
-        }[] = [];
-        const astTree: ESTree.Program = WebpackObfuscatorLoaderHelper.parseCode(sourceCode);
-
-        estraverse.traverse(astTree, {
-            enter: (node: ESTree.Node): void => {
-                if (WebpackObfuscatorLoaderHelper.isRequire(node) && node.start && node.end) {
-                    entries.push({
-                        start: node.start,
-                        end: node.end,
-                    });
-                }
-            }
-        });
-
-        // Wraps requires in conditional comments
-        let commentedSource: string = sourceCode.slice();
-
-        entries
-            .sort((a, b) => b.end - a.end)
-            .forEach((n) => {
-                const before = commentedSource.slice(0, n.start);
-                const mid = commentedSource.slice(n.start, n.end);
-                const after = commentedSource.slice(n.end);
-
-                commentedSource = `${before}/* javascript-obfuscator:disable */${mid}/* javascript-obfuscator:enable */${after}`;
-            });
-
-        return commentedSource;
-    }
-
-    /**
-     * @param {string} sourceCode
-     * @returns {ESTree.Program}
-     */
-    private static parseCode (sourceCode: string): ESTree.Program {
-        const sourceTypeLength: number = WebpackObfuscatorLoaderHelper.sourceTypes.length;
-
-        for (let i: number = 0; i < sourceTypeLength; i++) {
-            try {
-                return WebpackObfuscatorLoaderHelper.parseType(sourceCode, WebpackObfuscatorLoaderHelper.sourceTypes[i]);
-            } catch (error) {
-                if (i < sourceTypeLength - 1) {
-                    continue;
-                }
-
-                throw new Error(error);
-            }
-        }
-
-        throw new Error('Acorn parsing error');
-    }
-
-    /**
-     * @param {string} sourceCode
-     * @param {acorn.Options["sourceType"]} sourceType
-     * @returns {Program}
-     */
-    private static parseType (
-        sourceCode: string,
-        sourceType: acorn.Options['sourceType']
-    ): ESTree.Program {
-        const config: acorn.Options = {
-            sourceType,
-            ecmaVersion: 11
-        };
-
-        return <any>acorn.parse(sourceCode, config);
-    }
-
-    /**
-     * @param {ESTree.Node} node
-     * @returns {boolean}
-     */
-    private static isRequire (node: ESTree.Node) {
-        return node.type === 'CallExpression'
-            && node.callee.type === 'Identifier'
-            && node.callee.name === 'require';
-    }
-}
+type WebpackObfuscatorOptions = Omit<
+    ObfuscatorOptions,
+    | 'inputFileName'
+    | 'sourceMapBaseUrl'
+    | 'sourceMapFileName'
+    | 'sourceMapMode'
+    | 'sourceMapSourcesMode'
+    >;
 
 /**
  * JavaScript Obfuscator loader based on `obfuscator-loader` package
  */
 function Loader (sourceCode: string) {
-    // Obfuscates commented source code
     // @ts-ignore
-    const options = loaderUtils.getOptions(this) || {};
-    const commentedSourceCode: string = WebpackObfuscatorLoaderHelper.getCommentedSource(sourceCode);
-    const obfuscationResult = JavaScriptObfuscator.obfuscate(commentedSourceCode, options);
+    const context = this;
+
+    const relativePathOfModule = path.relative(context.rootContext, context.resourcePath);
+
+    // Obfuscates commented source code
+    const options  = loaderUtils.getOptions<WebpackObfuscatorOptions>(context) || {};
+    const obfuscationResult = JavaScriptObfuscator.obfuscate(
+        sourceCode,
+        {
+            ...options,
+            ignoreRequireImports: true,
+            inputFileName: relativePathOfModule,
+            sourceMapMode: 'separate'
+        }
+    );
 
     return obfuscationResult.getObfuscatedCode();
 }