From 3d4781d61376dade06fdbac9315431e860195666 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 25 Aug 2024 10:53:23 -0400 Subject: [PATCH 1/6] fix: stop defaulting to throwOnError=true when isServer===true so that SSR can render the page the same way the client will rather than showing the error boundary fallback --- packages/solid-query/src/createBaseQuery.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 120b67dd97..ac5c9baea7 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -131,8 +131,7 @@ export function createBaseQuery< : 'optimistic' defaultOptions.structuralSharing = false if (isServer) { - defaultOptions.retry = false - defaultOptions.throwOnError = true + defaultOptions.retry = false } return defaultOptions }) From 582892be40b9fc5529ce15fa88d9c3d4b348b937 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 25 Aug 2024 10:55:30 -0400 Subject: [PATCH 2/6] fix: stop defaulting to throwOnError=true when isServer===true so that SSR can render the page the same way the client will rather than showing the error boundary fallback --- packages/solid-query/src/createBaseQuery.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index ac5c9baea7..e393325603 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -131,7 +131,7 @@ export function createBaseQuery< : 'optimistic' defaultOptions.structuralSharing = false if (isServer) { - defaultOptions.retry = false + defaultOptions.retry = false } return defaultOptions }) From 5bf2dd94d4ae2c99af4f196ffe29470189e4ca92 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 25 Aug 2024 12:18:28 -0400 Subject: [PATCH 3/6] fix: stop defaulting to throwOnError=true when isServer===true so that SSR can render the page the same way the client will rather than showing the error boundary fallback --- packages/solid-query/src/createBaseQuery.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index e393325603..6c6eae0e9b 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -156,7 +156,10 @@ export function createBaseQuery< const query = observer().getCurrentQuery() const unwrappedResult = hydratableObserverResult(query, result) - if (unwrappedResult.isError) { + if (unwrappedResult.isError && shouldThrowError(initialOptions.throwOnError, [ + observerResult.error, + query + ])) { reject(unwrappedResult.error) unsubscribeIfQueued() } else { From cfe8a00494e4df90b1160e7734a12944eee03227 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:20:54 +0000 Subject: [PATCH 4/6] ci: apply automated fixes --- packages/solid-query/src/createBaseQuery.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 6c6eae0e9b..4879b0b5f9 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -156,10 +156,13 @@ export function createBaseQuery< const query = observer().getCurrentQuery() const unwrappedResult = hydratableObserverResult(query, result) - if (unwrappedResult.isError && shouldThrowError(initialOptions.throwOnError, [ - observerResult.error, - query - ])) { + if ( + unwrappedResult.isError && + shouldThrowError(initialOptions.throwOnError, [ + observerResult.error, + query, + ]) + ) { reject(unwrappedResult.error) unsubscribeIfQueued() } else { From ea8c1d599339384b253be3fa991ead993b04c2eb Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 26 Aug 2024 12:37:01 -0400 Subject: [PATCH 5/6] fix not null TS error --- packages/solid-query/src/createBaseQuery.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 4879b0b5f9..3fccc5244e 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -159,7 +159,7 @@ export function createBaseQuery< if ( unwrappedResult.isError && shouldThrowError(initialOptions.throwOnError, [ - observerResult.error, + observerResult.error!, query, ]) ) { From c64559b1ceb3065f6203c9486c66bf860d389a65 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 26 Aug 2024 13:45:31 -0400 Subject: [PATCH 6/6] reference correct error when throwing --- packages/solid-query/src/createBaseQuery.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts index 3fccc5244e..bfbbbf34c9 100644 --- a/packages/solid-query/src/createBaseQuery.ts +++ b/packages/solid-query/src/createBaseQuery.ts @@ -159,7 +159,7 @@ export function createBaseQuery< if ( unwrappedResult.isError && shouldThrowError(initialOptions.throwOnError, [ - observerResult.error!, + unwrappedResult.error, query, ]) ) {