react-error-boundary 4.1.2 → 6.0.0

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

@@ -1,5 +1,4 @@
 import { ComponentType, ErrorInfo, PropsWithChildren, ReactNode } from "react";
-declare function FallbackRender(props: FallbackProps): ReactNode;
 export type FallbackProps = {
     error: any;
     resetErrorBoundary: (...args: any[]) => void;
@@ -24,7 +23,7 @@ export type ErrorBoundaryPropsWithComponent = ErrorBoundarySharedProps & {
 export type ErrorBoundaryPropsWithRender = ErrorBoundarySharedProps & {
     fallback?: never;
     FallbackComponent?: never;
-    fallbackRender: typeof FallbackRender;
+    fallbackRender: (props: FallbackProps) => ReactNode;
 };
 export type ErrorBoundaryPropsWithFallback = ErrorBoundarySharedProps & {
     fallback: ReactNode;

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

@@ -1,3 +1,3 @@
-import { RefAttributes, ForwardRefExoticComponent, PropsWithoutRef, ComponentType } from "react";
+import { RefAttributes, ForwardRefExoticComponent, PropsWithoutRef, ComponentType, ComponentRef, ComponentProps } 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<T extends ComponentType<any>>(component: T, errorBoundaryProps: ErrorBoundaryProps): ForwardRefExoticComponent<PropsWithoutRef<ComponentProps<T>> & RefAttributes<ComponentRef<T>>>;

package/dist/react-error-boundary.d.ts

@@ -0,0 +1,2 @@
+export * from "./declarations/src/index.js";
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVhY3QtZXJyb3ItYm91bmRhcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4vZGVjbGFyYXRpb25zL3NyYy9pbmRleC5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBIn0=

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "react-error-boundary",
-  "version": "4.1.2",
+  "version": "6.0.0",
+  "type": "module",
   "description": "Simple reusable React error boundary component",
   "author": "Brian Vaughn <brian.david.vaughn@gmail.com>",
   "license": "MIT",
@@ -8,23 +9,11 @@
     "type": "git",
     "url": "https://github.com/bvaughn/react-error-boundary"
   },
-  "packageManager": "pnpm@9.6.0",
-  "main": "dist/react-error-boundary.cjs.js",
-  "module": "dist/react-error-boundary.esm.js",
   "exports": {
     ".": {
-      "types": {
-        "import": "./dist/react-error-boundary.cjs.mjs",
-        "default": "./dist/react-error-boundary.cjs.js"
-      },
-      "development": {
-        "module": "./dist/react-error-boundary.development.esm.js",
-        "import": "./dist/react-error-boundary.development.cjs.mjs",
-        "default": "./dist/react-error-boundary.development.cjs.js"
-      },
-      "module": "./dist/react-error-boundary.esm.js",
-      "import": "./dist/react-error-boundary.cjs.mjs",
-      "default": "./dist/react-error-boundary.cjs.js"
+      "types": "./dist/react-error-boundary.js",
+      "development": "./dist/react-error-boundary.development.js",
+      "default": "./dist/react-error-boundary.js"
     },
     "./package.json": "./package.json"
   },
@@ -34,49 +23,35 @@
       "default": "./src/env-conditions/production.ts"
     }
   },
-  "types": "dist/react-error-boundary.cjs.d.ts",
+  "types": "dist/react-error-boundary.d.ts",
   "files": [
     "dist"
   ],
   "sideEffects": false,
