@flareapp/react 2.6.0 → 2.8.0

package/README.md

@@ -44,22 +44,24 @@ flare.logger.info('Checkout started', { cartId: cart.id, total: cart.total });
 ## Minified production errors
 
 In production, React throws minified errors like `Minified React error #418; visit https://react.dev/errors/418?args[]=Foo`.
-The client parses these into structured fields and attaches them, along with the running React version, to the report
-context:
+The client parses these into a single self-contained field, `flare.exception.react_minified_error`, carrying the running
+React version alongside the parsed pieces:
 
 ```ts
-react: {
-    version: '19.0.0',
-    minifiedError: {
-        number: 418,
-        args: ['Foo', 'Bar'],
-        url: 'https://react.dev/errors/418?args[]=Foo&args[]=Bar',
-    },
+'flare.exception.react_minified_error': {
+    number: 418,
+    args: ['Foo', 'Bar'],
+    url: 'https://react.dev/errors/418?args[]=Foo&args[]=Bar',
+    react_version: '19.0.0',
 }
 ```
 
-Flare uses `react.minifiedError` and `react.version` on the backend to look up React's error-code map and surface the
-full, human-readable message. No error-code map is bundled into the client. Non-minified errors are reported unchanged.
+Flare reads this field on the backend to look up React's error-code map (keyed on `react_version`) and surface the full,
+human-readable message. It is a Flare-internal field, not part of the display context, so it is emitted only when an
+error actually parses as a minified React error and cannot be stripped by a `beforeSubmit` hook. No error-code map is
+bundled into the client. Non-minified errors are reported unchanged.
+
+`context.custom.react` continues to carry `componentStack`, `componentStackFrames` and `version` for display.
 
 ## Identifying users
 
@@ -80,7 +82,59 @@ at [flareapp.io/docs/react/general/installation](https://flareapp.io/docs/react/
 
 - React 16, 17, 18, 19
 - `flareReactErrorHandler` requires React 19+
+- `withFlareProfiler` forwards `ref` on React 19 only
 
 ## License
 
 The MIT License (MIT). Please see [License File](../../LICENSE.md) for more information.
+
+## Component profiler (`@flareapp/react/profiler`)
+
+Opt-in mount profiling: wrap a component to record a `browser_component` span for
+its mount, nested under the active page-load / navigation trace. Requires tracing to be
+enabled (`enableTracing: true`).
+
+```tsx
+import { FlareProfiler, withFlareProfiler } from '@flareapp/react/profiler';
+
+// Wrap at the definition:
+export default withFlareProfiler(ProductPage);
+
+// Or wrap an inline subtree:
+<FlareProfiler name="Gallery">
+    <ProductGallery />
+</FlareProfiler>;
+```
+
+Spans nest into a tree: a profiled child nests under its nearest profiled ancestor;
+unprofiled components in between are transparent. A component with no active trace
+(tracing off, or no page-load/navigation root) records nothing and renders normally.
+
+A component that mounts later inside an already-mounted profiled ancestor still nests
+under that ancestor, whose own span closed when it finished mounting. The tree is
+correct, but the waterfall shows the child starting after its parent ended. A page body
+swapped inside a persistent layout is the usual way to see this.
+
+**Import the main entry somewhere too.** `@flareapp/react/profiler` is deliberately dependency-free, so
+it does not register React as the framework. That identity (`flare.framework.name`) is what tells Flare a
+component span came from React, and importing `@flareapp/react` anywhere in the app sets it. An app that
+uses only the `/profiler` entry reports `js` instead, and its component spans are attributed to plain
+JavaScript rather than React.
+
+**Naming:** the span name is `name` (prop or `withFlareProfiler(Component, { name })`),
+then `Component.displayName`, then `Component.name`. Minified production builds can
+mangle `Component.name`, so pass an explicit `name` or set `displayName` for production.
+
+**Suspense (v1 limitation):** a `<Suspense>` boundary inside a profiled subtree can end a
+parent span before a suspended child resumes, so the child may appear outside its parent
+in the waterfall, and its duration includes the data wait. If the wait outlasts the
+trace's idle window the child span is dropped rather than attached to a closed trace.
+
+**Render-phase start:** the span starts when the component first renders, not when React commits it. A
+render React defers or discards (`useDeferredValue`, an interrupted transition, an `<Activity mode="hidden">`
+prerender revealed later) bills that whole gap to the component.
+
+**Refs and statics:** the wrapper is a plain function component. It forwards no `ref` through `forwardRef`
+and hoists no statics. On React 19 `ref` is a normal prop and passes straight through, so this only affects
+the React 16-18 half of the peer range; there, wrap with `FlareProfiler` inside the component instead of
+applying `withFlareProfiler` to it.

package/dist/{flareReactErrorHandler-4Vgqlths.d.cts → flareReactErrorHandler-Ce0sCyMK.d.mts}

@@ -1,5 +1,5 @@
-import { Flare } from "@flareapp/js/browser";
 import { Component, ErrorInfo, PropsWithChildren, ReactNode } from "react";
+import { Flare } from "@flareapp/js/browser";
 
 //#region src/types.d.ts
 type ComponentStackFrame = {
@@ -18,7 +18,6 @@ type FlareReactContext = {
     componentStack: string[];
     componentStackFrames: ComponentStackFrame[];
     version?: string;
-    minifiedError?: MinifiedReactError;
   };
 };
 //#endregion
@@ -90,6 +89,10 @@ type FlareReactErrorHandlerOptions = {
     context: FlareReactContext;
   }) => void;
 };
