@rpcbase/client 0.291.0 → 0.293.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/apiClient/index.d.ts.map +1 -1
- package/dist/components/RouteErrorBoundary.d.ts +9 -0
- package/dist/components/RouteErrorBoundary.d.ts.map +1 -0
- package/dist/components/SsrErrorFallback.d.ts +10 -0
- package/dist/components/SsrErrorFallback.d.ts.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +82 -9
- package/dist/initWithRoutes.d.ts +2 -2
- package/dist/initWithRoutes.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/apiClient/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/apiClient/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1C,KAAK,GAAG,GAAG,GAAG,CAAA;AAKd,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,WAAW,CAAC;CAClB,CAAC;AAEF,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;KAC5C,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,EAAE,KAAK;CACzB,CAAC;AAEF,KAAK,eAAe,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,EACtB,GAAG,CAAC,EAAE,GAAG,KACN,OAAO,CAAC,SAAS,CAAC,CAAC;AAExB,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAC3D,KAAK,YAAY,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;AAEtD,QAAA,IAAI,SAAS,EAAE,SAAS,CAAA;AAExB,eAAO,MAAM,aAAa,GAAU,OAAO,UAAU,kBAuDpD,CAAA;AAED,OAAO,EAAE,SAAS,EAAE,CAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ReactNode } from 'react';
|
|
2
|
+
import { SsrErrorStatePayload } from '../ssrErrorState';
|
|
3
|
+
type RenderErrorExtra = (state: SsrErrorStatePayload) => ReactNode;
|
|
4
|
+
type RouteErrorBoundaryProps = {
|
|
5
|
+
renderErrorExtra?: RenderErrorExtra;
|
|
6
|
+
};
|
|
7
|
+
export declare const RouteErrorBoundary: ({ renderErrorExtra }: RouteErrorBoundaryProps) => import("react/jsx-runtime").JSX.Element;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=RouteErrorBoundary.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RouteErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/components/RouteErrorBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAIjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAGvD,KAAK,gBAAgB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,SAAS,CAAA;AAElE,KAAK,uBAAuB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAkDD,eAAO,MAAM,kBAAkB,GAAI,sBAAsB,uBAAuB,4CAU/E,CAAA"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ReactNode } from 'react';
|
|
2
|
+
import { SsrErrorStatePayload } from '../ssrErrorState';
|
|
3
|
+
type RenderErrorExtra = (state: SsrErrorStatePayload) => ReactNode;
|
|
4
|
+
type SsrErrorFallbackProps = {
|
|
5
|
+
state: SsrErrorStatePayload;
|
|
6
|
+
renderErrorExtra?: RenderErrorExtra;
|
|
7
|
+
};
|
|
8
|
+
export declare const SsrErrorFallback: ({ state, renderErrorExtra }: SsrErrorFallbackProps) => import("react/jsx-runtime").JSX.Element;
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=SsrErrorFallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SsrErrorFallback.d.ts","sourceRoot":"","sources":["../../src/components/SsrErrorFallback.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAGvD,KAAK,gBAAgB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,SAAS,CAAA;AAElE,KAAK,qBAAqB,GAAG;IAC3B,KAAK,EAAE,oBAAoB,CAAA;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC,CAAA;AAKD,eAAO,MAAM,gBAAgB,GAAI,6BAA6B,qBAAqB,4CAoClF,CAAA"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,SAAS,CAAA;AACvB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,+BAA+B,CAAA;AAC7C,cAAc,iCAAiC,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import env from "@rpcbase/env";
|
|
2
|
+
import { jsx, jsxs } from "react/jsx-runtime";
|
|
2
3
|
import { StrictMode, useRef, useEffect, useCallback, useState, useSyncExternalStore } from "react";
|
|
3
4
|
import posthog from "posthog-js";
|
|
4
|
-
import { createRoutesFromElements, createBrowserRouter, RouterProvider, useLocation } from "@rpcbase/router";
|
|
5
|
+
import { createRoutesFromElements, createBrowserRouter, RouterProvider, useLocation, useRouteError, isRouteErrorResponse } from "@rpcbase/router";
|
|
5
6
|
import { hydrateRoot } from "react-dom/client";
|
|
6
7
|
import { PostHogProvider } from "posthog-js/react/dist/esm/index.js";
|
|
7
8
|
import useMeasure from "react-use/esm/useMeasure.js";
|
|
9
|
+
console.log("API CLIENT ENV", env.SSR);
|
|
8
10
|
let apiClient;
|
|
9
11
|
const initApiClient = async (args) => {
|
|
10
12
|
if (globalThis.__rb_env__.SSR) {
|
|
@@ -103,6 +105,27 @@ const consumeClientSsrErrorState = () => {
|
|
|
103
105
|
}
|
|
104
106
|
return state;
|
|
105
107
|
};
|
|
108
|
+
const DEFAULT_TITLE = "Something went wrong";
|
|
109
|
+
const DEFAULT_MESSAGE = "We couldn't render this page. Please try again in a few seconds.";
|
|
110
|
+
const SsrErrorFallback = ({ state, renderErrorExtra }) => {
|
|
111
|
+
const {
|
|
112
|
+
statusCode = 500,
|
|
113
|
+
title = DEFAULT_TITLE,
|
|
114
|
+
message = DEFAULT_MESSAGE,
|
|
115
|
+
details
|
|
116
|
+
} = state;
|
|
117
|
+
const extra = renderErrorExtra?.(state);
|
|
118
|
+
return /* @__PURE__ */ jsx("div", { className: "bg-white min-h-screen", children: /* @__PURE__ */ jsxs("main", { className: "mx-auto flex min-h-screen max-w-2xl flex-col items-center justify-center px-6 py-12 text-center sm:py-24", children: [
|
|
119
|
+
/* @__PURE__ */ jsx("p", { className: "text-base font-semibold text-rose-600", children: statusCode }),
|
|
120
|
+
/* @__PURE__ */ jsx("h1", { className: "mt-4 text-pretty text-4xl font-semibold tracking-tight text-gray-900 sm:text-5xl", children: title }),
|
|
121
|
+
/* @__PURE__ */ jsx("p", { className: "mt-6 text-lg text-gray-600 sm:text-xl/relaxed", children: message }),
|
|
122
|
+
details ? /* @__PURE__ */ jsxs("div", { className: "mt-10 w-full rounded-2xl bg-gray-900/95 p-5 text-left shadow-2xl", children: [
|
|
123
|
+
/* @__PURE__ */ jsx("p", { className: "text-sm font-semibold uppercase tracking-wide text-gray-400", children: "Debug details" }),
|
|
124
|
+
/* @__PURE__ */ jsx("pre", { className: "mt-3 max-h-64 overflow-auto whitespace-pre-wrap text-sm text-gray-100", children: details })
|
|
125
|
+
] }) : null,
|
|
126
|
+
extra ? /* @__PURE__ */ jsx("div", { className: "mt-10 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-center", children: extra }) : null
|
|
127
|
+
] }) });
|
|
128
|
+
};
|
|
106
129
|
const isProduction = globalThis.__rb_env__.MODE === "production";
|
|
107
130
|
const showErrorOverlay = (err) => {
|
|
108
131
|
const ErrorOverlay = customElements.get("vite-error-overlay");
|
|
@@ -131,25 +154,21 @@ const getRootElement = () => {
|
|
|
131
154
|
}
|
|
132
155
|
return el;
|
|
133
156
|
};
|
|
134
|
-
const hydrateSsrFallbackIfPresent = (rootElement,
|
|
157
|
+
const hydrateSsrFallbackIfPresent = (rootElement, renderErrorExtra) => {
|
|
135
158
|
const ssrErrorState = peekClientSsrErrorState();
|
|
136
159
|
if (!ssrErrorState) {
|
|
137
160
|
return false;
|
|
138
161
|
}
|
|
139
|
-
const fallback = renderSsrErrorFallback?.(ssrErrorState);
|
|
140
|
-
if (!fallback) {
|
|
141
|
-
return false;
|
|
142
|
-
}
|
|
143
162
|
consumeClientSsrErrorState();
|
|
144
163
|
hydrateRoot(
|
|
145
164
|
rootElement,
|
|
146
|
-
/* @__PURE__ */ jsx(StrictMode, { children:
|
|
165
|
+
/* @__PURE__ */ jsx(StrictMode, { children: /* @__PURE__ */ jsx(SsrErrorFallback, { state: ssrErrorState, renderErrorExtra }) })
|
|
147
166
|
);
|
|
148
167
|
return true;
|
|
149
168
|
};
|
|
150
169
|
const initWithRoutes = async (routesElement, opts) => {
|
|
151
170
|
const rootElement = getRootElement();
|
|
152
|
-
if (hydrateSsrFallbackIfPresent(rootElement, opts?.
|
|
171
|
+
if (hydrateSsrFallbackIfPresent(rootElement, opts?.renderErrorExtra)) {
|
|
153
172
|
return;
|
|
154
173
|
}
|
|
155
174
|
await initApiClient();
|
|
@@ -1567,9 +1586,63 @@ const useMediaQuery = (query) => {
|
|
|
1567
1586
|
};
|
|
1568
1587
|
return useSyncExternalStore(subscribe, getSnapshot, () => false);
|
|
1569
1588
|
};
|
|
1589
|
+
const defaultState = {
|
|
1590
|
+
statusCode: 500,
|
|
1591
|
+
title: "Something went wrong",
|
|
1592
|
+
message: "We couldn't render this route. Please try again shortly."
|
|
1593
|
+
};
|
|
1594
|
+
const toSsrErrorState = (error) => {
|
|
1595
|
+
if (isRouteErrorResponse(error)) {
|
|
1596
|
+
const data = error.data;
|
|
1597
|
+
const message = typeof data === "string" ? data : data?.message || defaultState.message;
|
|
1598
|
+
let details;
|
|
1599
|
+
if (globalThis.__rb_env__.DEV && data && typeof data !== "string") {
|
|
1600
|
+
try {
|
|
1601
|
+
details = JSON.stringify(data, null, 2);
|
|
1602
|
+
} catch {
|
|
1603
|
+
details = void 0;
|
|
1604
|
+
}
|
|
1605
|
+
}
|
|
1606
|
+
return {
|
|
1607
|
+
statusCode: error.status ?? defaultState.statusCode,
|
|
1608
|
+
title: error.statusText || defaultState.title,
|
|
1609
|
+
message,
|
|
1610
|
+
details
|
|
1611
|
+
};
|
|
1612
|
+
}
|
|
1613
|
+
if (error instanceof Error) {
|
|
1614
|
+
return {
|
|
1615
|
+
statusCode: defaultState.statusCode,
|
|
1616
|
+
title: defaultState.title,
|
|
1617
|
+
message: error.message || defaultState.message,
|
|
1618
|
+
details: globalThis.__rb_env__.DEV ? error.stack ?? error.message : void 0
|
|
1619
|
+
};
|
|
1620
|
+
}
|
|
1621
|
+
if (typeof error === "string") {
|
|
1622
|
+
return {
|
|
1623
|
+
statusCode: defaultState.statusCode,
|
|
1624
|
+
title: defaultState.title,
|
|
1625
|
+
message: error
|
|
1626
|
+
};
|
|
1627
|
+
}
|
|
1628
|
+
return defaultState;
|
|
1629
|
+
};
|
|
1630
|
+
const RouteErrorBoundary = ({ renderErrorExtra }) => {
|
|
1631
|
+
const routeError = useRouteError();
|
|
1632
|
+
const state = toSsrErrorState(routeError);
|
|
1633
|
+
return /* @__PURE__ */ jsx(
|
|
1634
|
+
SsrErrorFallback,
|
|
1635
|
+
{
|
|
1636
|
+
state,
|
|
1637
|
+
renderErrorExtra
|
|
1638
|
+
}
|
|
1639
|
+
);
|
|
1640
|
+
};
|
|
1570
1641
|
export {
|
|
1571
1642
|
RootProvider,
|
|
1643
|
+
RouteErrorBoundary,
|
|
1572
1644
|
SSR_ERROR_STATE_GLOBAL_KEY,
|
|
1645
|
+
SsrErrorFallback,
|
|
1573
1646
|
apiClient,
|
|
1574
1647
|
consumeClientSsrErrorState,
|
|
1575
1648
|
getFeatureFlag,
|
package/dist/initWithRoutes.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ReactNode } from 'react';
|
|
2
2
|
import { createRoutesFromElements } from '../../router/src';
|
|
3
3
|
import { SsrErrorStatePayload } from './ssrErrorState';
|
|
4
4
|
type InitWithRoutesOptions = {
|
|
5
5
|
devThrowsOnHydrationErrors?: boolean;
|
|
6
|
-
|
|
6
|
+
renderErrorExtra?: (state: SsrErrorStatePayload) => ReactNode;
|
|
7
7
|
};
|
|
8
8
|
type RoutesElement = Parameters<typeof createRoutesFromElements>[0];
|
|
9
9
|
export declare const initWithRoutes: (routesElement: RoutesElement, opts?: InitWithRoutesOptions) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWithRoutes.d.ts","sourceRoot":"","sources":["../src/initWithRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"initWithRoutes.d.ts","sourceRoot":"","sources":["../src/initWithRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAsB,wBAAwB,EAAiB,MAAM,iBAAiB,CAAA;AAK7F,OAAO,EAGL,oBAAoB,EACrB,MAAM,iBAAiB,CAAA;AAkCxB,KAAK,qBAAqB,GAAG;IAC3B,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,SAAS,CAAA;CAC9D,CAAA;AAED,KAAK,aAAa,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAA;AA8BnE,eAAO,MAAM,cAAc,GACzB,eAAe,aAAa,EAC5B,OAAO,qBAAqB,kBA+E7B,CAAA"}
|