-  "scripts": {
-    "clear": "pnpm clear:builds & pnpm clear:node_modules",
-    "clear:builds": "rimraf ./dist",
-    "clear:node_modules": "rimraf ./node_modules",
-    "prerelease": "preconstruct build",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "typescript": "tsc --noEmit",
-    "typescript:watch": "tsc --noEmit --watch"
-  },
   "dependencies": {
     "@babel/runtime": "^7.12.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.21.5",
-    "@preconstruct/cli": "^2.8.1",
+    "@preconstruct/cli": "^2.8.12",
     "@types/assert": "^1.5.10",
-    "@types/jest": "^26.0.15",
-    "@types/react": "^18",
+    "@types/react": "^18.3.17",
     "@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": "^9.13.0",
+    "eslint-config-prettier": "^9.1.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",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.2",
+    "globals": "^15.11.0",
     "prettier": "^3.0.1",
     "react": "^18",
     "react-dom": "^18",
     "rimraf": "^6.0.1",
-    "ts-jest": "^29.0.5",
-    "typescript": "^5.1.6"
+    "vitest": "^3.1.2",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.18.0"
   },
   "peerDependencies": {
     "react": ">=16.13.1"
@@ -86,7 +61,21 @@
       "importConditionDefaultExport": "default"
     },
     "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
-      "importsConditions": true
+      "distInRoot": true,
+      "importsConditions": true,
+      "typeModule": true
     }
+  },
+  "scripts": {
+    "clear": "pnpm clear:builds & pnpm clear:node_modules",
+    "clear:builds": "rimraf ./dist",
+    "clear:node_modules": "rimraf ./node_modules",
+    "prerelease": "preconstruct build",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest --environment=jsdom --watch=false",
+    "test:watch": "vitest --environment=jsdom --watch",
+    "typescript": "tsc --noEmit",
+    "typescript:watch": "tsc --noEmit --watch"
   }
-}
+}

package/dist/react-error-boundary.cjs.d.mts

@@ -1,2 +0,0 @@
-export * from "./declarations/src/index.js";
-//# sourceMappingURL=react-error-boundary.cjs.d.mts.map

package/dist/react-error-boundary.cjs.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"react-error-boundary.cjs.d.mts","sourceRoot":"","sources":["./declarations/src/index.d.ts"],"names":[],"mappings":"AAAA"}

package/dist/react-error-boundary.cjs.d.ts

@@ -1,2 +0,0 @@
-export * from "./declarations/src/index";
-//# sourceMappingURL=react-error-boundary.cjs.d.ts.map

package/dist/react-error-boundary.cjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"react-error-boundary.cjs.d.ts","sourceRoot":"","sources":["./declarations/src/index.d.ts"],"names":[],"mappings":"AAAA"}

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