+/**
+ * Callback shaped to match react-error-boundary's `onError` prop, so consumers using that library
+ * can report to Flare without our own boundary.
+ */
 declare function flareReactErrorHandler(options?: FlareReactErrorHandlerOptions): FlareReactErrorHandlerCallback;
 //#endregion
 export { FlareErrorBoundaryFallbackProps as a, FlareReactContext as c, FlareErrorBoundary as i, MinifiedReactError as l, FlareReactErrorHandlerOptions as n, FlareErrorBoundaryProps as o, flareReactErrorHandler as r, ComponentStackFrame as s, FlareReactErrorHandlerCallback as t };

package/dist/{flareReactErrorHandler-BcVYRMtC.d.mts → flareReactErrorHandler-CnFo8otu.d.cts}

@@ -1,5 +1,5 @@
-import { Component, ErrorInfo, PropsWithChildren, ReactNode } from "react";
 import { Flare } from "@flareapp/js/browser";
+import { Component, ErrorInfo, PropsWithChildren, ReactNode } from "react";
 
 //#region src/types.d.ts
 type ComponentStackFrame = {
@@ -18,7 +18,6 @@ type FlareReactContext = {
     componentStack: string[];
     componentStackFrames: ComponentStackFrame[];
     version?: string;
-    minifiedError?: MinifiedReactError;
   };
 };
 //#endregion
@@ -90,6 +89,10 @@ type FlareReactErrorHandlerOptions = {
     context: FlareReactContext;
   }) => void;
 };
+/**
+ * Callback shaped to match react-error-boundary's `onError` prop, so consumers using that library
+ * can report to Flare without our own boundary.
+ */
 declare function flareReactErrorHandler(options?: FlareReactErrorHandlerOptions): FlareReactErrorHandlerCallback;
 //#endregion
 export { FlareErrorBoundaryFallbackProps as a, FlareReactContext as c, FlareErrorBoundary as i, MinifiedReactError as l, FlareReactErrorHandlerOptions as n, FlareErrorBoundaryProps as o, flareReactErrorHandler as r, ComponentStackFrame as s, FlareReactErrorHandlerCallback as t };

package/dist/{flareReactErrorHandler-BKUV8piX.cjs → flareReactErrorHandler-DBmb7u7U.cjs}

@@ -25,61 +25,52 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
+let _flareapp_core = require("@flareapp/core");
 let react = require("react");
 react = __toESM(react);
-let _flareapp_core = require("@flareapp/core");
+let _flareapp_js_browser = require("@flareapp/js/browser");
 
 //#region src/constants.ts
+/**
+* Chrome: `at ComponentName (http://localhost:5173/src/App.tsx:12:9)`; no source: `at div`.
+*/
 const CHROMIUM_STACK_REGEX = /^at\s+(\S+)(?:\s+\((.+):(\d+):(\d+)\))?$/;
+/**
+* Firefox/Safari: `ComponentName@http://localhost:5173/src/App.tsx:12:9`; no source: `div`.
+*/
 const FIREFOX_SAFARI_STACK_REGEX = /^(\S+?)@(.+):(\d+):(\d+)$/;
