From e520f1a812eca315af0292f43698cf490d48df0b Mon Sep 17 00:00:00 2001
From: Brenley Dueck <brenleydueck@gmail.com>
Date: Fri, 8 May 2026 16:34:19 -0500
Subject: [PATCH 1/2] Fix createResource initial value inference

---
 packages/solid/src/reactive/signal.ts      | 16 ++++++------
 packages/solid/test/resource.type-tests.ts | 30 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
index a7b4995ef..9bfc454ae 100644
--- a/packages/solid/src/reactive/signal.ts
+++ b/packages/solid/src/reactive/signal.ts
@@ -577,19 +577,19 @@ function isPromise(v: any): v is Promise<any> {
  *
  * @description https://docs.solidjs.com/reference/basic-reactivity/create-resource
  */
-export function createResource<T, R = unknown>(
-  fetcher: ResourceFetcher<true, T, R>,
-  options: InitializedResourceOptions<NoInfer<T>, true>
-): InitializedResourceReturn<T, R>;
+export function createResource<T, R = unknown, I = T>(
+  fetcher: (k: true, info: ResourceFetcherInfo<T | I, R>) => T | Promise<T>,
+  options: ResourceOptions<T | I, true> & { initialValue: I }
+): InitializedResourceReturn<T | I, R>;
 export function createResource<T, R = unknown>(
   fetcher: ResourceFetcher<true, T, R>,
   options?: ResourceOptions<NoInfer<T>, true>
 ): ResourceReturn<T, R>;
-export function createResource<T, S, R = unknown>(
+export function createResource<T, S, R = unknown, I = T>(
   source: ResourceSource<S>,
-  fetcher: ResourceFetcher<S, T, R>,
-  options: InitializedResourceOptions<NoInfer<T>, S>
-): InitializedResourceReturn<T, R>;
+  fetcher: (k: S, info: ResourceFetcherInfo<T | I, R>) => T | Promise<T>,
+  options: ResourceOptions<T | I, S> & { initialValue: I }
+): InitializedResourceReturn<T | I, R>;
 export function createResource<T, S, R = unknown>(
   source: ResourceSource<S>,
   fetcher: ResourceFetcher<S, T, R>,
diff --git a/packages/solid/test/resource.type-tests.ts b/packages/solid/test/resource.type-tests.ts
index 0df3a8e6b..05f9d6389 100644
--- a/packages/solid/test/resource.type-tests.ts
+++ b/packages/solid/test/resource.type-tests.ts
@@ -56,6 +56,21 @@ type Equals<X, Y> =
   type Tests = Assert<Equals<ResourceActions["mutate"], Setter<number>>>;
 }
 
+// without source
+// with fetcher, nullable initialValue
+{
+  const resourceReturn = createResource(
+    () => {
+      return Promise.resolve(1);
+    },
+    {
+      initialValue: null
+    }
+  );
+
+  type Tests = Assert<Equals<typeof resourceReturn, InitializedResourceReturn<number | null>>>;
+}
+
 // without initialValue
 // with source, fetcher
 {
@@ -105,6 +120,21 @@ type Equals<X, Y> =
   );
 }
 
+// with source, fetcher, nullable initialValue
+{
+  const resourceReturn = createResource(
+    () => 1,
+    () => {
+      return Promise.resolve(1);
+    },
+    {
+      initialValue: null
+    }
+  );
+
+  type Tests = Assert<Equals<typeof resourceReturn, InitializedResourceReturn<number | null>>>;
+}
+
 /* Resource type tests */
 {
   let resource!: Resource<string>;

From 4b1919a3763993f69ba087bbbc81ac0bc6fa5fa2 Mon Sep 17 00:00:00 2001
From: Ryan Carniato <ryansolid@gmail.com>
Date: Thu, 14 May 2026 22:37:02 -0700
Subject: [PATCH 2/2] Fix createResource initial value inference

Update the initial value inference for createResource.
---
 .changeset/silly-berries-bake.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/silly-berries-bake.md

diff --git a/.changeset/silly-berries-bake.md b/.changeset/silly-berries-bake.md
new file mode 100644
index 000000000..71fb7a517
--- /dev/null
+++ b/.changeset/silly-berries-bake.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Fix createResource initial value inference