Merge pull request #594 from javascript-obfuscator/issue-593

Fixed wrong external options merge
2026-08-09 12:42:29 +00:00 · 2020-04-10 20:44:26 +03:00
parent 173b2b83b8 e2d97841c4
commit 8ab502e560
10 changed files with 200 additions and 144 deletions
@@ -1,5 +1,9 @@
 Change Log

+v0.27.3
+---
+* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/593
+
 v0.27.2
 ---
 * Fixed identifiers prefix generation for `obfuscateMultiple` method
@@ -1,6 +1,6 @@
 {
  "name": "javascript-obfuscator",
-  "version": "0.27.2",
+  "version": "0.27.3",
  "description": "JavaScript obfuscator",
  "keywords": [
    "obfuscator",
@@ -25,7 +25,7 @@
    "@nuxtjs/opencollective": "0.2.2",
    "acorn": "7.1.1",
    "acorn-import-meta": "1.0.0",
-    "chalk": "3.0.0",
+    "chalk": "4.0.0",
    "chance": "1.1.4",
    "class-validator": "0.11.1",
    "commander": "5.0.0",
@@ -37,7 +37,7 @@
    "inversify": "5.0.1",
    "js-string-escape": "1.0.1",
    "md5": "2.2.1",
-    "mkdirp": "1.0.3",
+    "mkdirp": "1.0.4",
    "multimatch": "4.0.0",
    "reflect-metadata": "0.1.13",
    "source-map-support": "0.5.16",
@@ -46,7 +46,7 @@
  },
  "devDependencies": {
    "@types/chai": "4.2.11",
-    "@types/chance": "1.0.9",
+    "@types/chance": "1.0.10",
    "@types/escodegen": "0.0.6",
    "@types/eslint-scope": "3.7.0",
    "@types/estraverse": "0.0.6",
@@ -55,30 +55,30 @@
    "@types/mkdirp": "1.0.0",
    "@types/mocha": "7.0.2",
    "@types/multimatch": "4.0.0",
-    "@types/node": "13.9.8",
+    "@types/node": "13.11.1",
    "@types/rimraf": "3.0.0",
    "@types/sinon": "9.0.0",
    "@types/string-template": "1.0.2",
    "@types/webpack-env": "1.15.1",
-    "@typescript-eslint/eslint-plugin": "2.26.0",
-    "@typescript-eslint/parser": "2.26.0",
+    "@typescript-eslint/eslint-plugin": "2.27.0",
+    "@typescript-eslint/parser": "2.27.0",
    "chai": "4.2.0",
    "coveralls": "3.0.11",
    "eslint": "6.8.0",
    "eslint-plugin-import": "2.20.2",
    "eslint-plugin-jsdoc": "22.1.0",
    "eslint-plugin-no-null": "1.0.2",
-    "eslint-plugin-prefer-arrow": "1.1.7",
+    "eslint-plugin-prefer-arrow": "1.2.0",
    "eslint-plugin-unicorn": "18.0.1",
    "fork-ts-checker-notifier-webpack-plugin": "2.0.0",
-    "fork-ts-checker-webpack-plugin": "4.1.2",
+    "fork-ts-checker-webpack-plugin": "4.1.3",
    "mocha": "7.1.1",
-    "nyc": "15.0.0",
+    "nyc": "15.0.1",
    "pjson": "1.0.9",
    "pre-commit": "1.2.2",
    "rimraf": "3.0.2",
-    "sinon": "9.0.1",
-    "threads": "1.3.1",
+    "sinon": "9.0.2",
+    "threads": "1.4.0",
    "ts-loader": "6.2.2",
    "ts-node": "6.1.0",
    "typescript": "3.8.3",
@@ -97,24 +97,18 @@ export class JavaScriptObfuscatorCLI implements IInitializable {

    /**
     * @param {TInputCLIOptions} inputOptions
-     * @param {string} inputCodePath
     * @returns {TInputOptions}
     */
-    private static buildOptions (
-        inputOptions: TInputCLIOptions,
-        inputCodePath: string
-    ): TInputOptions {
+    private static buildOptions (inputOptions: TInputCLIOptions): TInputOptions {
        const inputCLIOptions: TInputOptions = JavaScriptObfuscatorCLI.filterOptions(inputOptions);
        const configFilePath: string | undefined = inputOptions.config;
        const configFileLocation: string = configFilePath ? path.resolve(configFilePath, '.') : '';
        const configFileOptions: TInputOptions = configFileLocation ? CLIUtils.getUserConfig(configFileLocation) : {};
-        const inputFileName: string = path.basename(inputCodePath);

        return {
            ...DEFAULT_PRESET,
            ...configFileOptions,
-            ...inputCLIOptions,
-            inputFileName
+            ...inputCLIOptions
        };
    }

@@ -145,7 +139,7 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
        this.configureCommands();
        this.configureHelp();

-        this.inputCLIOptions = this.commands.opts();
+        this.inputCLIOptions = JavaScriptObfuscatorCLI.buildOptions(this.commands.opts());
        this.sourceCodeReader = new SourceCodeReader(
            this.inputPath,
            this.inputCLIOptions
@@ -403,22 +397,16 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
        outputCodePath: string,
        sourceCodeIndex: number | null
    ): void {
-        let options: TInputOptions = JavaScriptObfuscatorCLI.buildOptions(
-            this.inputCLIOptions,
-            inputCodePath
-        );
-
-        if (sourceCodeIndex !== null) {
-            const identifiersPrefix: string = Utils.getIdentifiersPrefixForMultipleSources(
-                this.inputCLIOptions.identifiersPrefix,
-                sourceCodeIndex
-            );
-
-            options = {
-                ...options,
-                identifiersPrefix
-            };
-        }
+        const options: TInputOptions = {
+            ...this.inputCLIOptions,
+            inputFileName: path.basename(inputCodePath),
+            ...sourceCodeIndex !== null && {
+                identifiersPrefix: Utils.getIdentifiersPrefixForMultipleSources(
+                    this.inputCLIOptions.identifiersPrefix,
+                    sourceCodeIndex
+                )
+            }
+        };

        if (options.sourceMap) {
            this.processSourceCodeWithSourceMap(sourceCode, outputCodePath, options);
@@ -1,5 +1,6 @@
 module.exports = {
 	compact: true,
+    exclude: ['**/foo.js'],
 	selfDefending: false,
 	sourceMap: true
 };
@@ -814,51 +814,93 @@ describe('JavaScriptObfuscatorCLI', function (): void {
        });

        describe('`--config` option is set', () => {
-            const outputSourceMapPath: string = `${outputFilePath}.map`;
+            describe('Base options', () => {
+                const outputSourceMapPath: string = `${outputFilePath}.map`;

-            let isFileExist: boolean,
-                sourceMapObject: any;
+                let isFileExist: boolean,
+                    sourceMapObject: any;

-            before(() => {
-                JavaScriptObfuscatorCLI.obfuscate([
-                    'node',
-                    'javascript-obfuscator',
-                    fixtureFilePath,
-                    '--output',
-                    outputFilePath,
-                    '--config',
-                    configFilePath
-                ]);
+                before(() => {
+                    JavaScriptObfuscatorCLI.obfuscate([
+                        'node',
+                        'javascript-obfuscator',
+                        fixtureFilePath,
+                        '--output',
+                        outputFilePath,
+                        '--config',
+                        configFilePath
+                    ]);

-                try {
-                    const content: string = fs.readFileSync(outputSourceMapPath, {encoding: 'utf8'});
+                    try {
+                        const content: string = fs.readFileSync(outputSourceMapPath, {encoding: 'utf8'});

-                    isFileExist = true;
-                    sourceMapObject = JSON.parse(content);
-                } catch (e) {
-                    isFileExist = false;
-                }
+                        isFileExist = true;
+                        sourceMapObject = JSON.parse(content);
+                    } catch (e) {
+                        isFileExist = false;
+                    }
+                });
+
+                it('should create file with source map in the same directory as output file', () => {
+                    assert.equal(isFileExist, true);
+                });
+
+                it('source map from created file should contains property `version`', () => {
+                    assert.property(sourceMapObject, 'version');
+                });
+
+                it('source map from created file should contains property `sources`', () => {
+                    assert.property(sourceMapObject, 'sources');
+                });
+
+                it('source map from created file should contains property `names`', () => {
+                    assert.property(sourceMapObject, 'names');
+                });
+
+                after(() => {
+                    fs.unlinkSync(outputFilePath);
+                    fs.unlinkSync(outputSourceMapPath);
+                });
            });

-            it('should create file with source map in the same directory as output file', () => {
-                assert.equal(isFileExist, true);
-            });
+            describe('`--exclude` option', () => {
+                const directoryPath: string = `${fixturesDirName}/directory-obfuscation`;
+                const outputFileName1: string = 'foo-obfuscated.js';
+                const outputFileName2: string = 'bar-obfuscated.js';

-            it('source map from created file should contains property `version`', () => {
-                assert.property(sourceMapObject, 'version');
-            });
+                let outputFixturesFilePath1: string,
+                    outputFixturesFilePath2: string,
+                    isFileExist1: boolean,
+                    isFileExist2: boolean;

-            it('source map from created file should contains property `sources`', () => {
-                assert.property(sourceMapObject, 'sources');
-            });
+                before(() => {
+                    outputFixturesFilePath1 = `${directoryPath}/${outputFileName1}`;
+                    outputFixturesFilePath2 = `${directoryPath}/${outputFileName2}`;

-            it('source map from created file should contains property `names`', () => {
-                assert.property(sourceMapObject, 'names');
-            });
+                    JavaScriptObfuscatorCLI.obfuscate([
+                        'node',
+                        'javascript-obfuscator',
+                        directoryPath,
+                        '--config',
+                        configFilePath
+                    ]);

-            after(() => {
-                fs.unlinkSync(outputFilePath);
-                fs.unlinkSync(outputSourceMapPath);
+                    isFileExist1 = fs.existsSync(outputFixturesFilePath1);
+                    isFileExist2 = fs.existsSync(outputFixturesFilePath2);
+                });
+
+                it(`shouldn't create file \`${outputFileName1}\` in \`${fixturesDirName}\` directory`, () => {
+                    assert.equal(isFileExist1, false);
+                });
+
+                it(`should create file \`${outputFileName2}\` with obfuscated code in \`${fixturesDirName}\` directory`, () => {
+                    assert.equal(isFileExist2, true);
+                });
+
+                after(() => {
+                    rimraf.sync(outputFixturesFilePath1);
+                    rimraf.sync(outputFixturesFilePath2);
+                });
            });
        });

@@ -13,6 +13,7 @@ describe('CLIUtils', () => {
                const configFilePath: string = `../../../${configDirName}/${configFileName}`;
                const expectedResult: TInputOptions = {
                    compact: true,
+                    exclude: ['**/foo.js'],
                    selfDefending: false,
                    sourceMap: true
                };
@@ -213,6 +213,13 @@
  dependencies:
    type-detect "4.0.8"

+"@sinonjs/commons@^1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
+  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  dependencies:
+    type-detect "4.0.8"
+
 "@sinonjs/fake-timers@^6.0.0":
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz#b64b0faadfdd01a6dcf0c4dcdb78438d86fa7dbf"
@@ -220,6 +227,13 @@
  dependencies:
    "@sinonjs/commons" "^1.7.0"

+"@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
 "@sinonjs/formatio@^5.0.1":
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089"
@@ -247,10 +261,10 @@
  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.11.tgz#d3614d6c5f500142358e6ed24e1bf16657536c50"
  integrity sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==

-"@types/chance@1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.0.9.tgz#2074530976d53cfec84cbea0037923be31320e20"
-  integrity sha512-QEWzf4BICJwa9rr43hSRCAWDhxyakGl2iIXj5PsfGPuOBaJhv50tGX/P5flU8hStatLudPEhlJrZC2qwScD5nQ==
+"@types/chance@1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.0.10.tgz#09461c19963a8961c3935d71cef245d5d48ce16c"
+  integrity sha512-929ISFKdeE72r6VuorB5BMjuwQ+t5rx3MLsHq5i+dCM4aJVGb+EJ+mUmaEcqENzoLZuH3xkNpklBip4guQAYiA==

 "@types/color-name@^1.1.1":
  version "1.1.1"
@@ -350,10 +364,10 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.3.tgz#6356df2647de9eac569f9a52eda3480fa9e70b4d"
  integrity sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==

-"@types/node@13.9.8":
-  version "13.9.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.8.tgz#09976420fc80a7a00bf40680c63815ed8c7616f4"
-  integrity sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==
+"@types/node@13.11.1":
+  version "13.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7"
+  integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==

 "@types/normalize-package-data@^2.4.0":
  version "2.4.0"
@@ -395,40 +409,40 @@
  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.1.tgz#c8e84705e08eed430b5e15b39c65b0944e4d1422"
  integrity sha512-eWN5ElDTeBc5lRDh95SqA8x18D0ll2pWudU3uWiyfsRmIZcmUXpEsxPU+7+BsdCrO2vfLRC629u/MmjbmF+2tA==

-"@typescript-eslint/eslint-plugin@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz#04c96560c8981421e5a9caad8394192363cc423f"
-  integrity sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==
+"@typescript-eslint/eslint-plugin@2.27.0":
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz#e479cdc4c9cf46f96b4c287755733311b0d0ba4b"
+  integrity sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==
  dependencies:
-    "@typescript-eslint/experimental-utils" "2.26.0"
+    "@typescript-eslint/experimental-utils" "2.27.0"
    functional-red-black-tree "^1.0.1"
    regexpp "^3.0.0"
    tsutils "^3.17.1"

-"@typescript-eslint/experimental-utils@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d"
-  integrity sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==
+"@typescript-eslint/experimental-utils@2.27.0":
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
+  integrity sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==
  dependencies:
    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.26.0"
+    "@typescript-eslint/typescript-estree" "2.27.0"
    eslint-scope "^5.0.0"
    eslint-utils "^2.0.0"

-"@typescript-eslint/parser@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.26.0.tgz#385463615818b33acb72a25b39c03579df93d76f"
-  integrity sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ==
+"@typescript-eslint/parser@2.27.0":
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.27.0.tgz#d91664335b2c46584294e42eb4ff35838c427287"
+  integrity sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg==
  dependencies:
    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.26.0"
-    "@typescript-eslint/typescript-estree" "2.26.0"
+    "@typescript-eslint/experimental-utils" "2.27.0"
+    "@typescript-eslint/typescript-estree" "2.27.0"
    eslint-visitor-keys "^1.1.0"

-"@typescript-eslint/typescript-estree@2.26.0":
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56"
-  integrity sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==
+"@typescript-eslint/typescript-estree@2.27.0":
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
+  integrity sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==
  dependencies:
    debug "^4.1.1"
    eslint-visitor-keys "^1.1.0"
@@ -1136,10 +1150,10 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

-chalk@3.0.0, chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+chalk@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
  dependencies:
    ansi-styles "^4.1.0"
    supports-color "^7.1.0"
@@ -1155,6 +1169,14 @@ chalk@^1.1.3:
    strip-ansi "^3.0.0"
    supports-color "^2.0.0"

+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chance@1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz#d8743bf8e40bb05e024c305ca1ff441195eb23db"
@@ -1862,10 +1884,10 @@ eslint-plugin-no-null@1.0.2:
  resolved "https://registry.yarnpkg.com/eslint-plugin-no-null/-/eslint-plugin-no-null-1.0.2.tgz#1236a812391390a1877ad4007c26e745341c951f"
  integrity sha1-EjaoEjkTkKGHetQAfCbnRTQclR8=

-eslint-plugin-prefer-arrow@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.1.7.tgz#4534dd8d2e519cd579a951f95802137365d524a2"
-  integrity sha512-epsA4g804mRovlOHSbeO1xxW7REGeUjULRME9MJTJDOVscNIA01AkR66TP4cmHDfD+w72EQ9cPhf37MbZiFI2w==
+eslint-plugin-prefer-arrow@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.0.tgz#55f07b07e308f441c09e53a77ad12448ce1b7c29"
+  integrity sha512-/iaWpfc6CsGNG/OSElmN1/hZP9WG/EnxoCIFcJHT1utRqk8FRQYoyX7xWHo2O03p/9I2dw2lSNsVOYbpfNSsZQ==

 eslint-plugin-unicorn@18.0.1:
  version "18.0.1"
@@ -2283,10 +2305,10 @@ fork-ts-checker-notifier-webpack-plugin@2.0.0:
  dependencies:
    node-notifier "^6.0.0"

-fork-ts-checker-webpack-plugin@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.2.tgz#ab160c702e1bdf2a271ee4f7236c3280aeba02a7"
-  integrity sha512-3Qe6GxiidhyChpNcfQ9qaNEeO0FavxpvS1ArEy3boSWT05uCUTWPFMNl4OeH3XqsZymWv7t6EkTyj6YHJbVXig==
+fork-ts-checker-webpack-plugin@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.3.tgz#306f1566fc1c916816830b3de4e53da8d6d6a9e2"
+  integrity sha512-ErA8cFsPfAIOx2UFoRlMraGVB1Ye3bXQTdNW6lmeKQDuNnkORqJmA9bcReNxJj5kVHeKkKcNZv3f6PMyeugO+w==
  dependencies:
    babel-code-frame "^6.22.0"
    chalk "^2.4.1"
@@ -3060,10 +3082,10 @@ istanbul-lib-source-maps@^4.0.0:
    istanbul-lib-coverage "^3.0.0"
    source-map "^0.6.1"

-istanbul-reports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70"
-  integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
  dependencies:
    html-escaper "^2.0.0"
    istanbul-lib-report "^3.0.0"
@@ -3504,10 +3526,10 @@ mkdirp@0.5.3, mkdirp@^0.5.1:
  dependencies:
    minimist "^1.2.5"

-mkdirp@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
-  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
+mkdirp@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

 mkdirp@^0.5.3:
  version "0.5.4"
@@ -3695,7 +3717,7 @@ node-notifier@^6.0.0:
    shellwords "^0.1.1"
    which "^1.3.1"

-node-preload@^0.2.0:
+node-preload@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
  integrity sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==
@@ -3731,10 +3753,10 @@ npm-run-path@^2.0.0:
  dependencies:
    path-key "^2.0.0"

-nyc@15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.0.0.tgz#eb32db2c0f29242c2414fe46357f230121cfc162"
-  integrity sha512-qcLBlNCKMDVuKb7d1fpxjPR8sHeMVX0CHarXAVzrVWoFrigCkYR8xcrjfXSPi5HXM7EU78L6ywO7w1c5rZNCNg==
+nyc@15.0.1:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.0.1.tgz#bd4d5c2b17f2ec04370365a5ca1fc0ed26f9f93d"
+  integrity sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==
  dependencies:
    "@istanbuljs/load-nyc-config" "^1.0.0"
    "@istanbuljs/schema" "^0.1.2"
@@ -3751,10 +3773,9 @@ nyc@15.0.0:
    istanbul-lib-processinfo "^2.0.2"
    istanbul-lib-report "^3.0.0"
    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.0"
-    js-yaml "^3.13.1"
+    istanbul-reports "^3.0.2"
    make-dir "^3.0.0"
-    node-preload "^0.2.0"
+    node-preload "^0.2.1"
    p-map "^3.0.0"
    process-on-spawn "^1.0.0"
    resolve-from "^5.0.0"
@@ -3762,7 +3783,6 @@ nyc@15.0.0:
    signal-exit "^3.0.2"
    spawn-wrap "^2.0.0"
    test-exclude "^6.0.0"
-    uuid "^3.3.3"
    yargs "^15.0.2"

 oauth-sign@~0.9.0:
@@ -4673,13 +4693,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=

-sinon@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.1.tgz#dbb18f7d8f5835bcf91578089c0a97b2fffdd73b"
-  integrity sha512-iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg==
+sinon@9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
+  integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==
  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-    "@sinonjs/fake-timers" "^6.0.0"
+    "@sinonjs/commons" "^1.7.2"
+    "@sinonjs/fake-timers" "^6.0.1"
    "@sinonjs/formatio" "^5.0.1"
    "@sinonjs/samsam" "^5.0.3"
    diff "^4.0.2"
@@ -5089,10 +5109,10 @@ text-table@^0.2.0:
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

-threads@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/threads/-/threads-1.3.1.tgz#c6a9f0328995fcf4fa0d3b35ed700f1e194f5d55"
-  integrity sha512-uhNCUhxEMFVcJlKM0tYA4MHgOMoPaHmcoruWSGq1YV8RuuDbkwdfDbZToIUvf1YuXZj1Z8v1ePx08Cb5JWtjeg==
+threads@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/threads/-/threads-1.4.0.tgz#eb46dfcb194e7d5237febd6aa35eb226372dbef1"
+  integrity sha512-vaKhZODDnciJn4Bjmkd1GbJ2dlzFbzxwcQNM1IZV1bsCXmlJpirSAKsYG7MT7MHgO+qQxTaIn6CMstmlYnGNWw==
  dependencies:
    callsites "^3.1.0"
    debug "^4.1.1"