Merge remote-tracking branch 'origin/main' into feat/prevent-recursiv…

…e-fallback-throw-error
toss · Jan 20, 2025 · 95b27ec · 95b27ec
2 parents 87014d3 + c0c9c34
commit 95b27ec
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 17 deletions.
diff --git a/packages/jotai/CHANGELOG.md b/packages/jotai/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @suspensive/jotai
 
+## 2.18.12
+
 ## 2.18.11
 
 ## 2.18.10

diff --git a/packages/jotai/package.json b/packages/jotai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/jotai",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "Suspensive interfaces for jotai",
   "keywords": [
     "suspensive",

diff --git a/packages/react-query-4/CHANGELOG.md b/packages/react-query-4/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @suspensive/react-query-4
 
+## 2.18.12
+
+### Patch Changes
+
+- Updated dependencies [[`421d49d`](https://github.com/toss/suspensive/commit/421d49d6282bd375772aa898bca7b3f88b6a7ad8)]:
+  - @suspensive/react@2.18.12
+
 ## 2.18.11
 
 ### Patch Changes

diff --git a/packages/react-query-4/package.json b/packages/react-query-4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query-4",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "Suspensive interfaces for @tanstack/react-query@4",
   "keywords": [
     "suspensive",
@@ -59,7 +59,7 @@
     "react": "catalog:react19"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.11",
+    "@suspensive/react": "workspace:^2.18.12",
     "@tanstack/react-query": "^4",
     "react": "^18 || ^19"
   },

diff --git a/packages/react-query-5/CHANGELOG.md b/packages/react-query-5/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @suspensive/react-query-5
 
+## 2.18.12
+
+### Patch Changes
+
+- Updated dependencies [[`421d49d`](https://github.com/toss/suspensive/commit/421d49d6282bd375772aa898bca7b3f88b6a7ad8)]:
+  - @suspensive/react@2.18.12
+
 ## 2.18.11
 
 ### Patch Changes

diff --git a/packages/react-query-5/package.json b/packages/react-query-5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query-5",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "Suspensive interfaces for @tanstack/react-query@5",
   "keywords": [
     "suspensive",
@@ -59,7 +59,7 @@
     "react": "catalog:react19"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.11",
+    "@suspensive/react": "workspace:^2.18.12",
     "@tanstack/react-query": "^5",
     "react": "^18 || ^19"
   },

diff --git a/packages/react-query/CHANGELOG.md b/packages/react-query/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @suspensive/react-query
 
+## 2.18.12
+
+### Patch Changes
+
+- Updated dependencies [[`421d49d`](https://github.com/toss/suspensive/commit/421d49d6282bd375772aa898bca7b3f88b6a7ad8)]:
+  - @suspensive/react@2.18.12
+  - @suspensive/react-query-4@2.18.12
+  - @suspensive/react-query-5@2.18.12
+
 ## 2.18.11
 
 ### Patch Changes

diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "Suspensive interfaces for @tanstack/react-query",
   "keywords": [
     "suspensive",
@@ -56,8 +56,8 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "^12.1.0",
-    "@suspensive/react-query-4": "workspace:^2.18.11",
-    "@suspensive/react-query-5": "workspace:^2.18.11",
+    "@suspensive/react-query-4": "workspace:^2.18.12",
+    "@suspensive/react-query-5": "workspace:^2.18.12",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0"
   },
@@ -70,7 +70,7 @@
     "react": "catalog:react19"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.11",
+    "@suspensive/react": "workspace:^2.18.12",
     "@tanstack/react-query": "^4 || ^5",
     "react": "^18 || ^19"
   },

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @suspensive/react
 
+## 2.18.12
+
+### Patch Changes
+
+- [#1414](https://github.com/toss/suspensive/pull/1414) [`421d49d`](https://github.com/toss/suspensive/commit/421d49d6282bd375772aa898bca7b3f88b6a7ad8) Thanks [@manudeli](https://github.com/manudeli)! - fix(react): re-throw SuspensiveError before rerender
+
 ## 2.18.11
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react",
-  "version": "2.18.11",
+  "version": "2.18.12",
   "description": "Suspensive interface for react",
   "keywords": [
     "suspensive",

diff --git a/packages/react/src/ErrorBoundary.spec.tsx b/packages/react/src/ErrorBoundary.spec.tsx
@@ -423,6 +423,14 @@ describe('useErrorBoundary', () => {
         </ErrorBoundary>
       ).getByText(TEXT)
     ).toBeInTheDocument()
+    expect(() =>
+      render(
+        createElement(() => {
+          useErrorBoundary()
+          return <></>
+        })
+      )
+    ).toThrow(SuspensiveError)
     expect(() =>
       render(
         <ErrorBoundary
@@ -472,16 +480,23 @@ describe('useErrorBoundaryFallbackProps', () => {
   })
 
   it('should guarantee hook calling position is in fallback of ErrorBoundary', () => {
+    const inFallback = vi.fn()
     expect(() =>
       render(
-        <ErrorBoundary fallback={(props) => <>{props.error.message}</>}>
+        <ErrorBoundary
+          fallback={(props) => {
+            inFallback()
+            return <>{props.error.message}</>
+          }}
+        >
           {createElement(() => {
             useErrorBoundaryFallbackProps()
             return <></>
           })}
         </ErrorBoundary>
       )
     ).toThrow(SuspensiveError)
+    expect(inFallback).toHaveBeenCalledTimes(0)
   })
   it('should be prevented to be called outside fallback of ErrorBoundary', () => {
     expect(() =>
@@ -494,15 +509,22 @@ describe('useErrorBoundaryFallbackProps', () => {
     ).toThrow(SuspensiveError)
   })
   it("should be prevented to be called in children of ErrorBoundary (ErrorBoundary shouldn't catch SuspensiveError)", () => {
+    const inFallback = vi.fn()
     expect(() =>
       render(
-        <ErrorBoundary fallback={(props) => <>{props.error.message}</>}>
+        <ErrorBoundary
+          fallback={(props) => {
+            inFallback()
+            return <>{props.error.message}</>
+          }}
+        >
           {createElement(() => {
             useErrorBoundaryFallbackProps()
             return <></>
           })}
         </ErrorBoundary>
       )
     ).toThrow(SuspensiveError)
+    expect(inFallback).toHaveBeenCalledTimes(0)
   })
 })
diff --git a/packages/react/src/ErrorBoundary.tsx b/packages/react/src/ErrorBoundary.tsx
@@ -115,9 +115,6 @@ class BaseErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState
   }
 
   componentDidCatch(error: Error, info: ErrorInfo) {
-    if (error instanceof SuspensiveError) {
-      throw error
-    }
     this.props.onError?.(error, info)
   }
 
@@ -133,6 +130,9 @@ class BaseErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState
     let childrenOrFallback = children
 
     if (isError) {
+      if (error instanceof SuspensiveError) {
+        throw error
+      }
       if (error instanceof ErrorInFallback) {
         throw error.originalError
       }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml