diff --git a/packages/open-next/src/adapters/cache.ts b/packages/open-next/src/adapters/cache.ts index 9f87fa6e9..a52bd12db 100644 --- 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 index 2c9206c96..b67d6790d 100644 --- 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 index cba325f17..6d5191b08 100644 --- 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 index 5ab0f4659..04cd1131b 100644 --- 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, diff --git a/packages/open-next/src/adapters/binary.ts b/packages/open-next/src/utils/binary.ts similarity index 100% rename from packages/open-next/src/adapters/binary.ts rename to 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 index 1562716e1..5d0faeeb0 100644 --- 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 deleted file mode 100644 index cd305da87..000000000 --- a/packages/utils/src/binary.ts +++ /dev/null @@ -1,66 +0,0 @@ -const commonBinaryMimeTypes = new Set([ - "application/octet-stream", - // Docs - "application/epub+zip", - "application/msword", - "application/pdf", - "application/rtf", - "application/vnd.amazon.ebook", - "application/vnd.ms-excel", - "application/vnd.ms-powerpoint", - "application/vnd.openxmlformats-officedocument.presentationml.presentation", - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - // Fonts - "font/otf", - "font/woff", - "font/woff2", - // Images - "image/bmp", - "image/gif", - "image/jpeg", - "image/png", - "image/tiff", - "image/vnd.microsoft.icon", - "image/webp", - // Audio - "audio/3gpp", - "audio/aac", - "audio/basic", - "audio/mpeg", - "audio/ogg", - "audio/wavaudio/webm", - "audio/x-aiff", - "audio/x-midi", - "audio/x-wav", - // Video - "video/3gpp", - "video/mp2t", - "video/mpeg", - "video/ogg", - "video/quicktime", - "video/webm", - "video/x-msvideo", - // Archives - "application/java-archive", - "application/vnd.apple.installer+xml", - "application/x-7z-compressed", - "application/x-apple-diskimage", - "application/x-bzip", - "application/x-bzip2", - "application/x-gzip", - "application/x-java-archive", - "application/x-rar-compressed", - "application/x-tar", - "application/x-zip", - "application/zip", - // Serialized data - "application/x-protobuf", -]); - -export function isBinaryContentType(contentType?: string | null) { - if (!contentType) return false; - - const value = contentType?.split(";")[0] ?? ""; - return commonBinaryMimeTypes.has(value); -}