From b7d74c71a19cbcbf46bf5d98306c14211639498b Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Tue, 22 Oct 2024 22:12:49 +0200 Subject: [PATCH] add and fix "@typescript-eslint/consistent-type-imports": "error" --- .eslintrc.cjs | 1 + example/sst.config.ts | 2 +- examples/app-pages-router/app/albums/layout.tsx | 2 +- examples/app-pages-router/app/parallel/layout.tsx | 4 +++- examples/app-pages-router/app/ssr/layout.tsx | 2 +- examples/app-pages-router/middleware.ts | 3 ++- examples/app-pages-router/pages/pages_isr/index.tsx | 2 +- examples/app-pages-router/pages/pages_ssr/index.tsx | 2 +- examples/app-router/app/albums/layout.tsx | 2 +- examples/app-router/app/api/isr/route.ts | 3 ++- examples/app-router/app/api/sse/route.ts | 2 +- examples/app-router/app/parallel/layout.tsx | 4 +++- examples/app-router/app/ssr/layout.tsx | 2 +- examples/app-router/middleware.ts | 3 ++- examples/pages-router/src/middleware.ts | 3 ++- examples/pages-router/src/pages/isr/index.tsx | 2 +- examples/pages-router/src/pages/ssr/index.tsx | 2 +- examples/shared/components/Modal/index.tsx | 3 ++- examples/shared/components/Nav/index.tsx | 3 +-- examples/sst/sst.config.ts | 2 +- .../sst/stacks/OpenNextReferenceImplementation.ts | 6 +++--- packages/open-next/src/adapters/cache.ts | 2 +- packages/open-next/src/adapters/config/util.ts | 4 ++-- .../src/adapters/image-optimization-adapter.ts | 9 +++++---- packages/open-next/src/adapters/logger.ts | 2 +- packages/open-next/src/adapters/middleware.ts | 2 +- .../plugins/image-optimization/image-optimization.ts | 8 ++++---- .../plugins/without-routing/requestHandler.ts | 4 ++-- packages/open-next/src/build/buildNextApp.ts | 2 +- packages/open-next/src/build/compileConfig.ts | 2 +- packages/open-next/src/build/copyTracedFiles.ts | 2 +- packages/open-next/src/build/createServerBundle.ts | 2 +- .../open-next/src/build/edge/createEdgeBundle.ts | 7 ++++--- packages/open-next/src/build/generateOutput.ts | 4 ++-- packages/open-next/src/build/helper.ts | 9 +++------ packages/open-next/src/build/validateConfig.ts | 2 +- packages/open-next/src/core/createMainHandler.ts | 2 +- packages/open-next/src/core/requestHandler.ts | 12 +++++------- packages/open-next/src/core/resolve.ts | 4 ++-- .../open-next/src/core/routing/cacheInterceptor.ts | 4 ++-- packages/open-next/src/core/routing/i18n/index.ts | 2 +- packages/open-next/src/core/routing/matcher.ts | 11 +++-------- packages/open-next/src/core/routing/middleware.ts | 4 ++-- packages/open-next/src/core/routing/util.ts | 4 ++-- packages/open-next/src/core/routingHandler.ts | 2 +- packages/open-next/src/helpers/withCloudflare.ts | 2 +- packages/open-next/src/helpers/withSST.ts | 2 +- packages/open-next/src/http/openNextResponse.ts | 5 +++-- packages/open-next/src/http/util.ts | 2 +- packages/open-next/src/overrides/converters/edge.ts | 2 +- .../open-next/src/overrides/imageLoader/dummy.ts | 2 +- packages/open-next/src/overrides/imageLoader/host.ts | 4 ++-- packages/open-next/src/overrides/imageLoader/s3.ts | 4 ++-- .../src/overrides/incrementalCache/dummy.ts | 2 +- .../src/overrides/incrementalCache/s3-lite.ts | 4 ++-- .../open-next/src/overrides/incrementalCache/s3.ts | 6 +++--- .../src/overrides/incrementalCache/types.ts | 2 +- .../open-next/src/overrides/originResolver/dummy.ts | 2 +- .../src/overrides/originResolver/pattern-env.ts | 2 +- packages/open-next/src/overrides/queue/dummy.ts | 2 +- packages/open-next/src/overrides/tagCache/dummy.ts | 2 +- .../open-next/src/overrides/tagCache/dynamodb.ts | 2 +- .../open-next/src/overrides/warmer/aws-lambda.ts | 2 +- packages/open-next/src/overrides/wrappers/dummy.ts | 2 +- packages/open-next/src/plugins/edge.ts | 4 ++-- packages/open-next/src/plugins/replacement.ts | 2 +- packages/open-next/src/plugins/resolve.ts | 2 +- packages/open-next/src/types/aws-lambda.ts | 4 ++-- packages/open-next/src/types/next-types.ts | 2 +- .../tests-unit/tests/converters/aws-apigw-v1.test.ts | 2 +- .../tests-unit/tests/converters/aws-apigw-v2.test.ts | 2 +- .../tests/converters/aws-cloudfront.test.ts | 5 ++++- .../tests/core/routing/cacheInterceptor.test.ts | 4 ++-- .../tests-unit/tests/core/routing/matcher.test.ts | 2 +- .../tests-unit/tests/core/routing/middleware.test.ts | 2 +- 75 files changed, 124 insertions(+), 119 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 3e0895a90..9e110fb45 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -29,6 +29,7 @@ module.exports = { ], "@typescript-eslint/unbound-method": "error", + "@typescript-eslint/consistent-type-imports": "error", }, overrides: [ { diff --git a/example/sst.config.ts b/example/sst.config.ts index 14493ba33..a1b6e3c11 100644 --- a/example/sst.config.ts +++ b/example/sst.config.ts @@ -1,4 +1,4 @@ -import { SSTConfig } from "sst"; +import type { SSTConfig } from "sst"; import { Config, NextjsSite } from "sst/constructs"; export default { diff --git a/examples/app-pages-router/app/albums/layout.tsx b/examples/app-pages-router/app/albums/layout.tsx index 815c70ba3..06bfe0af2 100644 --- a/examples/app-pages-router/app/albums/layout.tsx +++ b/examples/app-pages-router/app/albums/layout.tsx @@ -1,4 +1,4 @@ -import { ReactNode } from "react"; +import type { ReactNode } from "react"; export default function Layout({ children, diff --git a/examples/app-pages-router/app/parallel/layout.tsx b/examples/app-pages-router/app/parallel/layout.tsx index ab791f5aa..56fe9a7d9 100644 --- a/examples/app-pages-router/app/parallel/layout.tsx +++ b/examples/app-pages-router/app/parallel/layout.tsx @@ -1,5 +1,7 @@ "use client"; -import { ReactNode, useState } from "react"; +import { useState } from "react"; + +import type { ReactNode } from "react"; export default function Layout({ a, diff --git a/examples/app-pages-router/app/ssr/layout.tsx b/examples/app-pages-router/app/ssr/layout.tsx index 3a8338f50..68e3e07ee 100644 --- a/examples/app-pages-router/app/ssr/layout.tsx +++ b/examples/app-pages-router/app/ssr/layout.tsx @@ -1,4 +1,4 @@ -import { PropsWithChildren } from "react"; +import type { PropsWithChildren } from "react"; export default function Layout({ children }: PropsWithChildren) { return ( diff --git a/examples/app-pages-router/middleware.ts b/examples/app-pages-router/middleware.ts index fb8c3126b..34c5e5e1d 100644 --- a/examples/app-pages-router/middleware.ts +++ b/examples/app-pages-router/middleware.ts @@ -1,4 +1,5 @@ -import { NextRequest, NextResponse } from "next/server"; +import type { NextRequest } from "next/server"; +import { NextResponse } from "next/server"; export function middleware(request: NextRequest) { const path = request.nextUrl.pathname; //new URL(request.url).pathname; diff --git a/examples/app-pages-router/pages/pages_isr/index.tsx b/examples/app-pages-router/pages/pages_isr/index.tsx index 08a953bba..f2b87da6e 100644 --- a/examples/app-pages-router/pages/pages_isr/index.tsx +++ b/examples/app-pages-router/pages/pages_isr/index.tsx @@ -1,4 +1,4 @@ -import { InferGetStaticPropsType } from "next"; +import type { InferGetStaticPropsType } from "next"; export async function getStaticProps() { return { diff --git a/examples/app-pages-router/pages/pages_ssr/index.tsx b/examples/app-pages-router/pages/pages_ssr/index.tsx index 86627836a..2e4256e99 100644 --- a/examples/app-pages-router/pages/pages_ssr/index.tsx +++ b/examples/app-pages-router/pages/pages_ssr/index.tsx @@ -1,4 +1,4 @@ -import { InferGetServerSidePropsType } from "next"; +import type { InferGetServerSidePropsType } from "next"; export async function getServerSideProps() { return { diff --git a/examples/app-router/app/albums/layout.tsx b/examples/app-router/app/albums/layout.tsx index 815c70ba3..06bfe0af2 100644 --- a/examples/app-router/app/albums/layout.tsx +++ b/examples/app-router/app/albums/layout.tsx @@ -1,4 +1,4 @@ -import { ReactNode } from "react"; +import type { ReactNode } from "react"; export default function Layout({ children, diff --git a/examples/app-router/app/api/isr/route.ts b/examples/app-router/app/api/isr/route.ts index 3f8d560cf..22ab599a6 100644 --- a/examples/app-router/app/api/isr/route.ts +++ b/examples/app-router/app/api/isr/route.ts @@ -1,5 +1,6 @@ import fs from "fs/promises"; -import { NextRequest, NextResponse } from "next/server"; +import type { NextRequest } from "next/server"; +import { NextResponse } from "next/server"; import path from "path"; export const dynamic = "force-dynamic"; diff --git a/examples/app-router/app/api/sse/route.ts b/examples/app-router/app/api/sse/route.ts index dc1a705c0..971129a8b 100644 --- a/examples/app-router/app/api/sse/route.ts +++ b/examples/app-router/app/api/sse/route.ts @@ -1,5 +1,5 @@ import { wait } from "@open-next/utils"; -import { NextRequest } from "next/server"; +import type { NextRequest } from "next/server"; export const dynamic = "force-dynamic"; diff --git a/examples/app-router/app/parallel/layout.tsx b/examples/app-router/app/parallel/layout.tsx index ab791f5aa..56fe9a7d9 100644 --- a/examples/app-router/app/parallel/layout.tsx +++ b/examples/app-router/app/parallel/layout.tsx @@ -1,5 +1,7 @@ "use client"; -import { ReactNode, useState } from "react"; +import { useState } from "react"; + +import type { ReactNode } from "react"; export default function Layout({ a, diff --git a/examples/app-router/app/ssr/layout.tsx b/examples/app-router/app/ssr/layout.tsx index 5ab0b64a7..181825b11 100644 --- a/examples/app-router/app/ssr/layout.tsx +++ b/examples/app-router/app/ssr/layout.tsx @@ -1,4 +1,4 @@ -import { PropsWithChildren } from "react"; +import type { PropsWithChildren } from "react"; export default function Layout({ children }: PropsWithChildren) { return ( diff --git a/examples/app-router/middleware.ts b/examples/app-router/middleware.ts index 3826dc11d..dace0fa25 100644 --- a/examples/app-router/middleware.ts +++ b/examples/app-router/middleware.ts @@ -1,4 +1,5 @@ -import { NextRequest, NextResponse } from "next/server"; +import type { NextRequest } from "next/server"; +import { NextResponse } from "next/server"; export function middleware(request: NextRequest) { const path = request.nextUrl.pathname; //new URL(request.url).pathname; diff --git a/examples/pages-router/src/middleware.ts b/examples/pages-router/src/middleware.ts index 77a0fc4fa..682614fdd 100644 --- a/examples/pages-router/src/middleware.ts +++ b/examples/pages-router/src/middleware.ts @@ -1,4 +1,5 @@ -import { NextRequest, NextResponse } from "next/server"; +import type { NextRequest } from "next/server"; +import { NextResponse } from "next/server"; export function middleware(request: NextRequest) { return NextResponse.next({ diff --git a/examples/pages-router/src/pages/isr/index.tsx b/examples/pages-router/src/pages/isr/index.tsx index ff73415ed..a073e5b3f 100644 --- a/examples/pages-router/src/pages/isr/index.tsx +++ b/examples/pages-router/src/pages/isr/index.tsx @@ -1,4 +1,4 @@ -import { InferGetStaticPropsType } from "next"; +import type { InferGetStaticPropsType } from "next"; import Link from "next/link"; export async function getStaticProps() { diff --git a/examples/pages-router/src/pages/ssr/index.tsx b/examples/pages-router/src/pages/ssr/index.tsx index 53236105a..cc750f4b7 100644 --- a/examples/pages-router/src/pages/ssr/index.tsx +++ b/examples/pages-router/src/pages/ssr/index.tsx @@ -1,4 +1,4 @@ -import { InferGetServerSidePropsType } from "next"; +import type { InferGetServerSidePropsType } from "next"; export async function getServerSideProps() { return { diff --git a/examples/shared/components/Modal/index.tsx b/examples/shared/components/Modal/index.tsx index fb306a4df..877bd9d65 100644 --- a/examples/shared/components/Modal/index.tsx +++ b/examples/shared/components/Modal/index.tsx @@ -1,7 +1,8 @@ "use client"; -import { MouseEventHandler, useCallback, useEffect, useRef } from "react"; +import { useCallback, useEffect, useRef } from "react"; import { useRouter } from "next/navigation"; +import type { MouseEventHandler } from "react"; export default function Modal({ children }: { children: React.ReactNode }) { const overlay = useRef(null); diff --git a/examples/shared/components/Nav/index.tsx b/examples/shared/components/Nav/index.tsx index cf3a6c790..d65433625 100644 --- a/examples/shared/components/Nav/index.tsx +++ b/examples/shared/components/Nav/index.tsx @@ -1,7 +1,6 @@ "use client"; -import { PropsWithChildren } from "react"; - import Link from "next/link"; +import type { PropsWithChildren } from "react"; type Props = PropsWithChildren & { href: string; diff --git a/examples/sst/sst.config.ts b/examples/sst/sst.config.ts index 1a1a9d79d..7d68f3f11 100644 --- a/examples/sst/sst.config.ts +++ b/examples/sst/sst.config.ts @@ -1,4 +1,4 @@ -import { SSTConfig } from "sst"; +import type { SSTConfig } from "sst"; import { AppPagesRouter } from "./stacks/AppPagesRouter"; import { AppRouter } from "./stacks/AppRouter"; diff --git a/examples/sst/stacks/OpenNextReferenceImplementation.ts b/examples/sst/stacks/OpenNextReferenceImplementation.ts index 9cea08b9c..43e0fa9ba 100644 --- a/examples/sst/stacks/OpenNextReferenceImplementation.ts +++ b/examples/sst/stacks/OpenNextReferenceImplementation.ts @@ -1,8 +1,8 @@ import { execSync } from "node:child_process"; +import type { BehaviorOptions, ICachePolicy } from "aws-cdk-lib/aws-cloudfront"; import { AllowedMethods, - BehaviorOptions, CacheCookieBehavior, CachedMethods, CacheHeaderBehavior, @@ -12,7 +12,6 @@ import { Function as CloudfrontFunction, FunctionCode, FunctionEventType, - ICachePolicy, OriginRequestPolicy, ViewerProtocolPolicy, } from "aws-cdk-lib/aws-cloudfront"; @@ -22,7 +21,8 @@ import { Billing, TableV2 as Table, } from "aws-cdk-lib/aws-dynamodb"; -import { IGrantable, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam"; +import type { IGrantable } from "aws-cdk-lib/aws-iam"; +import { Policy, PolicyStatement } from "aws-cdk-lib/aws-iam"; import { Architecture, Code, diff --git a/packages/open-next/src/adapters/cache.ts b/packages/open-next/src/adapters/cache.ts index 6a191fafd..c700d31dc 100644 --- a/packages/open-next/src/adapters/cache.ts +++ b/packages/open-next/src/adapters/cache.ts @@ -1,5 +1,5 @@ import type { IncrementalCache } from "../overrides/incrementalCache/types.js"; -import { TagCache } from "../overrides/tagCache/types.js"; +import type { TagCache } from "../overrides/tagCache/types.js"; import { isBinaryContentType } from "./binary.js"; import { debug, error, warn } from "./logger.js"; diff --git a/packages/open-next/src/adapters/config/util.ts b/packages/open-next/src/adapters/config/util.ts index af7427250..a4709cc40 100644 --- a/packages/open-next/src/adapters/config/util.ts +++ b/packages/open-next/src/adapters/config/util.ts @@ -1,13 +1,13 @@ import fs from "fs"; import path from "path"; -import { +import type { MiddlewareManifest, NextConfig, PrerenderManifest, RoutesManifest, } from "types/next-types"; -import { PublicFiles } from "../../build"; +import type { PublicFiles } from "../../build"; export function loadConfig(nextDir: string) { const filePath = path.join(nextDir, "required-server-files.json"); diff --git a/packages/open-next/src/adapters/image-optimization-adapter.ts b/packages/open-next/src/adapters/image-optimization-adapter.ts index d57aa5cde..d3b614be3 100644 --- a/packages/open-next/src/adapters/image-optimization-adapter.ts +++ b/packages/open-next/src/adapters/image-optimization-adapter.ts @@ -1,15 +1,16 @@ import { createHash } from "node:crypto"; -import { +import type { IncomingMessage, OutgoingHttpHeaders, ServerResponse, } from "node:http"; import https from "node:https"; import path from "node:path"; -import { Writable } from "node:stream"; +import type { Writable } from "node:stream"; import { loadBuildId, loadConfig } from "config/util.js"; -import { OpenNextNodeResponse, StreamCreator } from "http/openNextResponse.js"; +import type { StreamCreator } from "http/openNextResponse.js"; +import { OpenNextNodeResponse } from "http/openNextResponse.js"; // @ts-ignore import { defaultConfig } from "next/dist/server/config-shared"; import { @@ -18,7 +19,7 @@ import { } from "next/dist/server/image-optimizer"; // @ts-ignore import type { NextUrlWithParsedQuery } from "next/dist/server/request-meta"; -import { InternalEvent, InternalResult } from "types/open-next.js"; +import type { InternalEvent, InternalResult } from "types/open-next.js"; import { emptyReadableStream, toReadableStream } from "utils/stream.js"; import { createGenericHandler } from "../core/createGenericHandler.js"; diff --git a/packages/open-next/src/adapters/logger.ts b/packages/open-next/src/adapters/logger.ts index 9e7f9979f..3328192f5 100644 --- a/packages/open-next/src/adapters/logger.ts +++ b/packages/open-next/src/adapters/logger.ts @@ -1,4 +1,4 @@ -import { BaseOpenNextError } from "utils/error"; +import type { BaseOpenNextError } from "utils/error"; declare global { var openNextDebug: boolean; diff --git a/packages/open-next/src/adapters/middleware.ts b/packages/open-next/src/adapters/middleware.ts index 1137dacaf..b56930492 100644 --- a/packages/open-next/src/adapters/middleware.ts +++ b/packages/open-next/src/adapters/middleware.ts @@ -1,4 +1,4 @@ -import { InternalEvent, Origin } from "types/open-next"; +import type { InternalEvent, Origin } from "types/open-next"; import { debug } from "../adapters/logger"; import { createGenericHandler } from "../core/createGenericHandler"; diff --git a/packages/open-next/src/adapters/plugins/image-optimization/image-optimization.ts b/packages/open-next/src/adapters/plugins/image-optimization/image-optimization.ts index 5a9fc75ea..7258f0e33 100644 --- a/packages/open-next/src/adapters/plugins/image-optimization/image-optimization.ts +++ b/packages/open-next/src/adapters/plugins/image-optimization/image-optimization.ts @@ -1,11 +1,11 @@ -import { IncomingMessage, ServerResponse } from "node:http"; +import type { IncomingMessage, ServerResponse } from "node:http"; -import { APIGatewayProxyEventHeaders } from "aws-lambda"; -import { NextConfig } from "next/dist/server/config-shared"; +import type { APIGatewayProxyEventHeaders } from "aws-lambda"; +import type { NextConfig } from "next/dist/server/config-shared"; //#override imports import { imageOptimizer } from "next/dist/server/image-optimizer"; //#endOverride -import { NextUrlWithParsedQuery } from "next/dist/server/request-meta"; +import type { NextUrlWithParsedQuery } from "next/dist/server/request-meta"; import { debug } from "../../logger.js"; diff --git a/packages/open-next/src/adapters/plugins/without-routing/requestHandler.ts b/packages/open-next/src/adapters/plugins/without-routing/requestHandler.ts index 326a6a3f7..834a05aec 100644 --- a/packages/open-next/src/adapters/plugins/without-routing/requestHandler.ts +++ b/packages/open-next/src/adapters/plugins/without-routing/requestHandler.ts @@ -1,7 +1,7 @@ /* eslint-disable unused-imports/no-unused-vars */ -import { InternalEvent } from "types/open-next"; +import type { InternalEvent } from "types/open-next"; -import { MiddlewareOutputEvent } from "../../../core/routingHandler"; +import type { MiddlewareOutputEvent } from "../../../core/routingHandler"; // This is available in requestHandler.ts declare const internalEvent: InternalEvent; diff --git a/packages/open-next/src/build/buildNextApp.ts b/packages/open-next/src/build/buildNextApp.ts index 341907590..453086c45 100644 --- a/packages/open-next/src/build/buildNextApp.ts +++ b/packages/open-next/src/build/buildNextApp.ts @@ -1,7 +1,7 @@ import cp from "node:child_process"; import path from "node:path"; -import * as buildHelper from "./helper.js"; +import type * as buildHelper from "./helper.js"; export function setStandaloneBuildMode(options: buildHelper.BuildOptions) { // Equivalent to setting `output: "standalone"` in next.config.js diff --git a/packages/open-next/src/build/compileConfig.ts b/packages/open-next/src/build/compileConfig.ts index 97e0c1588..1cf48fc82 100644 --- a/packages/open-next/src/build/compileConfig.ts +++ b/packages/open-next/src/build/compileConfig.ts @@ -3,7 +3,7 @@ import os from "node:os"; import path from "node:path"; import { buildSync } from "esbuild"; -import { OpenNextConfig } from "types/open-next.js"; +import type { OpenNextConfig } from "types/open-next.js"; import logger from "../logger.js"; import { validateConfig } from "./validateConfig.js"; diff --git a/packages/open-next/src/build/copyTracedFiles.ts b/packages/open-next/src/build/copyTracedFiles.ts index 1a0a26020..e60a8a061 100644 --- a/packages/open-next/src/build/copyTracedFiles.ts +++ b/packages/open-next/src/build/copyTracedFiles.ts @@ -12,7 +12,7 @@ import { writeFileSync, } from "fs"; import path from "path"; -import { NextConfig, PrerenderManifest } from "types/next-types"; +import type { NextConfig, PrerenderManifest } from "types/next-types"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/createServerBundle.ts b/packages/open-next/src/build/createServerBundle.ts index b863a2d87..794b46d79 100644 --- a/packages/open-next/src/build/createServerBundle.ts +++ b/packages/open-next/src/build/createServerBundle.ts @@ -2,7 +2,7 @@ import fs from "node:fs"; import { createRequire } from "node:module"; import path from "node:path"; -import { +import type { FunctionOptions, OpenNextConfig, SplittedFunctionOptions, diff --git a/packages/open-next/src/build/edge/createEdgeBundle.ts b/packages/open-next/src/build/edge/createEdgeBundle.ts index acbe32d05..f0787707d 100644 --- a/packages/open-next/src/build/edge/createEdgeBundle.ts +++ b/packages/open-next/src/build/edge/createEdgeBundle.ts @@ -3,8 +3,8 @@ import { mkdirSync } from "node:fs"; import { build } from "esbuild"; import fs from "fs"; import path from "path"; -import { MiddlewareInfo, MiddlewareManifest } from "types/next-types"; -import { +import type { MiddlewareInfo, MiddlewareManifest } from "types/next-types"; +import type { IncludedConverter, OpenNextConfig, OverrideOptions, @@ -16,7 +16,8 @@ import logger from "../../logger.js"; import { openNextEdgePlugins } from "../../plugins/edge.js"; import { openNextReplacementPlugin } from "../../plugins/replacement.js"; import { openNextResolvePlugin } from "../../plugins/resolve.js"; -import { BuildOptions, copyOpenNextConfig, esbuildAsync } from "../helper.js"; +import type { BuildOptions } from "../helper.js"; +import { copyOpenNextConfig, esbuildAsync } from "../helper.js"; interface BuildEdgeBundleOptions { appBuildOutputPath: string; diff --git a/packages/open-next/src/build/generateOutput.ts b/packages/open-next/src/build/generateOutput.ts index 645b9432d..bf79384bb 100644 --- a/packages/open-next/src/build/generateOutput.ts +++ b/packages/open-next/src/build/generateOutput.ts @@ -1,8 +1,8 @@ import * as fs from "node:fs"; import path from "node:path"; -import { NextConfig } from "types/next-types.js"; -import { +import type { NextConfig } from "types/next-types.js"; +import type { BaseOverride, DefaultOverrideOptions, FunctionOptions, diff --git a/packages/open-next/src/build/helper.ts b/packages/open-next/src/build/helper.ts index 196081a1c..29d57c680 100644 --- a/packages/open-next/src/build/helper.ts +++ b/packages/open-next/src/build/helper.ts @@ -3,12 +3,9 @@ import { createRequire } from "node:module"; import path from "node:path"; import url from "node:url"; -import { - build as buildAsync, - BuildOptions as ESBuildOptions, - buildSync, -} from "esbuild"; -import { OpenNextConfig } from "types/open-next.js"; +import type { BuildOptions as ESBuildOptions } from "esbuild"; +import { build as buildAsync, buildSync } from "esbuild"; +import type { OpenNextConfig } from "types/open-next.js"; import logger from "../logger.js"; diff --git a/packages/open-next/src/build/validateConfig.ts b/packages/open-next/src/build/validateConfig.ts index b3a5dae06..e7f84728b 100644 --- a/packages/open-next/src/build/validateConfig.ts +++ b/packages/open-next/src/build/validateConfig.ts @@ -1,4 +1,4 @@ -import { +import type { FunctionOptions, IncludedConverter, IncludedWrapper, diff --git a/packages/open-next/src/core/createMainHandler.ts b/packages/open-next/src/core/createMainHandler.ts index e9a1f378d..6763668d7 100644 --- a/packages/open-next/src/core/createMainHandler.ts +++ b/packages/open-next/src/core/createMainHandler.ts @@ -1,7 +1,7 @@ import type { AsyncLocalStorage } from "node:async_hooks"; import type { OpenNextConfig } from "types/open-next"; -import { DetachedPromiseRunner } from "utils/promise"; +import type { DetachedPromiseRunner } from "utils/promise"; import { debug } from "../adapters/logger"; import { generateUniqueId } from "../adapters/util"; diff --git a/packages/open-next/src/core/requestHandler.ts b/packages/open-next/src/core/requestHandler.ts index 60a2bd0f6..f255c5e35 100644 --- a/packages/open-next/src/core/requestHandler.ts +++ b/packages/open-next/src/core/requestHandler.ts @@ -1,17 +1,15 @@ import { AsyncLocalStorage } from "node:async_hooks"; -import { - IncomingMessage, - OpenNextNodeResponse, - StreamCreator, -} from "http/index.js"; -import { InternalEvent, InternalResult } from "types/open-next"; +import type { OpenNextNodeResponse, StreamCreator } from "http/index.js"; +import { IncomingMessage } from "http/index.js"; +import type { InternalEvent, InternalResult } from "types/open-next"; import { DetachedPromiseRunner } from "utils/promise"; import { debug, error, warn } from "../adapters/logger"; import { patchAsyncStorage } from "./patchAsyncStorage"; import { convertRes, createServerResponse, proxyRequest } from "./routing/util"; -import routingHandler, { MiddlewareOutputEvent } from "./routingHandler"; +import type { MiddlewareOutputEvent } from "./routingHandler"; +import routingHandler from "./routingHandler"; import { requestHandler, setNextjsPrebundledReact } from "./util"; // This is used to identify requests in the cache diff --git a/packages/open-next/src/core/resolve.ts b/packages/open-next/src/core/resolve.ts index 28c73c4a0..56223b330 100644 --- a/packages/open-next/src/core/resolve.ts +++ b/packages/open-next/src/core/resolve.ts @@ -1,4 +1,4 @@ -import { +import type { BaseEventOrResult, Converter, DefaultOverrideOptions, @@ -12,7 +12,7 @@ import { Wrapper, } from "types/open-next.js"; -import { TagCache } from "../overrides/tagCache/types.js"; +import type { TagCache } from "../overrides/tagCache/types.js"; export async function resolveConverter< E extends BaseEventOrResult = InternalEvent, diff --git a/packages/open-next/src/core/routing/cacheInterceptor.ts b/packages/open-next/src/core/routing/cacheInterceptor.ts index 29848753c..515aa1f0f 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 { InternalEvent, InternalResult } from "types/open-next"; +import type { InternalEvent, InternalResult } from "types/open-next"; import { emptyReadableStream, toReadableStream } from "utils/stream"; import { debug } from "../../adapters/logger"; -import { CacheValue } from "../../overrides/incrementalCache/types"; +import type { CacheValue } from "../../overrides/incrementalCache/types"; import { localizePath } from "./i18n"; import { generateMessageGroupId } from "./util"; diff --git a/packages/open-next/src/core/routing/i18n/index.ts b/packages/open-next/src/core/routing/i18n/index.ts index bbb07aeed..1465d12e8 100644 --- a/packages/open-next/src/core/routing/i18n/index.ts +++ b/packages/open-next/src/core/routing/i18n/index.ts @@ -1,6 +1,6 @@ import { NextConfig } from "config/index.js"; import type { i18nConfig } from "types/next-types"; -import { InternalEvent } from "types/open-next"; +import type { InternalEvent } from "types/open-next"; import { debug } from "../../../adapters/logger.js"; import { acceptLanguage } from "./accept-header"; diff --git a/packages/open-next/src/core/routing/matcher.ts b/packages/open-next/src/core/routing/matcher.ts index 249526edc..ad8989fed 100644 --- a/packages/open-next/src/core/routing/matcher.ts +++ b/packages/open-next/src/core/routing/matcher.ts @@ -1,11 +1,6 @@ import { NextConfig } from "config/index"; -import { - compile, - Match, - match, - MatchFunction, - PathFunction, -} from "path-to-regexp"; +import type { Match, MatchFunction, PathFunction } from "path-to-regexp"; +import { compile, match } from "path-to-regexp"; import type { Header, PrerenderManifest, @@ -13,7 +8,7 @@ import type { RewriteDefinition, RouteHas, } from "types/next-types"; -import { InternalEvent, InternalResult } from "types/open-next"; +import type { InternalEvent, InternalResult } from "types/open-next"; 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 d768dd0ef..d5a5646f3 100644 --- a/packages/open-next/src/core/routing/middleware.ts +++ b/packages/open-next/src/core/routing/middleware.ts @@ -1,7 +1,7 @@ -import { ReadableStream } from "node:stream/web"; +import type { ReadableStream } from "node:stream/web"; import { MiddlewareManifest, NextConfig } from "config/index.js"; -import { InternalEvent, InternalResult } from "types/open-next.js"; +import type { InternalEvent, InternalResult } from "types/open-next.js"; import { emptyReadableStream } from "utils/stream.js"; import { localizePath } from "./i18n/index.js"; diff --git a/packages/open-next/src/core/routing/util.ts b/packages/open-next/src/core/routing/util.ts index 08084f6d8..855df1ccb 100644 --- a/packages/open-next/src/core/routing/util.ts +++ b/packages/open-next/src/core/routing/util.ts @@ -1,5 +1,5 @@ import crypto from "node:crypto"; -import { OutgoingHttpHeaders } from "node:http"; +import type { OutgoingHttpHeaders } from "node:http"; import { Readable } from "node:stream"; import { BuildId, HtmlPages, NextConfig } from "config/index.js"; @@ -7,7 +7,7 @@ import type { IncomingMessage, StreamCreator } from "http/index.js"; import { OpenNextNodeResponse } from "http/openNextResponse.js"; import { parseHeaders } from "http/util.js"; import type { MiddlewareManifest } from "types/next-types"; -import { InternalEvent, InternalResult } from "types/open-next.js"; +import type { InternalEvent, InternalResult } from "types/open-next.js"; import { isBinaryContentType } from "../../adapters/binary.js"; import { debug, error } from "../../adapters/logger.js"; diff --git a/packages/open-next/src/core/routingHandler.ts b/packages/open-next/src/core/routingHandler.ts index 6641f9d84..f8f292a15 100644 --- a/packages/open-next/src/core/routingHandler.ts +++ b/packages/open-next/src/core/routingHandler.ts @@ -4,7 +4,7 @@ import { PrerenderManifest, RoutesManifest, } from "config/index"; -import { InternalEvent, InternalResult, Origin } from "types/open-next"; +import type { InternalEvent, InternalResult, Origin } from "types/open-next"; import { debug } from "../adapters/logger"; import { cacheInterceptor } from "./routing/cacheInterceptor"; diff --git a/packages/open-next/src/helpers/withCloudflare.ts b/packages/open-next/src/helpers/withCloudflare.ts index 37f486d28..db0096364 100644 --- a/packages/open-next/src/helpers/withCloudflare.ts +++ b/packages/open-next/src/helpers/withCloudflare.ts @@ -1,4 +1,4 @@ -import { +import type { FunctionOptions, OpenNextConfig, RouteTemplate, diff --git a/packages/open-next/src/helpers/withSST.ts b/packages/open-next/src/helpers/withSST.ts index afe11b33e..fc8412d97 100644 --- a/packages/open-next/src/helpers/withSST.ts +++ b/packages/open-next/src/helpers/withSST.ts @@ -1,4 +1,4 @@ -import { +import type { FunctionOptions, OpenNextConfig, RouteTemplate, diff --git a/packages/open-next/src/http/openNextResponse.ts b/packages/open-next/src/http/openNextResponse.ts index 9e4d2d717..643572cbe 100644 --- a/packages/open-next/src/http/openNextResponse.ts +++ b/packages/open-next/src/http/openNextResponse.ts @@ -4,8 +4,9 @@ import type { OutgoingHttpHeaders, ServerResponse, } from "http"; -import { Socket } from "net"; -import { Transform, TransformCallback, Writable } from "stream"; +import type { Socket } from "net"; +import type { TransformCallback, Writable } from "stream"; +import { Transform } from "stream"; import { debug } from "../adapters/logger"; import { parseCookies, parseHeaders } from "./util"; diff --git a/packages/open-next/src/http/util.ts b/packages/open-next/src/http/util.ts index 048ef982d..8567e3341 100644 --- a/packages/open-next/src/http/util.ts +++ b/packages/open-next/src/http/util.ts @@ -1,4 +1,4 @@ -import http from "node:http"; +import type http from "node:http"; export const parseHeaders = ( headers?: http.OutgoingHttpHeader[] | http.OutgoingHttpHeaders, diff --git a/packages/open-next/src/overrides/converters/edge.ts b/packages/open-next/src/overrides/converters/edge.ts index 140f621e2..d6f695ff6 100644 --- a/packages/open-next/src/overrides/converters/edge.ts +++ b/packages/open-next/src/overrides/converters/edge.ts @@ -3,7 +3,7 @@ import { Buffer } from "node:buffer"; import { parseCookies } from "http/util"; import type { Converter, InternalEvent, InternalResult } from "types/open-next"; -import { MiddlewareOutputEvent } from "../../core/routingHandler"; +import type { MiddlewareOutputEvent } from "../../core/routingHandler"; const converter: Converter< InternalEvent, diff --git a/packages/open-next/src/overrides/imageLoader/dummy.ts b/packages/open-next/src/overrides/imageLoader/dummy.ts index aa013a3ae..177cff802 100644 --- a/packages/open-next/src/overrides/imageLoader/dummy.ts +++ b/packages/open-next/src/overrides/imageLoader/dummy.ts @@ -1,4 +1,4 @@ -import { ImageLoader } from "types/open-next"; +import type { ImageLoader } from "types/open-next"; import { FatalError } from "utils/error"; const dummyLoader: ImageLoader = { diff --git a/packages/open-next/src/overrides/imageLoader/host.ts b/packages/open-next/src/overrides/imageLoader/host.ts index e0f28b00a..a6e8b3d3d 100644 --- a/packages/open-next/src/overrides/imageLoader/host.ts +++ b/packages/open-next/src/overrides/imageLoader/host.ts @@ -1,7 +1,7 @@ import { Readable } from "node:stream"; -import { ReadableStream } from "node:stream/web"; +import type { ReadableStream } from "node:stream/web"; -import { ImageLoader } from "types/open-next"; +import type { ImageLoader } from "types/open-next"; import { FatalError } from "utils/error"; const hostLoader: ImageLoader = { diff --git a/packages/open-next/src/overrides/imageLoader/s3.ts b/packages/open-next/src/overrides/imageLoader/s3.ts index fcd29b2ce..af85de3b2 100644 --- a/packages/open-next/src/overrides/imageLoader/s3.ts +++ b/packages/open-next/src/overrides/imageLoader/s3.ts @@ -1,7 +1,7 @@ -import { Readable } from "node:stream"; +import type { Readable } from "node:stream"; import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3"; -import { ImageLoader } from "types/open-next"; +import type { ImageLoader } from "types/open-next"; 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 51580a775..c6605b8d6 100644 --- a/packages/open-next/src/overrides/incrementalCache/dummy.ts +++ b/packages/open-next/src/overrides/incrementalCache/dummy.ts @@ -1,4 +1,4 @@ -import { IncrementalCache } from "./types"; +import type { IncrementalCache } from "./types"; const dummyIncrementalCache: IncrementalCache = { name: "dummy", diff --git a/packages/open-next/src/overrides/incrementalCache/s3-lite.ts b/packages/open-next/src/overrides/incrementalCache/s3-lite.ts index 25d24ba61..ba626db17 100644 --- a/packages/open-next/src/overrides/incrementalCache/s3-lite.ts +++ b/packages/open-next/src/overrides/incrementalCache/s3-lite.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { AwsClient } from "aws4fetch"; import path from "path"; -import { Extension } from "types/cache"; +import type { Extension } from "types/cache"; import { IgnorableError, RecoverableError } from "utils/error"; import { customFetchClient } from "utils/fetch"; import { parseNumberFromEnv } from "../../adapters/util"; -import { IncrementalCache } from "./types"; +import type { IncrementalCache } from "./types"; let awsClient: AwsClient | null = null; diff --git a/packages/open-next/src/overrides/incrementalCache/s3.ts b/packages/open-next/src/overrides/incrementalCache/s3.ts index cc1cdb3e1..14c583af3 100644 --- a/packages/open-next/src/overrides/incrementalCache/s3.ts +++ b/packages/open-next/src/overrides/incrementalCache/s3.ts @@ -1,16 +1,16 @@ +import type { S3ClientConfig } from "@aws-sdk/client-s3"; import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client, - S3ClientConfig, } from "@aws-sdk/client-s3"; import path from "path"; -import { Extension } from "types/cache"; +import type { Extension } from "types/cache"; import { awsLogger } from "../../adapters/logger"; import { parseNumberFromEnv } from "../../adapters/util"; -import { IncrementalCache } from "./types"; +import type { IncrementalCache } from "./types"; const { CACHE_BUCKET_REGION, diff --git a/packages/open-next/src/overrides/incrementalCache/types.ts b/packages/open-next/src/overrides/incrementalCache/types.ts index 71948665c..d86c1b926 100644 --- a/packages/open-next/src/overrides/incrementalCache/types.ts +++ b/packages/open-next/src/overrides/incrementalCache/types.ts @@ -1,4 +1,4 @@ -import { Meta } from "types/cache"; +import type { Meta } from "types/cache"; export type S3CachedFile = | { diff --git a/packages/open-next/src/overrides/originResolver/dummy.ts b/packages/open-next/src/overrides/originResolver/dummy.ts index 89aef325e..95b561a56 100644 --- a/packages/open-next/src/overrides/originResolver/dummy.ts +++ b/packages/open-next/src/overrides/originResolver/dummy.ts @@ -1,4 +1,4 @@ -import { OriginResolver } from "types/open-next"; +import type { OriginResolver } from "types/open-next"; 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 73b142158..3e889bd6b 100644 --- a/packages/open-next/src/overrides/originResolver/pattern-env.ts +++ b/packages/open-next/src/overrides/originResolver/pattern-env.ts @@ -1,4 +1,4 @@ -import { Origin, OriginResolver } from "types/open-next"; +import type { Origin, OriginResolver } from "types/open-next"; import { debug, error } from "../../adapters/logger"; diff --git a/packages/open-next/src/overrides/queue/dummy.ts b/packages/open-next/src/overrides/queue/dummy.ts index a1c2e579c..5e20a3d44 100644 --- a/packages/open-next/src/overrides/queue/dummy.ts +++ b/packages/open-next/src/overrides/queue/dummy.ts @@ -1,4 +1,4 @@ -import { Queue } from "./types"; +import type { Queue } from "./types"; const dummyQueue: Queue = { name: "dummy", diff --git a/packages/open-next/src/overrides/tagCache/dummy.ts b/packages/open-next/src/overrides/tagCache/dummy.ts index 0b4b52db2..ab7d180da 100644 --- a/packages/open-next/src/overrides/tagCache/dummy.ts +++ b/packages/open-next/src/overrides/tagCache/dummy.ts @@ -1,4 +1,4 @@ -import { TagCache } from "./types"; +import type { TagCache } from "./types"; // 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.ts b/packages/open-next/src/overrides/tagCache/dynamodb.ts index 8d9ec89c1..4a968493d 100644 --- a/packages/open-next/src/overrides/tagCache/dynamodb.ts +++ b/packages/open-next/src/overrides/tagCache/dynamodb.ts @@ -1,7 +1,7 @@ +import type { DynamoDBClientConfig } from "@aws-sdk/client-dynamodb"; import { BatchWriteItemCommand, DynamoDBClient, - DynamoDBClientConfig, QueryCommand, } from "@aws-sdk/client-dynamodb"; import path from "path"; diff --git a/packages/open-next/src/overrides/warmer/aws-lambda.ts b/packages/open-next/src/overrides/warmer/aws-lambda.ts index d7da9bea7..0a8af22d8 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 { Warmer } from "types/open-next"; +import type { Warmer } from "types/open-next"; import { debug, error } from "../../adapters/logger"; import type { diff --git a/packages/open-next/src/overrides/wrappers/dummy.ts b/packages/open-next/src/overrides/wrappers/dummy.ts index 0f66667fa..d97189978 100644 --- a/packages/open-next/src/overrides/wrappers/dummy.ts +++ b/packages/open-next/src/overrides/wrappers/dummy.ts @@ -1,4 +1,4 @@ -import { WrapperHandler } from "types/open-next"; +import type { WrapperHandler } from "types/open-next"; const dummyWrapper: WrapperHandler = async () => async () => undefined; diff --git a/packages/open-next/src/plugins/edge.ts b/packages/open-next/src/plugins/edge.ts index bd376636d..6a87b6108 100644 --- a/packages/open-next/src/plugins/edge.ts +++ b/packages/open-next/src/plugins/edge.ts @@ -1,8 +1,8 @@ import { readFileSync } from "node:fs"; import path from "node:path"; -import { Plugin } from "esbuild"; -import { MiddlewareInfo } from "types/next-types.js"; +import type { Plugin } from "esbuild"; +import type { MiddlewareInfo } from "types/next-types.js"; import { loadAppPathsManifestKeys, diff --git a/packages/open-next/src/plugins/replacement.ts b/packages/open-next/src/plugins/replacement.ts index 1e648fe10..089444b37 100644 --- a/packages/open-next/src/plugins/replacement.ts +++ b/packages/open-next/src/plugins/replacement.ts @@ -1,7 +1,7 @@ import { readFile } from "node:fs/promises"; import chalk from "chalk"; -import { Plugin } from "esbuild"; +import type { Plugin } from "esbuild"; import logger from "../logger.js"; diff --git a/packages/open-next/src/plugins/resolve.ts b/packages/open-next/src/plugins/resolve.ts index de28f8c63..a5538adc7 100644 --- a/packages/open-next/src/plugins/resolve.ts +++ b/packages/open-next/src/plugins/resolve.ts @@ -1,6 +1,6 @@ import { readFileSync } from "node:fs"; -import { Plugin } from "esbuild"; +import type { Plugin } from "esbuild"; import type { DefaultOverrideOptions, ImageLoader, diff --git a/packages/open-next/src/types/aws-lambda.ts b/packages/open-next/src/types/aws-lambda.ts index 1516f2ae0..633869a4f 100644 --- a/packages/open-next/src/types/aws-lambda.ts +++ b/packages/open-next/src/types/aws-lambda.ts @@ -1,5 +1,5 @@ -import { APIGatewayProxyEventV2, Context } from "aws-lambda"; -import { Writable } from "stream"; +import type { APIGatewayProxyEventV2, Context } from "aws-lambda"; +import type { Writable } from "stream"; export interface ResponseStream extends Writable { getBufferedData(): Buffer; diff --git a/packages/open-next/src/types/next-types.ts b/packages/open-next/src/types/next-types.ts index b9640528d..0e63767b5 100644 --- a/packages/open-next/src/types/next-types.ts +++ b/packages/open-next/src/types/next-types.ts @@ -2,7 +2,7 @@ import type { IncomingMessage, OpenNextNodeResponse } from "http/index.js"; -import { InternalEvent } from "./open-next"; +import type { InternalEvent } from "./open-next"; type RemotePattern = { protocol?: "http" | "https"; diff --git a/packages/tests-unit/tests/converters/aws-apigw-v1.test.ts b/packages/tests-unit/tests/converters/aws-apigw-v1.test.ts index 343ef72ed..2ecb2eda5 100644 --- a/packages/tests-unit/tests/converters/aws-apigw-v1.test.ts +++ b/packages/tests-unit/tests/converters/aws-apigw-v1.test.ts @@ -1,6 +1,6 @@ /* eslint-disable sonarjs/no-duplicate-string */ import converter from "@opennextjs/aws/overrides/converters/aws-apigw-v1.js"; -import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda"; +import type { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda"; import { Readable } from "stream"; describe("convertTo", () => { diff --git a/packages/tests-unit/tests/converters/aws-apigw-v2.test.ts b/packages/tests-unit/tests/converters/aws-apigw-v2.test.ts index 420e41e87..6a0bcd9d9 100644 --- a/packages/tests-unit/tests/converters/aws-apigw-v2.test.ts +++ b/packages/tests-unit/tests/converters/aws-apigw-v2.test.ts @@ -1,5 +1,5 @@ import converter from "@opennextjs/aws/overrides/converters/aws-apigw-v2.js"; -import { APIGatewayProxyEventV2 } from "aws-lambda"; +import type { APIGatewayProxyEventV2 } from "aws-lambda"; import { Readable } from "stream"; import { vi } from "vitest"; diff --git a/packages/tests-unit/tests/converters/aws-cloudfront.test.ts b/packages/tests-unit/tests/converters/aws-cloudfront.test.ts index 81749a558..179ba9d2f 100644 --- a/packages/tests-unit/tests/converters/aws-cloudfront.test.ts +++ b/packages/tests-unit/tests/converters/aws-cloudfront.test.ts @@ -1,5 +1,8 @@ import converter from "@opennextjs/aws/overrides/converters/aws-cloudfront.js"; -import { CloudFrontRequestEvent, CloudFrontRequestResult } from "aws-lambda"; +import type { + CloudFrontRequestEvent, + CloudFrontRequestResult, +} from "aws-lambda"; import { Readable } from "stream"; import { vi } from "vitest"; diff --git a/packages/tests-unit/tests/core/routing/cacheInterceptor.test.ts b/packages/tests-unit/tests/core/routing/cacheInterceptor.test.ts index 5a2d80fd3..32600fb79 100644 --- a/packages/tests-unit/tests/core/routing/cacheInterceptor.test.ts +++ b/packages/tests-unit/tests/core/routing/cacheInterceptor.test.ts @@ -1,8 +1,8 @@ /* eslint-disable sonarjs/no-duplicate-string */ import { cacheInterceptor } from "@opennextjs/aws/core/routing/cacheInterceptor.js"; import { convertFromQueryString } from "@opennextjs/aws/core/routing/util.js"; -import { Queue } from "@opennextjs/aws/queue/types.js"; -import { InternalEvent } from "@opennextjs/aws/types/open-next.js"; +import type { Queue } from "@opennextjs/aws/queue/types.js"; +import type { InternalEvent } from "@opennextjs/aws/types/open-next.js"; import { fromReadableStream } from "@opennextjs/aws/utils/stream.js"; import { vi } from "vitest"; diff --git a/packages/tests-unit/tests/core/routing/matcher.test.ts b/packages/tests-unit/tests/core/routing/matcher.test.ts index 89af3a847..360a6947f 100644 --- a/packages/tests-unit/tests/core/routing/matcher.test.ts +++ b/packages/tests-unit/tests/core/routing/matcher.test.ts @@ -6,7 +6,7 @@ import { handleRewrites, } from "@opennextjs/aws/core/routing/matcher.js"; import { convertFromQueryString } from "@opennextjs/aws/core/routing/util.js"; -import { InternalEvent } from "@opennextjs/aws/types/open-next.js"; +import type { InternalEvent } from "@opennextjs/aws/types/open-next.js"; import { vi } from "vitest"; vi.mock("@opennextjs/aws/adapters/config/index.js", () => ({ diff --git a/packages/tests-unit/tests/core/routing/middleware.test.ts b/packages/tests-unit/tests/core/routing/middleware.test.ts index 2d736df15..998098d28 100644 --- a/packages/tests-unit/tests/core/routing/middleware.test.ts +++ b/packages/tests-unit/tests/core/routing/middleware.test.ts @@ -1,6 +1,6 @@ import { handleMiddleware } from "@opennextjs/aws/core/routing/middleware.js"; import { convertFromQueryString } from "@opennextjs/aws/core/routing/util.js"; -import { InternalEvent } from "@opennextjs/aws/types/open-next.js"; +import type { InternalEvent } from "@opennextjs/aws/types/open-next.js"; import { toReadableStream } from "@opennextjs/aws/utils/stream.js"; import { vi } from "vitest";