oidc-spa 8.3.2 → 8.3.4
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/core/createOidc.js +3 -1
- package/core/createOidc.js.map +1 -1
- package/esm/core/createOidc.js +3 -1
- package/esm/core/createOidc.js.map +1 -1
- package/esm/tanstack-start/react/createOidcSpaApi.js +4 -4
- package/esm/tanstack-start/react/createOidcSpaApi.js.map +1 -1
- package/esm/tanstack-start/react/disableSsrIfLoginEnforced.d.ts +5 -0
- package/esm/tanstack-start/react/disableSsrIfLoginEnforced.js +19 -0
- package/esm/tanstack-start/react/disableSsrIfLoginEnforced.js.map +1 -0
- package/esm/tanstack-start/react/index.d.ts +1 -0
- package/esm/tanstack-start/react/index.js +1 -0
- package/esm/tanstack-start/react/index.js.map +1 -1
- package/esm/tools/ensureNonBlankPaint.d.ts +1 -0
- package/esm/tools/ensureNonBlankPaint.js +10 -0
- package/esm/tools/ensureNonBlankPaint.js.map +1 -0
- package/package.json +1 -11
- package/src/core/createOidc.ts +3 -0
- package/src/tanstack-start/react/createOidcSpaApi.tsx +4 -4
- package/src/tanstack-start/react/disableSsrIfLoginEnforced.tsx +29 -0
- package/src/tanstack-start/react/index.ts +1 -0
- package/src/tools/ensureNonBlankPaint.ts +12 -0
- package/src/vite-plugin/handleClientEntrypoint.ts +0 -4
- package/src/vite-plugin/transformTanstackRouterCreateFileRoute.ts +6 -6
- package/tools/ensureNonBlankPaint.d.ts +1 -0
- package/tools/ensureNonBlankPaint.js +13 -0
- package/tools/ensureNonBlankPaint.js.map +1 -0
- package/vite-plugin/handleClientEntrypoint.js +0 -4
- package/vite-plugin/handleClientEntrypoint.js.map +1 -1
- package/vite-plugin/transformTanstackRouterCreateFileRoute.js +6 -6
- package/vite-plugin/transformTanstackRouterCreateFileRoute.js.map +1 -1
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError.d.ts +0 -4
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError.js +0 -8
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError.js.map +0 -1
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/enableUnifiedClientRetryForSsrLoaders.d.ts +0 -4
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/enableUnifiedClientRetryForSsrLoaders.js +0 -86
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/enableUnifiedClientRetryForSsrLoaders.js.map +0 -1
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.d.ts +0 -1
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.js +0 -13
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.js.map +0 -1
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.d.ts +0 -2
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.js +0 -3
- package/esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.js.map +0 -1
- package/esm/tools/inferIsViteDev.d.ts +0 -1
- package/esm/tools/inferIsViteDev.js +0 -6
- package/esm/tools/inferIsViteDev.js.map +0 -1
- package/src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError.ts +0 -8
- package/src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/enableUnifiedClientRetryForSsrLoaders.tsx +0 -127
- package/src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.ts +0 -15
- package/src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.ts +0 -2
- package/src/tools/inferIsViteDev.ts +0 -6
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensureNonBlankPaint.js","sourceRoot":"","sources":["../../src/tools/ensureNonBlankPaint.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,mBAAmB;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;IAEtC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC;IAE9B,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;IACzB,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oidc-spa",
|
|
3
|
-
"version": "8.3.
|
|
3
|
+
"version": "8.3.4",
|
|
4
4
|
"description": "OIDC Client for Client Centric Web Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -100,16 +100,6 @@
|
|
|
100
100
|
"types": "./esm/tanstack-start/react/index.d.ts",
|
|
101
101
|
"default": "./esm/tanstack-start/react/index.js"
|
|
102
102
|
},
|
|
103
|
-
"./react-tanstack-start/rfcUnifiedClientRetryForSsrLoaders": {
|
|
104
|
-
"module": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.js",
|
|
105
|
-
"types": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.d.ts",
|
|
106
|
-
"default": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.js"
|
|
107
|
-
},
|
|
108
|
-
"./react-tanstack-start/rfcUnifiedClientRetryForSsrLoaders/entrypoint": {
|
|
109
|
-
"module": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.js",
|
|
110
|
-
"types": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.d.ts",
|
|
111
|
-
"default": "./esm/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.js"
|
|
112
|
-
},
|
|
113
103
|
"./mock/react": {
|
|
114
104
|
"module": "./esm/mock/react.js",
|
|
115
105
|
"default": "./mock/react.js"
|
package/src/core/createOidc.ts
CHANGED
|
@@ -53,6 +53,7 @@ import {
|
|
|
53
53
|
} from "./instancesThatCantUseIframes";
|
|
54
54
|
import { getDesiredPostLoginRedirectUrl } from "./desiredPostLoginRedirectUrl";
|
|
55
55
|
import { getHomeAndRedirectUri } from "./homeAndRedirectUri";
|
|
56
|
+
import { ensureNonBlankPaint } from "../tools/ensureNonBlankPaint";
|
|
56
57
|
|
|
57
58
|
// NOTE: Replaced at build time
|
|
58
59
|
const VERSION = "{{OIDC_SPA_VERSION}}";
|
|
@@ -985,6 +986,8 @@ export async function createOidc_nonMemoized<
|
|
|
985
986
|
evtInitializationOutcomeUserNotLoggedIn.post();
|
|
986
987
|
}
|
|
987
988
|
|
|
989
|
+
ensureNonBlankPaint();
|
|
990
|
+
|
|
988
991
|
await waitForAllOtherOngoingLoginOrRefreshProcessesToComplete({
|
|
989
992
|
prUnlock:
|
|
990
993
|
getPrSafelyRestoredFromBfCacheAfterLoginBackNavigationOrInitializationError()
|
|
@@ -22,7 +22,7 @@ import { createServerFn, createMiddleware } from "@tanstack/react-start";
|
|
|
22
22
|
// @ts-expect-error: Since our module is not labeled as ESM we don't have the types here.
|
|
23
23
|
import { getRequest, setResponseHeader, setResponseStatus } from "@tanstack/react-start/server";
|
|
24
24
|
import { toFullyQualifiedUrl } from "../../tools/toFullyQualifiedUrl";
|
|
25
|
-
import {
|
|
25
|
+
import { BEFORE_LOAD_FN_BRAND_PROPERTY_NAME } from "./disableSsrIfLoginEnforced";
|
|
26
26
|
import { setDesiredPostLoginRedirectUrl } from "../../core/desiredPostLoginRedirectUrl";
|
|
27
27
|
import type { MaybeAsync } from "../../tools/MaybeAsync";
|
|
28
28
|
|
|
@@ -375,7 +375,7 @@ export function createOidcSpaApi<
|
|
|
375
375
|
assert?: "user logged in" | "user not logged in" | "init completed";
|
|
376
376
|
}): Promise<GetOidc.Oidc<DecodedIdToken>> {
|
|
377
377
|
if (!isBrowser) {
|
|
378
|
-
throw new
|
|
378
|
+
throw new Error(
|
|
379
379
|
[
|
|
380
380
|
"oidc-spa: getOidc() can't be used on the server",
|
|
381
381
|
"if you use it in a loader, make sure to mark the route",
|
|
@@ -688,7 +688,7 @@ export function createOidcSpaApi<
|
|
|
688
688
|
};
|
|
689
689
|
}): Promise<void | never> {
|
|
690
690
|
if (!isBrowser) {
|
|
691
|
-
throw new
|
|
691
|
+
throw new Error(
|
|
692
692
|
[
|
|
693
693
|
"oidc-spa: enforceLogin cannot be used on the server",
|
|
694
694
|
"make sure to mark any route that uses it as ssr: false"
|
|
@@ -759,7 +759,7 @@ export function createOidcSpaApi<
|
|
|
759
759
|
}
|
|
760
760
|
}
|
|
761
761
|
|
|
762
|
-
enforceLogin
|
|
762
|
+
enforceLogin[BEFORE_LOAD_FN_BRAND_PROPERTY_NAME] = true;
|
|
763
763
|
|
|
764
764
|
function OidcInitializationGate(props: {
|
|
765
765
|
errorComponent?: ComponentType<{ oidcInitializationError: OidcInitializationError }>;
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { createFileRoute } from "@tanstack/react-router";
|
|
2
|
+
|
|
3
|
+
type OptionsOfCreateFileRoute = NonNullable<Parameters<ReturnType<typeof createFileRoute>>[0]>;
|
|
4
|
+
|
|
5
|
+
export const BEFORE_LOAD_FN_BRAND_PROPERTY_NAME = "__isOidcSpaEnforceLogin";
|
|
6
|
+
|
|
7
|
+
export function __disableSsrIfLoginEnforced<Options extends OptionsOfCreateFileRoute>(
|
|
8
|
+
options: Options
|
|
9
|
+
): Options {
|
|
10
|
+
if (options.ssr === false) {
|
|
11
|
+
return options;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
const { beforeLoad } = options;
|
|
15
|
+
|
|
16
|
+
if (beforeLoad === undefined) {
|
|
17
|
+
return options;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
// @ts-expect-error
|
|
21
|
+
if (!beforeLoad[BEFORE_LOAD_FN_BRAND_PROPERTY_NAME]) {
|
|
22
|
+
return options;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return {
|
|
26
|
+
...options,
|
|
27
|
+
ssr: false
|
|
28
|
+
};
|
|
29
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export function ensureNonBlankPaint() {
|
|
2
|
+
const html = document.documentElement;
|
|
3
|
+
|
|
4
|
+
const marker = document.createElement("span");
|
|
5
|
+
marker.textContent = "\u00A0";
|
|
6
|
+
|
|
7
|
+
marker.style.position = "fixed";
|
|
8
|
+
marker.style.top = "0px";
|
|
9
|
+
marker.style.left = "0px";
|
|
10
|
+
|
|
11
|
+
html.prepend(marker);
|
|
12
|
+
}
|
|
@@ -71,8 +71,6 @@ export function createLoadHandleEntrypoint(params: {
|
|
|
71
71
|
|
|
72
72
|
const stubSourceCache = [
|
|
73
73
|
`import { oidcEarlyInit } from "oidc-spa/entrypoint";`,
|
|
74
|
-
projectType === "tanstack-start" &&
|
|
75
|
-
`import { preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError } from "oidc-spa/react-tanstack-start/rfcUnifiedClientRetryForSsrLoaders/entrypoint";`,
|
|
76
74
|
`const { shouldLoadApp } = oidcEarlyInit({`,
|
|
77
75
|
` freezeFetch: ${freezeFetch},`,
|
|
78
76
|
` freezeXMLHttpRequest: ${freezeXMLHttpRequest},`,
|
|
@@ -84,8 +82,6 @@ export function createLoadHandleEntrypoint(params: {
|
|
|
84
82
|
`});`,
|
|
85
83
|
``,
|
|
86
84
|
`if(shouldLoadApp){`,
|
|
87
|
-
projectType === "tanstack-start" &&
|
|
88
|
-
` preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError();`,
|
|
89
85
|
` import("./${path.basename(
|
|
90
86
|
entryResolution.absolutePath
|
|
91
87
|
)}?${ORIGINAL_QUERY_PARAM}=true");`,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { MagicString } from "../vendor/build-runtime/magic-string";
|
|
2
2
|
import { babelParser, babelTraverse, babelTypes as t } from "../vendor/build-runtime/babel";
|
|
3
3
|
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const DISABLE_SSR_SPECIFIER = "__disableSsrIfLoginEnforced";
|
|
5
|
+
const DISABLE_SSR_SOURCE = "oidc-spa/react-tanstack-start";
|
|
6
6
|
const CREATE_FILE_ROUTE_IDENTIFIER = "createFileRoute";
|
|
7
7
|
const POST_LOGIN_IMPORT_SPECIFIER = "withHandlingOidcPostLoginNavigation";
|
|
8
8
|
const POST_LOGIN_IMPORT_SOURCE = "oidc-spa/react-tanstack-start";
|
|
@@ -68,12 +68,12 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
if (sourceValue ===
|
|
71
|
+
if (sourceValue === DISABLE_SSR_SOURCE) {
|
|
72
72
|
if (
|
|
73
73
|
path.node.specifiers.some(
|
|
74
74
|
specifier =>
|
|
75
75
|
t.isImportSpecifier(specifier) &&
|
|
76
|
-
t.isIdentifier(specifier.imported, { name:
|
|
76
|
+
t.isIdentifier(specifier.imported, { name: DISABLE_SSR_SPECIFIER })
|
|
77
77
|
)
|
|
78
78
|
) {
|
|
79
79
|
hasEnableImport = true;
|
|
@@ -121,7 +121,7 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
|
|
|
121
121
|
const end = configNode.end ?? undefined;
|
|
122
122
|
|
|
123
123
|
if (typeof start === "number" && typeof end === "number") {
|
|
124
|
-
magicString.appendLeft(start, `${
|
|
124
|
+
magicString.appendLeft(start, `${DISABLE_SSR_SPECIFIER}(`);
|
|
125
125
|
magicString.appendRight(end, ")");
|
|
126
126
|
requiresEnableImport = true;
|
|
127
127
|
localMutated = true;
|
|
@@ -168,7 +168,7 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
|
|
|
168
168
|
const importStatements: string[] = [];
|
|
169
169
|
|
|
170
170
|
if (requiresEnableImport && !hasEnableImport) {
|
|
171
|
-
importStatements.push(`import { ${
|
|
171
|
+
importStatements.push(`import { ${DISABLE_SSR_SPECIFIER} } from "${DISABLE_SSR_SOURCE}";`);
|
|
172
172
|
}
|
|
173
173
|
|
|
174
174
|
if (requiresPostLoginImport && !hasPostLoginImport) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function ensureNonBlankPaint(): void;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ensureNonBlankPaint = ensureNonBlankPaint;
|
|
4
|
+
function ensureNonBlankPaint() {
|
|
5
|
+
const html = document.documentElement;
|
|
6
|
+
const marker = document.createElement("span");
|
|
7
|
+
marker.textContent = "\u00A0";
|
|
8
|
+
marker.style.position = "fixed";
|
|
9
|
+
marker.style.top = "0px";
|
|
10
|
+
marker.style.left = "0px";
|
|
11
|
+
html.prepend(marker);
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=ensureNonBlankPaint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensureNonBlankPaint.js","sourceRoot":"","sources":["../src/tools/ensureNonBlankPaint.ts"],"names":[],"mappings":";;AAAA,kDAWC;AAXD,SAAgB,mBAAmB;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;IAEtC,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC;IAE9B,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;IACzB,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -74,8 +74,6 @@ function createLoadHandleEntrypoint(params) {
|
|
|
74
74
|
assert_1.assert;
|
|
75
75
|
const stubSourceCache = [
|
|
76
76
|
`import { oidcEarlyInit } from "oidc-spa/entrypoint";`,
|
|
77
|
-
projectType === "tanstack-start" &&
|
|
78
|
-
`import { preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError } from "oidc-spa/react-tanstack-start/rfcUnifiedClientRetryForSsrLoaders/entrypoint";`,
|
|
79
77
|
`const { shouldLoadApp } = oidcEarlyInit({`,
|
|
80
78
|
` freezeFetch: ${freezeFetch},`,
|
|
81
79
|
` freezeXMLHttpRequest: ${freezeXMLHttpRequest},`,
|
|
@@ -87,8 +85,6 @@ function createLoadHandleEntrypoint(params) {
|
|
|
87
85
|
`});`,
|
|
88
86
|
``,
|
|
89
87
|
`if(shouldLoadApp){`,
|
|
90
|
-
projectType === "tanstack-start" &&
|
|
91
|
-
` preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError();`,
|
|
92
88
|
` import("./${path.basename(entryResolution.absolutePath)}?${ORIGINAL_QUERY_PARAM}=true");`,
|
|
93
89
|
`}`
|
|
94
90
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleClientEntrypoint.js","sourceRoot":"","sources":["../src/vite-plugin/handleClientEntrypoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,
|
|
1
|
+
{"version":3,"file":"handleClientEntrypoint.js","sourceRoot":"","sources":["../src/vite-plugin/handleClientEntrypoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.transformCreateFileRoute = transformCreateFileRoute;
|
|
4
4
|
const magic_string_1 = require("../vendor/build-runtime/magic-string");
|
|
5
5
|
const babel_1 = require("../vendor/build-runtime/babel");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const DISABLE_SSR_SPECIFIER = "__disableSsrIfLoginEnforced";
|
|
7
|
+
const DISABLE_SSR_SOURCE = "oidc-spa/react-tanstack-start";
|
|
8
8
|
const CREATE_FILE_ROUTE_IDENTIFIER = "createFileRoute";
|
|
9
9
|
const POST_LOGIN_IMPORT_SPECIFIER = "withHandlingOidcPostLoginNavigation";
|
|
10
10
|
const POST_LOGIN_IMPORT_SOURCE = "oidc-spa/react-tanstack-start";
|
|
@@ -48,9 +48,9 @@ function transformCreateFileRoute(params) {
|
|
|
48
48
|
hasCreateFileRouteImport = true;
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
if (sourceValue ===
|
|
51
|
+
if (sourceValue === DISABLE_SSR_SOURCE) {
|
|
52
52
|
if (path.node.specifiers.some(specifier => babel_1.babelTypes.isImportSpecifier(specifier) &&
|
|
53
|
-
babel_1.babelTypes.isIdentifier(specifier.imported, { name:
|
|
53
|
+
babel_1.babelTypes.isIdentifier(specifier.imported, { name: DISABLE_SSR_SPECIFIER }))) {
|
|
54
54
|
hasEnableImport = true;
|
|
55
55
|
}
|
|
56
56
|
}
|
|
@@ -84,7 +84,7 @@ function transformCreateFileRoute(params) {
|
|
|
84
84
|
const start = configNode.start ?? undefined;
|
|
85
85
|
const end = configNode.end ?? undefined;
|
|
86
86
|
if (typeof start === "number" && typeof end === "number") {
|
|
87
|
-
magicString.appendLeft(start, `${
|
|
87
|
+
magicString.appendLeft(start, `${DISABLE_SSR_SPECIFIER}(`);
|
|
88
88
|
magicString.appendRight(end, ")");
|
|
89
89
|
requiresEnableImport = true;
|
|
90
90
|
localMutated = true;
|
|
@@ -118,7 +118,7 @@ function transformCreateFileRoute(params) {
|
|
|
118
118
|
}
|
|
119
119
|
const importStatements = [];
|
|
120
120
|
if (requiresEnableImport && !hasEnableImport) {
|
|
121
|
-
importStatements.push(`import { ${
|
|
121
|
+
importStatements.push(`import { ${DISABLE_SSR_SPECIFIER} } from "${DISABLE_SSR_SOURCE}";`);
|
|
122
122
|
}
|
|
123
123
|
if (requiresPostLoginImport && !hasPostLoginImport) {
|
|
124
124
|
importStatements.push(`import { ${POST_LOGIN_IMPORT_SPECIFIER} } from "${POST_LOGIN_IMPORT_SOURCE}";`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformTanstackRouterCreateFileRoute.js","sourceRoot":"","sources":["../src/vite-plugin/transformTanstackRouterCreateFileRoute.ts"],"names":[],"mappings":";;AAmBA,4DA2KC;AA9LD,uEAAmE;AACnE,yDAA4F;AAE5F,MAAM,
|
|
1
|
+
{"version":3,"file":"transformTanstackRouterCreateFileRoute.js","sourceRoot":"","sources":["../src/vite-plugin/transformTanstackRouterCreateFileRoute.ts"],"names":[],"mappings":";;AAmBA,4DA2KC;AA9LD,uEAAmE;AACnE,yDAA4F;AAE5F,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAC5D,MAAM,kBAAkB,GAAG,+BAA+B,CAAC;AAC3D,MAAM,4BAA4B,GAAG,iBAAiB,CAAC;AACvD,MAAM,2BAA2B,GAAG,qCAAqC,CAAC;AAC1E,MAAM,wBAAwB,GAAG,+BAA+B,CAAC;AAYjE,SAAgB,wBAAwB,CAAC,MAAuB;IAC5D,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;IAC5B,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAE/B,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,GAAyC,CAAC;IAC9C,IAAI,CAAC;QACD,GAAG,GAAG,mBAAW,CAAC,KAAK,CAAC,IAAI,EAAE;YAC1B,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC;SACjC,CAAC,CAAC;IACP,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,wBAAwB,GAAG,KAAK,CAAC;IACrC,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,IAAI,uBAAuB,GAAG,KAAK,CAAC;IACpC,IAAI,aAAiC,CAAC;IACtC,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,IAAA,qBAAa,EAAC,GAAG,EAAE;QACf,iBAAiB,CAAC,IAAI;YAClB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAC3C,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO;YACX,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC;YACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAC1B,aAAa,GAAG,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;YACrF,CAAC;YAED,IAAI,WAAW,KAAK,wBAAwB,EAAE,CAAC;gBAC3C,IACI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CACrB,SAAS,CAAC,EAAE,CACR,kBAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBAC9B,kBAAC,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CACjF,EACH,CAAC;oBACC,wBAAwB,GAAG,IAAI,CAAC;gBACpC,CAAC;YACL,CAAC;YAED,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;gBACrC,IACI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CACrB,SAAS,CAAC,EAAE,CACR,kBAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBAC9B,kBAAC,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,CAC1E,EACH,CAAC;oBACC,eAAe,GAAG,IAAI,CAAC;gBAC3B,CAAC;YACL,CAAC;YAED,IAAI,WAAW,KAAK,wBAAwB,EAAE,CAAC;gBAC3C,IACI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CACrB,SAAS,CAAC,EAAE,CACR,kBAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBAC9B,kBAAC,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC,CAChF,EACH,CAAC;oBACC,kBAAkB,GAAG,IAAI,CAAC;gBAC9B,CAAC;YACL,CAAC;QACL,CAAC;QACD,cAAc,CAAC,IAAI;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC7B,OAAO;YACX,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,EAAE,CAAC;gBACpE,OAAO;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACpB,OAAO;YACX,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAClC,OAAO;YACX,CAAC;YAED,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;YAClC,IAAI,YAAY,GAAG,KAAK,CAAC;YAEzB,IAAI,gCAAgC,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,SAAS,CAAC;gBAC5C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,IAAI,SAAS,CAAC;gBAExC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;oBACvD,WAAW,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,qBAAqB,GAAG,CAAC,CAAC;oBAC3D,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBAClC,oBAAoB,GAAG,IAAI,CAAC;oBAC5B,YAAY,GAAG,IAAI,CAAC;gBACxB,CAAC;YACL,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC;YAC9C,MAAM,WAAW,GACb,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,kBAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC;YAE1F,IAAI,WAAW,EAAE,CAAC;gBACd,MAAM,aAAa,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;gBACxD,IAAI,aAAa,EAAE,CAAC;oBAChB,MAAM,SAAS,GAAG,aAAa,CAAC,KAAqB,CAAC;oBAEtD,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;wBACpC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC;wBAC3C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC;wBAEvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;4BACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;4BACxC,WAAW,CAAC,SAAS,CACjB,KAAK,EACL,GAAG,EACH,GAAG,2BAA2B,IAAI,QAAQ,GAAG,CAChD,CAAC;4BACF,uBAAuB,GAAG,IAAI,CAAC;4BAC/B,YAAY,GAAG,IAAI,CAAC;wBACxB,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YAED,IAAI,YAAY,EAAE,CAAC;gBACf,OAAO,GAAG,IAAI,CAAC;YACnB,CAAC;QACL,CAAC;KACJ,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,gBAAgB,GAAa,EAAE,CAAC;IAEtC,IAAI,oBAAoB,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,gBAAgB,CAAC,IAAI,CAAC,YAAY,qBAAqB,YAAY,kBAAkB,IAAI,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,uBAAuB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjD,gBAAgB,CAAC,IAAI,CACjB,YAAY,2BAA2B,YAAY,wBAAwB,IAAI,CAClF,CAAC;IACN,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,aAAa,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,GAAG,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,OAAO;QACH,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;QAC5B,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;KACjE,CAAC;AACN,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAwB;IACnD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CACvB,IAAI,CAAC,EAAE,CACH,kBAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,kBAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC;YACxD,CAAC,kBAAC,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAC3C,CAAC;AACtC,CAAC;AAED,SAAS,gCAAgC,CAAC,IAAwB;IAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC/B,IAAI,CAAC,kBAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,IAAI,kBAAC,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC;QAC9D,CAAC;QAED,IAAI,kBAAC,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,KAAK,YAAY,CAAC;QAChE,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY;IACvC,OAAO,CACH,kBAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,kBAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC,CACjG,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,EAAU;IAC/B,IAAI,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,UAAU,CAAC,EAAU;IAC1B,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export const ERROR_MESSAGE_SINGULAR_STRING = "__RETRY_ON_CLIENT_SENTINEL__";
|
|
2
|
-
export class UnifiedClientRetryForSsrLoadersError extends Error {
|
|
3
|
-
constructor(message) {
|
|
4
|
-
super(`(${ERROR_MESSAGE_SINGULAR_STRING}) ${message}`);
|
|
5
|
-
Object.setPrototypeOf(this, new.target.prototype);
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
//# sourceMappingURL=UnifiedClientRetryForSsrLoadersError.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"UnifiedClientRetryForSsrLoadersError.js","sourceRoot":"","sources":["../../../../src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,6BAA6B,GAAG,8BAA8B,CAAC;AAE5E,MAAM,OAAO,oCAAqC,SAAQ,KAAK;IAC3D,YAAY,OAAe;QACvB,KAAK,CAAC,IAAI,6BAA6B,KAAK,OAAO,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;CACJ"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import { type createFileRoute } from "@tanstack/react-router";
|
|
2
|
-
type OptionsOfCreateFileRoute = NonNullable<Parameters<ReturnType<typeof createFileRoute>>[0]>;
|
|
3
|
-
export declare function enableUnifiedClientRetryForSsrLoaders<Options extends OptionsOfCreateFileRoute>(options: Options): Options;
|
|
4
|
-
export {};
|
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { useEffect } from "react";
|
|
3
|
-
import { useRouter } from "@tanstack/react-router";
|
|
4
|
-
import { ERROR_MESSAGE_SINGULAR_STRING } from "./UnifiedClientRetryForSsrLoadersError";
|
|
5
|
-
import { inferIsViteDev } from "../../../tools/inferIsViteDev";
|
|
6
|
-
export function enableUnifiedClientRetryForSsrLoaders(options) {
|
|
7
|
-
if (options.ssr === false) {
|
|
8
|
-
return options;
|
|
9
|
-
}
|
|
10
|
-
common_case_exception: {
|
|
11
|
-
const { beforeLoad } = options;
|
|
12
|
-
if (beforeLoad === undefined) {
|
|
13
|
-
break common_case_exception;
|
|
14
|
-
}
|
|
15
|
-
// @ts-expect-error
|
|
16
|
-
if (!beforeLoad.__isOidcSpaEnforceLogin) {
|
|
17
|
-
break common_case_exception;
|
|
18
|
-
}
|
|
19
|
-
return {
|
|
20
|
-
...options,
|
|
21
|
-
ssr: false
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
function ErrorComponentWithUnifiedClientRetryForSsrLoader(props) {
|
|
25
|
-
unified_client_retry: {
|
|
26
|
-
const { error } = props;
|
|
27
|
-
const isSentinelError = error instanceof Error && error.message.includes(ERROR_MESSAGE_SINGULAR_STRING);
|
|
28
|
-
const router = useRouter();
|
|
29
|
-
useEffect(() => {
|
|
30
|
-
if (!isSentinelError) {
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
const isDev = inferIsViteDev();
|
|
34
|
-
console.info([
|
|
35
|
-
`oidc-spa: The '500 (Internal Server Error)'${!isDev ? "" : " and 'Warning: Error in route match'"} above can be safely ignored.`,
|
|
36
|
-
"\nIt's not a real error, but an expected and recoverable case.",
|
|
37
|
-
"\nThis happens when a server action requires user authentication",
|
|
38
|
-
"before the client has finished establishing it."
|
|
39
|
-
].join(" "));
|
|
40
|
-
router.invalidate();
|
|
41
|
-
}, []);
|
|
42
|
-
if (!isSentinelError) {
|
|
43
|
-
break unified_client_retry;
|
|
44
|
-
}
|
|
45
|
-
const PendingComponent = options.pendingComponent;
|
|
46
|
-
if (PendingComponent === undefined) {
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
49
|
-
return _jsx(PendingComponent, {});
|
|
50
|
-
}
|
|
51
|
-
// Default behavior
|
|
52
|
-
{
|
|
53
|
-
const { errorComponent } = options;
|
|
54
|
-
if (errorComponent === false) {
|
|
55
|
-
queueMicrotask(() => {
|
|
56
|
-
throw props.error;
|
|
57
|
-
});
|
|
58
|
-
return null;
|
|
59
|
-
}
|
|
60
|
-
if (errorComponent === null || errorComponent === undefined) {
|
|
61
|
-
throw props.error;
|
|
62
|
-
}
|
|
63
|
-
const ErrorComponent = errorComponent;
|
|
64
|
-
return _jsx(ErrorComponent, { ...props });
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
forward_properties: {
|
|
68
|
-
const { errorComponent } = options;
|
|
69
|
-
if (!errorComponent) {
|
|
70
|
-
ErrorComponentWithUnifiedClientRetryForSsrLoader.displayName =
|
|
71
|
-
ErrorComponentWithUnifiedClientRetryForSsrLoader.name;
|
|
72
|
-
break forward_properties;
|
|
73
|
-
}
|
|
74
|
-
const ErrorComponent = errorComponent;
|
|
75
|
-
ErrorComponentWithUnifiedClientRetryForSsrLoader.displayName = `${ErrorComponent.displayName ?? ErrorComponent.name ?? "ErrorComponent"}WithUnifiedClientRetryForSsrLoader`;
|
|
76
|
-
if (ErrorComponent.preload !== undefined) {
|
|
77
|
-
ErrorComponentWithUnifiedClientRetryForSsrLoader.preload =
|
|
78
|
-
ErrorComponent.preload.bind(ErrorComponent);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return {
|
|
82
|
-
...options,
|
|
83
|
-
errorComponent: ErrorComponentWithUnifiedClientRetryForSsrLoader
|
|
84
|
-
};
|
|
85
|
-
}
|
|
86
|
-
//# sourceMappingURL=enableUnifiedClientRetryForSsrLoaders.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"enableUnifiedClientRetryForSsrLoaders.js","sourceRoot":"","sources":["../../../../src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/enableUnifiedClientRetryForSsrLoaders.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError(): void;
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { ERROR_MESSAGE_SINGULAR_STRING } from "./UnifiedClientRetryForSsrLoadersError";
|
|
2
|
-
export function preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError() {
|
|
3
|
-
const originalConsoleError = console.error;
|
|
4
|
-
console.error = function error(...args) {
|
|
5
|
-
for (const arg of args) {
|
|
6
|
-
if (arg instanceof Error && arg.message.includes(ERROR_MESSAGE_SINGULAR_STRING)) {
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
originalConsoleError.call(console, ...args);
|
|
11
|
-
};
|
|
12
|
-
}
|
|
13
|
-
//# sourceMappingURL=entrypoint.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["../../../../src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAEvF,MAAM,UAAU,2DAA2D;IACvE,MAAM,oBAAoB,GAAG,OAAO,CAAC,KAAK,CAAC;IAE3C,OAAO,CAAC,KAAK,GAAG,SAAS,KAAK,CAAC,GAAG,IAAI;QAClC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE,CAAC;gBAC9E,OAAO;YACX,CAAC;QACL,CAAC;QAED,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tanstack-start/react/rfcUnifiedClientRetryForSsrLoaders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oCAAoC,EAAE,MAAM,wCAAwC,CAAC;AAC9F,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function inferIsViteDev(): boolean;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"inferIsViteDev.js","sourceRoot":"","sources":["../../src/tools/inferIsViteDev.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc;IAC1B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAE9B,OAAO,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export const ERROR_MESSAGE_SINGULAR_STRING = "__RETRY_ON_CLIENT_SENTINEL__";
|
|
2
|
-
|
|
3
|
-
export class UnifiedClientRetryForSsrLoadersError extends Error {
|
|
4
|
-
constructor(message: string) {
|
|
5
|
-
super(`(${ERROR_MESSAGE_SINGULAR_STRING}) ${message}`);
|
|
6
|
-
Object.setPrototypeOf(this, new.target.prototype);
|
|
7
|
-
}
|
|
8
|
-
}
|