chore(packages): replace util-base64-* with util-base64 (#4141)

trivikr · web-flow · commit 71b99cffcccb · 2022-11-03T13:28:54.000-07:00
diff --git a/packages/chunked-blob-reader-native/package.json b/packages/chunked-blob-reader-native/package.json
@@ -20,7 +20,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/util-base64-browser": "*",
+    "@aws-sdk/util-base64": "*",
     "tslib": "^2.3.1"
   },
   "typesVersions": {
diff --git a/packages/chunked-blob-reader-native/src/index.ts b/packages/chunked-blob-reader-native/src/index.ts
@@ -1,4 +1,4 @@
-import { fromBase64 } from "@aws-sdk/util-base64-browser";
+import { fromBase64 } from "@aws-sdk/util-base64";
 export function blobReader(
   blob: Blob,
   onChunk: (chunk: Uint8Array) => void,
diff --git a/packages/fetch-http-handler/karma.conf.js b/packages/fetch-http-handler/karma.conf.js
@@ -23,7 +23,7 @@ module.exports = function (config) {
     },
     karmaTypescriptConfig: {
       bundlerOptions: {
-        addNodeGlobals: false,
+        addNodeGlobals: true,
       },
     },
     singleRun: true,
diff --git a/packages/fetch-http-handler/package.json b/packages/fetch-http-handler/package.json
@@ -24,7 +24,7 @@
     "@aws-sdk/protocol-http": "*",
     "@aws-sdk/querystring-builder": "*",
     "@aws-sdk/types": "*",
-    "@aws-sdk/util-base64-browser": "*",
+    "@aws-sdk/util-base64": "*",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
diff --git a/packages/fetch-http-handler/src/stream-collector.ts b/packages/fetch-http-handler/src/stream-collector.ts
@@ -1,5 +1,5 @@
 import { StreamCollector } from "@aws-sdk/types";
-import { fromBase64 } from "@aws-sdk/util-base64-browser";
+import { fromBase64 } from "@aws-sdk/util-base64";
 
 //reference: https://snack.expo.io/r1JCSWRGU
 export const streamCollector: StreamCollector = (stream: Blob | ReadableStream): Promise<Uint8Array> => {
diff --git a/packages/md5-js/package.json b/packages/md5-js/package.json
@@ -20,8 +20,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-sdk/util-base64-browser": "*",
-    "@aws-sdk/util-base64-node": "*",
+    "@aws-sdk/util-base64": "*",
     "@aws-sdk/util-hex-encoding": "*",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^10.0.0",
@@ -39,11 +38,9 @@
     "tslib": "^2.3.1"
   },
   "browser": {
-    "@aws-sdk/util-base64-node": "@aws-sdk/util-base64-browser",
     "@aws-sdk/util-utf8-node": "@aws-sdk/util-utf8-browser"
   },
   "react-native": {
-    "@aws-sdk/util-base64-node": "@aws-sdk/util-base64-browser",
     "@aws-sdk/util-utf8-node": "@aws-sdk/util-utf8-browser"
   },
   "typesVersions": {
diff --git a/packages/md5-js/src/index.spec.ts b/packages/md5-js/src/index.spec.ts
@@ -1,4 +1,4 @@
-import { fromBase64 } from "@aws-sdk/util-base64-node";
+import { fromBase64 } from "@aws-sdk/util-base64";
 import { toHex } from "@aws-sdk/util-hex-encoding";
 
 import { Md5 } from "./";
diff --git a/packages/util-stream-browser/package.json b/packages/util-stream-browser/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-sdk/fetch-http-handler": "*",
     "@aws-sdk/types": "*",
-    "@aws-sdk/util-base64-browser": "*",
+    "@aws-sdk/util-base64": "*",
     "@aws-sdk/util-hex-encoding": "*",
     "@aws-sdk/util-utf8-browser": "*",
     "tslib": "^2.3.1"
diff --git a/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts b/packages/util-stream-browser/src/sdk-stream-mixin.spec.ts
@@ -1,14 +1,14 @@
 // @jest-environment jsdom
 import { streamCollector } from "@aws-sdk/fetch-http-handler";
 import { SdkStreamMixin } from "@aws-sdk/types";
-import { toBase64 } from "@aws-sdk/util-base64-browser";
+import { toBase64 } from "@aws-sdk/util-base64";
 import { toHex } from "@aws-sdk/util-hex-encoding";
 import { toUtf8 } from "@aws-sdk/util-utf8-browser";
 
 import { sdkStreamMixin } from "./sdk-stream-mixin";
 
 jest.mock("@aws-sdk/fetch-http-handler");
-jest.mock("@aws-sdk/util-base64-browser");
+jest.mock("@aws-sdk/util-base64");
 jest.mock("@aws-sdk/util-hex-encoding");
 jest.mock("@aws-sdk/util-utf8-browser");
 
diff --git a/packages/util-stream-browser/src/sdk-stream-mixin.ts b/packages/util-stream-browser/src/sdk-stream-mixin.ts
@@ -1,6 +1,6 @@
 import { streamCollector } from "@aws-sdk/fetch-http-handler";
 import { SdkStream, SdkStreamMixin } from "@aws-sdk/types";
-import { toBase64 } from "@aws-sdk/util-base64-browser";
+import { toBase64 } from "@aws-sdk/util-base64";
 import { toHex } from "@aws-sdk/util-hex-encoding";
 import { toUtf8 } from "@aws-sdk/util-utf8-browser";
 
diff --git a/packages/xhr-http-handler/package.json b/packages/xhr-http-handler/package.json
@@ -21,7 +21,6 @@
     "@aws-sdk/protocol-http": "*",
     "@aws-sdk/querystring-builder": "*",
     "@aws-sdk/types": "*",
-    "@aws-sdk/util-base64-browser": "*",
     "events": "3.3.0",
     "tslib": "^2.3.1"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { fromBase64 } from "@aws-sdk/util-base64-browser";`
	`1`	`+import { fromBase64 } from "@aws-sdk/util-base64";`
`2`	`2`	`export function blobReader(`
`3`	`3`	`blob: Blob,`
`4`	`4`	`onChunk: (chunk: Uint8Array) => void,`