From f4815f7e9bb76d22911c8cec5cb8f0da9c45c310 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Tue, 21 Sep 2021 11:38:45 -0500 Subject: [PATCH] fix: Revert #7ba9425166ce0adc5feda67415e514f4d5616b87 --- .../src/material_helpers.ts | 4 +- package-lock.json | 59 +++---------------- package.json | 2 +- 3 files changed, 10 insertions(+), 55 deletions(-) diff --git a/modules/material-management-node/src/material_helpers.ts b/modules/material-management-node/src/material_helpers.ts index c484df8b9..350bfa626 100644 --- a/modules/material-management-node/src/material_helpers.ts +++ b/modules/material-management-node/src/material_helpers.ts @@ -11,7 +11,7 @@ import { NodeHash, } from '@aws-crypto/material-management' import { - Sign, + Signer, Verify, createCipheriv, createDecipheriv, @@ -55,7 +55,7 @@ export interface GetCipherInfo { } export interface GetSigner { - (): Sign & { awsCryptoSign: () => Buffer } + (): Signer & { awsCryptoSign: () => Buffer } } export interface NodeEncryptionMaterialHelper { diff --git a/package-lock.json b/package-lock.json index 0ec5c4cf7..6ab2330d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -194,7 +194,7 @@ "karma-mocha": "2.0.1", "karma-webpack": "^4.0.2", "ts-loader": "9.2.5", - "ts-node": "^10.2.1", + "ts-node": "^9.1.1", "tslib": "^2.2.0", "typescript": "^4.0.2", "webpack": "^4.42.1", @@ -447,8 +447,7 @@ "socket.io": "^3.1.0", "source-map": "^0.6.1", "tmp": "0.2.1", - "ua-parser-js": "^0.7.23", - "yargs": "^16.1.1" + "ua-parser-js": "^0.7.23" } }, "karma-webpack": { @@ -746,8 +745,7 @@ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "^0.1.3" } } } @@ -1218,7 +1216,7 @@ "requires": { "@aws-crypto/ie11-detection": "1.0.0", "@aws-crypto/supports-web-crypto": "1.0.0", - "@aws-sdk/util-locate-window": "3.23.0", + "@aws-sdk/util-locate-window": "3.13.1", "tslib": "^2.2.0" }, "dependencies": { @@ -4419,9 +4417,9 @@ "dev": true }, "@types/node": { - "version": "16.7.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.9.tgz", - "integrity": "sha512-KktxVzS4FPDFVHUUOWyZMvRo//8vqOLITtLMhFSW9IdLsYT/sPyXj3wXtaTcR7A7olCe7R2Xy7R+q5pg2bU46g==", + "version": "15.14.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.8.tgz", + "integrity": "sha512-+ZjmmoGV7WBwhzNh/GkwehB7uyXn9HFwzQUfj9pbyR8eFAq20Qguoh93sPbWzzhsbhTme6YE92/iJ54Z0WRH7A==", "dev": true }, "@types/normalize-package-data": { @@ -13653,35 +13651,6 @@ } } }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "readdir-scoped-modules": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", @@ -16705,20 +16674,6 @@ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - }, "yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", diff --git a/package.json b/package.json index fab0e2cd7..fd3230bcb 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "@types/chai-as-promised": "^7.1.3", "@types/from2": "^2.3.0", "@types/mocha": "^9.0.0", - "@types/node": "^16.7.9", + "@types/node": "^15.12.5", "@typescript-eslint/eslint-plugin": "^4.1.0", "@typescript-eslint/parser": "^4.1.0", "buffer": "^6.0.3",