瀏覽代碼

Merge pull request #926 from javascript-obfuscator/typescript-4.3

Typescript 4.3 update
Timofey Kachalov 4 年之前
父節點
當前提交
e7dfd041ba
共有 38 個文件被更改,包括 72 次插入72 次删除
  1. 0 0
      dist/index.browser.js
  2. 0 0
      dist/index.cli.js
  3. 0 0
      dist/index.js
  4. 3 3
      package.json
  5. 1 1
      src/custom-code-helpers/calls-controller/CallsControllerFunctionCodeHelper.ts
  6. 1 1
      src/custom-code-helpers/console-output/ConsoleOutputDisableCodeHelper.ts
  7. 1 1
      src/custom-code-helpers/debug-protection/DebugProtectionFunctionCallCodeHelper.ts
  8. 1 1
      src/custom-code-helpers/debug-protection/DebugProtectionFunctionCodeHelper.ts
  9. 1 1
      src/custom-code-helpers/debug-protection/DebugProtectionFunctionIntervalCodeHelper.ts
  10. 1 1
      src/custom-code-helpers/domain-lock/DomainLockCodeHelper.ts
  11. 1 1
      src/custom-code-helpers/self-defending/SelfDefendingUnicodeCodeHelper.ts
  12. 1 1
      src/custom-code-helpers/string-array/StringArrayCallsWrapperBase64CodeHelper.ts
  13. 1 1
      src/custom-code-helpers/string-array/StringArrayCallsWrapperCodeHelper.ts
  14. 1 1
      src/custom-code-helpers/string-array/StringArrayCallsWrapperRc4CodeHelper.ts
  15. 1 1
      src/custom-code-helpers/string-array/StringArrayCodeHelper.ts
  16. 1 1
      src/custom-code-helpers/string-array/StringArrayRotateFunctionCodeHelper.ts
  17. 1 1
      src/custom-nodes/dead-code-injection-nodes/BlockStatementDeadCodeInjectionNode.ts
  18. 1 1
      src/generators/identifier-names-generators/MangledIdentifierNamesGenerator.ts
  19. 2 2
      src/generators/identifier-names-generators/MangledShuffledIdentifierNamesGenerator.ts
  20. 1 1
      src/node-transformers/converting-transformers/NumberLiteralTransformer.ts
  21. 1 1
      src/node-transformers/converting-transformers/SplitStringTransformer.ts
  22. 1 1
      src/node-transformers/finalizing-transformers/DirectivePlacementTransformer.ts
  23. 1 1
      src/node-transformers/finalizing-transformers/EscapeSequenceTransformer.ts
  24. 2 2
      src/node-transformers/preparing-transformers/CustomCodeHelpersTransformer.ts
  25. 2 2
      src/node-transformers/preparing-transformers/EvalCallExpressionTransformer.ts
  26. 2 2
      src/node-transformers/preparing-transformers/MetadataTransformer.ts
  27. 2 2
      src/node-transformers/preparing-transformers/ObfuscatingGuardsTransformer.ts
  28. 1 1
      src/node-transformers/preparing-transformers/VariablePreserveTransformer.ts
  29. 2 2
      src/node-transformers/simplifying-transformers/AbstractStatementSimplifyTransformer.ts
  30. 1 1
      src/node-transformers/simplifying-transformers/BlockStatementSimplifyTransformer.ts
  31. 1 1
      src/node-transformers/simplifying-transformers/IfStatementSimplifyTransformer.ts
  32. 1 1
      src/node-transformers/string-array-transformers/StringArrayScopeCallsWrapperTransformer.ts
  33. 1 1
      src/node-transformers/string-array-transformers/StringArrayTransformer.ts
  34. 1 1
      src/storages/custom-code-helpers/CustomCodeHelperGroupStorage.ts
  35. 3 3
      src/storages/string-array-transformers/StringArrayStorage.ts
  36. 2 2
      src/utils/CryptUtilsStringArray.ts
  37. 1 1
      tsconfig.json
  38. 27 27
      yarn.lock

File diff suppressed because it is too large
+ 0 - 0
dist/index.browser.js


