refactor: remove dead code and reorganize binary.ts (#652)

sommeeeer · web-flow · commit d2ead5809ca4 · 2024-11-28T08:09:28.000+01:00
diff --git a/packages/open-next/src/adapters/cache.ts b/packages/open-next/src/adapters/cache.ts
@@ -1,4 +1,4 @@
-import { isBinaryContentType } from "./binary";
+import { isBinaryContentType } from "../utils/binary";
 import { debug, error, warn } from "./logger";
 
 interface CachedFetchValue {
diff --git a/packages/open-next/src/build/createAssets.ts b/packages/open-next/src/build/createAssets.ts
@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import { isBinaryContentType } from "../adapters/binary.js";
 import logger from "../logger.js";
+import { isBinaryContentType } from "../utils/binary.js";
 import * as buildHelper from "./helper.js";
 
 export function createStaticAssets(options: buildHelper.BuildOptions) {
diff --git a/packages/open-next/src/core/routing/util.ts b/packages/open-next/src/core/routing/util.ts
@@ -9,8 +9,8 @@ import { parseHeaders } from "http/util.js";
 import type { MiddlewareManifest } from "types/next-types";
 import type { InternalEvent, InternalResult } from "types/open-next.js";
 
-import { isBinaryContentType } from "../../adapters/binary.js";
 import { debug, error } from "../../adapters/logger.js";
+import { isBinaryContentType } from "../../utils/binary.js";
 
 /**
  *
diff --git a/packages/open-next/src/overrides/proxyExternalRequest/node.ts b/packages/open-next/src/overrides/proxyExternalRequest/node.ts
@@ -3,7 +3,7 @@ import { request } from "node:https";
 import { Readable } from "node:stream";
 import type { InternalEvent, InternalResult } from "types/open-next";
 import type { ProxyExternalRequest } from "types/overrides";
-import { isBinaryContentType } from "../../adapters/binary";
+import { isBinaryContentType } from "../../utils/binary";
 
 function filterHeadersForProxy(
   headers: Record<string, string | string[] | undefined>,
diff --git a/packages/open-next/src/utils/binary.ts b/packages/open-next/src/utils/binary.ts
diff --git a/packages/tests-unit/tests/binary.test.ts b/packages/tests-unit/tests/binary.test.ts
@@ -1,4 +1,4 @@
-import { isBinaryContentType } from "@opennextjs/aws/adapters/binary.js";
+import { isBinaryContentType } from "@opennextjs/aws/utils/binary.js";
 
 describe("isBinaryContentType", () => {
   const tests = [
diff --git a/packages/utils/src/binary.ts b/packages/utils/src/binary.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isBinaryContentType } from "./binary";`
	`1`	`+import { isBinaryContentType } from "../utils/binary";`
`2`	`2`	`import { debug, error, warn } from "./logger";`
`3`	`3`
`4`	`4`	`interface CachedFetchValue {`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import { parseHeaders } from "http/util.js";`
`9`	`9`	`import type { MiddlewareManifest } from "types/next-types";`
`10`	`10`	`import type { InternalEvent, InternalResult } from "types/open-next.js";`
`11`	`11`
`12`		`-import { isBinaryContentType } from "../../adapters/binary.js";`
`13`	`12`	`import { debug, error } from "../../adapters/logger.js";`
	`13`	`+import { isBinaryContentType } from "../../utils/binary.js";`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isBinaryContentType } from "@opennextjs/aws/adapters/binary.js";`
	`1`	`+import { isBinaryContentType } from "@opennextjs/aws/utils/binary.js";`
`2`	`2`
`3`	`3`	`describe("isBinaryContentType", () => {`
`4`	`4`	`const tests = [`