Skip to content

Commit 80cffaf

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: index.ts
2 parents 5de6c9a + bdcfc56 commit 80cffaf

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
2-
const JavaScriptObfuscator = require('javascript-obfuscator');
3-
let multimatch = require('multimatch'), RawSource = require('webpack-core/lib/RawSource');
2+
let JavaScriptObfuscator = require('javascript-obfuscator'), multimatch = require('multimatch'), RawSource = require('webpack-core/lib/RawSource');
43
class WebpackObfuscator {
54
constructor(options, excludes) {
65
this.options = {};

index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
"use strict";
22

3-
import { JavaScriptObfuscator } from 'javascript-obfuscator';
4-
5-
let multimatch: any = require('multimatch'),
3+
let JavaScriptObfuscator = require('javascript-obfuscator'),
4+
multimatch: any = require('multimatch'),
65
RawSource: any = require('webpack-core/lib/RawSource');
76

87
class WebpackObfuscator {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "webpack-obfuscator",
3-
"version": "0.5.1",
3+
"version": "0.5.4",
44
"description": "javascript-obfuscator plugin for Webpack",
55
"main": "index.js",
66
"dependencies": {
77
"gulp-util": "^3.0.5",
8-
"javascript-obfuscator": "^0.5.1",
8+
"javascript-obfuscator": "^0.5.3",
99
"multimatch": "^2.0.0",
1010
"through2": "^2.0.0",
1111
"webpack-core": "^0.6.8",

0 commit comments

Comments
 (0)