oidc-spa 8.3.2-rc.4 → 8.3.2
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 +1 -1
- package/esm/core/createOidc.js +1 -1
- package/package.json +1 -1
- package/src/vite-plugin/handleClientEntrypoint.ts +7 -44
- package/src/vite-plugin/manageOptimizedDeps.ts +1 -5
- package/src/vite-plugin/projectType.ts +1 -9
- package/vite-plugin/handleClientEntrypoint.js +5 -31
- package/vite-plugin/handleClientEntrypoint.js.map +1 -1
- package/vite-plugin/manageOptimizedDeps.js +1 -4
- package/vite-plugin/manageOptimizedDeps.js.map +1 -1
- package/vite-plugin/projectType.d.ts +2 -2
- package/vite-plugin/projectType.js +0 -3
- package/vite-plugin/projectType.js.map +1 -1
package/core/createOidc.js
CHANGED
|
@@ -71,7 +71,7 @@ const instancesThatCantUseIframes_1 = require("./instancesThatCantUseIframes");
|
|
|
71
71
|
const desiredPostLoginRedirectUrl_1 = require("./desiredPostLoginRedirectUrl");
|
|
72
72
|
const homeAndRedirectUri_1 = require("./homeAndRedirectUri");
|
|
73
73
|
// NOTE: Replaced at build time
|
|
74
|
-
const VERSION = "8.3.2
|
|
74
|
+
const VERSION = "8.3.2";
|
|
75
75
|
const globalContext = {
|
|
76
76
|
prOidcByConfigId: new Map(),
|
|
77
77
|
hasLogoutBeenCalled: (0, id_1.id)(false)
|
package/esm/core/createOidc.js
CHANGED
|
@@ -34,7 +34,7 @@ import { evtIsThereMoreThanOneInstanceThatCantUserIframes, notifyNewInstanceThat
|
|
|
34
34
|
import { getDesiredPostLoginRedirectUrl } from "./desiredPostLoginRedirectUrl";
|
|
35
35
|
import { getHomeAndRedirectUri } from "./homeAndRedirectUri";
|
|
36
36
|
// NOTE: Replaced at build time
|
|
37
|
-
const VERSION = "8.3.2
|
|
37
|
+
const VERSION = "8.3.2";
|
|
38
38
|
const globalContext = {
|
|
39
39
|
prOidcByConfigId: new Map(),
|
|
40
40
|
hasLogoutBeenCalled: id(false)
|
package/package.json
CHANGED
|
@@ -47,12 +47,12 @@ export function createLoadHandleEntrypoint(params: {
|
|
|
47
47
|
}): Promise<null | string> {
|
|
48
48
|
const { id, pluginContext } = params;
|
|
49
49
|
const { path: rawPath, queryParams } = splitId(id);
|
|
50
|
-
|
|
51
50
|
const normalizedRequestPath = normalizeRequestPath(rawPath);
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
if (!normalizedRequestPath) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
54
|
|
|
55
|
-
if (
|
|
55
|
+
if (normalizedRequestPath !== entryResolution.normalizedPath) {
|
|
56
56
|
return null;
|
|
57
57
|
}
|
|
58
58
|
|
|
@@ -69,10 +69,6 @@ export function createLoadHandleEntrypoint(params: {
|
|
|
69
69
|
|
|
70
70
|
assert<Equals<typeof rest, {}>>;
|
|
71
71
|
|
|
72
|
-
const originalEntryImport = `import("./${path.basename(
|
|
73
|
-
entryResolution.absolutePath
|
|
74
|
-
)}?${ORIGINAL_QUERY_PARAM}=true")`;
|
|
75
|
-
|
|
76
72
|
const stubSourceCache = [
|
|
77
73
|
`import { oidcEarlyInit } from "oidc-spa/entrypoint";`,
|
|
78
74
|
projectType === "tanstack-start" &&
|
|
@@ -90,7 +86,9 @@ export function createLoadHandleEntrypoint(params: {
|
|
|
90
86
|
`if(shouldLoadApp){`,
|
|
91
87
|
projectType === "tanstack-start" &&
|
|
92
88
|
` preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError();`,
|
|
93
|
-
`
|
|
89
|
+
` import("./${path.basename(
|
|
90
|
+
entryResolution.absolutePath
|
|
91
|
+
)}?${ORIGINAL_QUERY_PARAM}=true");`,
|
|
94
92
|
`}`
|
|
95
93
|
]
|
|
96
94
|
.filter(line => typeof line === "string")
|
|
@@ -166,41 +164,6 @@ function resolveEntryForProject({
|
|
|
166
164
|
return resolution;
|
|
167
165
|
}
|
|
168
166
|
|
|
169
|
-
case "nuxt": {
|
|
170
|
-
const rollupInput = config.build.rollupOptions?.input;
|
|
171
|
-
|
|
172
|
-
let entryPath: string;
|
|
173
|
-
|
|
174
|
-
if (typeof rollupInput === "string") {
|
|
175
|
-
entryPath = rollupInput;
|
|
176
|
-
} else if (Array.isArray(rollupInput)) {
|
|
177
|
-
assert(rollupInput.length > 0, "Nuxt rollupOptions.input array is empty");
|
|
178
|
-
entryPath = rollupInput[0];
|
|
179
|
-
} else if (rollupInput && typeof rollupInput === "object") {
|
|
180
|
-
const inputRecord = rollupInput;
|
|
181
|
-
assert(
|
|
182
|
-
Object.keys(inputRecord).length > 0,
|
|
183
|
-
"Nuxt rollupOptions.input object must contain at least one entry"
|
|
184
|
-
);
|
|
185
|
-
entryPath = Object.values(inputRecord)[0];
|
|
186
|
-
} else {
|
|
187
|
-
throw new Error(
|
|
188
|
-
"Could not resolve Nuxt entry point from Vite config. " +
|
|
189
|
-
"rollupOptions.input is undefined or has an unexpected type."
|
|
190
|
-
);
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
const normalized = normalizeAbsolute(entryPath);
|
|
194
|
-
|
|
195
|
-
const resolution: EntryResolution = {
|
|
196
|
-
absolutePath: entryPath,
|
|
197
|
-
normalizedPath: normalized,
|
|
198
|
-
watchFiles: []
|
|
199
|
-
};
|
|
200
|
-
|
|
201
|
-
return resolution;
|
|
202
|
-
}
|
|
203
|
-
|
|
204
167
|
case "other": {
|
|
205
168
|
const candidate = resolveCandidate({
|
|
206
169
|
root,
|
|
@@ -11,10 +11,6 @@ export function manageOptimizedDeps(params: {
|
|
|
11
11
|
}): UserConfig {
|
|
12
12
|
const { userConfig, projectType } = params;
|
|
13
13
|
|
|
14
|
-
if (projectType === "other") {
|
|
15
|
-
return userConfig;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
14
|
const packageJsonParsed = JSON.parse(
|
|
19
15
|
fs.readFileSync(pathJoin(getThisCodebaseRootDirPath(), "package.json")).toString("utf8")
|
|
20
16
|
) as { name: string; exports: Record<string, { module?: string }> };
|
|
@@ -24,8 +20,8 @@ export function manageOptimizedDeps(params: {
|
|
|
24
20
|
.map(([key]) => key.replace(/^\./, packageJsonParsed.name));
|
|
25
21
|
|
|
26
22
|
switch (projectType) {
|
|
23
|
+
case "other":
|
|
27
24
|
case "tanstack-start":
|
|
28
|
-
case "nuxt":
|
|
29
25
|
{
|
|
30
26
|
((userConfig.optimizeDeps ??= {}).exclude ??= []).push(...[...moduleNames, "zod"]);
|
|
31
27
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type ProjectType = "tanstack-start" | "react-router-framework" | "
|
|
1
|
+
export type ProjectType = "tanstack-start" | "react-router-framework" | "other";
|
|
2
2
|
|
|
3
3
|
export function getProjectType(params: { pluginNames: string[] }) {
|
|
4
4
|
const pluginNames = new Set(params.pluginNames);
|
|
@@ -14,13 +14,5 @@ export function getProjectType(params: { pluginNames: string[] }) {
|
|
|
14
14
|
return "react-router-framework";
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
if (
|
|
18
|
-
Array.from(pluginNames).some(
|
|
19
|
-
pluginName => pluginName.startsWith("nuxt:") || pluginName.startsWith("nuxt-")
|
|
20
|
-
)
|
|
21
|
-
) {
|
|
22
|
-
return "nuxt";
|
|
23
|
-
}
|
|
24
|
-
|
|
25
17
|
return "other";
|
|
26
18
|
}
|
|
@@ -59,8 +59,10 @@ function createLoadHandleEntrypoint(params) {
|
|
|
59
59
|
const { id, pluginContext } = params;
|
|
60
60
|
const { path: rawPath, queryParams } = splitId(id);
|
|
61
61
|
const normalizedRequestPath = normalizeRequestPath(rawPath);
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
if (!normalizedRequestPath) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
if (normalizedRequestPath !== entryResolution.normalizedPath) {
|
|
64
66
|
return null;
|
|
65
67
|
}
|
|
66
68
|
const isOriginalRequest = queryParams.getAll(ORIGINAL_QUERY_PARAM).includes("true");
|
|
@@ -70,7 +72,6 @@ function createLoadHandleEntrypoint(params) {
|
|
|
70
72
|
entryResolution.watchFiles.forEach(file => pluginContext.addWatchFile(file));
|
|
71
73
|
const { freezeFetch, freezeXMLHttpRequest, freezeWebSocket, freezePromise, safeMode, ...rest } = oidcSpaVitePluginParams ?? {};
|
|
72
74
|
assert_1.assert;
|
|
73
|
-
const originalEntryImport = `import("./${path.basename(entryResolution.absolutePath)}?${ORIGINAL_QUERY_PARAM}=true")`;
|
|
74
75
|
const stubSourceCache = [
|
|
75
76
|
`import { oidcEarlyInit } from "oidc-spa/entrypoint";`,
|
|
76
77
|
projectType === "tanstack-start" &&
|
|
@@ -88,7 +89,7 @@ function createLoadHandleEntrypoint(params) {
|
|
|
88
89
|
`if(shouldLoadApp){`,
|
|
89
90
|
projectType === "tanstack-start" &&
|
|
90
91
|
` preventConsoleLoggingOfUnifiedClientRetryForSsrLoadersError();`,
|
|
91
|
-
`
|
|
92
|
+
` import("./${path.basename(entryResolution.absolutePath)}?${ORIGINAL_QUERY_PARAM}=true");`,
|
|
92
93
|
`}`
|
|
93
94
|
]
|
|
94
95
|
.filter(line => typeof line === "string")
|
|
@@ -142,33 +143,6 @@ function resolveEntryForProject({ config, projectType }) {
|
|
|
142
143
|
};
|
|
143
144
|
return resolution;
|
|
144
145
|
}
|
|
145
|
-
case "nuxt": {
|
|
146
|
-
const rollupInput = config.build.rollupOptions?.input;
|
|
147
|
-
let entryPath;
|
|
148
|
-
if (typeof rollupInput === "string") {
|
|
149
|
-
entryPath = rollupInput;
|
|
150
|
-
}
|
|
151
|
-
else if (Array.isArray(rollupInput)) {
|
|
152
|
-
(0, assert_1.assert)(rollupInput.length > 0, "Nuxt rollupOptions.input array is empty");
|
|
153
|
-
entryPath = rollupInput[0];
|
|
154
|
-
}
|
|
155
|
-
else if (rollupInput && typeof rollupInput === "object") {
|
|
156
|
-
const inputRecord = rollupInput;
|
|
157
|
-
(0, assert_1.assert)(Object.keys(inputRecord).length > 0, "Nuxt rollupOptions.input object must contain at least one entry");
|
|
158
|
-
entryPath = Object.values(inputRecord)[0];
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
throw new Error("Could not resolve Nuxt entry point from Vite config. " +
|
|
162
|
-
"rollupOptions.input is undefined or has an unexpected type.");
|
|
163
|
-
}
|
|
164
|
-
const normalized = normalizeAbsolute(entryPath);
|
|
165
|
-
const resolution = {
|
|
166
|
-
absolutePath: entryPath,
|
|
167
|
-
normalizedPath: normalized,
|
|
168
|
-
watchFiles: []
|
|
169
|
-
};
|
|
170
|
-
return resolution;
|
|
171
|
-
}
|
|
172
146
|
case "other": {
|
|
173
147
|
const candidate = resolveCandidate({
|
|
174
148
|
root,
|
|
@@ -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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"}
|
|
@@ -41,16 +41,13 @@ const assert_1 = require("../tools/tsafe/assert");
|
|
|
41
41
|
function manageOptimizedDeps(params) {
|
|
42
42
|
var _a, _b;
|
|
43
43
|
const { userConfig, projectType } = params;
|
|
44
|
-
if (projectType === "other") {
|
|
45
|
-
return userConfig;
|
|
46
|
-
}
|
|
47
44
|
const packageJsonParsed = JSON.parse(fs.readFileSync((0, path_1.join)((0, getThisCodebaseRootDirPath_cjs_1.getThisCodebaseRootDirPath)(), "package.json")).toString("utf8"));
|
|
48
45
|
const moduleNames = Object.entries(packageJsonParsed.exports)
|
|
49
46
|
.filter(([, value]) => value.module !== undefined)
|
|
50
47
|
.map(([key]) => key.replace(/^\./, packageJsonParsed.name));
|
|
51
48
|
switch (projectType) {
|
|
49
|
+
case "other":
|
|
52
50
|
case "tanstack-start":
|
|
53
|
-
case "nuxt":
|
|
54
51
|
{
|
|
55
52
|
((_a = (userConfig.optimizeDeps ?? (userConfig.optimizeDeps = {}))).exclude ?? (_a.exclude = [])).push(...[...moduleNames, "zod"]);
|
|
56
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manageOptimizedDeps.js","sourceRoot":"","sources":["../src/vite-plugin/manageOptimizedDeps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"manageOptimizedDeps.js","sourceRoot":"","sources":["../src/vite-plugin/manageOptimizedDeps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAwDC;AA9DD,4FAAqF;AACrF,4CAA8B;AAC9B,+BAAwC;AAExC,kDAA+C;AAE/C,SAAgB,mBAAmB,CAAC,MAGnC;;IACG,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAChC,EAAE,CAAC,YAAY,CAAC,IAAA,WAAQ,EAAC,IAAA,2DAA0B,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CACzB,CAAC;IAEpE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC;SACxD,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;SACjD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhE,QAAQ,WAAW,EAAE,CAAC;QAClB,KAAK,OAAO,CAAC;QACb,KAAK,gBAAgB;YACjB,CAAC;gBACG,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;YACvF,CAAC;YACD,MAAM;QACV,KAAK,wBAAwB;YACzB,CAAC;gBACG,MAAM,mBAAmB,GAAG;oBACxB,oBAAoB;oBACpB,qBAAqB;oBACrB,mBAAmB;oBACnB,eAAe;iBAClB,CAAC;gBAEF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;oBAC3C,IAAA,eAAM,EAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;oBACzB,IAAI,CAAC;wBACD,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBACxC,CAAC;oBAAC,MAAM,CAAC;wBACL,OAAO,KAAK,CAAC;oBACjB,CAAC;oBAED,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,EAAE,CAAC;gBAEL,IAAI,cAAc,EAAE,CAAC;oBACjB,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,CAAC;gBAED,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAErC,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;YACnF,CAAC;YACD,MAAM;IACd,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type ProjectType = "tanstack-start" | "react-router-framework" | "
|
|
1
|
+
export type ProjectType = "tanstack-start" | "react-router-framework" | "other";
|
|
2
2
|
export declare function getProjectType(params: {
|
|
3
3
|
pluginNames: string[];
|
|
4
|
-
}): "tanstack-start" | "react-router-framework" | "
|
|
4
|
+
}): "tanstack-start" | "react-router-framework" | "other";
|
|
@@ -10,9 +10,6 @@ function getProjectType(params) {
|
|
|
10
10
|
Array.from(pluginNames).some(pluginName => pluginName.startsWith("react-router:"))) {
|
|
11
11
|
return "react-router-framework";
|
|
12
12
|
}
|
|
13
|
-
if (Array.from(pluginNames).some(pluginName => pluginName.startsWith("nuxt:") || pluginName.startsWith("nuxt-"))) {
|
|
14
|
-
return "nuxt";
|
|
15
|
-
}
|
|
16
13
|
return "other";
|
|
17
14
|
}
|
|
18
15
|
//# sourceMappingURL=projectType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectType.js","sourceRoot":"","sources":["../src/vite-plugin/projectType.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"projectType.js","sourceRoot":"","sources":["../src/vite-plugin/projectType.ts"],"names":[],"mappings":";;AAEA,wCAeC;AAfD,SAAgB,cAAc,CAAC,MAAiC;IAC5D,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEhD,IAAI,WAAW,CAAC,GAAG,CAAC,6BAA6B,CAAC,EAAE,CAAC;QACjD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,IACI,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EACpF,CAAC;QACC,OAAO,wBAAwB,CAAC;IACpC,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC"}
|