-const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+/**
+* React 16/17/18 synthetic component stack: `in ComponentName (at App.jsx:10)`; with an optional
+* column `in ComponentName (at App.jsx:10:5)`; no source: `in ComponentName`. These versions usually
+* emit a line only, so the column capture group is optional. The file capture is lazy so the trailing
+* `:line(:column)` binds to the numeric tail even when the file path itself contains colons. Without
+* `__source` React names the owner instead (`in App (created by Root)`), so that suffix is matched and
+* discarded; the group is greedy because an owner name can carry brackets of its own (`Connect(Form)`).
+*/
+const REACT_LEGACY_STACK_REGEX = /^in\s+(\S+)(?:\s+\(at\s+(.+?):(\d+)(?::(\d+))?\))?(?:\s+\(created by\s+.+\))?$/;
+/** Injected at build time via tsdown --env.PACKAGE_VERSION (reads package.json version). */
+const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/identify.ts
-const sdkTagged = /* @__PURE__ */ new WeakSet();
-const frameworkTagged = /* @__PURE__ */ new WeakSet();
+const tagger = (0, _flareapp_core.createIdentityTagger)({
+	sdkName: "@flareapp/react",
+	sdkVersion: PACKAGE_VERSION,
+	frameworkName: _flareapp_core.FrameworkName.React
+});
+/** Web path: full identity on the default singleton (sdk + framework). */
 function registerReactSdkIdentity(flare) {
-	if (!sdkTagged.has(flare)) {
-		sdkTagged.add(flare);
-		flare.setSdkInfo({
-			name: "@flareapp/react",
-			version: PACKAGE_VERSION
-		});
-	}
-	tagReactFramework(flare);
+	tagger.registerSdkIdentity(flare);
+	tagger.tagFramework(flare, react.version);
 }
+/** Injected path: framework tag only, never sdkInfo (would clobber the injected SDK name). */
 function tagReactFramework(flare) {
-	if (frameworkTagged.has(flare)) return;
-	frameworkTagged.add(flare);
-	flare.setFramework({
-		name: "React",
-		version: react.version
-	});
+	tagger.tagFramework(flare, react.version);
 }
 
 //#endregion
 //#region src/resolveFlare.ts
-let defaultProvider = null;
-function isDevMode() {
-	try {
-		return process.env.NODE_ENV !== "production";
-	} catch {
-		return false;
-	}
-}
-function registerDefaultFlare(provider) {
-	if (typeof window !== "undefined" && window.__flare) {
-		const message = "[flare] @flareapp/react (web root) was imported in a renderer where the Electron bridge is present, pulling the keyed @flareapp/js singleton into the renderer. Import @flareapp/react/inject and pass the @flareapp/electron/renderer instance instead.";
-		if (isDevMode()) throw new Error(message);
-		console.warn(message);
-	}
-	defaultProvider = provider;
-}
-function resolveFlare(explicit) {
-	if (explicit) return explicit;
-	if (defaultProvider) return defaultProvider();
-	throw new Error("[flare] No Flare instance available. Pass `flare` (e.g. from @flareapp/electron/renderer), or import @flareapp/react (the package root) to use the @flareapp/js default singleton.");
-}
+const { registerDefaultFlare, resolveFlare } = (0, _flareapp_js_browser.createFlareResolver)({ packageName: "@flareapp/react" });
 
 //#endregion
 //#region src/formatComponentStack.ts
