From 7ab3788e4c8e396a54cc331cbb982fe6e1f4e342 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 2 Feb 2026 18:26:08 +0000 Subject: [PATCH] update import aliases to new format --- packages/open-next/src/adapter.ts | 2 +- packages/open-next/src/adapters/cache.ts | 4 ++-- packages/open-next/src/adapters/composable-cache.ts | 8 ++++---- packages/open-next/src/adapters/config/util.ts | 2 +- packages/open-next/src/adapters/edge-adapter.ts | 8 ++++---- .../src/adapters/image-optimization-adapter.ts | 8 ++++---- packages/open-next/src/adapters/logger.ts | 2 +- packages/open-next/src/adapters/middleware.ts | 6 +++--- packages/open-next/src/build/compileConfig.ts | 3 ++- packages/open-next/src/build/copyTracedFiles.ts | 4 ++-- packages/open-next/src/build/createAssets.ts | 4 ++-- packages/open-next/src/build/createMiddleware.ts | 2 +- packages/open-next/src/build/createServerBundle.ts | 5 +++-- .../open-next/src/build/edge/createEdgeBundle.ts | 9 +++++---- packages/open-next/src/build/generateOutput.ts | 4 ++-- packages/open-next/src/build/helper.ts | 3 ++- packages/open-next/src/build/installDeps.ts | 2 +- .../src/build/middleware/buildNodeMiddleware.ts | 6 +++--- .../patch/patches/patchBackgroundRevalidation.ts | 2 +- .../src/build/patch/patches/patchFetchCacheISR.ts | 3 ++- .../build/patch/patches/patchFetchCacheWaitUntil.ts | 2 +- .../src/build/patch/patches/patchNextServer.ts | 2 +- .../src/build/patch/patches/patchNodeEnvironment.ts | 2 +- packages/open-next/src/build/validateConfig.ts | 2 +- packages/open-next/src/core/createGenericHandler.ts | 4 ++-- packages/open-next/src/core/createMainHandler.ts | 2 +- packages/open-next/src/core/edgeFunctionHandler.ts | 2 +- packages/open-next/src/core/nodeMiddlewareHandler.ts | 2 +- packages/open-next/src/core/requestHandler.ts | 9 ++++----- packages/open-next/src/core/require-hooks.ts | 2 +- packages/open-next/src/core/resolve.ts | 4 ++-- .../open-next/src/core/routing/adapterHandler.ts | 3 +-- .../open-next/src/core/routing/cacheInterceptor.ts | 12 ++++++------ packages/open-next/src/core/routing/i18n/index.ts | 8 ++++---- packages/open-next/src/core/routing/matcher.ts | 11 ++++++----- packages/open-next/src/core/routing/middleware.ts | 11 ++++++++--- packages/open-next/src/core/routing/routeMatcher.ts | 6 +++--- packages/open-next/src/core/routing/util.ts | 7 +++---- packages/open-next/src/core/routingHandler.ts | 6 +++--- packages/open-next/src/core/util.ts | 3 ++- packages/open-next/src/helpers/withCloudflare.ts | 2 +- packages/open-next/src/helpers/withSST.ts | 2 +- packages/open-next/src/http/openNextResponse.ts | 2 +- .../open-next/src/overrides/assetResolver/dummy.ts | 2 +- .../src/overrides/cdnInvalidation/cloudfront.ts | 3 ++- .../open-next/src/overrides/cdnInvalidation/dummy.ts | 2 +- .../src/overrides/converters/aws-apigw-v1.ts | 7 ++++--- .../src/overrides/converters/aws-apigw-v2.ts | 6 +++--- .../src/overrides/converters/aws-cloudfront.ts | 6 +++--- packages/open-next/src/overrides/converters/dummy.ts | 2 +- packages/open-next/src/overrides/converters/edge.ts | 4 ++-- packages/open-next/src/overrides/converters/node.ts | 5 +++-- .../src/overrides/converters/sqs-revalidate.ts | 3 ++- .../open-next/src/overrides/imageLoader/dummy.ts | 4 ++-- .../open-next/src/overrides/imageLoader/fs-dev.ts | 6 +++--- packages/open-next/src/overrides/imageLoader/host.ts | 4 ++-- .../open-next/src/overrides/imageLoader/s3-lite.ts | 5 +++-- packages/open-next/src/overrides/imageLoader/s3.ts | 5 +++-- .../src/overrides/incrementalCache/dummy.ts | 4 ++-- .../src/overrides/incrementalCache/fs-dev.ts | 4 ++-- .../overrides/incrementalCache/multi-tier-ddb-s3.ts | 6 +++--- .../src/overrides/incrementalCache/s3-lite.ts | 9 +++++---- .../open-next/src/overrides/incrementalCache/s3.ts | 5 +++-- .../open-next/src/overrides/originResolver/dummy.ts | 2 +- .../src/overrides/originResolver/pattern-env.ts | 4 ++-- .../src/overrides/proxyExternalRequest/dummy.ts | 4 ++-- .../src/overrides/proxyExternalRequest/fetch.ts | 4 ++-- .../src/overrides/proxyExternalRequest/node.ts | 4 ++-- packages/open-next/src/overrides/queue/direct.ts | 2 +- packages/open-next/src/overrides/queue/dummy.ts | 4 ++-- packages/open-next/src/overrides/queue/sqs-lite.ts | 7 ++++--- packages/open-next/src/overrides/queue/sqs.ts | 3 ++- packages/open-next/src/overrides/tagCache/dummy.ts | 2 +- .../src/overrides/tagCache/dynamodb-lite.ts | 7 ++++--- .../src/overrides/tagCache/dynamodb-nextMode.ts | 7 ++++--- .../open-next/src/overrides/tagCache/dynamodb.ts | 3 ++- .../src/overrides/tagCache/fs-dev-nextMode.ts | 2 +- packages/open-next/src/overrides/tagCache/fs-dev.ts | 4 ++-- .../open-next/src/overrides/warmer/aws-lambda.ts | 2 +- packages/open-next/src/overrides/warmer/dummy.ts | 4 ++-- .../src/overrides/wrappers/aws-lambda-compressed.ts | 6 +++--- .../src/overrides/wrappers/aws-lambda-streaming.ts | 5 +++-- .../open-next/src/overrides/wrappers/aws-lambda.ts | 6 +++--- .../src/overrides/wrappers/cloudflare-edge.ts | 4 ++-- .../src/overrides/wrappers/cloudflare-node.ts | 4 ++-- packages/open-next/src/overrides/wrappers/dummy.ts | 4 ++-- .../open-next/src/overrides/wrappers/express-dev.ts | 9 +++++---- packages/open-next/src/overrides/wrappers/node.ts | 4 ++-- packages/open-next/src/plugins/edge.ts | 3 ++- packages/open-next/src/plugins/externalMiddleware.ts | 3 ++- .../open-next/src/plugins/inlineRouteHandlers.ts | 2 +- packages/open-next/src/plugins/resolve.ts | 5 +++-- packages/open-next/src/types/global.ts | 2 +- packages/open-next/src/types/overrides.ts | 2 +- packages/open-next/src/utils/cache.ts | 2 +- packages/open-next/src/utils/promise.ts | 2 +- packages/open-next/tsconfig.json | 7 +++---- 97 files changed, 223 insertions(+), 197 deletions(-) diff --git a/packages/open-next/src/adapter.ts b/packages/open-next/src/adapter.ts index 3a788cdc..e521bcee 100644 --- a/packages/open-next/src/adapter.ts +++ b/packages/open-next/src/adapter.ts @@ -2,7 +2,7 @@ import fs from "node:fs"; import { createRequire } from "node:module"; import path from "node:path"; -import type { NextConfig } from "types/next-types"; +import type { NextConfig } from "@/types/next-types"; import { compileCache } from "./build/compileCache.js"; import { compileOpenNextConfig } from "./build/compileConfig.js"; diff --git a/packages/open-next/src/adapters/cache.ts b/packages/open-next/src/adapters/cache.ts index e128816d..e95c7b6b 100644 --- a/packages/open-next/src/adapters/cache.ts +++ b/packages/open-next/src/adapters/cache.ts @@ -1,5 +1,5 @@ -import type { CacheHandlerValue, IncrementalCacheContext, IncrementalCacheValue } from "types/cache"; -import { getTagsFromValue, hasBeenRevalidated, writeTags } from "utils/cache"; +import type { CacheHandlerValue, IncrementalCacheContext, IncrementalCacheValue } from "@/types/cache"; +import { getTagsFromValue, hasBeenRevalidated, writeTags } from "@/utils/cache"; import { isBinaryContentType } from "../utils/binary"; diff --git a/packages/open-next/src/adapters/composable-cache.ts b/packages/open-next/src/adapters/composable-cache.ts index a60615f4..a6fb19c3 100644 --- a/packages/open-next/src/adapters/composable-cache.ts +++ b/packages/open-next/src/adapters/composable-cache.ts @@ -1,7 +1,7 @@ -import type { ComposableCacheEntry, ComposableCacheHandler } from "types/cache"; -import type { CacheValue } from "types/overrides"; -import { writeTags } from "utils/cache"; -import { fromReadableStream, toReadableStream } from "utils/stream"; +import type { ComposableCacheEntry, ComposableCacheHandler } from "@/types/cache"; +import type { CacheValue } from "@/types/overrides"; +import { writeTags } from "@/utils/cache"; +import { fromReadableStream, toReadableStream } from "@/utils/stream"; import { debug } from "./logger"; diff --git a/packages/open-next/src/adapters/config/util.ts b/packages/open-next/src/adapters/config/util.ts index defd7274..228c0572 100644 --- a/packages/open-next/src/adapters/config/util.ts +++ b/packages/open-next/src/adapters/config/util.ts @@ -7,7 +7,7 @@ import type { NextConfig, PrerenderManifest, RoutesManifest, -} from "types/next-types"; +} from "@/types/next-types"; import type { PublicFiles } from "../../build"; diff --git a/packages/open-next/src/adapters/edge-adapter.ts b/packages/open-next/src/adapters/edge-adapter.ts index 4c7047e2..f6841c6b 100644 --- a/packages/open-next/src/adapters/edge-adapter.ts +++ b/packages/open-next/src/adapters/edge-adapter.ts @@ -1,9 +1,9 @@ import type { ReadableStream } from "node:stream/web"; -import type { InternalEvent, InternalResult } from "types/open-next"; -import type { OpenNextHandlerOptions } from "types/overrides"; -import { runWithOpenNextRequestContext } from "utils/promise"; -import { emptyReadableStream } from "utils/stream"; +import type { InternalEvent, InternalResult } from "@/types/open-next"; +import type { OpenNextHandlerOptions } from "@/types/overrides"; +import { runWithOpenNextRequestContext } from "@/utils/promise"; +import { emptyReadableStream } from "@/utils/stream"; // We import it like that so that the edge plugin can replace it import { NextConfig } from "../adapters/config"; diff --git a/packages/open-next/src/adapters/image-optimization-adapter.ts b/packages/open-next/src/adapters/image-optimization-adapter.ts index 806f9833..55a5fb16 100644 --- a/packages/open-next/src/adapters/image-optimization-adapter.ts +++ b/packages/open-next/src/adapters/image-optimization-adapter.ts @@ -4,7 +4,6 @@ import https from "node:https"; import path from "node:path"; import type { Writable } from "node:stream"; -import { loadBuildId, loadConfig } from "config/util.js"; // @ts-ignore import { defaultConfig } from "next/dist/server/config-shared"; import { @@ -13,11 +12,12 @@ import { } from "next/dist/server/image-optimizer"; // @ts-ignore import type { NextUrlWithParsedQuery } from "next/dist/server/request-meta"; -import type { InternalEvent, InternalResult, StreamCreator } from "types/open-next.js"; -import type { OpenNextHandlerOptions } from "types/overrides.js"; -import { emptyReadableStream, toReadableStream } from "utils/stream.js"; +import { loadBuildId, loadConfig } from "@/config/util.js"; import { OpenNextNodeResponse } from "@/http/openNextResponse.js"; +import type { InternalEvent, InternalResult, StreamCreator } from "@/types/open-next.js"; +import type { OpenNextHandlerOptions } from "@/types/overrides.js"; +import { emptyReadableStream, toReadableStream } from "@/utils/stream.js"; import { createGenericHandler } from "../core/createGenericHandler.js"; import { resolveImageLoader } from "../core/resolve.js"; diff --git a/packages/open-next/src/adapters/logger.ts b/packages/open-next/src/adapters/logger.ts index 0a0f2725..64b3aee7 100644 --- a/packages/open-next/src/adapters/logger.ts +++ b/packages/open-next/src/adapters/logger.ts @@ -1,4 +1,4 @@ -import { isOpenNextError } from "utils/error.js"; +import { isOpenNextError } from "@/utils/error.js"; export function debug(...args: any[]) { if (globalThis.openNextDebug) { diff --git a/packages/open-next/src/adapters/middleware.ts b/packages/open-next/src/adapters/middleware.ts index 92827d74..3d777fa8 100644 --- a/packages/open-next/src/adapters/middleware.ts +++ b/packages/open-next/src/adapters/middleware.ts @@ -3,9 +3,9 @@ import type { InternalEvent, InternalResult, MiddlewareResult, -} from "types/open-next"; -import type { OpenNextHandlerOptions } from "types/overrides"; -import { runWithOpenNextRequestContext } from "utils/promise"; +} from "@/types/open-next"; +import type { OpenNextHandlerOptions } from "@/types/overrides"; +import { runWithOpenNextRequestContext } from "@/utils/promise"; import { debug, error } from "../adapters/logger"; import { createGenericHandler } from "../core/createGenericHandler"; diff --git a/packages/open-next/src/build/compileConfig.ts b/packages/open-next/src/build/compileConfig.ts index 6bc7e2ed..d4da6813 100644 --- a/packages/open-next/src/build/compileConfig.ts +++ b/packages/open-next/src/build/compileConfig.ts @@ -3,7 +3,8 @@ import os from "node:os"; import path from "node:path"; import { buildSync } from "esbuild"; -import type { OpenNextConfig } from "types/open-next.js"; + +import type { OpenNextConfig } from "@/types/open-next.js"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/copyTracedFiles.ts b/packages/open-next/src/build/copyTracedFiles.ts index c3e226ff..31a1d63f 100644 --- a/packages/open-next/src/build/copyTracedFiles.ts +++ b/packages/open-next/src/build/copyTracedFiles.ts @@ -21,8 +21,8 @@ import { loadMiddlewareManifest, loadPagesManifest, loadPrerenderManifest, -} from "config/util.js"; -import { getCrossPlatformPathRegex } from "utils/regex.js"; +} from "@/config/util.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/createAssets.ts b/packages/open-next/src/build/createAssets.ts index 72b63e9f..b60d7a74 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 { loadConfig } from "config/util.js"; -import { safeParseJsonFile } from "utils/safe-json-parse.js"; +import { loadConfig } from "@/config/util.js"; +import { safeParseJsonFile } from "@/utils/safe-json-parse.js"; import logger from "../logger.js"; import type { TagCacheMetaFile } from "../types/cache.js"; diff --git a/packages/open-next/src/build/createMiddleware.ts b/packages/open-next/src/build/createMiddleware.ts index cab67c4f..a5e6fb39 100644 --- a/packages/open-next/src/build/createMiddleware.ts +++ b/packages/open-next/src/build/createMiddleware.ts @@ -1,7 +1,7 @@ import fs from "node:fs"; import path from "node:path"; -import { loadFunctionsConfigManifest, loadMiddlewareManifest } from "config/util.js"; +import { loadFunctionsConfigManifest, loadMiddlewareManifest } from "@/config/util.js"; import logger from "../logger.js"; import type { MiddlewareInfo } from "../types/next-types.js"; diff --git a/packages/open-next/src/build/createServerBundle.ts b/packages/open-next/src/build/createServerBundle.ts index 79353b67..82eabf63 100644 --- a/packages/open-next/src/build/createServerBundle.ts +++ b/packages/open-next/src/build/createServerBundle.ts @@ -2,9 +2,10 @@ import fs from "node:fs"; import { createRequire } from "node:module"; import path from "node:path"; -import { loadMiddlewareManifest } from "config/util.js"; import type { Plugin } from "esbuild"; -import type { FunctionOptions, SplittedFunctionOptions } from "types/open-next"; + +import { loadMiddlewareManifest } from "@/config/util.js"; +import type { FunctionOptions, SplittedFunctionOptions } from "@/types/open-next"; import type { NextAdapterOutputs } from "../adapter.js"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/edge/createEdgeBundle.ts b/packages/open-next/src/build/edge/createEdgeBundle.ts index 785968fe..22137f80 100644 --- a/packages/open-next/src/build/edge/createEdgeBundle.ts +++ b/packages/open-next/src/build/edge/createEdgeBundle.ts @@ -1,9 +1,10 @@ import fs from "node:fs"; import path from "node:path"; -import { loadMiddlewareManifest } from "config/util.js"; import { type Plugin, build } from "esbuild"; -import type { MiddlewareInfo } from "types/next-types"; + +import { loadMiddlewareManifest } from "@/config/util.js"; +import type { MiddlewareInfo } from "@/types/next-types"; import type { IncludedConverter, IncludedOriginResolver, @@ -11,8 +12,8 @@ import type { OverrideOptions, RouteTemplate, SplittedFunctionOptions, -} from "types/open-next"; -import type { OriginResolver } from "types/overrides.js"; +} from "@/types/open-next"; +import type { OriginResolver } from "@/types/overrides.js"; import logger from "../../logger.js"; import { ContentUpdater } from "../../plugins/content-updater.js"; diff --git a/packages/open-next/src/build/generateOutput.ts b/packages/open-next/src/build/generateOutput.ts index b63209c8..79716cdc 100644 --- a/packages/open-next/src/build/generateOutput.ts +++ b/packages/open-next/src/build/generateOutput.ts @@ -1,7 +1,7 @@ import * as fs from "node:fs"; import path from "node:path"; -import { loadConfig } from "config/util.js"; +import { loadConfig } from "@/config/util.js"; import type { BaseOverride, DefaultOverrideOptions, @@ -9,7 +9,7 @@ import type { FunctionOptions, LazyLoadedOverride, OverrideOptions, -} from "types/open-next"; +} from "@/types/open-next"; import { type BuildOptions, getBuildId } from "./helper.js"; diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index 677d0142..c4ee7f30 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -5,7 +5,8 @@ import url from "node:url"; import type { BuildOptions as ESBuildOptions } from "esbuild"; import { build as buildAsync, buildSync } from "esbuild"; -import type { DefaultOverrideOptions, OpenNextConfig } from "types/open-next.js"; + +import type { DefaultOverrideOptions, OpenNextConfig } from "@/types/open-next.js"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/installDeps.ts b/packages/open-next/src/build/installDeps.ts index b70a82f5..bc291a19 100644 --- a/packages/open-next/src/build/installDeps.ts +++ b/packages/open-next/src/build/installDeps.ts @@ -3,7 +3,7 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; -import type { InstallOptions } from "types/open-next"; +import type { InstallOptions } from "@/types/open-next"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/middleware/buildNodeMiddleware.ts b/packages/open-next/src/build/middleware/buildNodeMiddleware.ts index 9b450fb7..fe3a17fc 100644 --- a/packages/open-next/src/build/middleware/buildNodeMiddleware.ts +++ b/packages/open-next/src/build/middleware/buildNodeMiddleware.ts @@ -1,9 +1,9 @@ import fs from "node:fs"; import path from "node:path"; -import type { IncludedOriginResolver, LazyLoadedOverride, OverrideOptions } from "types/open-next.js"; -import type { OriginResolver } from "types/overrides.js"; -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import type { IncludedOriginResolver, LazyLoadedOverride, OverrideOptions } from "@/types/open-next.js"; +import type { OriginResolver } from "@/types/overrides.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { openNextExternalMiddlewarePlugin } from "../../plugins/externalMiddleware.js"; import { openNextReplacementPlugin } from "../../plugins/replacement.js"; diff --git a/packages/open-next/src/build/patch/patches/patchBackgroundRevalidation.ts b/packages/open-next/src/build/patch/patches/patchBackgroundRevalidation.ts index f6c615c1..9845f774 100644 --- a/packages/open-next/src/build/patch/patches/patchBackgroundRevalidation.ts +++ b/packages/open-next/src/build/patch/patches/patchBackgroundRevalidation.ts @@ -1,4 +1,4 @@ -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { createPatchCode } from "../astCodePatcher.js"; import type { CodePatcher } from "../codePatcher.js"; diff --git a/packages/open-next/src/build/patch/patches/patchFetchCacheISR.ts b/packages/open-next/src/build/patch/patches/patchFetchCacheISR.ts index 3589e995..38fa023b 100644 --- a/packages/open-next/src/build/patch/patches/patchFetchCacheISR.ts +++ b/packages/open-next/src/build/patch/patches/patchFetchCacheISR.ts @@ -1,5 +1,6 @@ import { Lang } from "@ast-grep/napi"; -import { getCrossPlatformPathRegex } from "utils/regex.js"; + +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { createPatchCode } from "../astCodePatcher.js"; import type { CodePatcher } from "../codePatcher.js"; diff --git a/packages/open-next/src/build/patch/patches/patchFetchCacheWaitUntil.ts b/packages/open-next/src/build/patch/patches/patchFetchCacheWaitUntil.ts index 7fd2dfdc..671d58d5 100644 --- a/packages/open-next/src/build/patch/patches/patchFetchCacheWaitUntil.ts +++ b/packages/open-next/src/build/patch/patches/patchFetchCacheWaitUntil.ts @@ -1,4 +1,4 @@ -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { createPatchCode } from "../astCodePatcher.js"; import type { CodePatcher } from "../codePatcher.js"; diff --git a/packages/open-next/src/build/patch/patches/patchNextServer.ts b/packages/open-next/src/build/patch/patches/patchNextServer.ts index fd37d94b..98fba834 100644 --- a/packages/open-next/src/build/patch/patches/patchNextServer.ts +++ b/packages/open-next/src/build/patch/patches/patchNextServer.ts @@ -1,4 +1,4 @@ -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { createPatchCode } from "../astCodePatcher.js"; import type { CodePatcher } from "../codePatcher.js"; diff --git a/packages/open-next/src/build/patch/patches/patchNodeEnvironment.ts b/packages/open-next/src/build/patch/patches/patchNodeEnvironment.ts index 7b1e510c..e864b194 100644 --- a/packages/open-next/src/build/patch/patches/patchNodeEnvironment.ts +++ b/packages/open-next/src/build/patch/patches/patchNodeEnvironment.ts @@ -1,4 +1,4 @@ -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import { createPatchCode } from "../astCodePatcher.js"; import type { CodePatcher } from "../codePatcher.js"; diff --git a/packages/open-next/src/build/validateConfig.ts b/packages/open-next/src/build/validateConfig.ts index 68cf44fb..7e5c6be9 100644 --- a/packages/open-next/src/build/validateConfig.ts +++ b/packages/open-next/src/build/validateConfig.ts @@ -4,7 +4,7 @@ import type { IncludedWrapper, OpenNextConfig, SplittedFunctionOptions, -} from "types/open-next"; +} from "@/types/open-next"; import logger from "../logger.js"; diff --git a/packages/open-next/src/core/createGenericHandler.ts b/packages/open-next/src/core/createGenericHandler.ts index 13dfbf72..486e7d41 100644 --- a/packages/open-next/src/core/createGenericHandler.ts +++ b/packages/open-next/src/core/createGenericHandler.ts @@ -4,8 +4,8 @@ import type { InternalEvent, InternalResult, OpenNextConfig, -} from "types/open-next"; -import type { OpenNextHandler } from "types/overrides"; +} from "@/types/open-next"; +import type { OpenNextHandler } from "@/types/overrides"; import { debug } from "../adapters/logger"; diff --git a/packages/open-next/src/core/createMainHandler.ts b/packages/open-next/src/core/createMainHandler.ts index c4cbf9f5..abd7615f 100644 --- a/packages/open-next/src/core/createMainHandler.ts +++ b/packages/open-next/src/core/createMainHandler.ts @@ -1,4 +1,4 @@ -import type { OpenNextConfig } from "types/open-next"; +import type { OpenNextConfig } from "@/types/open-next"; import { debug } from "../adapters/logger"; import { generateUniqueId } from "../adapters/util"; diff --git a/packages/open-next/src/core/edgeFunctionHandler.ts b/packages/open-next/src/core/edgeFunctionHandler.ts index 4be8e92c..6f2168a4 100644 --- a/packages/open-next/src/core/edgeFunctionHandler.ts +++ b/packages/open-next/src/core/edgeFunctionHandler.ts @@ -1,6 +1,6 @@ // Necessary files will be imported here with banner in esbuild -import type { RequestData } from "types/global"; +import type { RequestData } from "@/types/global"; type EdgeRequest = Omit; diff --git a/packages/open-next/src/core/nodeMiddlewareHandler.ts b/packages/open-next/src/core/nodeMiddlewareHandler.ts index 147a1082..796fc20a 100644 --- a/packages/open-next/src/core/nodeMiddlewareHandler.ts +++ b/packages/open-next/src/core/nodeMiddlewareHandler.ts @@ -1,4 +1,4 @@ -import type { RequestData } from "types/global"; +import type { RequestData } from "@/types/global"; type EdgeRequest = Omit; diff --git a/packages/open-next/src/core/requestHandler.ts b/packages/open-next/src/core/requestHandler.ts index 6888945a..a02001ac 100644 --- a/packages/open-next/src/core/requestHandler.ts +++ b/packages/open-next/src/core/requestHandler.ts @@ -1,12 +1,11 @@ import { AsyncLocalStorage } from "node:async_hooks"; -import { NextConfig } from "config/index"; -import type { InternalEvent, InternalResult, ResolvedRoute, RoutingResult } from "types/open-next"; -import type { OpenNextHandlerOptions } from "types/overrides"; -import { runWithOpenNextRequestContext } from "utils/promise"; - +import { NextConfig } from "@/config/index"; import type { OpenNextNodeResponse } from "@/http/index.js"; import { IncomingMessage } from "@/http/index.js"; +import type { InternalEvent, InternalResult, ResolvedRoute, RoutingResult } from "@/types/open-next"; +import type { OpenNextHandlerOptions } from "@/types/overrides"; +import { runWithOpenNextRequestContext } from "@/utils/promise"; import { debug, error } from "../adapters/logger"; diff --git a/packages/open-next/src/core/require-hooks.ts b/packages/open-next/src/core/require-hooks.ts index f6450df0..4445cae9 100644 --- a/packages/open-next/src/core/require-hooks.ts +++ b/packages/open-next/src/core/require-hooks.ts @@ -2,7 +2,7 @@ // This is needed for userland plugins to attach to the same webpack instance as Next.js'. // Individually compiled modules are as defined for the compilation in bundles/webpack/packages/*. -import type { NextConfig } from "types/next-types.js"; +import type { NextConfig } from "@/types/next-types.js"; import { error } from "../adapters/logger.js"; diff --git a/packages/open-next/src/core/resolve.ts b/packages/open-next/src/core/resolve.ts index 5e3aaa47..a6d41389 100644 --- a/packages/open-next/src/core/resolve.ts +++ b/packages/open-next/src/core/resolve.ts @@ -6,8 +6,8 @@ import type { InternalResult, OpenNextConfig, OverrideOptions, -} from "types/open-next"; -import type { Converter, TagCache, Wrapper } from "types/overrides"; +} from "@/types/open-next"; +import type { Converter, TagCache, Wrapper } from "@/types/overrides"; // Just a little utility type to remove undefined from a type type RemoveUndefined = T extends undefined ? never : T; diff --git a/packages/open-next/src/core/routing/adapterHandler.ts b/packages/open-next/src/core/routing/adapterHandler.ts index 28707fb6..379889da 100644 --- a/packages/open-next/src/core/routing/adapterHandler.ts +++ b/packages/open-next/src/core/routing/adapterHandler.ts @@ -1,9 +1,8 @@ import type { IncomingMessage } from "node:http"; import { finished } from "node:stream/promises"; -import type { ResolvedRoute, RoutingResult, WaitUntil } from "types/open-next"; - import type { OpenNextNodeResponse } from "@/http/index"; +import type { ResolvedRoute, RoutingResult, WaitUntil } from "@/types/open-next"; /** * This function loads the necessary routes, and invoke the expected handler. diff --git a/packages/open-next/src/core/routing/cacheInterceptor.ts b/packages/open-next/src/core/routing/cacheInterceptor.ts index 8a86e72d..472f0d87 100644 --- a/packages/open-next/src/core/routing/cacheInterceptor.ts +++ b/packages/open-next/src/core/routing/cacheInterceptor.ts @@ -1,11 +1,11 @@ import { createHash } from "node:crypto"; -import { NextConfig, PrerenderManifest } from "config/index"; -import type { InternalEvent, InternalResult, MiddlewareEvent } from "types/open-next"; -import type { CacheValue } from "types/overrides"; -import { isBinaryContentType } from "utils/binary"; -import { getTagsFromValue, hasBeenRevalidated } from "utils/cache"; -import { emptyReadableStream, toReadableStream } from "utils/stream"; +import { NextConfig, PrerenderManifest } from "@/config/index"; +import type { InternalEvent, InternalResult, MiddlewareEvent } from "@/types/open-next"; +import type { CacheValue } from "@/types/overrides"; +import { isBinaryContentType } from "@/utils/binary"; +import { getTagsFromValue, hasBeenRevalidated } from "@/utils/cache"; +import { emptyReadableStream, toReadableStream } from "@/utils/stream"; import { debug, error } from "../../adapters/logger"; diff --git a/packages/open-next/src/core/routing/i18n/index.ts b/packages/open-next/src/core/routing/i18n/index.ts index da525d90..008c59cb 100644 --- a/packages/open-next/src/core/routing/i18n/index.ts +++ b/packages/open-next/src/core/routing/i18n/index.ts @@ -1,7 +1,7 @@ -import { NextConfig } from "config/index.js"; -import type { DomainLocale, i18nConfig } from "types/next-types"; -import type { InternalEvent, InternalResult } from "types/open-next"; -import { emptyReadableStream } from "utils/stream.js"; +import { NextConfig } from "@/config/index.js"; +import type { DomainLocale, i18nConfig } from "@/types/next-types"; +import type { InternalEvent, InternalResult } from "@/types/open-next"; +import { emptyReadableStream } from "@/utils/stream.js"; import { debug } from "../../../adapters/logger.js"; import { constructNextUrl } from "../util.js"; diff --git a/packages/open-next/src/core/routing/matcher.ts b/packages/open-next/src/core/routing/matcher.ts index c9f24db5..f91816a1 100644 --- a/packages/open-next/src/core/routing/matcher.ts +++ b/packages/open-next/src/core/routing/matcher.ts @@ -1,16 +1,17 @@ -import { NextConfig } from "config/index"; import type { Match, MatchFunction, PathFunction } from "path-to-regexp"; import { compile, match } from "path-to-regexp"; + +import { NextConfig } from "@/config/index"; import type { Header, PrerenderManifest, RedirectDefinition, RewriteDefinition, RouteHas, -} from "types/next-types"; -import type { InternalEvent, InternalResult } from "types/open-next"; -import { normalizeRepeatedSlashes } from "utils/normalize-path"; -import { emptyReadableStream, toReadableStream } from "utils/stream"; +} from "@/types/next-types"; +import type { InternalEvent, InternalResult } from "@/types/open-next"; +import { normalizeRepeatedSlashes } from "@/utils/normalize-path"; +import { emptyReadableStream, toReadableStream } from "@/utils/stream"; import { debug } from "../../adapters/logger"; diff --git a/packages/open-next/src/core/routing/middleware.ts b/packages/open-next/src/core/routing/middleware.ts index a98000e2..78638c95 100644 --- a/packages/open-next/src/core/routing/middleware.ts +++ b/packages/open-next/src/core/routing/middleware.ts @@ -1,8 +1,13 @@ import type { ReadableStream } from "node:stream/web"; -import { FunctionsConfigManifest, MiddlewareManifest, NextConfig, PrerenderManifest } from "config/index.js"; -import type { InternalEvent, InternalResult, MiddlewareEvent } from "types/open-next.js"; -import { emptyReadableStream } from "utils/stream.js"; +import { + FunctionsConfigManifest, + MiddlewareManifest, + NextConfig, + PrerenderManifest, +} from "@/config/index.js"; +import type { InternalEvent, InternalResult, MiddlewareEvent } from "@/types/open-next.js"; +import { emptyReadableStream } from "@/utils/stream.js"; import { getQueryFromSearchParams } from "../../overrides/converters/utils.js"; diff --git a/packages/open-next/src/core/routing/routeMatcher.ts b/packages/open-next/src/core/routing/routeMatcher.ts index 140b2711..83fb4ef8 100644 --- a/packages/open-next/src/core/routing/routeMatcher.ts +++ b/packages/open-next/src/core/routing/routeMatcher.ts @@ -1,6 +1,6 @@ -import { AppPathRoutesManifest, PagesManifest, RoutesManifest } from "config/index"; -import type { RouteDefinition } from "types/next-types"; -import type { ResolvedRoute, RouteType } from "types/open-next"; +import { AppPathRoutesManifest, PagesManifest, RoutesManifest } from "@/config/index"; +import type { RouteDefinition } from "@/types/next-types"; +import type { ResolvedRoute, RouteType } from "@/types/open-next"; // Add the locale prefix to the regex so we correctly match the rawPath const optionalLocalePrefixRegex = `^/(?:${RoutesManifest.locales.map((locale) => `${locale}/?`).join("|")})?`; diff --git a/packages/open-next/src/core/routing/util.ts b/packages/open-next/src/core/routing/util.ts index e191035b..0d4ead50 100644 --- a/packages/open-next/src/core/routing/util.ts +++ b/packages/open-next/src/core/routing/util.ts @@ -3,13 +3,12 @@ import type { OutgoingHttpHeaders } from "node:http"; import { parse as parseQs, stringify as stringifyQs } from "node:querystring"; import { ReadableStream } from "node:stream/web"; -import { BuildId, HtmlPages, NextConfig } from "config/index.js"; -import type { FunctionsConfigManifest, MiddlewareManifest } from "types/next-types"; -import type { InternalEvent, InternalResult, RoutingResult, StreamCreator } from "types/open-next.js"; - +import { BuildId, HtmlPages, NextConfig } from "@/config/index.js"; import type { IncomingMessage } from "@/http/index.js"; import { OpenNextNodeResponse } from "@/http/openNextResponse.js"; import { getQueryFromIterator, parseHeaders } from "@/http/util.js"; +import type { FunctionsConfigManifest, MiddlewareManifest } from "@/types/next-types"; +import type { InternalEvent, InternalResult, RoutingResult, StreamCreator } from "@/types/open-next.js"; import { debug, error } from "../../adapters/logger.js"; import { isBinaryContentType } from "../../utils/binary.js"; diff --git a/packages/open-next/src/core/routingHandler.ts b/packages/open-next/src/core/routingHandler.ts index 07a60775..2aab0d12 100644 --- a/packages/open-next/src/core/routingHandler.ts +++ b/packages/open-next/src/core/routingHandler.ts @@ -1,6 +1,6 @@ -import { BuildId, ConfigHeaders, NextConfig, PrerenderManifest, RoutesManifest } from "config/index"; -import type { InternalEvent, InternalResult, ResolvedRoute, RoutingResult } from "types/open-next"; -import type { AssetResolver } from "types/overrides"; +import { BuildId, ConfigHeaders, NextConfig, PrerenderManifest, RoutesManifest } from "@/config/index"; +import type { InternalEvent, InternalResult, ResolvedRoute, RoutingResult } from "@/types/open-next"; +import type { AssetResolver } from "@/types/overrides"; import { debug, error } from "../adapters/logger"; diff --git a/packages/open-next/src/core/util.ts b/packages/open-next/src/core/util.ts index 8dc5580f..2b8eafd9 100644 --- a/packages/open-next/src/core/util.ts +++ b/packages/open-next/src/core/util.ts @@ -1,7 +1,8 @@ -import { AppPathsManifestKeys, NextConfig, RoutesManifest } from "config/index.js"; // @ts-ignore import NextServer from "next/dist/server/next-server.js"; +import { AppPathsManifestKeys, NextConfig, RoutesManifest } from "@/config/index.js"; + import { debug, error } from "../adapters/logger.js"; import { diff --git a/packages/open-next/src/helpers/withCloudflare.ts b/packages/open-next/src/helpers/withCloudflare.ts index 6c1a1569..c8e883e6 100644 --- a/packages/open-next/src/helpers/withCloudflare.ts +++ b/packages/open-next/src/helpers/withCloudflare.ts @@ -3,7 +3,7 @@ import type { OpenNextConfig, RouteTemplate, SplittedFunctionOptions, -} from "types/open-next"; +} from "@/types/open-next"; type CloudflareCompatibleFunction = Placement extends "regional" ? FunctionOptions & { diff --git a/packages/open-next/src/helpers/withSST.ts b/packages/open-next/src/helpers/withSST.ts index f4cfd22c..16a78cae 100644 --- a/packages/open-next/src/helpers/withSST.ts +++ b/packages/open-next/src/helpers/withSST.ts @@ -1,4 +1,4 @@ -import type { FunctionOptions, OpenNextConfig, RouteTemplate } from "types/open-next"; +import type { FunctionOptions, OpenNextConfig, RouteTemplate } from "@/types/open-next"; type SSTCompatibleFunction = FunctionOptions & { override?: { diff --git a/packages/open-next/src/http/openNextResponse.ts b/packages/open-next/src/http/openNextResponse.ts index de06ebac..8e9523bd 100644 --- a/packages/open-next/src/http/openNextResponse.ts +++ b/packages/open-next/src/http/openNextResponse.ts @@ -3,7 +3,7 @@ import type { Socket } from "node:net"; import { Transform } from "node:stream"; import type { TransformCallback, Writable } from "node:stream"; -import type { StreamCreator } from "types/open-next"; +import type { StreamCreator } from "@/types/open-next"; import { debug } from "../adapters/logger"; diff --git a/packages/open-next/src/overrides/assetResolver/dummy.ts b/packages/open-next/src/overrides/assetResolver/dummy.ts index ce5b5a83..4de2f2d0 100644 --- a/packages/open-next/src/overrides/assetResolver/dummy.ts +++ b/packages/open-next/src/overrides/assetResolver/dummy.ts @@ -1,4 +1,4 @@ -import type { AssetResolver } from "types/overrides"; +import type { AssetResolver } from "@/types/overrides"; /** * A dummy asset resolver. diff --git a/packages/open-next/src/overrides/cdnInvalidation/cloudfront.ts b/packages/open-next/src/overrides/cdnInvalidation/cloudfront.ts index 6b5174eb..f8faa9fd 100644 --- a/packages/open-next/src/overrides/cdnInvalidation/cloudfront.ts +++ b/packages/open-next/src/overrides/cdnInvalidation/cloudfront.ts @@ -1,5 +1,6 @@ import { CloudFrontClient, CreateInvalidationCommand } from "@aws-sdk/client-cloudfront"; -import type { CDNInvalidationHandler } from "types/overrides"; + +import type { CDNInvalidationHandler } from "@/types/overrides"; const cloudfront = new CloudFrontClient({}); export default { diff --git a/packages/open-next/src/overrides/cdnInvalidation/dummy.ts b/packages/open-next/src/overrides/cdnInvalidation/dummy.ts index 8f1b1137..5124a1e5 100644 --- a/packages/open-next/src/overrides/cdnInvalidation/dummy.ts +++ b/packages/open-next/src/overrides/cdnInvalidation/dummy.ts @@ -1,4 +1,4 @@ -import type { CDNInvalidationHandler } from "types/overrides"; +import type { CDNInvalidationHandler } from "@/types/overrides"; export default { name: "dummy", diff --git a/packages/open-next/src/overrides/converters/aws-apigw-v1.ts b/packages/open-next/src/overrides/converters/aws-apigw-v1.ts index 4fa9a892..fdc83a07 100644 --- a/packages/open-next/src/overrides/converters/aws-apigw-v1.ts +++ b/packages/open-next/src/overrides/converters/aws-apigw-v1.ts @@ -1,7 +1,8 @@ import type { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda"; -import type { InternalEvent, InternalResult } from "types/open-next"; -import type { Converter } from "types/overrides"; -import { fromReadableStream } from "utils/stream"; + +import type { InternalEvent, InternalResult } from "@/types/open-next"; +import type { Converter } from "@/types/overrides"; +import { fromReadableStream } from "@/utils/stream"; import { debug } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/converters/aws-apigw-v2.ts b/packages/open-next/src/overrides/converters/aws-apigw-v2.ts index 22adf4fa..87c53b84 100644 --- a/packages/open-next/src/overrides/converters/aws-apigw-v2.ts +++ b/packages/open-next/src/overrides/converters/aws-apigw-v2.ts @@ -1,9 +1,9 @@ import type { APIGatewayProxyEventV2, APIGatewayProxyResultV2 } from "aws-lambda"; -import type { InternalEvent, InternalResult } from "types/open-next"; -import type { Converter } from "types/overrides"; -import { fromReadableStream } from "utils/stream"; import { parseSetCookieHeader } from "@/http/util"; +import type { InternalEvent, InternalResult } from "@/types/open-next"; +import type { Converter } from "@/types/overrides"; +import { fromReadableStream } from "@/utils/stream"; import { debug } from "../../adapters/logger"; import { convertToQuery } from "../../core/routing/util"; diff --git a/packages/open-next/src/overrides/converters/aws-cloudfront.ts b/packages/open-next/src/overrides/converters/aws-cloudfront.ts index 0bb05eba..678b114e 100644 --- a/packages/open-next/src/overrides/converters/aws-cloudfront.ts +++ b/packages/open-next/src/overrides/converters/aws-cloudfront.ts @@ -7,11 +7,11 @@ import type { CloudFrontRequestEvent, CloudFrontRequestResult, } from "aws-lambda"; -import type { InternalEvent, InternalResult, MiddlewareResult } from "types/open-next"; -import type { Converter } from "types/overrides"; -import { fromReadableStream } from "utils/stream"; import { parseSetCookieHeader } from "@/http/util"; +import type { InternalEvent, InternalResult, MiddlewareResult } from "@/types/open-next"; +import type { Converter } from "@/types/overrides"; +import { fromReadableStream } from "@/utils/stream"; import { debug } from "../../adapters/logger"; import { convertToQuery, convertToQueryString } from "../../core/routing/util"; diff --git a/packages/open-next/src/overrides/converters/dummy.ts b/packages/open-next/src/overrides/converters/dummy.ts index 48ffa707..d4f66dcf 100644 --- a/packages/open-next/src/overrides/converters/dummy.ts +++ b/packages/open-next/src/overrides/converters/dummy.ts @@ -1,4 +1,4 @@ -import type { Converter } from "types/overrides"; +import type { Converter } from "@/types/overrides"; type DummyEventOrResult = { type: "dummy"; diff --git a/packages/open-next/src/overrides/converters/edge.ts b/packages/open-next/src/overrides/converters/edge.ts index cda6f7ce..8c653e5e 100644 --- a/packages/open-next/src/overrides/converters/edge.ts +++ b/packages/open-next/src/overrides/converters/edge.ts @@ -1,10 +1,10 @@ import { Buffer } from "node:buffer"; import cookieParser from "cookie"; -import type { InternalEvent, InternalResult, MiddlewareResult } from "types/open-next"; -import type { Converter } from "types/overrides"; import { parseSetCookieHeader } from "@/http/util"; +import type { InternalEvent, InternalResult, MiddlewareResult } from "@/types/open-next"; +import type { Converter } from "@/types/overrides"; import { getQueryFromSearchParams } from "./utils.js"; diff --git a/packages/open-next/src/overrides/converters/node.ts b/packages/open-next/src/overrides/converters/node.ts index 867b1ccb..aef33991 100644 --- a/packages/open-next/src/overrides/converters/node.ts +++ b/packages/open-next/src/overrides/converters/node.ts @@ -1,8 +1,9 @@ import type { IncomingMessage } from "node:http"; import cookieParser from "cookie"; -import type { InternalResult } from "types/open-next"; -import type { Converter } from "types/overrides"; + +import type { InternalResult } from "@/types/open-next"; +import type { Converter } from "@/types/overrides"; import { extractHostFromHeaders, getQueryFromSearchParams } from "./utils.js"; diff --git a/packages/open-next/src/overrides/converters/sqs-revalidate.ts b/packages/open-next/src/overrides/converters/sqs-revalidate.ts index 08a0cf3e..094ecb5c 100644 --- a/packages/open-next/src/overrides/converters/sqs-revalidate.ts +++ b/packages/open-next/src/overrides/converters/sqs-revalidate.ts @@ -1,5 +1,6 @@ import type { SQSEvent } from "aws-lambda"; -import type { Converter } from "types/overrides"; + +import type { Converter } from "@/types/overrides"; import type { RevalidateEvent } from "../../adapters/revalidate"; diff --git a/packages/open-next/src/overrides/imageLoader/dummy.ts b/packages/open-next/src/overrides/imageLoader/dummy.ts index dbcbc862..b3b2d3a6 100644 --- a/packages/open-next/src/overrides/imageLoader/dummy.ts +++ b/packages/open-next/src/overrides/imageLoader/dummy.ts @@ -1,5 +1,5 @@ -import type { ImageLoader } from "types/overrides"; -import { FatalError } from "utils/error"; +import type { ImageLoader } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; const dummyLoader: ImageLoader = { name: "dummy", diff --git a/packages/open-next/src/overrides/imageLoader/fs-dev.ts b/packages/open-next/src/overrides/imageLoader/fs-dev.ts index 773c84db..cdf0b77e 100644 --- a/packages/open-next/src/overrides/imageLoader/fs-dev.ts +++ b/packages/open-next/src/overrides/imageLoader/fs-dev.ts @@ -1,9 +1,9 @@ import fs from "node:fs"; import path from "node:path"; -import { NextConfig } from "config/index"; -import type { ImageLoader } from "types/overrides"; -import { getMonorepoRelativePath } from "utils/normalize-path"; +import { NextConfig } from "@/config/index"; +import type { ImageLoader } from "@/types/overrides"; +import { getMonorepoRelativePath } from "@/utils/normalize-path"; export default { name: "fs-dev", diff --git a/packages/open-next/src/overrides/imageLoader/host.ts b/packages/open-next/src/overrides/imageLoader/host.ts index 713682c5..7b2dd215 100644 --- a/packages/open-next/src/overrides/imageLoader/host.ts +++ b/packages/open-next/src/overrides/imageLoader/host.ts @@ -1,8 +1,8 @@ import { Readable } from "node:stream"; import type { ReadableStream } from "node:stream/web"; -import type { ImageLoader } from "types/overrides"; -import { FatalError } from "utils/error"; +import type { ImageLoader } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; const hostLoader: ImageLoader = { name: "host", diff --git a/packages/open-next/src/overrides/imageLoader/s3-lite.ts b/packages/open-next/src/overrides/imageLoader/s3-lite.ts index 074f330e..23ec1a4a 100644 --- a/packages/open-next/src/overrides/imageLoader/s3-lite.ts +++ b/packages/open-next/src/overrides/imageLoader/s3-lite.ts @@ -2,8 +2,9 @@ import { Readable } from "node:stream"; import type { ReadableStream } from "node:stream/web"; import { AwsClient } from "aws4fetch"; -import type { ImageLoader } from "types/overrides"; -import { FatalError } from "utils/error"; + +import type { ImageLoader } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; let awsClient: AwsClient | null = null; diff --git a/packages/open-next/src/overrides/imageLoader/s3.ts b/packages/open-next/src/overrides/imageLoader/s3.ts index 2d08b5b2..8471378a 100644 --- a/packages/open-next/src/overrides/imageLoader/s3.ts +++ b/packages/open-next/src/overrides/imageLoader/s3.ts @@ -1,8 +1,9 @@ import type { Readable } from "node:stream"; import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3"; -import type { ImageLoader } from "types/overrides"; -import { FatalError } from "utils/error"; + +import type { ImageLoader } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; import { awsLogger } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/incrementalCache/dummy.ts b/packages/open-next/src/overrides/incrementalCache/dummy.ts index a4756cba..24639aef 100644 --- a/packages/open-next/src/overrides/incrementalCache/dummy.ts +++ b/packages/open-next/src/overrides/incrementalCache/dummy.ts @@ -1,5 +1,5 @@ -import type { IncrementalCache } from "types/overrides"; -import { IgnorableError } from "utils/error"; +import type { IncrementalCache } from "@/types/overrides"; +import { IgnorableError } from "@/utils/error"; const dummyIncrementalCache: IncrementalCache = { name: "dummy", diff --git a/packages/open-next/src/overrides/incrementalCache/fs-dev.ts b/packages/open-next/src/overrides/incrementalCache/fs-dev.ts index 2c42e760..9df4f9c2 100644 --- a/packages/open-next/src/overrides/incrementalCache/fs-dev.ts +++ b/packages/open-next/src/overrides/incrementalCache/fs-dev.ts @@ -1,8 +1,8 @@ import fs from "node:fs/promises"; import path from "node:path"; -import type { IncrementalCache } from "types/overrides.js"; -import { getMonorepoRelativePath } from "utils/normalize-path"; +import type { IncrementalCache } from "@/types/overrides.js"; +import { getMonorepoRelativePath } from "@/utils/normalize-path"; const buildId = process.env.NEXT_BUILD_ID; const basePath = path.join(getMonorepoRelativePath(), `cache/${buildId}`); diff --git a/packages/open-next/src/overrides/incrementalCache/multi-tier-ddb-s3.ts b/packages/open-next/src/overrides/incrementalCache/multi-tier-ddb-s3.ts index 794b285f..0fe490ac 100644 --- a/packages/open-next/src/overrides/incrementalCache/multi-tier-ddb-s3.ts +++ b/packages/open-next/src/overrides/incrementalCache/multi-tier-ddb-s3.ts @@ -1,6 +1,6 @@ -import type { CacheEntryType, CacheValue, IncrementalCache } from "types/overrides"; -import { customFetchClient } from "utils/fetch"; -import { LRUCache } from "utils/lru"; +import type { CacheEntryType, CacheValue, IncrementalCache } from "@/types/overrides"; +import { customFetchClient } from "@/utils/fetch"; +import { LRUCache } from "@/utils/lru"; import { debug } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/incrementalCache/s3-lite.ts b/packages/open-next/src/overrides/incrementalCache/s3-lite.ts index 0e4ce5fe..eff7939c 100644 --- a/packages/open-next/src/overrides/incrementalCache/s3-lite.ts +++ b/packages/open-next/src/overrides/incrementalCache/s3-lite.ts @@ -1,10 +1,11 @@ import path from "node:path"; import { AwsClient } from "aws4fetch"; -import type { Extension } from "types/cache"; -import type { IncrementalCache } from "types/overrides"; -import { IgnorableError, RecoverableError } from "utils/error"; -import { customFetchClient } from "utils/fetch"; + +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"; diff --git a/packages/open-next/src/overrides/incrementalCache/s3.ts b/packages/open-next/src/overrides/incrementalCache/s3.ts index 528b314e..01eafdaa 100644 --- a/packages/open-next/src/overrides/incrementalCache/s3.ts +++ b/packages/open-next/src/overrides/incrementalCache/s3.ts @@ -2,8 +2,9 @@ import path from "node:path"; import type { S3ClientConfig } from "@aws-sdk/client-s3"; import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from "@aws-sdk/client-s3"; -import type { Extension } from "types/cache"; -import type { IncrementalCache } from "types/overrides"; + +import type { Extension } from "@/types/cache"; +import type { IncrementalCache } from "@/types/overrides"; import { awsLogger } from "../../adapters/logger"; import { parseNumberFromEnv } from "../../adapters/util"; diff --git a/packages/open-next/src/overrides/originResolver/dummy.ts b/packages/open-next/src/overrides/originResolver/dummy.ts index c7896d5d..b713dedc 100644 --- a/packages/open-next/src/overrides/originResolver/dummy.ts +++ b/packages/open-next/src/overrides/originResolver/dummy.ts @@ -1,4 +1,4 @@ -import type { OriginResolver } from "types/overrides"; +import type { OriginResolver } from "@/types/overrides"; const dummyOriginResolver: OriginResolver = { name: "dummy", diff --git a/packages/open-next/src/overrides/originResolver/pattern-env.ts b/packages/open-next/src/overrides/originResolver/pattern-env.ts index 14e4025c..3996f02b 100644 --- a/packages/open-next/src/overrides/originResolver/pattern-env.ts +++ b/packages/open-next/src/overrides/originResolver/pattern-env.ts @@ -1,5 +1,5 @@ -import type { Origin } from "types/open-next"; -import type { OriginResolver } from "types/overrides"; +import type { Origin } from "@/types/open-next"; +import type { OriginResolver } from "@/types/overrides"; import { debug, error } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/proxyExternalRequest/dummy.ts b/packages/open-next/src/overrides/proxyExternalRequest/dummy.ts index 355a1594..ec361260 100644 --- a/packages/open-next/src/overrides/proxyExternalRequest/dummy.ts +++ b/packages/open-next/src/overrides/proxyExternalRequest/dummy.ts @@ -1,5 +1,5 @@ -import type { ProxyExternalRequest } from "types/overrides"; -import { FatalError } from "utils/error"; +import type { ProxyExternalRequest } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; const DummyProxyExternalRequest: ProxyExternalRequest = { name: "dummy", diff --git a/packages/open-next/src/overrides/proxyExternalRequest/fetch.ts b/packages/open-next/src/overrides/proxyExternalRequest/fetch.ts index 15912659..df1dd18c 100644 --- a/packages/open-next/src/overrides/proxyExternalRequest/fetch.ts +++ b/packages/open-next/src/overrides/proxyExternalRequest/fetch.ts @@ -1,5 +1,5 @@ -import type { ProxyExternalRequest } from "types/overrides"; -import { emptyReadableStream } from "utils/stream"; +import type { ProxyExternalRequest } from "@/types/overrides"; +import { emptyReadableStream } from "@/utils/stream"; const fetchProxy: ProxyExternalRequest = { name: "fetch-proxy", diff --git a/packages/open-next/src/overrides/proxyExternalRequest/node.ts b/packages/open-next/src/overrides/proxyExternalRequest/node.ts index b9e24041..97fdef0a 100644 --- a/packages/open-next/src/overrides/proxyExternalRequest/node.ts +++ b/packages/open-next/src/overrides/proxyExternalRequest/node.ts @@ -1,8 +1,8 @@ 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 type { InternalEvent, InternalResult } from "@/types/open-next"; +import type { ProxyExternalRequest } from "@/types/overrides"; import { debug, error } from "../../adapters/logger"; import { isBinaryContentType } from "../../utils/binary"; diff --git a/packages/open-next/src/overrides/queue/direct.ts b/packages/open-next/src/overrides/queue/direct.ts index 1765016d..f767b114 100644 --- a/packages/open-next/src/overrides/queue/direct.ts +++ b/packages/open-next/src/overrides/queue/direct.ts @@ -1,4 +1,4 @@ -import type { Queue } from "types/overrides.js"; +import type { Queue } from "@/types/overrides.js"; const queue: Queue = { name: "dev-queue", diff --git a/packages/open-next/src/overrides/queue/dummy.ts b/packages/open-next/src/overrides/queue/dummy.ts index f403bc4a..8b5646ee 100644 --- a/packages/open-next/src/overrides/queue/dummy.ts +++ b/packages/open-next/src/overrides/queue/dummy.ts @@ -1,5 +1,5 @@ -import type { Queue } from "types/overrides"; -import { FatalError } from "utils/error"; +import type { Queue } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; const dummyQueue: Queue = { name: "dummy", diff --git a/packages/open-next/src/overrides/queue/sqs-lite.ts b/packages/open-next/src/overrides/queue/sqs-lite.ts index e063936d..d55a1e7f 100644 --- a/packages/open-next/src/overrides/queue/sqs-lite.ts +++ b/packages/open-next/src/overrides/queue/sqs-lite.ts @@ -1,7 +1,8 @@ import { AwsClient } from "aws4fetch"; -import type { Queue } from "types/overrides"; -import { RecoverableError } from "utils/error"; -import { customFetchClient } from "utils/fetch"; + +import type { Queue } from "@/types/overrides"; +import { RecoverableError } from "@/utils/error"; +import { customFetchClient } from "@/utils/fetch"; import { error } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/queue/sqs.ts b/packages/open-next/src/overrides/queue/sqs.ts index c5ef677f..156c14f7 100644 --- a/packages/open-next/src/overrides/queue/sqs.ts +++ b/packages/open-next/src/overrides/queue/sqs.ts @@ -1,5 +1,6 @@ import { SQSClient, SendMessageCommand } from "@aws-sdk/client-sqs"; -import type { Queue } from "types/overrides"; + +import type { Queue } from "@/types/overrides"; import { awsLogger } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/tagCache/dummy.ts b/packages/open-next/src/overrides/tagCache/dummy.ts index ed279bc3..ac44b532 100644 --- a/packages/open-next/src/overrides/tagCache/dummy.ts +++ b/packages/open-next/src/overrides/tagCache/dummy.ts @@ -1,4 +1,4 @@ -import type { TagCache } from "types/overrides"; +import type { TagCache } from "@/types/overrides"; // We don't want to throw error on this one because we might use it when we don't need tag cache const dummyTagCache: TagCache = { diff --git a/packages/open-next/src/overrides/tagCache/dynamodb-lite.ts b/packages/open-next/src/overrides/tagCache/dynamodb-lite.ts index c04a04a8..184923a4 100644 --- a/packages/open-next/src/overrides/tagCache/dynamodb-lite.ts +++ b/packages/open-next/src/overrides/tagCache/dynamodb-lite.ts @@ -1,9 +1,10 @@ import path from "node:path"; import { AwsClient } from "aws4fetch"; -import type { TagCache } from "types/overrides"; -import { RecoverableError } from "utils/error"; -import { customFetchClient } from "utils/fetch"; + +import type { TagCache } from "@/types/overrides"; +import { RecoverableError } from "@/utils/error"; +import { customFetchClient } from "@/utils/fetch"; import { debug, error } from "../../adapters/logger"; import { chunk, parseNumberFromEnv } from "../../adapters/util"; diff --git a/packages/open-next/src/overrides/tagCache/dynamodb-nextMode.ts b/packages/open-next/src/overrides/tagCache/dynamodb-nextMode.ts index 509d49b5..fa4efbe0 100644 --- a/packages/open-next/src/overrides/tagCache/dynamodb-nextMode.ts +++ b/packages/open-next/src/overrides/tagCache/dynamodb-nextMode.ts @@ -1,9 +1,10 @@ import path from "node:path"; import { AwsClient } from "aws4fetch"; -import type { NextModeTagCache } from "types/overrides"; -import { RecoverableError } from "utils/error"; -import { customFetchClient } from "utils/fetch"; + +import type { NextModeTagCache } from "@/types/overrides"; +import { RecoverableError } from "@/utils/error"; +import { customFetchClient } from "@/utils/fetch"; import { debug, error } from "../../adapters/logger"; import { chunk, parseNumberFromEnv } from "../../adapters/util"; diff --git a/packages/open-next/src/overrides/tagCache/dynamodb.ts b/packages/open-next/src/overrides/tagCache/dynamodb.ts index d83aad99..8a69f64c 100644 --- a/packages/open-next/src/overrides/tagCache/dynamodb.ts +++ b/packages/open-next/src/overrides/tagCache/dynamodb.ts @@ -2,7 +2,8 @@ import path from "node:path"; import type { DynamoDBClientConfig } from "@aws-sdk/client-dynamodb"; import { BatchWriteItemCommand, DynamoDBClient, QueryCommand } from "@aws-sdk/client-dynamodb"; -import type { TagCache } from "types/overrides"; + +import type { TagCache } from "@/types/overrides"; import { awsLogger, debug, error } from "../../adapters/logger"; import { chunk, parseNumberFromEnv } from "../../adapters/util"; diff --git a/packages/open-next/src/overrides/tagCache/fs-dev-nextMode.ts b/packages/open-next/src/overrides/tagCache/fs-dev-nextMode.ts index 97e4a752..49ccb498 100644 --- a/packages/open-next/src/overrides/tagCache/fs-dev-nextMode.ts +++ b/packages/open-next/src/overrides/tagCache/fs-dev-nextMode.ts @@ -1,4 +1,4 @@ -import type { NextModeTagCache } from "types/overrides"; +import type { NextModeTagCache } from "@/types/overrides"; import { debug } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/tagCache/fs-dev.ts b/packages/open-next/src/overrides/tagCache/fs-dev.ts index f3425a2a..932eb216 100644 --- a/packages/open-next/src/overrides/tagCache/fs-dev.ts +++ b/packages/open-next/src/overrides/tagCache/fs-dev.ts @@ -1,8 +1,8 @@ import fs from "node:fs"; import path from "node:path"; -import type { TagCache } from "types/overrides"; -import { getMonorepoRelativePath } from "utils/normalize-path"; +import type { TagCache } from "@/types/overrides"; +import { getMonorepoRelativePath } from "@/utils/normalize-path"; const tagFile = path.join(getMonorepoRelativePath(), "dynamodb-provider/dynamodb-cache.json"); const tagContent = fs.readFileSync(tagFile, "utf-8"); diff --git a/packages/open-next/src/overrides/warmer/aws-lambda.ts b/packages/open-next/src/overrides/warmer/aws-lambda.ts index 74592b8e..7fa1a8b2 100644 --- a/packages/open-next/src/overrides/warmer/aws-lambda.ts +++ b/packages/open-next/src/overrides/warmer/aws-lambda.ts @@ -1,4 +1,4 @@ -import type { Warmer } from "types/overrides"; +import type { Warmer } from "@/types/overrides"; import { debug, error } from "../../adapters/logger"; import type { WarmerEvent, WarmerResponse } from "../../adapters/warmer-function"; diff --git a/packages/open-next/src/overrides/warmer/dummy.ts b/packages/open-next/src/overrides/warmer/dummy.ts index 12ec0504..92453195 100644 --- a/packages/open-next/src/overrides/warmer/dummy.ts +++ b/packages/open-next/src/overrides/warmer/dummy.ts @@ -1,5 +1,5 @@ -import type { Warmer } from "types/overrides"; -import { FatalError } from "utils/error"; +import type { Warmer } from "@/types/overrides"; +import { FatalError } from "@/utils/error"; const dummyWarmer: Warmer = { name: "dummy", diff --git a/packages/open-next/src/overrides/wrappers/aws-lambda-compressed.ts b/packages/open-next/src/overrides/wrappers/aws-lambda-compressed.ts index 3d0f9eb7..06055d38 100644 --- a/packages/open-next/src/overrides/wrappers/aws-lambda-compressed.ts +++ b/packages/open-next/src/overrides/wrappers/aws-lambda-compressed.ts @@ -2,9 +2,9 @@ import { Readable, type Transform, Writable } from "node:stream"; import type { ReadableStream } from "node:stream/web"; import zlib from "node:zlib"; -import type { AwsLambdaEvent, AwsLambdaReturn } from "types/aws-lambda"; -import type { InternalResult, StreamCreator } from "types/open-next"; -import type { WrapperHandler } from "types/overrides"; +import type { AwsLambdaEvent, AwsLambdaReturn } from "@/types/aws-lambda"; +import type { InternalResult, StreamCreator } from "@/types/open-next"; +import type { WrapperHandler } from "@/types/overrides"; import { error } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/wrappers/aws-lambda-streaming.ts b/packages/open-next/src/overrides/wrappers/aws-lambda-streaming.ts index 12df8e3b..3d18e5db 100644 --- a/packages/open-next/src/overrides/wrappers/aws-lambda-streaming.ts +++ b/packages/open-next/src/overrides/wrappers/aws-lambda-streaming.ts @@ -2,8 +2,9 @@ import { Readable, type Writable } from "node:stream"; import zlib from "node:zlib"; import type { APIGatewayProxyEventV2 } from "aws-lambda"; -import type { StreamCreator } from "types/open-next"; -import type { Wrapper, WrapperHandler } from "types/overrides"; + +import type { StreamCreator } from "@/types/open-next"; +import type { Wrapper, WrapperHandler } from "@/types/overrides"; import { debug, error } from "../../adapters/logger"; import type { WarmerEvent, WarmerResponse } from "../../adapters/warmer-function"; diff --git a/packages/open-next/src/overrides/wrappers/aws-lambda.ts b/packages/open-next/src/overrides/wrappers/aws-lambda.ts index 71d3efed..41640868 100644 --- a/packages/open-next/src/overrides/wrappers/aws-lambda.ts +++ b/packages/open-next/src/overrides/wrappers/aws-lambda.ts @@ -1,8 +1,8 @@ import { Writable } from "node:stream"; -import type { AwsLambdaEvent, AwsLambdaReturn } from "types/aws-lambda"; -import type { StreamCreator } from "types/open-next"; -import type { WrapperHandler } from "types/overrides"; +import type { AwsLambdaEvent, AwsLambdaReturn } from "@/types/aws-lambda"; +import type { StreamCreator } from "@/types/open-next"; +import type { WrapperHandler } from "@/types/overrides"; import type { WarmerEvent, WarmerResponse } from "../../adapters/warmer-function"; diff --git a/packages/open-next/src/overrides/wrappers/cloudflare-edge.ts b/packages/open-next/src/overrides/wrappers/cloudflare-edge.ts index d615d340..c3d849cd 100644 --- a/packages/open-next/src/overrides/wrappers/cloudflare-edge.ts +++ b/packages/open-next/src/overrides/wrappers/cloudflare-edge.ts @@ -1,5 +1,5 @@ -import type { InternalEvent, InternalResult, MiddlewareResult } from "types/open-next"; -import type { Wrapper, WrapperHandler } from "types/overrides"; +import type { InternalEvent, InternalResult, MiddlewareResult } from "@/types/open-next"; +import type { Wrapper, WrapperHandler } from "@/types/overrides"; const cfPropNameMapping: Record string, string]> = { // The city name is percent-encoded. diff --git a/packages/open-next/src/overrides/wrappers/cloudflare-node.ts b/packages/open-next/src/overrides/wrappers/cloudflare-node.ts index e7d1de75..deb08848 100644 --- a/packages/open-next/src/overrides/wrappers/cloudflare-node.ts +++ b/packages/open-next/src/overrides/wrappers/cloudflare-node.ts @@ -1,7 +1,7 @@ import { Writable } from "node:stream"; -import type { InternalEvent, InternalResult, StreamCreator } from "types/open-next"; -import type { Wrapper, WrapperHandler } from "types/overrides"; +import type { InternalEvent, InternalResult, StreamCreator } from "@/types/open-next"; +import type { Wrapper, WrapperHandler } from "@/types/overrides"; // Response with null body status (101, 204, 205, or 304) cannot have a body. const NULL_BODY_STATUSES = new Set([101, 204, 205, 304]); diff --git a/packages/open-next/src/overrides/wrappers/dummy.ts b/packages/open-next/src/overrides/wrappers/dummy.ts index 159546fc..fc048208 100644 --- a/packages/open-next/src/overrides/wrappers/dummy.ts +++ b/packages/open-next/src/overrides/wrappers/dummy.ts @@ -1,5 +1,5 @@ -import type { InternalEvent } from "types/open-next"; -import type { OpenNextHandlerOptions, Wrapper, WrapperHandler } from "types/overrides"; +import type { InternalEvent } from "@/types/open-next"; +import type { OpenNextHandlerOptions, Wrapper, WrapperHandler } from "@/types/overrides"; const dummyWrapper: WrapperHandler = async (handler, converter) => { return async (event: InternalEvent, options?: OpenNextHandlerOptions) => { diff --git a/packages/open-next/src/overrides/wrappers/express-dev.ts b/packages/open-next/src/overrides/wrappers/express-dev.ts index da2732ae..acaa6f87 100644 --- a/packages/open-next/src/overrides/wrappers/express-dev.ts +++ b/packages/open-next/src/overrides/wrappers/express-dev.ts @@ -1,10 +1,11 @@ import path from "node:path"; -import { NextConfig } from "config/index"; import express from "express"; -import type { StreamCreator } from "types/open-next.js"; -import type { WrapperHandler } from "types/overrides.js"; -import { getMonorepoRelativePath } from "utils/normalize-path"; + +import { NextConfig } from "@/config/index"; +import type { StreamCreator } from "@/types/open-next.js"; +import type { WrapperHandler } from "@/types/overrides.js"; +import { getMonorepoRelativePath } from "@/utils/normalize-path"; const wrapper: WrapperHandler = async (handler, converter) => { const app = express(); diff --git a/packages/open-next/src/overrides/wrappers/node.ts b/packages/open-next/src/overrides/wrappers/node.ts index b12775df..c1432bf6 100644 --- a/packages/open-next/src/overrides/wrappers/node.ts +++ b/packages/open-next/src/overrides/wrappers/node.ts @@ -1,7 +1,7 @@ import { createServer } from "node:http"; -import type { StreamCreator } from "types/open-next"; -import type { Wrapper, WrapperHandler } from "types/overrides"; +import type { StreamCreator } from "@/types/open-next"; +import type { Wrapper, WrapperHandler } from "@/types/overrides"; import { debug, error } from "../../adapters/logger"; diff --git a/packages/open-next/src/plugins/edge.ts b/packages/open-next/src/plugins/edge.ts index d36ff56f..41dca4fb 100644 --- a/packages/open-next/src/plugins/edge.ts +++ b/packages/open-next/src/plugins/edge.ts @@ -3,7 +3,8 @@ import path from "node:path"; import chalk from "chalk"; import type { Plugin } from "esbuild"; -import type { MiddlewareInfo } from "types/next-types.js"; + +import type { MiddlewareInfo } from "@/types/next-types.js"; import { loadAppPathRoutesManifest, diff --git a/packages/open-next/src/plugins/externalMiddleware.ts b/packages/open-next/src/plugins/externalMiddleware.ts index c7ab0eb3..9ad1b97a 100644 --- a/packages/open-next/src/plugins/externalMiddleware.ts +++ b/packages/open-next/src/plugins/externalMiddleware.ts @@ -1,5 +1,6 @@ import type { Plugin } from "esbuild"; -import { getCrossPlatformPathRegex } from "utils/regex.js"; + +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; export function openNextExternalMiddlewarePlugin(functionPath: string): Plugin { return { diff --git a/packages/open-next/src/plugins/inlineRouteHandlers.ts b/packages/open-next/src/plugins/inlineRouteHandlers.ts index 4a0ad13a..1f98c854 100644 --- a/packages/open-next/src/plugins/inlineRouteHandlers.ts +++ b/packages/open-next/src/plugins/inlineRouteHandlers.ts @@ -1,4 +1,4 @@ -import { getCrossPlatformPathRegex } from "utils/regex.js"; +import { getCrossPlatformPathRegex } from "@/utils/regex.js"; import type { NextAdapterOutputs } from "../adapter.js"; import { patchCode } from "../build/patch/astCodePatcher.js"; diff --git a/packages/open-next/src/plugins/resolve.ts b/packages/open-next/src/plugins/resolve.ts index 1d431118..bc53725b 100644 --- a/packages/open-next/src/plugins/resolve.ts +++ b/packages/open-next/src/plugins/resolve.ts @@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises"; import chalk from "chalk"; import type { Plugin } from "esbuild"; + import type { DefaultOverrideOptions, IncludedImageLoader, @@ -9,8 +10,8 @@ import type { IncludedWarmer, LazyLoadedOverride, OverrideOptions, -} from "types/open-next"; -import type { ImageLoader, OriginResolver, Warmer } from "types/overrides"; +} from "@/types/open-next"; +import type { ImageLoader, OriginResolver, Warmer } from "@/types/overrides"; import logger from "../logger.js"; import { getCrossPlatformPathRegex } from "../utils/regex.js"; diff --git a/packages/open-next/src/types/global.ts b/packages/open-next/src/types/global.ts index d3116115..cf605cf7 100644 --- a/packages/open-next/src/types/global.ts +++ b/packages/open-next/src/types/global.ts @@ -8,7 +8,7 @@ import type { ProxyExternalRequest, Queue, TagCache, -} from "types/overrides"; +} from "@/types/overrides"; import type { DetachedPromiseRunner } from "../utils/promise"; diff --git a/packages/open-next/src/types/overrides.ts b/packages/open-next/src/types/overrides.ts index 84b7e880..3ebf747c 100644 --- a/packages/open-next/src/types/overrides.ts +++ b/packages/open-next/src/types/overrides.ts @@ -1,6 +1,6 @@ import type { Readable } from "node:stream"; -import type { Extension, Meta, StoredComposableCacheEntry } from "types/cache"; +import type { Extension, Meta, StoredComposableCacheEntry } from "@/types/cache"; import type { BaseEventOrResult, diff --git a/packages/open-next/src/utils/cache.ts b/packages/open-next/src/utils/cache.ts index 2d50d09e..11945273 100644 --- a/packages/open-next/src/utils/cache.ts +++ b/packages/open-next/src/utils/cache.ts @@ -1,4 +1,4 @@ -import type { CacheValue, OriginalTagCacheWriteInput, WithLastModified } from "types/overrides"; +import type { CacheValue, OriginalTagCacheWriteInput, WithLastModified } from "@/types/overrides"; import { debug } from "../adapters/logger"; diff --git a/packages/open-next/src/utils/promise.ts b/packages/open-next/src/utils/promise.ts index 76d5cf3c..99829e4e 100644 --- a/packages/open-next/src/utils/promise.ts +++ b/packages/open-next/src/utils/promise.ts @@ -1,4 +1,4 @@ -import type { WaitUntil } from "types/open-next"; +import type { WaitUntil } from "@/types/open-next"; import { debug, error } from "../adapters/logger"; diff --git a/packages/open-next/tsconfig.json b/packages/open-next/tsconfig.json index d2c25576..67b691f0 100644 --- a/packages/open-next/tsconfig.json +++ b/packages/open-next/tsconfig.json @@ -7,11 +7,10 @@ "outDir": "./dist", "allowSyntheticDefaultImports": true, "paths": { - // TODO: Align path aliases - "types/*": ["./src/types/*"], - "config/*": ["./src/adapters/config/*"], + "@/types/*": ["./src/types/*"], + "@/config/*": ["./src/adapters/config/*"], "@/http/*": ["./src/http/*"], - "utils/*": ["./src/utils/*"] + "@/utils/*": ["./src/utils/*"] } } }