From bf11a92db2a397bf52e5117ef7a90173d65a3064 Mon Sep 17 00:00:00 2001 From: magnus Date: Tue, 26 Nov 2024 14:35:40 +0100 Subject: [PATCH 1/4] remove binary.ts in utils --- packages/utils/src/binary.ts | 66 ------------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 packages/utils/src/binary.ts 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); -} From ee9367c3fae9c963c4fe95d0c52ef4c97a664632 Mon Sep 17 00:00:00 2001 From: magnus Date: Tue, 26 Nov 2024 14:35:48 +0100 Subject: [PATCH 2/4] remove binary.ts in adapters --- packages/open-next/src/adapters/binary.ts | 66 ----------------------- 1 file changed, 66 deletions(-) delete mode 100644 packages/open-next/src/adapters/binary.ts diff --git a/packages/open-next/src/adapters/binary.ts b/packages/open-next/src/adapters/binary.ts deleted file mode 100644 index cd305da87..000000000 --- a/packages/open-next/src/adapters/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); -} From aa6c3d7a742c0546392fbde8ad14d66b6c505aa8 Mon Sep 17 00:00:00 2001 From: magnus Date: Tue, 26 Nov 2024 14:36:11 +0100 Subject: [PATCH 3/4] add binary.ts to utils in open-next package --- packages/open-next/src/adapters/cache.ts | 2 +- packages/open-next/src/build/createAssets.ts | 2 +- packages/open-next/src/core/routing/util.ts | 2 +- .../overrides/proxyExternalRequest/node.ts | 2 +- packages/open-next/src/utils/binary.ts | 66 +++++++++++++++++++ packages/tests-unit/tests/binary.test.ts | 2 +- 6 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 packages/open-next/src/utils/binary.ts 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..ca578b0ac 100644 --- a/packages/open-next/src/build/createAssets.ts +++ b/packages/open-next/src/build/createAssets.ts @@ -1,7 +1,7 @@ import fs from "node:fs"; import path from "node:path"; -import { isBinaryContentType } from "../adapters/binary.js"; +import { isBinaryContentType } from "../utils/binary.js"; import logger from "../logger.js"; import * as buildHelper from "./helper.js"; diff --git a/packages/open-next/src/core/routing/util.ts b/packages/open-next/src/core/routing/util.ts index cba325f17..49274f640 100644 --- a/packages/open-next/src/core/routing/util.ts +++ b/packages/open-next/src/core/routing/util.ts @@ -9,7 +9,7 @@ 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 { isBinaryContentType } from "../../utils/binary.js"; import { debug, error } from "../../adapters/logger.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/utils/binary.ts b/packages/open-next/src/utils/binary.ts new file mode 100644 index 000000000..cd305da87 --- /dev/null +++ b/packages/open-next/src/utils/binary.ts @@ -0,0 +1,66 @@ +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); +} 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 = [ From 9d09a49d169582a51fd24014f1f668ea1f150c1e Mon Sep 17 00:00:00 2001 From: magnus Date: Tue, 26 Nov 2024 15:19:35 +0100 Subject: [PATCH 4/4] biome --- packages/open-next/src/build/createAssets.ts | 2 +- packages/open-next/src/core/routing/util.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/open-next/src/build/createAssets.ts b/packages/open-next/src/build/createAssets.ts index ca578b0ac..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 "../utils/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 49274f640..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 "../../utils/binary.js"; import { debug, error } from "../../adapters/logger.js"; +import { isBinaryContentType } from "../../utils/binary.js"; /** *