From f6f9644a73e50809cba2d260f65d3bc895c78a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Fri, 1 Sep 2023 17:02:27 +0200 Subject: [PATCH] feat(remix-node): use built-in `atob` & `btoa` (#7206) Co-authored-by: Matt Brophy --- .changeset/early-trains-fold.md | 5 +++++ packages/remix-node/base64.ts | 7 ------- packages/remix-node/globals.ts | 7 ------- 3 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 .changeset/early-trains-fold.md delete mode 100644 packages/remix-node/base64.ts diff --git a/.changeset/early-trains-fold.md b/.changeset/early-trains-fold.md new file mode 100644 index 00000000000..541665eb412 --- /dev/null +++ b/.changeset/early-trains-fold.md @@ -0,0 +1,5 @@ +--- +"@remix-run/node": patch +--- + +Remove `atob`/`btoa` polyfills in favor of built-in versions diff --git a/packages/remix-node/base64.ts b/packages/remix-node/base64.ts deleted file mode 100644 index f4d2f50ffff..00000000000 --- a/packages/remix-node/base64.ts +++ /dev/null @@ -1,7 +0,0 @@ -export function atob(a: string): string { - return Buffer.from(a, "base64").toString("binary"); -} - -export function btoa(b: string): string { - return Buffer.from(b, "binary").toString("base64"); -} diff --git a/packages/remix-node/globals.ts b/packages/remix-node/globals.ts index aadae3533ce..a4e55bea42c 100644 --- a/packages/remix-node/globals.ts +++ b/packages/remix-node/globals.ts @@ -14,7 +14,6 @@ import { WritableStreamDefaultWriter as NodeWritableStreamDefaultWriter, } from "@remix-run/web-stream"; -import { atob, btoa } from "./base64"; import { Blob as NodeBlob, File as NodeFile, @@ -32,9 +31,6 @@ declare global { } interface Global { - atob: typeof atob; - btoa: typeof btoa; - Blob: typeof Blob; File: typeof File; @@ -51,9 +47,6 @@ declare global { } export function installGlobals() { - global.atob = atob; - global.btoa = btoa; - global.Blob = NodeBlob; global.File = NodeFile;