react-error-boundary 4.0.11 → 4.0.13

package/README.md

@@ -20,12 +20,12 @@ yarn add react-error-boundary
 ## API
 
 ### `ErrorBoundary` component
-Wrap an `ErrorBoundary` around other React components to "catch" errors and render a fallback UI. The component supports several ways to render a fallback (shown below).
+Wrap an `ErrorBoundary` component around other React components to "catch" errors and render a fallback UI. The component supports several ways to render a fallback (as shown below).
 
 > **Note** `ErrorBoundary` is a _client_ component. You can only pass props to it that are serializeable or use it in files that have a `"use client";` directive.
 
 #### `ErrorBoundary` with `fallback` prop
-The simplest way to render a default "something went wrong" type error message.
+The simplest way to render a default "something went wrong" type of error message.
 ```js
 "use client";
 
@@ -142,7 +142,7 @@ function Example() {
 ```
 
 #### Dismiss the nearest error boundary
-A fallback component can use this hook to request the nearest error boundary retry the render that original failed.
+A fallback component can use this hook to request the nearest error boundary retry the render that originally failed.
 
 ```js
 "use client";
@@ -211,4 +211,4 @@ If using Yarn:
 
 ---
 
-[This blog post](https://kentcdodds.com/blog/use-react-error-boundary-to-handle-errors-in-react) shows more examples of how this package can be used, although it was written for the [version 3 API](https://github.com/bvaughn/react-error-boundary/releases/tag/v3.1.4).
+[This blog post](https://kentcdodds.com/blog/use-react-error-boundary-to-handle-errors-in-react) shows more examples of how this package can be used, although it was written for the [version 3 API](https://github.com/bvaughn/react-error-boundary/releases/tag/v3.1.4).

package/dist/declarations/src/ErrorBoundary.d.ts

@@ -1,8 +1,11 @@
 import { Component, ErrorInfo } from "react";
 import { ErrorBoundaryProps } from "./types.js";
 type ErrorBoundaryState = {
-    didCatch: boolean;
+    didCatch: true;
     error: any;
+} | {
+    didCatch: false;
+    error: null;
 };
 export declare class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
     constructor(props: ErrorBoundaryProps);

package/dist/declarations/src/useErrorBoundary.d.ts

@@ -1,5 +1,5 @@
-export type UseErrorBoundaryApi<Error> = {
+export type UseErrorBoundaryApi<TError> = {
     resetBoundary: () => void;
-    showBoundary: (error: Error) => void;
+    showBoundary: (error: TError) => void;
 };
-export declare function useErrorBoundary<Error = any>(): UseErrorBoundaryApi<Error>;
+export declare function useErrorBoundary<TError = any>(): UseErrorBoundaryApi<TError>;

package/dist/declarations/src/withErrorBoundary.d.ts

@@ -1,3 +1,3 @@
 import { RefAttributes, ForwardRefExoticComponent, PropsWithoutRef, ComponentType } from "react";
 import { ErrorBoundaryProps } from "./types.js";
-export declare function withErrorBoundary<Props extends Object>(component: ComponentType<Props>, errorBoundaryProps: ErrorBoundaryProps): ForwardRefExoticComponent<PropsWithoutRef<Props> & RefAttributes<any>>;
+export declare function withErrorBoundary<Props extends object>(component: ComponentType<Props>, errorBoundaryProps: ErrorBoundaryProps): ForwardRefExoticComponent<PropsWithoutRef<Props> & RefAttributes<any>>;

package/dist/react-error-boundary.cjs.js

@@ -83,12 +83,12 @@ class ErrorBoundary extends react.Component {
         error,
         resetErrorBoundary: this.resetErrorBoundary
       };
-      if (react.isValidElement(fallback)) {
-        childToRender = fallback;
-      } else if (typeof fallbackRender === "function") {
+      if (typeof fallbackRender === "function") {
         childToRender = fallbackRender(props);
       } else if (FallbackComponent) {
         childToRender = react.createElement(FallbackComponent, props);
+      } else if (fallback === null || react.isValidElement(fallback)) {
+        childToRender = fallback;
       } else {
         throw error;
       }
@@ -112,7 +112,6 @@ function assertErrorBoundaryContext(value) {
   if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
     throw new Error("ErrorBoundaryContext not found");
   }
-  return true;
 }
 
 function useErrorBoundary() {
@@ -124,7 +123,7 @@ function useErrorBoundary() {
   });
   const memoized = react.useMemo(() => ({
     resetBoundary: () => {
-      context === null || context === void 0 ? void 0 : context.resetErrorBoundary();
+      context.resetErrorBoundary();
       setState({
         error: null,
         hasError: false
@@ -134,7 +133,7 @@ function useErrorBoundary() {
       error,
       hasError: true
     })
-  }), [context === null || context === void 0 ? void 0 : context.resetErrorBoundary]);
+  }), [context.resetErrorBoundary]);
   if (state.hasError) {
     throw state.error;
   }

package/dist/react-error-boundary.development.cjs.js

@@ -83,12 +83,12 @@ class ErrorBoundary extends react.Component {
         error,
         resetErrorBoundary: this.resetErrorBoundary
       };
-      if (react.isValidElement(fallback)) {
-        childToRender = fallback;
-      } else if (typeof fallbackRender === "function") {
+      if (typeof fallbackRender === "function") {
         childToRender = fallbackRender(props);
       } else if (FallbackComponent) {
         childToRender = react.createElement(FallbackComponent, props);
+      } else if (fallback === null || react.isValidElement(fallback)) {
+        childToRender = fallback;
       } else {
         {
           console.error("react-error-boundary requires either a fallback, fallbackRender, or FallbackComponent prop");
@@ -115,7 +115,6 @@ function assertErrorBoundaryContext(value) {
   if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
     throw new Error("ErrorBoundaryContext not found");
   }
-  return true;
 }
 
 function useErrorBoundary() {
@@ -127,7 +126,7 @@ function useErrorBoundary() {
   });
   const memoized = react.useMemo(() => ({
     resetBoundary: () => {
-      context === null || context === void 0 ? void 0 : context.resetErrorBoundary();
+      context.resetErrorBoundary();
       setState({
         error: null,
         hasError: false
@@ -137,7 +136,7 @@ function useErrorBoundary() {
       error,
       hasError: true
     })
-  }), [context === null || context === void 0 ? void 0 : context.resetErrorBoundary]);
+  }), [context.resetErrorBoundary]);
   if (state.hasError) {
     throw state.error;
   }

package/dist/react-error-boundary.development.esm.js

@@ -1,5 +1,5 @@
 'use client';
-import { createContext, Component, isValidElement, createElement, useContext, useState, useMemo, forwardRef } from 'react';
+import { createContext, Component, createElement, isValidElement, useContext, useState, useMemo, forwardRef } from 'react';
 
 const ErrorBoundaryContext = createContext(null);
 
@@ -79,12 +79,12 @@ class ErrorBoundary extends Component {
         error,
         resetErrorBoundary: this.resetErrorBoundary
       };
-      if (isValidElement(fallback)) {
-        childToRender = fallback;
-      } else if (typeof fallbackRender === "function") {
+      if (typeof fallbackRender === "function") {
         childToRender = fallbackRender(props);
       } else if (FallbackComponent) {
         childToRender = createElement(FallbackComponent, props);
+      } else if (fallback === null || isValidElement(fallback)) {
+        childToRender = fallback;
       } else {
         {
           console.error("react-error-boundary requires either a fallback, fallbackRender, or FallbackComponent prop");
@@ -111,7 +111,6 @@ function assertErrorBoundaryContext(value) {
   if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
     throw new Error("ErrorBoundaryContext not found");
   }
-  return true;
 }
 
 function useErrorBoundary() {
@@ -123,7 +122,7 @@ function useErrorBoundary() {
   });
   const memoized = useMemo(() => ({
     resetBoundary: () => {
-      context === null || context === void 0 ? void 0 : context.resetErrorBoundary();
+      context.resetErrorBoundary();
       setState({
         error: null,
         hasError: false
@@ -133,7 +132,7 @@ function useErrorBoundary() {
       error,
       hasError: true
     })
-  }), [context === null || context === void 0 ? void 0 : context.resetErrorBoundary]);
+  }), [context.resetErrorBoundary]);
   if (state.hasError) {
     throw state.error;
   }

package/dist/react-error-boundary.esm.js

@@ -1,5 +1,5 @@
 'use client';
-import { createContext, Component, isValidElement, createElement, useContext, useState, useMemo, forwardRef } from 'react';
+import { createContext, Component, createElement, isValidElement, useContext, useState, useMemo, forwardRef } from 'react';
 
 const ErrorBoundaryContext = createContext(null);
 
@@ -79,12 +79,12 @@ class ErrorBoundary extends Component {
         error,
         resetErrorBoundary: this.resetErrorBoundary
       };
-      if (isValidElement(fallback)) {
-        childToRender = fallback;
-      } else if (typeof fallbackRender === "function") {
+      if (typeof fallbackRender === "function") {
         childToRender = fallbackRender(props);
       } else if (FallbackComponent) {
         childToRender = createElement(FallbackComponent, props);
+      } else if (fallback === null || isValidElement(fallback)) {
+        childToRender = fallback;
       } else {
         throw error;
       }
@@ -108,7 +108,6 @@ function assertErrorBoundaryContext(value) {
   if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
     throw new Error("ErrorBoundaryContext not found");
   }
-  return true;
 }
 
 function useErrorBoundary() {
@@ -120,7 +119,7 @@ function useErrorBoundary() {
   });
   const memoized = useMemo(() => ({
     resetBoundary: () => {
-      context === null || context === void 0 ? void 0 : context.resetErrorBoundary();
+      context.resetErrorBoundary();
       setState({
         error: null,
         hasError: false
@@ -130,7 +129,7 @@ function useErrorBoundary() {
       error,
       hasError: true
     })
-  }), [context === null || context === void 0 ? void 0 : context.resetErrorBoundary]);
+  }), [context.resetErrorBoundary]);
   if (state.hasError) {
     throw state.error;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-error-boundary",
-  "version": "4.0.11",
+  "version": "4.0.13",
   "description": "Simple reusable React error boundary component",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "license": "MIT",
@@ -44,8 +44,8 @@
     "clear:builds": "rm -rf ./dist",
     "clear:node_modules": "rm -rf ./node_modules",
     "prerelease": "preconstruct build",
-    "prettier": "prettier --write \"**/*.{css,html,js,json,jsx,ts,tsx}\"",
-    "prettier:ci": "prettier --check \"**/*.{css,html,js,json,jsx,ts,tsx}\"",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "test": "jest",
     "test:watch": "jest --watch",
     "typescript": "tsc --noEmit",
@@ -58,12 +58,20 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.21.5",
     "@preconstruct/cli": "^2.8.1",
+    "@types/assert": "^1.5.10",
     "@types/jest": "^26.0.15",
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "assert": "^2.0.0",
+    "eslint": "^8.0.1",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.1",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.4.3",
-    "prettier": "^2.8.6",
+    "prettier": "^3.0.1",
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
@@ -72,14 +80,6 @@
   "peerDependencies": {
     "react": ">=16.13.1"
   },
-  "eslintConfig": {
-    "extends": "./node_modules/kcd-scripts/eslint.js",
-    "rules": {
-      "react/prop-types": "off",
-      "react/no-did-update-set-state": "off",
-      "babel/no-unused-expressions": "off"
-    }
-  },
   "preconstruct": {
     "exports": {
       "importConditionDefaultExport": "default"