From 340d136223b418ce6ae00ff6e14b375e97547588 Mon Sep 17 00:00:00 2001 From: Iha Shin Date: Sun, 8 Dec 2024 14:37:59 -0800 Subject: [PATCH] chore: support moduleResolution: nodenext --- .changeset/ninety-moose-lay.md | 5 +++++ src/index.ts | 14 +++++++------- src/loadQuery.ts | 2 +- src/primitives/createFragment.ts | 6 +++--- src/primitives/createLazyLoadQuery.ts | 8 ++++---- src/primitives/createMutation.ts | 2 +- src/primitives/createQueryLoader.ts | 6 +++--- src/primitives/createRefetchableFragment.ts | 14 +++++++------- src/types/relayRuntimeExperimental.d.ts | 2 +- src/utils/getQueryRef.ts | 2 +- tsconfig.json | 3 ++- 11 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 .changeset/ninety-moose-lay.md diff --git a/.changeset/ninety-moose-lay.md b/.changeset/ninety-moose-lay.md new file mode 100644 index 0000000..85e920d --- /dev/null +++ b/.changeset/ninety-moose-lay.md @@ -0,0 +1,5 @@ +--- +"solid-relay": patch +--- + +chore: support moduleResolution: nodenext diff --git a/src/index.ts b/src/index.ts index 6f4a38a..d1258a8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,10 @@ -export { createLazyLoadQuery } from "./primitives/createLazyLoadQuery"; -export { createFragment } from "./primitives/createFragment"; -export { createRefetchableFragment } from "./primitives/createRefetchableFragment"; -export { createMutation } from "./primitives/createMutation"; -export { createQueryLoader } from "./primitives/createQueryLoader"; -export { loadQuery } from "./loadQuery"; +export { createLazyLoadQuery } from "./primitives/createLazyLoadQuery.js"; +export { createFragment } from "./primitives/createFragment.js"; +export { createRefetchableFragment } from "./primitives/createRefetchableFragment.js"; +export { createMutation } from "./primitives/createMutation.js"; +export { createQueryLoader } from "./primitives/createQueryLoader.js"; +export { loadQuery } from "./loadQuery.js"; export { RelayEnvironmentProvider, useRelayEnvironment, -} from "./RelayEnvironment"; +} from "./RelayEnvironment.js"; diff --git a/src/loadQuery.ts b/src/loadQuery.ts index 17ece83..7805ceb 100644 --- a/src/loadQuery.ts +++ b/src/loadQuery.ts @@ -20,7 +20,7 @@ import { getRequest, getRequestIdentifier, } from "relay-runtime"; -import type { RequestIdentifier } from "relay-runtime/lib/util/getRequestIdentifier"; +import type { RequestIdentifier } from "relay-runtime/lib/util/getRequestIdentifier.js"; import invariant from "tiny-invariant"; export type PreloadFetchPolicy = diff --git a/src/primitives/createFragment.ts b/src/primitives/createFragment.ts index 30a0c24..e8f488e 100644 --- a/src/primitives/createFragment.ts +++ b/src/primitives/createFragment.ts @@ -7,7 +7,7 @@ import RelayRuntime from "relay-runtime/experimental"; import type { KeyType, KeyTypeData, -} from "relay-runtime/lib/store/ResolverFragments"; +} from "relay-runtime/lib/store/ResolverFragments.js"; import { batch, createComputed, @@ -18,8 +18,8 @@ import { import type { Accessor } from "solid-js"; import { createStore, reconcile, unwrap } from "solid-js/store"; -import { useRelayEnvironment } from "../RelayEnvironment"; -import { type DataProxy, makeDataProxy } from "../utils/dataProxy"; +import { useRelayEnvironment } from "../RelayEnvironment.js"; +import { type DataProxy, makeDataProxy } from "../utils/dataProxy.js"; type FragmentResult = | { diff --git a/src/primitives/createLazyLoadQuery.ts b/src/primitives/createLazyLoadQuery.ts index 00dbd1a..48f56c5 100644 --- a/src/primitives/createLazyLoadQuery.ts +++ b/src/primitives/createLazyLoadQuery.ts @@ -22,10 +22,10 @@ import { } from "solid-js"; import { createStore, reconcile } from "solid-js/store"; -import { useRelayEnvironment } from "../RelayEnvironment"; -import { type DataProxy, makeDataProxy } from "../utils/dataProxy"; -import { getQueryRef } from "../utils/getQueryRef"; -import { createMemoOperationDescriptor } from "./createMemoOperationDescriptor"; +import { useRelayEnvironment } from "../RelayEnvironment.js"; +import { type DataProxy, makeDataProxy } from "../utils/dataProxy.js"; +import { getQueryRef } from "../utils/getQueryRef.js"; +import { createMemoOperationDescriptor } from "./createMemoOperationDescriptor.js"; type QueryResult = | { diff --git a/src/primitives/createMutation.ts b/src/primitives/createMutation.ts index da8f7c7..4a458d1 100644 --- a/src/primitives/createMutation.ts +++ b/src/primitives/createMutation.ts @@ -7,7 +7,7 @@ import { } from "relay-runtime"; import { type Accessor, createSignal } from "solid-js"; -import { useRelayEnvironment } from "../RelayEnvironment"; +import { useRelayEnvironment } from "../RelayEnvironment.js"; export function createMutation( mutation: GraphQLTaggedNode, diff --git a/src/primitives/createQueryLoader.ts b/src/primitives/createQueryLoader.ts index 5268a22..5144171 100644 --- a/src/primitives/createQueryLoader.ts +++ b/src/primitives/createQueryLoader.ts @@ -14,13 +14,13 @@ import { onCleanup, untrack, } from "solid-js"; -import { useRelayEnvironment } from "../RelayEnvironment"; +import { useRelayEnvironment } from "../RelayEnvironment.js"; import { type LoadQueryOptions, type PreloadedQuery, loadQuery, -} from "../loadQuery"; -import { useIsMounted } from "../utils/useIsMounted"; +} from "../loadQuery.js"; +import { useIsMounted } from "../utils/useIsMounted.js"; export type NullQueryReference = { kind: "NullQueryReference" }; const initialNullQueryReferenceState: NullQueryReference = { diff --git a/src/primitives/createRefetchableFragment.ts b/src/primitives/createRefetchableFragment.ts index e581c72..4c7b429 100644 --- a/src/primitives/createRefetchableFragment.ts +++ b/src/primitives/createRefetchableFragment.ts @@ -23,7 +23,7 @@ import RelayRuntimeExperimental from "relay-runtime/experimental"; import type { KeyType, KeyTypeData, -} from "relay-runtime/lib/store/ResolverFragments"; +} from "relay-runtime/lib/store/ResolverFragments.js"; import { type Accessor, batch, @@ -35,12 +35,12 @@ import { untrack, } from "solid-js"; import { unwrap } from "solid-js/store"; -import { useRelayEnvironment } from "../RelayEnvironment"; -import type { DataProxy } from "../utils/dataProxy"; -import { getQueryRef } from "../utils/getQueryRef"; -import { useIsMounted } from "../utils/useIsMounted"; -import { createFragment, createFragmentInternal } from "./createFragment"; -import { createQueryLoader } from "./createQueryLoader"; +import { useRelayEnvironment } from "../RelayEnvironment.js"; +import type { DataProxy } from "../utils/dataProxy.js"; +import { getQueryRef } from "../utils/getQueryRef.js"; +import { useIsMounted } from "../utils/useIsMounted.js"; +import { createFragment, createFragmentInternal } from "./createFragment.js"; +import { createQueryLoader } from "./createQueryLoader.js"; export type CreateRefetchableFragmentReturn< TQuery extends OperationType, diff --git a/src/types/relayRuntimeExperimental.d.ts b/src/types/relayRuntimeExperimental.d.ts index af33ec7..208b5ab 100644 --- a/src/types/relayRuntimeExperimental.d.ts +++ b/src/types/relayRuntimeExperimental.d.ts @@ -4,7 +4,7 @@ declare module "relay-runtime/experimental" { IEnvironment, Observable, } from "relay-runtime"; - import type { KeyType } from "relay-runtime/lib/store/ResolverFragments"; + import type { KeyType } from "relay-runtime/lib/store/ResolverFragments.js"; export type FragmentState = | { state: "ok"; value: T } diff --git a/src/utils/getQueryRef.ts b/src/utils/getQueryRef.ts index 0c7fc9c..d8726bc 100644 --- a/src/utils/getQueryRef.ts +++ b/src/utils/getQueryRef.ts @@ -1,5 +1,5 @@ import RelayRuntime, { type OperationDescriptor } from "relay-runtime"; -import type { KeyType } from "relay-runtime/lib/store/ResolverFragments"; +import type { KeyType } from "relay-runtime/lib/store/ResolverFragments.js"; export const getQueryRef = (operation: OperationDescriptor) => ({ diff --git a/tsconfig.json b/tsconfig.json index 01e14f0..c3c7883 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { "target": "ESNext", - "moduleResolution": "bundler", + "module": "NodeNext", + "moduleResolution": "NodeNext", "strict": true, "outDir": "dist", "rootDir": "src",