Skip to content

update import aliases to new format #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james-elicx merged 1 commit into from
Feb 2, 2026
Merged

update import aliases to new format #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/open-next/src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/adapters/cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
8 changes: 4 additions & 4 deletions packages/open-next/src/adapters/composable-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/adapters/config/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type {
NextConfig,
PrerenderManifest,
RoutesManifest,
} from "types/next-types";
} from "@/types/next-types";

import type { PublicFiles } from "../../build";

Expand Down
8 changes: 4 additions & 4 deletions packages/open-next/src/adapters/edge-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
8 changes: 4 additions & 4 deletions packages/open-next/src/adapters/image-optimization-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/adapters/logger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isOpenNextError } from "utils/error.js";
import { isOpenNextError } from "@/utils/error.js";

export function debug(...args: any[]) {
if (globalThis.openNextDebug) {
Expand Down
6 changes: 3 additions & 3 deletions packages/open-next/src/adapters/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion packages/open-next/src/build/compileConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/build/copyTracedFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/build/createAssets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/createMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
5 changes: 3 additions & 2 deletions packages/open-next/src/build/createServerBundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 5 additions & 4 deletions packages/open-next/src/build/edge/createEdgeBundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
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,
LazyLoadedOverride,
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";
Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/build/generateOutput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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,
ExternalMiddlewareConfig,
FunctionOptions,
LazyLoadedOverride,
OverrideOptions,
} from "types/open-next";
} from "@/types/open-next";

import { type BuildOptions, getBuildId } from "./helper.js";

Expand Down
3 changes: 2 additions & 1 deletion packages/open-next/src/build/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/installDeps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
6 changes: 3 additions & 3 deletions packages/open-next/src/build/middleware/buildNodeMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/patch/patches/patchBackgroundRevalidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
3 changes: 2 additions & 1 deletion packages/open-next/src/build/patch/patches/patchFetchCacheISR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/patch/patches/patchFetchCacheWaitUntil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/patch/patches/patchNextServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/patch/patches/patchNodeEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/build/validateConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
IncludedWrapper,
OpenNextConfig,
SplittedFunctionOptions,
} from "types/open-next";
} from "@/types/open-next";

import logger from "../logger.js";

Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/core/createGenericHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/core/createMainHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/core/edgeFunctionHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<RequestData, "page">;

Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/core/nodeMiddlewareHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RequestData } from "types/global";
import type { RequestData } from "@/types/global";

type EdgeRequest = Omit<RequestData, "page">;

Expand Down
9 changes: 4 additions & 5 deletions packages/open-next/src/core/requestHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/core/require-hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions packages/open-next/src/core/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> = T extends undefined ? never : T;
Expand Down
3 changes: 1 addition & 2 deletions packages/open-next/src/core/routing/adapterHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
12 changes: 6 additions & 6 deletions packages/open-next/src/core/routing/cacheInterceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
8 changes: 4 additions & 4 deletions packages/open-next/src/core/routing/i18n/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
11 changes: 6 additions & 5 deletions packages/open-next/src/core/routing/matcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
Loading
Loading