0.28.2 release

Author: sanex3339

dist/index.js

@@ -21,24 +21,32 @@ class WebpackObfuscator {
         const pluginName = this.constructor.name;
         compiler.hooks.emit.tap(pluginName, (compilation) => {
             let identifiersPrefixCounter = 0;
+            const sourcemapOutput = {};
             compilation.chunks.forEach(chunk => {
                 chunk.files.forEach((fileName) => {
+                    if (this.options.sourceMap && fileName.toLowerCase().endsWith('.map')) {
+                        let srcName = fileName.toLowerCase().substr(0, fileName.length - 4);
+                        if (!this.shouldExclude(srcName)) {
+                            const transferredSourceMap = transferSourceMap({
+                                fromSourceMap: sourcemapOutput[srcName],
+                                toSourceMap: compilation.assets[fileName].source()
+                            });
+                            const finalSourcemap = JSON.parse(transferredSourceMap);
+                            finalSourcemap['sourcesContent'] = JSON.parse(compilation.assets[fileName].source())['sourcesContent'];
+                            compilation.assets[fileName] = new webpack_sources_1.RawSource(JSON.stringify(finalSourcemap));
+                        }
+                        return;
+                    }
                     if (!fileName.toLowerCase().endsWith('.js') || this.shouldExclude(fileName)) {
                         return;
                     }
                     const asset = compilation.assets[fileName];
                     const { inputSource, inputSourceMap } = this.extractSourceAndSourceMap(asset);
-                    const { obfuscatedSource, obfuscationSourceMap } = this.obfuscate(inputSource, identifiersPrefixCounter);
+                    const { obfuscatedSource, obfuscationSourceMap } = this.obfuscate(inputSource, fileName, identifiersPrefixCounter);
                     if (this.options.sourceMap && inputSourceMap) {
-                        const transferredSourceMap = transferSourceMap({
-                            fromSourceMap: obfuscationSourceMap,
-                            toSourceMap: inputSourceMap
-                        });
-                        compilation.assets[fileName] = new webpack_sources_1.SourceMapSource(obfuscatedSource, fileName, transferredSourceMap, inputSource, inputSourceMap);
-                    }
-                    else {
-                        compilation.assets[fileName] = new webpack_sources_1.RawSource(obfuscatedSource);
+                        sourcemapOutput[fileName] = obfuscationSourceMap;
                     }
+                    compilation.assets[fileName] = new webpack_sources_1.RawSource(obfuscatedSource);
                     identifiersPrefixCounter++;
                 });
             });
@@ -59,8 +67,8 @@ class WebpackObfuscator {
             };
         }
     }
-    obfuscate(javascript, identifiersPrefixCounter) {
-        const obfuscationResult = javascript_obfuscator_1.default.obfuscate(javascript, Object.assign({ identifiersPrefix: `${WebpackObfuscator.baseIdentifiersPrefix}${identifiersPrefixCounter}` }, this.options));
+    obfuscate(javascript, fileName, identifiersPrefixCounter) {
+        const obfuscationResult = javascript_obfuscator_1.default.obfuscate(javascript, Object.assign({ identifiersPrefix: `${WebpackObfuscator.baseIdentifiersPrefix}${identifiersPrefixCounter}`, sourceMapFileName: fileName + '.map' }, this.options));
         return {
             obfuscatedSource: obfuscationResult.getObfuscatedCode(),
             obfuscationSourceMap: obfuscationResult.getSourceMap()

index.ts

@@ -2,7 +2,7 @@
 
 import { Compiler, compilation } from 'webpack';
 import JavaScriptObfuscator, { ObfuscatorOptions } from 'javascript-obfuscator';
-import { RawSource, SourceMapSource } from 'webpack-sources';
+import { RawSource } from 'webpack-sources';
 import multimatch from 'multimatch';
 import { RawSourceMap } from 'source-map';
 const transferSourceMap = require("multi-stage-sourcemap").transfer;
@@ -24,6 +24,7 @@ class WebpackObfuscator {
 
     public apply(compiler: Compiler): void {
         const isDevServer = process.argv.find(v => v.includes('webpack-dev-server'));
+
         if (isDevServer) {
             console.info(
                 'JavascriptObfuscator is disabled on webpack-dev-server as the reloading scripts ',
@@ -35,35 +36,40 @@ class WebpackObfuscator {
 
         compiler.hooks.emit.tap(pluginName, (compilation: compilation.Compilation) => {
             let identifiersPrefixCounter: number = 0;
-            let sourcemap_output: {[index:string]: string} = {};
+            const sourcemapOutput: {[index:string]: string} = {};
+
             compilation.chunks.forEach(chunk => {
                 chunk.files.forEach((fileName: string) => {
                     if (this.options.sourceMap && fileName.toLowerCase().endsWith('.map')) {
-                        let src_name = fileName.toLowerCase().substr(0, fileName.length-4);
-                        if (!this.shouldExclude(src_name)) {
+                        let srcName = fileName.toLowerCase().substr(0, fileName.length - 4);
+
+                        if (!this.shouldExclude(srcName)) {
                             const transferredSourceMap = transferSourceMap({
-                                fromSourceMap: sourcemap_output[src_name],
+                                fromSourceMap: sourcemapOutput[srcName],
                                 toSourceMap: compilation.assets[fileName].source()
                             });
-                            let final_sourcemap = JSON.parse(transferredSourceMap);
-                            final_sourcemap['sourcesContent'] = JSON.parse(compilation.assets[fileName].source())['sourcesContent'];
-                            compilation.assets[fileName] = new RawSource(JSON.stringify(final_sourcemap));
+                            const finalSourcemap = JSON.parse(transferredSourceMap);
+
+                            finalSourcemap['sourcesContent'] = JSON.parse(compilation.assets[fileName].source())['sourcesContent'];
+                            compilation.assets[fileName] = new RawSource(JSON.stringify(finalSourcemap));
                         }
+
                         return;
                     }
+
                     if (!fileName.toLowerCase().endsWith('.js') || this.shouldExclude(fileName)) {
                         return;
                     }
+
                     const asset = compilation.assets[fileName]
                     const { inputSource, inputSourceMap } = this.extractSourceAndSourceMap(asset);
                     const { obfuscatedSource, obfuscationSourceMap } = this.obfuscate(inputSource, fileName, identifiersPrefixCounter);
 
                     if (this.options.sourceMap && inputSourceMap) {
-                        sourcemap_output[fileName] = obfuscationSourceMap;
+                        sourcemapOutput[fileName] = obfuscationSourceMap;
                     }
-                    compilation.assets[fileName] = new RawSource(obfuscatedSource);
-                    
 
+                    compilation.assets[fileName] = new RawSource(obfuscatedSource);
                     identifiersPrefixCounter++;
                 });
             });

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "webpack-obfuscator",
-    "version": "0.28.1",
+    "version": "0.28.2",
     "description": "javascript-obfuscator plugin for Webpack",
     "keywords": [
         "obfuscator",
@@ -15,7 +15,7 @@
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "dependencies": {
-        "javascript-obfuscator": "^0.28.1",
+        "javascript-obfuscator": "^0.28.2",
         "multi-stage-sourcemap": "^0.2.1",
         "multimatch": "^2.1.0",
         "webpack-sources": "^1.3.0"
@@ -46,5 +46,9 @@
     "author": {
         "name": "Timofey Kachalov"
     },
-    "license": "BSD-2-Clause"
+    "license": "BSD-2-Clause",
+    "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/javascript-obfuscator"
+    }
 }

package.json

@@ -18,9 +18,9 @@ var JavaScriptObfuscator = require('webpack-obfuscator');
 // webpack plugins array
 plugins: [
 	new JavaScriptObfuscator ({
-      rotateUnicodeArray: true
+      rotateStringArray: true
   }, ['excluded_bundle_name.js'])
-],
+]
 ```
 
 ### obfuscatorOptions
@@ -58,7 +58,7 @@ module.exports = {
     },
     plugins: [
         new JavaScriptObfuscator({
-            rotateUnicodeArray: true
+            rotateStringArray: true
         }, ['abc.js'])
     ]
 };
@@ -67,7 +67,7 @@ module.exports = {
 Can be used to bypass obfuscation of some files.
 
 ### License
-Copyright (C) 2017 [Timofey Kachalov](http://github.com/sanex3339).
+Copyright (C) 2020 [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:

readme.md

@@ -14,7 +14,9 @@ module.exports = {
     },
     plugins: [
         new JavaScriptObfuscator({
-            disableConsoleOutput: false
+            disableConsoleOutput: false,
+            sourceMap: true,
+            sourceMapMode: 'separate'
         }, ['index-excluded*'])
     ],
     output: {