sanex3339 7 лет назад
Родитель
Сommit
f6edb4c9df

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/index.js


+ 2 - 2
package.json

@@ -54,7 +54,7 @@
     "@types/sinon": "4.1.3",
     "@types/string-template": "1.0.2",
     "@types/webpack-env": "1.13.5",
-    "awesome-typescript-loader": "3.4.1",
+    "awesome-typescript-loader": "4.0.0-0",
     "babel-cli": "6.26.0",
     "babel-loader": "7.1.2",
     "babel-plugin-array-includes": "2.0.3",
@@ -69,7 +69,7 @@
     "threads": "0.10.1",
     "ts-node": "5.0.0",
     "tslint": "5.9.1",
-    "tslint-eslint-rules": "5.0.0",
+    "tslint-eslint-rules": "5.1.0",
     "tslint-language-service": "0.9.8",
     "tslint-webpack-plugin": "1.1.1",
     "typescript": "2.7.2",

+ 1 - 1
src/cli/JavaScriptObfuscatorCLI.ts

@@ -157,7 +157,7 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
         }
 
         const sourceCodeData: TSourceCodeData = new SourceCodeReader(this.inputCLIOptions)
-            .readSourceCode(this.inputPath, this.inputCLIOptions.exclude);
+            .readSourceCode(this.inputPath);
 
         this.processSourceCodeData(sourceCodeData);
     }

+ 1 - 2
src/cli/utils/SourceCodeReader.ts

@@ -90,10 +90,9 @@ export class SourceCodeReader {
 
     /**
      * @param {string} inputPath
-     * @param {string[]} excludePatterns
      * @returns {TSourceCodeData}
      */
-    public readSourceCode (inputPath: string, excludePatterns: string[] = []): TSourceCodeData {
+    public readSourceCode (inputPath: string): TSourceCodeData {
         if (SourceCodeReader.isFilePath(inputPath) && this.isValidFile(inputPath)) {
             return this.readFile(inputPath);
         }

+ 1 - 1
test/unit-tests/cli/utils/SourceCodeReader.spec.ts

@@ -18,7 +18,7 @@ describe('SourceCodeReader', () => {
         mkdirp.sync(tmpDirectoryPath);
     });
 
-    describe('readSourceCode (inputPath: string): void', () => {
+    describe('readSourceCode (inputPath: string): TSourceCodeData', () => {
         describe('Variant #1: input path is a file path', () => {
             describe('Variant #1: `inputPath` is a valid path', () => {
                 const tmpFileName: string = 'test.js';

+ 10 - 15
yarn.lock

@@ -296,18 +296,17 @@ atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-awesome-typescript-loader@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.4.1.tgz#22fa49800f0619ec18ab15383aef93b95378dea9"
+awesome-typescript-loader@4.0.0-0:
+  version "4.0.0-0"
+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-4.0.0-0.tgz#fde4fa9490ccd15a503dc0934292188c5b9d09d7"
   dependencies:
-    colors "^1.1.2"
+    chalk "^2.3.1"
     enhanced-resolve "3.3.0"
     loader-utils "^1.1.0"
     lodash "^4.17.4"
     micromatch "^3.0.3"
     mkdirp "^0.5.1"
-    object-assign "^4.1.1"
-    source-map-support "^0.4.15"
+    source-map-support "^0.5.3"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
@@ -1050,7 +1049,7 @@ [email protected], chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
[email protected]:
[email protected], chalk@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
@@ -1167,10 +1166,6 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -2834,7 +2829,7 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -3811,9 +3806,9 @@ tslib@^1.7.1, tslib@^1.8.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
 
-tslint-eslint-rules@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.0.0.tgz#ba46e32168137b7b6f73c2121a29d57abea032a6"
+tslint-eslint-rules@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.1.0.tgz#3232b318da55dbb5a83e3f5d657c1ddbb27b9ff2"
   dependencies:
     doctrine "0.7.2"
     tslib "1.9.0"

Некоторые файлы не были показаны из-за большого количества измененных файлов