File diff suppressed because it is too large
+ 0 - 0
dist/index.cli.js


File diff suppressed because it is too large
+ 0 - 0
dist/index.js


+ 3 - 3
package.json

@@ -80,12 +80,12 @@
     "pjson": "1.0.9",
     "pre-commit": "1.2.2",
     "rimraf": "3.0.2",
-    "sinon": "11.1.0",
+    "sinon": "11.1.1",
     "threads": "1.6.4",
     "ts-loader": "9.2.2",
     "ts-node": "10.0.0",
-    "typescript": "beta",
-    "webpack": "5.37.1",
+    "typescript": "4.3.2",
+    "webpack": "5.38.1",
     "webpack-cli": "4.7.0",
     "webpack-node-externals": "3.0.0"
   },

+ 1 - 1
src/custom-code-helpers/calls-controller/CallsControllerFunctionCodeHelper.ts

@@ -76,7 +76,7 @@ export class CallsControllerFunctionCodeHelper extends AbstractCustomCodeHelper
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         if (this.nodeTransformationStage === NodeTransformationStage.Finalizing) {
             return this.customCodeHelperObfuscator.obfuscateTemplate(
                 this.customCodeHelperFormatter.formatTemplate(SingleCallControllerTemplate(), {

+ 1 - 1
src/custom-code-helpers/console-output/ConsoleOutputDisableCodeHelper.ts

@@ -77,7 +77,7 @@ export class ConsoleOutputDisableCodeHelper extends AbstractCustomCodeHelper {
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const globalVariableTemplate: string = this.options.target !== ObfuscationTarget.BrowserNoEval
             ? this.getGlobalVariableTemplate()
             : GlobalVariableNoEvalTemplate();

+ 1 - 1
src/custom-code-helpers/debug-protection/DebugProtectionFunctionCallCodeHelper.ts

@@ -74,7 +74,7 @@ export class DebugProtectionFunctionCallCodeHelper extends AbstractCustomCodeHel
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         return this.customCodeHelperFormatter.formatTemplate(DebugProtectionFunctionCallTemplate(), {
             debugProtectionFunctionName: this.debugProtectionFunctionName,
             callControllerFunctionName: this.callsControllerFunctionName

+ 1 - 1
src/custom-code-helpers/debug-protection/DebugProtectionFunctionCodeHelper.ts

@@ -70,7 +70,7 @@ export class DebugProtectionFunctionCodeHelper extends AbstractCustomCodeHelper
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const debuggerTemplate: string = this.options.target !== ObfuscationTarget.BrowserNoEval
             ? DebuggerTemplate()
             : DebuggerTemplateNoEval();

+ 1 - 1
src/custom-code-helpers/debug-protection/DebugProtectionFunctionIntervalCodeHelper.ts

@@ -66,7 +66,7 @@ export class DebugProtectionFunctionIntervalCodeHelper extends AbstractCustomCod
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         return this.customCodeHelperFormatter.formatTemplate(DebugProtectionFunctionIntervalTemplate(), {
             debugProtectionFunctionName: this.debugProtectionFunctionName
         });

+ 1 - 1
src/custom-code-helpers/domain-lock/DomainLockCodeHelper.ts

@@ -87,7 +87,7 @@ export class DomainLockCodeHelper extends AbstractCustomCodeHelper {
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const domainsString: string = this.options.domainLock.join(';');
         const [hiddenDomainsString, diff]: string[] = this.cryptUtils.hideString(
             domainsString,

+ 1 - 1
src/custom-code-helpers/self-defending/SelfDefendingUnicodeCodeHelper.ts

@@ -78,7 +78,7 @@ export class SelfDefendingUnicodeCodeHelper extends AbstractCustomCodeHelper {
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const globalVariableTemplate: string = this.options.target !== ObfuscationTarget.BrowserNoEval
             ? this.getGlobalVariableTemplate()
             : GlobalVariableNoEvalTemplate();

+ 1 - 1
src/custom-code-helpers/string-array/StringArrayCallsWrapperBase64CodeHelper.ts

@@ -10,7 +10,7 @@ export class StringArrayCallsWrapperBase64CodeHelper extends StringArrayCallsWra
     /**
      * @returns {string}
      */
-    protected getDecodeStringArrayTemplate (): string {
+    protected override getDecodeStringArrayTemplate (): string {
         const atobFunctionName: string = this.randomGenerator.getRandomString(6);
 
         const atobPolyfill: string = this.customCodeHelperFormatter.formatTemplate(AtobTemplate(), {

+ 1 - 1
src/custom-code-helpers/string-array/StringArrayCallsWrapperCodeHelper.ts

@@ -97,7 +97,7 @@ export class StringArrayCallsWrapperCodeHelper extends AbstractCustomCodeHelper
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const decodeCodeHelperTemplate: string = this.getDecodeStringArrayTemplate();
 
         const preservedNames: string[] = [`^${this.stringArrayName}$`];

+ 1 - 1
src/custom-code-helpers/string-array/StringArrayCallsWrapperRc4CodeHelper.ts

@@ -11,7 +11,7 @@ export class StringArrayCallsWrapperRc4CodeHelper extends StringArrayCallsWrappe
     /**
      * @returns {string}
      */
-    protected getDecodeStringArrayTemplate (): string {
+    protected override getDecodeStringArrayTemplate (): string {
         const atobFunctionName: string = this.randomGenerator.getRandomString(6);
 
         const atobPolyfill: string = this.customCodeHelperFormatter.formatTemplate(AtobTemplate(), {

+ 1 - 1
src/custom-code-helpers/string-array/StringArrayCodeHelper.ts

@@ -80,7 +80,7 @@ export class StringArrayCodeHelper extends AbstractCustomCodeHelper {
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         return this.customCodeHelperFormatter.formatTemplate(StringArrayTemplate(), {
             stringArrayName: this.stringArrayName,
             stringArrayStorageItems: this.getEncodedStringArrayStorageItems()

+ 1 - 1
src/custom-code-helpers/string-array/StringArrayRotateFunctionCodeHelper.ts

@@ -87,7 +87,7 @@ export class StringArrayRotateFunctionCodeHelper extends AbstractCustomCodeHelpe
     /**
      * @returns {string}
      */
-    protected getCodeHelperTemplate (): string {
+    protected override getCodeHelperTemplate (): string {
         const comparisonExpressionCode: string = NodeUtils.convertStructureToCode([this.comparisonExpressionNode]);
 
         return this.customCodeHelperFormatter.formatTemplate(

+ 1 - 1
src/custom-nodes/dead-code-injection-nodes/BlockStatementDeadCodeInjectionNode.ts

@@ -64,7 +64,7 @@ export class BlockStatementDeadCodeInjectionNode extends AbstractCustomNode {
      *
      * @returns {TStatement[]}
      */
-    public getNode (): TStatement[] {
+    public override getNode (): TStatement[] {
         return this.getNodeStructure();
     }
 

+ 1 - 1
src/generators/identifier-names-generators/MangledIdentifierNamesGenerator.ts

@@ -165,7 +165,7 @@ export class MangledIdentifierNamesGenerator extends AbstractIdentifierNamesGene
      * @param {string} mangledName
      * @returns {boolean}
      */
-    public isValidIdentifierName (mangledName: string): boolean {
+    public override isValidIdentifierName (mangledName: string): boolean {
         return super.isValidIdentifierName(mangledName)
             && !MangledIdentifierNamesGenerator.reservedNamesSet.has(mangledName);
     }

+ 2 - 2
src/generators/identifier-names-generators/MangledShuffledIdentifierNamesGenerator.ts

@@ -58,7 +58,7 @@ export class MangledShuffledIdentifierNamesGenerator extends MangledIdentifierNa
     /**
      * @returns {string[]}
      */
-    protected getNameSequence (): string[] {
+    protected override getNameSequence (): string[] {
         return MangledShuffledIdentifierNamesGenerator.shuffledNameSequence;
     }
 
@@ -66,7 +66,7 @@ export class MangledShuffledIdentifierNamesGenerator extends MangledIdentifierNa
      * @param {string} previousMangledName
      * @returns {string}
      */
-    protected generateNewMangledName (previousMangledName: string): string {
+    protected override generateNewMangledName (previousMangledName: string): string {
         return super.generateNewMangledName(previousMangledName);
     }
 }

+ 1 - 1
src/node-transformers/converting-transformers/NumberLiteralTransformer.ts

@@ -22,7 +22,7 @@ export class NumberLiteralTransformer extends AbstractNodeTransformer {
      *
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.NumberToNumericalExpressionTransformer
     ];
 

+ 1 - 1
src/node-transformers/converting-transformers/SplitStringTransformer.ts

@@ -31,7 +31,7 @@ export class SplitStringTransformer extends AbstractNodeTransformer {
     /**
      * @type {NodeTransformer[]}
      */
-    public runAfter: NodeTransformer[] = [
+    public override runAfter: NodeTransformer[] = [
         NodeTransformer.ObjectExpressionKeysTransformer,
         NodeTransformer.TemplateLiteralTransformer
     ];

+ 1 - 1
src/node-transformers/finalizing-transformers/DirectivePlacementTransformer.ts

@@ -28,7 +28,7 @@ export class DirectivePlacementTransformer extends AbstractNodeTransformer {
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.CustomCodeHelpersTransformer
     ];
 

+ 1 - 1
src/node-transformers/finalizing-transformers/EscapeSequenceTransformer.ts

@@ -22,7 +22,7 @@ export class EscapeSequenceTransformer extends AbstractNodeTransformer {
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.CustomCodeHelpersTransformer
     ];
 

+ 2 - 2
src/node-transformers/preparing-transformers/CustomCodeHelpersTransformer.ts

@@ -26,9 +26,9 @@ import { NodeGuards } from '../../node/NodeGuards';
 @injectable()
 export class CustomCodeHelpersTransformer extends AbstractNodeTransformer {
     /**
-     * @type {NodeTransformer.ParentificationTransformer[]}
+     * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.ParentificationTransformer,
         NodeTransformer.VariablePreserveTransformer
     ];

+ 2 - 2
src/node-transformers/preparing-transformers/EvalCallExpressionTransformer.ts

@@ -19,9 +19,9 @@ import { StringUtils } from '../../utils/StringUtils';
 @injectable()
 export class EvalCallExpressionTransformer extends AbstractNodeTransformer {
     /**
-     * @type {NodeTransformer.NodeTransformer[]}
+     * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.EscapeSequenceTransformer,
         NodeTransformer.ParentificationTransformer,
         NodeTransformer.VariablePreserveTransformer

+ 2 - 2
src/node-transformers/preparing-transformers/MetadataTransformer.ts

@@ -20,9 +20,9 @@ import { NodeMetadata } from '../../node/NodeMetadata';
 @injectable()
 export class MetadataTransformer extends AbstractNodeTransformer {
     /**
-     * @type {NodeTransformer.ParentificationTransformer[]}
+     * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.ParentificationTransformer,
         NodeTransformer.VariablePreserveTransformer
     ];

+ 2 - 2
src/node-transformers/preparing-transformers/ObfuscatingGuardsTransformer.ts

@@ -36,9 +36,9 @@ export class ObfuscatingGuardsTransformer extends AbstractNodeTransformer {
     ];
 
     /**
-     * @type {NodeTransformer.ParentificationTransformer[]}
+     * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.ParentificationTransformer,
         NodeTransformer.VariablePreserveTransformer
     ];

+ 1 - 1
src/node-transformers/preparing-transformers/VariablePreserveTransformer.ts

@@ -26,7 +26,7 @@ export class VariablePreserveTransformer extends AbstractNodeTransformer {
     /**
      * @type {NodeTransformer.ParentificationTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.ParentificationTransformer
     ];
 

+ 2 - 2
src/node-transformers/simplifying-transformers/AbstractStatementSimplifyTransformer.ts

@@ -22,7 +22,7 @@ export abstract class AbstractStatementSimplifyTransformer extends AbstractNodeT
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.ExpressionStatementsMergeTransformer,
         NodeTransformer.VariableDeclarationsMergeTransformer
     ];
@@ -189,7 +189,7 @@ export abstract class AbstractStatementSimplifyTransformer extends AbstractNodeT
      * @param {ESTree.Node} parentNode
      * @returns {ESTree.Node}
      */
-    public abstract transformNode (
+    public abstract override transformNode (
         statementNode: ESTree.Statement,
         parentNode: ESTree.Node
     ): ESTree.Node;

+ 1 - 1
src/node-transformers/simplifying-transformers/BlockStatementSimplifyTransformer.ts

@@ -24,7 +24,7 @@ export class BlockStatementSimplifyTransformer extends AbstractStatementSimplify
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.VariableDeclarationsMergeTransformer
     ];
 

+ 1 - 1
src/node-transformers/simplifying-transformers/IfStatementSimplifyTransformer.ts

@@ -262,7 +262,7 @@ export class IfStatementSimplifyTransformer extends AbstractStatementSimplifyTra
      * @param {IStatementSimplifyData} statementSimplifyData
      * @returns {ESTree.Statement}
      */
-    protected getPartialStatement (statementSimplifyData: IStatementSimplifyData): ESTree.Statement {
+    protected override getPartialStatement (statementSimplifyData: IStatementSimplifyData): ESTree.Statement {
         const partialStatement: ESTree.Statement = super.getPartialStatement(statementSimplifyData);
 
         if (!NodeGuards.isBlockStatementNode(partialStatement)) {

+ 1 - 1
src/node-transformers/string-array-transformers/StringArrayScopeCallsWrapperTransformer.ts

@@ -38,7 +38,7 @@ export class StringArrayScopeCallsWrapperTransformer extends AbstractNodeTransfo
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.StringArrayRotateFunctionTransformer
     ];
 

+ 1 - 1
src/node-transformers/string-array-transformers/StringArrayTransformer.ts

@@ -53,7 +53,7 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
     /**
      * @type {NodeTransformer[]}
      */
-    public readonly runAfter: NodeTransformer[] = [
+    public override readonly runAfter: NodeTransformer[] = [
         NodeTransformer.StringArrayRotateFunctionTransformer
     ];
 

+ 1 - 1
src/storages/custom-code-helpers/CustomCodeHelperGroupStorage.ts

@@ -45,7 +45,7 @@ export class CustomCodeHelperGroupStorage extends MapStorage <string, ICustomCod
     }
 
     @postConstruct()
-    public initialize (): void {
+    public override initialize (): void {
         super.initialize();
 
         CustomCodeHelperGroupStorage.customCodeHelperGroupsList.forEach((customCodeHelperGroupName: CustomCodeHelperGroup) => {

+ 3 - 3
src/storages/string-array-transformers/StringArrayStorage.ts

@@ -130,7 +130,7 @@ export class StringArrayStorage extends MapStorage <`${string}-${TStringArrayEnc
     }
 
     @postConstruct()
-    public initialize (): void {
+    public override initialize (): void {
         super.initialize();
 
         this.indexShiftAmount = this.options.stringArrayIndexShift
@@ -150,7 +150,7 @@ export class StringArrayStorage extends MapStorage <`${string}-${TStringArrayEnc
     /**
      * @param {string} value
      */
-    public get (value: string): IStringArrayStorageItemData {
+    public override get (value: string): IStringArrayStorageItemData {
         return this.getOrSetIfDoesNotExist(value);
     }
 
@@ -178,7 +178,7 @@ export class StringArrayStorage extends MapStorage <`${string}-${TStringArrayEnc
     /**
      * @returns {string}
      */
-    public getStorageId (): string {
+    public override getStorageId (): string {
         if (!this.stringArrayStorageName) {
             this.stringArrayStorageName = this.identifierNamesGenerator
                 .generateForGlobalScope(StringArrayStorage.stringArrayNameLength);

+ 2 - 2
src/utils/CryptUtilsStringArray.ts

@@ -13,7 +13,7 @@ export class CryptUtilsStringArray extends CryptUtils implements ICryptUtilsStri
     /**
      * @type {string}
      */
-    protected readonly base64Alphabet: string = base64alphabetSwapped;
+    protected override readonly base64Alphabet: string = base64alphabetSwapped;
 
     /**
      * @param {IRandomGenerator} randomGenerator
@@ -30,7 +30,7 @@ export class CryptUtilsStringArray extends CryptUtils implements ICryptUtilsStri
      * @param {string} string
      * @returns {string}
      */
-    public btoa (string: string): string {
+    public override btoa (string: string): string {
         const output = super.btoa(string);
 
         return output.replace(/=+$/, '');

+ 1 - 1
tsconfig.json

@@ -13,7 +13,7 @@
     "module": "commonjs",
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "noImplicitOverride": false,
+    "noImplicitOverride": true,
     "noImplicitThis": false,
     "noUnusedLocals": true,
     "removeComments": true,

+ 27 - 27
yarn.lock

@@ -3986,17 +3986,17 @@ signal-exit@^3.0.3:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
[email protected].0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-11.1.0.tgz#e8aa528ffb964d98a588b5f3b81a27720b6e3ed3"
-  integrity sha512-wCbMjy6pepGX3CE/IBz3QDqOmdYP96tWrrqTMVnbREgJG989725EbMZD9vp+Cd+A6MNXDjb7weWLi/bPPpcH/g==
[email protected].1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-11.1.1.tgz#99a295a8b6f0fadbbb7e004076f3ae54fc6eab91"
+  integrity sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==
   dependencies:
     "@sinonjs/commons" "^1.8.3"
     "@sinonjs/fake-timers" "^7.1.0"
     "@sinonjs/samsam" "^6.0.2"
     diff "^5.0.0"
     nise "^5.1.0"
-    supports-color "^8.1.1"
+    supports-color "^7.2.0"
 
 slash@^3.0.0:
   version "3.0.0"
@@ -4222,7 +4222,7 @@ strip-json-comments@^3.1.0:
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"
   integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
 
[email protected], supports-color@^8.1.1:
[email protected]:
   version "8.1.1"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -4236,9 +4236,9 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
@@ -4442,10 +4442,10 @@ typedarray@^0.0.6:
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@beta:
-  version "4.3.0-beta"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.0-beta.tgz#8098e7be29032f09827e94b8e3a6befc9ff70c77"
-  integrity sha512-bl3wxSVL6gWLQFa466Vm5Vk3z0BNx+QxWhb9wFiYEHm6H8oqFd8Wo3XjgCVxAa5yiSFFKgo/ngBpXdIwqo5o0A==
+typescript@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
+  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -4514,10 +4514,10 @@ validator@^13.5.2:
   resolved "https://registry.npmjs.org/validator/-/validator-13.5.2.tgz"
   integrity sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ==
 
-watchpack@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.0.0.tgz"
-  integrity sha512-xSdCxxYZWNk3VK13bZRYhsQpfa8Vg63zXG+3pyU8ouqSLRCv4IGXIp9Kr226q6GBkGRlZrST2wwKtjfKz2m7Cg==
+watchpack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+  integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -4554,18 +4554,18 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917"
   integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==
 
-webpack-sources@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.1.1.tgz"
-  integrity sha512-hraq9n99K564zuZUsE61iATO3jvzxOmGo20UlOe3zgdHOBp8inTJgv7EY4RgvCv7Ywx0/vpQTyYSjnFpv4gNtQ==
+webpack-sources@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
+  integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
   dependencies:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
[email protected]7.1:
-  version "5.37.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.1.tgz#2deb5acd350583c1ab9338471f323381b0b0c14b"
-  integrity sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==
[email protected]8.1:
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.38.1.tgz#5224c7f24c18e729268d3e3bc97240d6e880258e"
+  integrity sha512-OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.47"
@@ -4577,7 +4577,7 @@ [email protected]:
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.8.0"
     es-module-lexer "^0.4.0"
-    eslint-scope "^5.1.1"
+    eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.4"
@@ -4588,8 +4588,8 @@ [email protected]:
     schema-utils "^3.0.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.1"
-    watchpack "^2.0.0"
-    webpack-sources "^2.1.1"
+    watchpack "^2.2.0"
+    webpack-sources "^2.3.0"
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"

Some files were not shown because too many files changed in this diff