@@ -89,6 +80,12 @@ function formatComponentStack(stack) {
 
 //#endregion
 //#region src/parseComponentStack.ts
+/**
+* Parse React's newline-separated `errorInfo.componentStack` into structured frames so the Flare UI
+* can render file/line links. The line format is browser-native in React 19 (Chromium / Firefox /
+* Safari shapes) and React-synthetic in 16-18 (`in X (at File:line)`). Unrecognised lines fall back
+* to component-name-only rather than being dropped.
+*/
 function parseComponentStack(stack) {
 	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0).map((line) => {
 		const chromeMatch = line.match(CHROMIUM_STACK_REGEX);
@@ -105,6 +102,13 @@ function parseComponentStack(stack) {
 			line: Number(firefoxSafariMatch[3]),
 			column: Number(firefoxSafariMatch[4])
 		};
+		const reactLegacyMatch = line.match(REACT_LEGACY_STACK_REGEX);
+		if (reactLegacyMatch) return {
+			component: reactLegacyMatch[1],
+			file: reactLegacyMatch[2] ?? null,
+			line: reactLegacyMatch[3] ? Number(reactLegacyMatch[3]) : null,
+			column: reactLegacyMatch[4] ? Number(reactLegacyMatch[4]) : null
+		};
 		return {
 			component: line.replace(/^at\s+/, ""),
 			file: null,
@@ -114,25 +118,46 @@ function parseComponentStack(stack) {
 	});
 }
 
+//#endregion
+//#region src/buildReactContext.ts
+function buildReactContext(rawStack) {
+	return { react: {
+		componentStack: formatComponentStack(rawStack),
+		componentStackFrames: parseComponentStack(rawStack),
+		version: react.version
+	} };
+}
+
+//#endregion
+//#region src/contextToAttributes.ts
+function contextToAttributes(context, minifiedError) {
+	return {
+		...(0, _flareapp_core.toCustomContext)("react", {
+			componentStack: context.react.componentStack,
+			componentStackFrames: context.react.componentStackFrames,
+			...context.react.version ? { version: context.react.version } : {}
+		}),
+		...minifiedError ? { "flare.exception.react_minified_error": {
+			number: minifiedError.number,
+			args: minifiedError.args,
+			url: minifiedError.url,
+			react_version: react.version
+		} } : {}
+	};
+}
+
 //#endregion
 //#region src/parseMinifiedReactError.ts
 const NUMBER_PATTERN = /Minified React error #(\d+)/;
 const ARG_PATTERN = /args\[\]=([^&\s]*)/g;
 const URL_PATTERN = /(https?:\/\/\S+)/;
-function safeDecode(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
 function parseMinifiedReactError(error) {
 	const message = error?.message;
 	if (!message) return null;
 	const numberMatch = message.match(NUMBER_PATTERN);
 	if (!numberMatch) return null;
 	const args = [];
-	for (const match of message.matchAll(ARG_PATTERN)) args.push(safeDecode(match[1]));
+	for (const match of message.matchAll(ARG_PATTERN)) args.push((0, _flareapp_core.safeDecode)(match[1]));
 	const urlMatch = message.match(URL_PATTERN);
 	return {
 		number: Number(numberMatch[1]),
@@ -141,29 +166,6 @@ function parseMinifiedReactError(error) {
 	};
 }
 
-//#endregion
-//#region src/buildReactContext.ts
-function buildReactContext(rawStack, error) {
-	const minifiedError = parseMinifiedReactError(error);
-	return { react: {
-		componentStack: formatComponentStack(rawStack),
-		componentStackFrames: parseComponentStack(rawStack),
-		version: react.version,
-		...minifiedError ? { minifiedError } : {}
-	} };
-}
-
-//#endregion
-//#region src/contextToAttributes.ts
-function contextToAttributes(context) {
-	return { "context.custom": { react: {
-		componentStack: context.react.componentStack,
-		componentStackFrames: context.react.componentStackFrames,
-		...context.react.version ? { version: context.react.version } : {},
-		...context.react.minifiedError ? { minifiedError: context.react.minifiedError } : {}
-	} } };
-}
-
 //#endregion
 //#region src/FlareErrorBoundary.ts
 var FlareErrorBoundary = class extends react.Component {
@@ -185,14 +187,14 @@ var FlareErrorBoundary = class extends react.Component {
 			error,
 			errorInfo
 		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", error);
+		const context = buildReactContext(errorInfo.componentStack ?? "");
 		const finalContext = this.props.beforeSubmit?.({
 			error,
 			errorInfo,
 			context
 		}) ?? context;
 		this.setState({ componentStack: finalContext.react.componentStack });
-		this.flare.reportSilently(error, contextToAttributes(finalContext));
+		this.flare.reportSilently(error, contextToAttributes(finalContext, parseMinifiedReactError(error)));
 		this.props.afterSubmit?.({
 			error,
 			errorInfo,
@@ -232,6 +234,10 @@ var FlareErrorBoundary = class extends react.Component {
 
 //#endregion
 //#region src/flareReactErrorHandler.ts
+/**
+* Callback shaped to match react-error-boundary's `onError` prop, so consumers using that library
+* can report to Flare without our own boundary.
+*/
 function flareReactErrorHandler(options) {
 	const flare = resolveFlare(options?.flare);
 	tagReactFramework(flare);
@@ -241,13 +247,13 @@ function flareReactErrorHandler(options) {
 			error: errorObject,
 			errorInfo
 		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", errorObject);
+		const context = buildReactContext(errorInfo.componentStack ?? "");
 		const finalContext = options?.beforeSubmit?.({
 			error: errorObject,
 			errorInfo,
 			context
 		}) ?? context;
-		flare.reportSilently(errorObject, contextToAttributes(finalContext));
+		flare.reportSilently(errorObject, contextToAttributes(finalContext, parseMinifiedReactError(errorObject)));
 		options?.afterSubmit?.({
 			error: errorObject,
 			errorInfo,

package/dist/{flareReactErrorHandler-CfcBSmhG.mjs → flareReactErrorHandler-sRmFoJAG.mjs}

@@ -1,58 +1,49 @@
+import { FrameworkName, convertToError, createIdentityTagger, safeDecode, toCustomContext } from "@flareapp/core";
 import * as React from "react";
 import { Component, version } from "react";
-import { convertToError } from "@flareapp/core";
+import { createFlareResolver } from "@flareapp/js/browser";
 
 //#region src/constants.ts
+/**
+* Chrome: `at ComponentName (http://localhost:5173/src/App.tsx:12:9)`; no source: `at div`.
+*/
 const CHROMIUM_STACK_REGEX = /^at\s+(\S+)(?:\s+\((.+):(\d+):(\d+)\))?$/;
+/**
+* Firefox/Safari: `ComponentName@http://localhost:5173/src/App.tsx:12:9`; no source: `div`.
+*/
 const FIREFOX_SAFARI_STACK_REGEX = /^(\S+?)@(.+):(\d+):(\d+)$/;
-const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.6.0" : "?";
+/**
+* React 16/17/18 synthetic component stack: `in ComponentName (at App.jsx:10)`; with an optional
+* column `in ComponentName (at App.jsx:10:5)`; no source: `in ComponentName`. These versions usually
+* emit a line only, so the column capture group is optional. The file capture is lazy so the trailing
+* `:line(:column)` binds to the numeric tail even when the file path itself contains colons. Without
+* `__source` React names the owner instead (`in App (created by Root)`), so that suffix is matched and
+* discarded; the group is greedy because an owner name can carry brackets of its own (`Connect(Form)`).
+*/
+const REACT_LEGACY_STACK_REGEX = /^in\s+(\S+)(?:\s+\(at\s+(.+?):(\d+)(?::(\d+))?\))?(?:\s+\(created by\s+.+\))?$/;
+/** Injected at build time via tsdown --env.PACKAGE_VERSION (reads package.json version). */
+const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.8.0" : "?";
 
 //#endregion
 //#region src/identify.ts
-const sdkTagged = /* @__PURE__ */ new WeakSet();
-const frameworkTagged = /* @__PURE__ */ new WeakSet();
+const tagger = createIdentityTagger({
+	sdkName: "@flareapp/react",
+	sdkVersion: PACKAGE_VERSION,
+	frameworkName: FrameworkName.React
+});
+/** Web path: full identity on the default singleton (sdk + framework). */
 function registerReactSdkIdentity(flare) {
-	if (!sdkTagged.has(flare)) {
-		sdkTagged.add(flare);
-		flare.setSdkInfo({
-			name: "@flareapp/react",
-			version: PACKAGE_VERSION
-		});
-	}
-	tagReactFramework(flare);
+	tagger.registerSdkIdentity(flare);
+	tagger.tagFramework(flare, React.version);
 }
+/** Injected path: framework tag only, never sdkInfo (would clobber the injected SDK name). */
 function tagReactFramework(flare) {
-	if (frameworkTagged.has(flare)) return;
-	frameworkTagged.add(flare);
-	flare.setFramework({
-		name: "React",
-		version: React.version
-	});
+	tagger.tagFramework(flare, React.version);
 }
 
 //#endregion
 //#region src/resolveFlare.ts
-let defaultProvider = null;
-function isDevMode() {
-	try {
-		return process.env.NODE_ENV !== "production";
-	} catch {
-		return false;
-	}
-}
-function registerDefaultFlare(provider) {
-	if (typeof window !== "undefined" && window.__flare) {
-		const message = "[flare] @flareapp/react (web root) was imported in a renderer where the Electron bridge is present, pulling the keyed @flareapp/js singleton into the renderer. Import @flareapp/react/inject and pass the @flareapp/electron/renderer instance instead.";
-		if (isDevMode()) throw new Error(message);
-		console.warn(message);
-	}
-	defaultProvider = provider;
-}
-function resolveFlare(explicit) {
-	if (explicit) return explicit;
-	if (defaultProvider) return defaultProvider();
-	throw new Error("[flare] No Flare instance available. Pass `flare` (e.g. from @flareapp/electron/renderer), or import @flareapp/react (the package root) to use the @flareapp/js default singleton.");
-}
+const { registerDefaultFlare, resolveFlare } = createFlareResolver({ packageName: "@flareapp/react" });
 
 //#endregion
 //#region src/formatComponentStack.ts
@@ -62,6 +53,12 @@ function formatComponentStack(stack) {
 
 //#endregion
 //#region src/parseComponentStack.ts
+/**
+* Parse React's newline-separated `errorInfo.componentStack` into structured frames so the Flare UI
+* can render file/line links. The line format is browser-native in React 19 (Chromium / Firefox /
+* Safari shapes) and React-synthetic in 16-18 (`in X (at File:line)`). Unrecognised lines fall back
+* to component-name-only rather than being dropped.
+*/
 function parseComponentStack(stack) {
 	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0).map((line) => {
 		const chromeMatch = line.match(CHROMIUM_STACK_REGEX);
@@ -78,6 +75,13 @@ function parseComponentStack(stack) {
 			line: Number(firefoxSafariMatch[3]),
 			column: Number(firefoxSafariMatch[4])
 		};
+		const reactLegacyMatch = line.match(REACT_LEGACY_STACK_REGEX);
+		if (reactLegacyMatch) return {
+			component: reactLegacyMatch[1],
+			file: reactLegacyMatch[2] ?? null,
+			line: reactLegacyMatch[3] ? Number(reactLegacyMatch[3]) : null,
+			column: reactLegacyMatch[4] ? Number(reactLegacyMatch[4]) : null
+		};
 		return {
 			component: line.replace(/^at\s+/, ""),
 			file: null,
@@ -87,18 +91,39 @@ function parseComponentStack(stack) {
 	});
 }
 
+//#endregion
+//#region src/buildReactContext.ts
+function buildReactContext(rawStack) {
+	return { react: {
+		componentStack: formatComponentStack(rawStack),
+		componentStackFrames: parseComponentStack(rawStack),
+		version
+	} };
+}
+
+//#endregion
+//#region src/contextToAttributes.ts
+function contextToAttributes(context, minifiedError) {
+	return {
+		...toCustomContext("react", {
+			componentStack: context.react.componentStack,
+			componentStackFrames: context.react.componentStackFrames,
+			...context.react.version ? { version: context.react.version } : {}
+		}),
+		...minifiedError ? { "flare.exception.react_minified_error": {
+			number: minifiedError.number,
+			args: minifiedError.args,
+			url: minifiedError.url,
+			react_version: version
+		} } : {}
+	};
+}
+
 //#endregion
 //#region src/parseMinifiedReactError.ts
 const NUMBER_PATTERN = /Minified React error #(\d+)/;
 const ARG_PATTERN = /args\[\]=([^&\s]*)/g;
 const URL_PATTERN = /(https?:\/\/\S+)/;
-function safeDecode(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
 function parseMinifiedReactError(error) {
 	const message = error?.message;
 	if (!message) return null;
@@ -114,29 +139,6 @@ function parseMinifiedReactError(error) {
 	};
 }
 
-//#endregion
-//#region src/buildReactContext.ts
-function buildReactContext(rawStack, error) {
-	const minifiedError = parseMinifiedReactError(error);
-	return { react: {
-		componentStack: formatComponentStack(rawStack),
-		componentStackFrames: parseComponentStack(rawStack),
-		version,
-		...minifiedError ? { minifiedError } : {}
-	} };
-}
-
-//#endregion
-//#region src/contextToAttributes.ts
-function contextToAttributes(context) {
-	return { "context.custom": { react: {
-		componentStack: context.react.componentStack,
-		componentStackFrames: context.react.componentStackFrames,
-		...context.react.version ? { version: context.react.version } : {},
-		...context.react.minifiedError ? { minifiedError: context.react.minifiedError } : {}
-	} } };
-}
-
 //#endregion
 //#region src/FlareErrorBoundary.ts
 var FlareErrorBoundary = class extends Component {
@@ -158,14 +160,14 @@ var FlareErrorBoundary = class extends Component {
 			error,
 			errorInfo
 		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", error);
+		const context = buildReactContext(errorInfo.componentStack ?? "");
 		const finalContext = this.props.beforeSubmit?.({
 			error,
 			errorInfo,
 			context
 		}) ?? context;
 		this.setState({ componentStack: finalContext.react.componentStack });
-		this.flare.reportSilently(error, contextToAttributes(finalContext));
+		this.flare.reportSilently(error, contextToAttributes(finalContext, parseMinifiedReactError(error)));
 		this.props.afterSubmit?.({
 			error,
 			errorInfo,
@@ -205,6 +207,10 @@ var FlareErrorBoundary = class extends Component {
 
 //#endregion
 //#region src/flareReactErrorHandler.ts
+/**
+* Callback shaped to match react-error-boundary's `onError` prop, so consumers using that library
+* can report to Flare without our own boundary.
+*/
 function flareReactErrorHandler(options) {
 	const flare = resolveFlare(options?.flare);
 	tagReactFramework(flare);
@@ -214,13 +220,13 @@ function flareReactErrorHandler(options) {
 			error: errorObject,
 			errorInfo
 		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", errorObject);
+		const context = buildReactContext(errorInfo.componentStack ?? "");
 		const finalContext = options?.beforeSubmit?.({
 			error: errorObject,
 			errorInfo,
 			context
 		}) ?? context;
-		flare.reportSilently(errorObject, contextToAttributes(finalContext));
+		flare.reportSilently(errorObject, contextToAttributes(finalContext, parseMinifiedReactError(errorObject)));
 		options?.afterSubmit?.({
 			error: errorObject,
 			errorInfo,

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_flareReactErrorHandler = require('./flareReactErrorHandler-BKUV8piX.cjs');
+const require_flareReactErrorHandler = require('./flareReactErrorHandler-DBmb7u7U.cjs');
 let _flareapp_js = require("@flareapp/js");
 
 //#region src/index.ts

package/dist/index.d.cts

@@ -1,2 +1,2 @@
-import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-4Vgqlths.cjs";
+import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-CnFo8otu.cjs";
 export { type ComponentStackFrame, FlareErrorBoundary, type FlareErrorBoundaryFallbackProps, type FlareErrorBoundaryProps, type FlareReactContext, type FlareReactErrorHandlerCallback, type FlareReactErrorHandlerOptions, type MinifiedReactError, flareReactErrorHandler };

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-BcVYRMtC.mjs";
+import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-Ce0sCyMK.mjs";
 export { type ComponentStackFrame, FlareErrorBoundary, type FlareErrorBoundaryFallbackProps, type FlareErrorBoundaryProps, type FlareReactContext, type FlareReactErrorHandlerCallback, type FlareReactErrorHandlerOptions, type MinifiedReactError, flareReactErrorHandler };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as registerReactSdkIdentity, n as FlareErrorBoundary, r as registerDefaultFlare, t as flareReactErrorHandler } from "./flareReactErrorHandler-CfcBSmhG.mjs";
+import { i as registerReactSdkIdentity, n as FlareErrorBoundary, r as registerDefaultFlare, t as flareReactErrorHandler } from "./flareReactErrorHandler-sRmFoJAG.mjs";
 import { flare } from "@flareapp/js";
 
 //#region src/index.ts

package/dist/inject.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_flareReactErrorHandler = require('./flareReactErrorHandler-BKUV8piX.cjs');
+const require_flareReactErrorHandler = require('./flareReactErrorHandler-DBmb7u7U.cjs');
 
 exports.FlareErrorBoundary = require_flareReactErrorHandler.FlareErrorBoundary;
 exports.flareReactErrorHandler = require_flareReactErrorHandler.flareReactErrorHandler;

package/dist/inject.d.cts

@@ -1,2 +1,2 @@
-import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-4Vgqlths.cjs";
+import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-CnFo8otu.cjs";
 export { type ComponentStackFrame, FlareErrorBoundary, type FlareErrorBoundaryFallbackProps, type FlareErrorBoundaryProps, type FlareReactContext, type FlareReactErrorHandlerCallback, type FlareReactErrorHandlerOptions, type MinifiedReactError, flareReactErrorHandler };