@@ -1,158 +0,0 @@
-'use client';
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var react = require('react');
-
-const ErrorBoundaryContext = react.createContext(null);
-
-const initialState = {
-  didCatch: false,
-  error: null
-};
-class ErrorBoundary extends react.Component {
-  constructor(props) {
-    super(props);
-    this.resetErrorBoundary = this.resetErrorBoundary.bind(this);
-    this.state = initialState;
-  }
-  static getDerivedStateFromError(error) {
-    return {
-      didCatch: true,
-      error
-    };
-  }
-  resetErrorBoundary() {
-    const {
-      error
-    } = this.state;
-    if (error !== null) {
-      var _this$props$onReset, _this$props;
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      (_this$props$onReset = (_this$props = this.props).onReset) === null || _this$props$onReset === void 0 ? void 0 : _this$props$onReset.call(_this$props, {
-        args,
-        reason: "imperative-api"
-      });
-      this.setState(initialState);
-    }
-  }
-  componentDidCatch(error, info) {
-    var _this$props$onError, _this$props2;
-    (_this$props$onError = (_this$props2 = this.props).onError) === null || _this$props$onError === void 0 ? void 0 : _this$props$onError.call(_this$props2, error, info);
-  }
-  componentDidUpdate(prevProps, prevState) {
-    const {
-      didCatch
-    } = this.state;
-    const {
-      resetKeys
-    } = this.props;
-
-    // There's an edge case where if the thing that triggered the error happens to *also* be in the resetKeys array,
-    // we'd end up resetting the error boundary immediately.
-    // This would likely trigger a second error to be thrown.
-    // So we make sure that we don't check the resetKeys on the first call of cDU after the error is set.
-
-    if (didCatch && prevState.error !== null && hasArrayChanged(prevProps.resetKeys, resetKeys)) {
-      var _this$props$onReset2, _this$props3;
-      (_this$props$onReset2 = (_this$props3 = this.props).onReset) === null || _this$props$onReset2 === void 0 ? void 0 : _this$props$onReset2.call(_this$props3, {
-        next: resetKeys,
-        prev: prevProps.resetKeys,
-        reason: "keys"
-      });
-      this.setState(initialState);
-    }
-  }
-  render() {
-    const {
-      children,
-      fallbackRender,
-      FallbackComponent,
-      fallback
-    } = this.props;
-    const {
-      didCatch,
-      error
-    } = this.state;
-    let childToRender = children;
-    if (didCatch) {
-      const props = {
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      };
-      if (typeof fallbackRender === "function") {
-        childToRender = fallbackRender(props);
-      } else if (FallbackComponent) {
-        childToRender = react.createElement(FallbackComponent, props);
-      } else if (fallback !== undefined) {
-        childToRender = fallback;
-      } else {
-        throw error;
-      }
-    }
-    return react.createElement(ErrorBoundaryContext.Provider, {
-      value: {
-        didCatch,
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      }
-    }, childToRender);
-  }
-}
-function hasArrayChanged() {
-  let a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return a.length !== b.length || a.some((item, index) => !Object.is(item, b[index]));
-}
-
-function assertErrorBoundaryContext(value) {
-  if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
-    throw new Error("ErrorBoundaryContext not found");
-  }
-}
-
-function useErrorBoundary() {
-  const context = react.useContext(ErrorBoundaryContext);
-  assertErrorBoundaryContext(context);
-  const [state, setState] = react.useState({
-    error: null,
-    hasError: false
-  });
-  const memoized = react.useMemo(() => ({
-    resetBoundary: () => {
-      context.resetErrorBoundary();
-      setState({
-        error: null,
-        hasError: false
-      });
-    },
-    showBoundary: error => setState({
-      error,
-      hasError: true
-    })
-  }), [context.resetErrorBoundary]);
-  if (state.hasError) {
-    throw state.error;
-  }
-  return memoized;
-}
-
-function withErrorBoundary(component, errorBoundaryProps) {
-  const Wrapped = react.forwardRef((props, ref) => react.createElement(ErrorBoundary, errorBoundaryProps, react.createElement(component, {
-    ...props,
-    ref
-  })));
-
-  // Format for display in DevTools
-  const name = component.displayName || component.name || "Unknown";
-  Wrapped.displayName = "withErrorBoundary(".concat(name, ")");
-  return Wrapped;
-}
-
-exports.ErrorBoundary = ErrorBoundary;
-exports.ErrorBoundaryContext = ErrorBoundaryContext;
-exports.useErrorBoundary = useErrorBoundary;
-exports.withErrorBoundary = withErrorBoundary;

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

@@ -1,6 +0,0 @@
-export {
-  ErrorBoundary,
-  ErrorBoundaryContext,
-  useErrorBoundary,
-  withErrorBoundary
-} from "./react-error-boundary.cjs.js";

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

