Skip to content

Commit d795278

Browse files
authored
fix: mitigate dependency issues — remove deprecated packages (#1654)
1 parent 6fab564 commit d795278

40 files changed

Lines changed: 2085 additions & 2807 deletions

modules/caching-materials-manager-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@aws-crypto/serialize": "file:../serialize",
2424
"@aws-crypto/web-crypto-backend": "file:../web-crypto-backend",
2525
"@aws-sdk/util-base64": "^3.374.0",
26-
"@aws-sdk/util-utf8-browser": "3.259.0",
26+
"@smithy/util-utf8": "^4.0.0",
2727
"tslib": "^2.2.0"
2828
},
2929
"sideEffects": false,

modules/caching-materials-manager-browser/src/caching_materials_manager_browser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import {
1919
WebCryptoGetEncryptionMaterials,
2020
WebCryptoGetDecryptMaterials,
2121
} from '@aws-crypto/material-management-browser'
22-
import { fromUtf8, toUtf8 } from '@aws-sdk/util-utf8-browser'
23-
import { toBase64 } from '@aws-sdk/util-base64-browser'
22+
import { fromUtf8, toUtf8 } from '@smithy/util-utf8'
23+
import { toBase64 } from '@aws-sdk/util-base64'
2424
import { synchronousRandomValues } from '@aws-crypto/web-crypto-backend'
2525
import { sha512 } from './sha512'
2626

modules/caching-materials-manager-browser/src/sha512.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
import { fromUtf8 } from '@aws-sdk/util-utf8-browser'
4+
import { fromUtf8 } from '@smithy/util-utf8'
55
import {
66
getWebCryptoBackend,
77
getNonZeroByteBackend,

modules/decrypt-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dependencies": {
2020
"@aws-crypto/material-management-browser": "file:../material-management-browser",
2121
"@aws-crypto/serialize": "file:../serialize",
22-
"@aws-sdk/util-utf8-browser": "3.259.0",
22+
"@smithy/util-utf8": "^4.0.0",
2323
"tslib": "^2.2.0"
2424
},
2525
"sideEffects": false,

modules/decrypt-browser/src/decrypt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
HeaderInfo,
2525
MessageHeaderV2,
2626
} from '@aws-crypto/serialize'
27-
import { fromUtf8, toUtf8 } from '@aws-sdk/util-utf8-browser'
27+
import { fromUtf8, toUtf8 } from '@smithy/util-utf8'
2828

2929
const deserialize = deserializeFactory(toUtf8, WebCryptoAlgorithmSuite)
3030
const { messageAADContentString, messageAAD } = aadFactory(fromUtf8)

modules/decrypt-browser/test/compatibility.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import {
2424
KMS,
2525
getClient,
2626
} from '@aws-crypto/kms-keyring-browser'
27-
import { fromBase64, toBase64 } from '@aws-sdk/util-base64-browser'
28-
import { toUtf8 } from '@aws-sdk/util-utf8-browser'
27+
import { fromBase64, toBase64 } from '@aws-sdk/util-base64'
28+
import { toUtf8 } from '@smithy/util-utf8'
2929
chai.use(chaiAsPromised)
3030
const { expect } = chai
3131

modules/decrypt-browser/test/decrypt.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
MessageFormat,
2323
WebCryptoAlgorithmSuite,
2424
} from '@aws-crypto/material-management'
25-
import { fromBase64 } from '@aws-sdk/util-base64-browser'
25+
import { fromBase64 } from '@aws-sdk/util-base64'
2626
chai.use(chaiAsPromised)
2727
const { expect } = chai
2828
const { decrypt } = buildDecrypt(CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT)

modules/encrypt-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@aws-crypto/material-management-browser": "file:../material-management-browser",
2121
"@aws-crypto/serialize": "file:../serialize",
2222
"@aws-crypto/web-crypto-backend": "file:../web-crypto-backend",
23-
"@aws-sdk/util-utf8-browser": "3.259.0",
23+
"@smithy/util-utf8": "^4.0.0",
2424
"tslib": "^2.2.0"
2525
},
2626
"sideEffects": false,

modules/encrypt-browser/src/encrypt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
MessageIdLength,
2929
serializeMessageHeaderAuth,
3030
} from '@aws-crypto/serialize'
31-
import { fromUtf8 } from '@aws-sdk/util-utf8-browser'
31+
import { fromUtf8 } from '@smithy/util-utf8'
3232
import { getWebCryptoBackend } from '@aws-crypto/web-crypto-backend'
3333

3434
const serialize = serializeFactory(fromUtf8, { utf8Sorting: true })

modules/encrypt-browser/test/encrypt.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
} from '@aws-crypto/serialize'
2525
import { buildEncrypt } from '../src/index'
2626
import { _encrypt } from '../src/encrypt'
27-
import { toUtf8, fromUtf8 } from '@aws-sdk/util-utf8-browser'
27+
import { toUtf8, fromUtf8 } from '@smithy/util-utf8'
2828
const { encrypt } = buildEncrypt(CommitmentPolicy.FORBID_ENCRYPT_ALLOW_DECRYPT)
2929

3030
chai.use(chaiAsPromised)

0 commit comments

Comments
 (0)