refactor(overrides): move types to top level types folder

Author: vicb

packages/open-next/src/adapters/cache.ts

@@ -1,7 +1,7 @@
-import type { IncrementalCache } from "../overrides/incrementalCache/types.js";
-import type { TagCache } from "../overrides/tagCache/types.js";
-import { isBinaryContentType } from "./binary.js";
-import { debug, error, warn } from "./logger.js";
+import type { IncrementalCache, TagCache } from "types/overrides";
+
+import { isBinaryContentType } from "./binary";
+import { debug, error, warn } from "./logger";
 
 interface CachedFetchValue {
   kind: "FETCH";

packages/open-next/src/core/createMainHandler.ts

@@ -1,13 +1,12 @@
 import type { AsyncLocalStorage } from "node:async_hooks";
 
 import type { OpenNextConfig } from "types/open-next";
+import type { IncrementalCache, Queue } from "types/overrides";
 import type { DetachedPromiseRunner } from "utils/promise";
 
 import { debug } from "../adapters/logger";
 import { generateUniqueId } from "../adapters/util";
-import type { IncrementalCache } from "../overrides/incrementalCache/types";
-import type { Queue } from "../overrides/queue/types";
-import { openNextHandler } from "./requestHandler.js";
+import { openNextHandler } from "./requestHandler";
 import {
   resolveConverter,
   resolveIncrementalCache,

packages/open-next/src/core/resolve.ts

@@ -10,9 +10,8 @@ import type {
   OverrideOptions,
   Warmer,
   Wrapper,
-} from "types/open-next.js";
-
-import type { TagCache } from "../overrides/tagCache/types.js";
+} from "types/open-next";
+import type { TagCache } from "types/overrides";
 
 export async function resolveConverter<
   E extends BaseEventOrResult = InternalEvent,

packages/open-next/src/core/routing/cacheInterceptor.ts

@@ -2,10 +2,10 @@ import { createHash } from "node:crypto";
 
 import { NextConfig, PrerenderManifest } from "config/index";
 import type { InternalEvent, InternalResult } from "types/open-next";
+import type { CacheValue } from "types/overrides";
 import { emptyReadableStream, toReadableStream } from "utils/stream";
 
 import { debug } from "../../adapters/logger";
-import type { CacheValue } from "../../overrides/incrementalCache/types";
 import { localizePath } from "./i18n";
 import { generateMessageGroupId } from "./util";
 

packages/open-next/src/overrides/incrementalCache/dummy.ts

@@ -1,4 +1,4 @@
-import type { IncrementalCache } from "./types";
+import type { IncrementalCache } from "types/overrides";
 
 const dummyIncrementalCache: IncrementalCache = {
   name: "dummy",

packages/open-next/src/overrides/incrementalCache/s3-lite.ts

@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import path from "node:path";
+
 import { AwsClient } from "aws4fetch";
-import path from "path";
 import type { Extension } from "types/cache";
+import type { IncrementalCache } from "types/overrides";
 import { IgnorableError, RecoverableError } from "utils/error";
 import { customFetchClient } from "utils/fetch";
 
 import { parseNumberFromEnv } from "../../adapters/util";
-import type { IncrementalCache } from "./types";
 
 let awsClient: AwsClient | null = null;
 

packages/open-next/src/overrides/incrementalCache/s3.ts

@@ -1,16 +1,17 @@
+import path from "node:path";
+
 import type { S3ClientConfig } from "@aws-sdk/client-s3";
 import {
   DeleteObjectCommand,
   GetObjectCommand,
   PutObjectCommand,
   S3Client,
 } from "@aws-sdk/client-s3";
-import path from "path";
 import type { Extension } from "types/cache";
+import type { IncrementalCache } from "types/overrides";
 
 import { awsLogger } from "../../adapters/logger";
 import { parseNumberFromEnv } from "../../adapters/util";
-import type { IncrementalCache } from "./types";
 
 const {
   CACHE_BUCKET_REGION,

packages/open-next/src/overrides/queue/dummy.ts

@@ -1,4 +1,4 @@
-import type { Queue } from "./types";
+import type { Queue } from "types/overrides";
 
 const dummyQueue: Queue = {
   name: "dummy",

packages/open-next/src/overrides/queue/sqs-lite.ts

@@ -1,9 +1,9 @@
 import { AwsClient } from "aws4fetch";
+import type { Queue } from "types/overrides";
 import { RecoverableError } from "utils/error";
 import { customFetchClient } from "utils/fetch";
 
 import { error } from "../../adapters/logger";
-import type { Queue } from "./types";
 
 let awsClient: AwsClient | null = null;
 

packages/open-next/src/overrides/queue/sqs.ts

@@ -1,7 +1,7 @@
 import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
+import type { Queue } from "types/overrides";
 
 import { awsLogger } from "../../adapters/logger";
-import type { Queue } from "./types";
 
 // Expected environment variables
 const { REVALIDATION_QUEUE_REGION, REVALIDATION_QUEUE_URL } = process.env;