@@ -1,161 +0,0 @@
-'use client';
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var react = require('react');
-
-const ErrorBoundaryContext = react.createContext(null);
-
-const initialState = {
-  didCatch: false,
-  error: null
-};
-class ErrorBoundary extends react.Component {
-  constructor(props) {
-    super(props);
-    this.resetErrorBoundary = this.resetErrorBoundary.bind(this);
-    this.state = initialState;
-  }
-  static getDerivedStateFromError(error) {
-    return {
-      didCatch: true,
-      error
-    };
-  }
-  resetErrorBoundary() {
-    const {
-      error
-    } = this.state;
-    if (error !== null) {
-      var _this$props$onReset, _this$props;
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      (_this$props$onReset = (_this$props = this.props).onReset) === null || _this$props$onReset === void 0 ? void 0 : _this$props$onReset.call(_this$props, {
-        args,
-        reason: "imperative-api"
-      });
-      this.setState(initialState);
-    }
-  }
-  componentDidCatch(error, info) {
-    var _this$props$onError, _this$props2;
-    (_this$props$onError = (_this$props2 = this.props).onError) === null || _this$props$onError === void 0 ? void 0 : _this$props$onError.call(_this$props2, error, info);
-  }
-  componentDidUpdate(prevProps, prevState) {
-    const {
-      didCatch
-    } = this.state;
-    const {
-      resetKeys
-    } = this.props;
-
-    // There's an edge case where if the thing that triggered the error happens to *also* be in the resetKeys array,
-    // we'd end up resetting the error boundary immediately.
-    // This would likely trigger a second error to be thrown.
-    // So we make sure that we don't check the resetKeys on the first call of cDU after the error is set.
-
-    if (didCatch && prevState.error !== null && hasArrayChanged(prevProps.resetKeys, resetKeys)) {
-      var _this$props$onReset2, _this$props3;
-      (_this$props$onReset2 = (_this$props3 = this.props).onReset) === null || _this$props$onReset2 === void 0 ? void 0 : _this$props$onReset2.call(_this$props3, {
-        next: resetKeys,
-        prev: prevProps.resetKeys,
-        reason: "keys"
-      });
-      this.setState(initialState);
-    }
-  }
-  render() {
-    const {
-      children,
-      fallbackRender,
-      FallbackComponent,
-      fallback
-    } = this.props;
-    const {
-      didCatch,
-      error
-    } = this.state;
-    let childToRender = children;
-    if (didCatch) {
-      const props = {
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      };
-      if (typeof fallbackRender === "function") {
-        childToRender = fallbackRender(props);
-      } else if (FallbackComponent) {
-        childToRender = react.createElement(FallbackComponent, props);
-      } else if (fallback !== undefined) {
-        childToRender = fallback;
-      } else {
-        {
-          console.error("react-error-boundary requires either a fallback, fallbackRender, or FallbackComponent prop");
-        }
-        throw error;
-      }
-    }
-    return react.createElement(ErrorBoundaryContext.Provider, {
-      value: {
-        didCatch,
-        error,
-        resetErrorBoundary: this.resetErrorBoundary
-      }
-    }, childToRender);
-  }
-}
-function hasArrayChanged() {
-  let a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return a.length !== b.length || a.some((item, index) => !Object.is(item, b[index]));
-}
-
-function assertErrorBoundaryContext(value) {
-  if (value == null || typeof value.didCatch !== "boolean" || typeof value.resetErrorBoundary !== "function") {
-    throw new Error("ErrorBoundaryContext not found");
-  }
-}
-
-function useErrorBoundary() {
-  const context = react.useContext(ErrorBoundaryContext);
-  assertErrorBoundaryContext(context);
-  const [state, setState] = react.useState({
-    error: null,
-    hasError: false
-  });
-  const memoized = react.useMemo(() => ({
-    resetBoundary: () => {
-      context.resetErrorBoundary();
-      setState({
-        error: null,
-        hasError: false
-      });
-    },
-    showBoundary: error => setState({
-      error,
-      hasError: true
-    })
-  }), [context.resetErrorBoundary]);
-  if (state.hasError) {
-    throw state.error;
-  }
-  return memoized;
-}
-
-function withErrorBoundary(component, errorBoundaryProps) {
-  const Wrapped = react.forwardRef((props, ref) => react.createElement(ErrorBoundary, errorBoundaryProps, react.createElement(component, {
-    ...props,
-    ref
-  })));
-
-  // Format for display in DevTools
-  const name = component.displayName || component.name || "Unknown";
-  Wrapped.displayName = "withErrorBoundary(".concat(name, ")");
-  return Wrapped;
-}
-
-exports.ErrorBoundary = ErrorBoundary;
-exports.ErrorBoundaryContext = ErrorBoundaryContext;
-exports.useErrorBoundary = useErrorBoundary;
-exports.withErrorBoundary = withErrorBoundary;

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

@@ -1,6 +0,0 @@
-export {
-  ErrorBoundary,
-  ErrorBoundaryContext,
-  useErrorBoundary,
-  withErrorBoundary
-} from "./react-error-boundary.development.cjs.js";