@uniformdev/canvas-next-rsc 19.211.1-alpha.2 → 19.212.2-alpha.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/dist/{UniformComposition-D_HC6rSo.d.mts → UniformComposition-IWWzoI_H.d.mts} +3 -2
- package/dist/{UniformComposition-D_HC6rSo.d.ts → UniformComposition-IWWzoI_H.d.ts} +3 -2
- package/dist/component.d.mts +11 -11
- package/dist/component.d.ts +11 -11
- package/dist/config.js +16 -43
- package/dist/config.mjs +16 -43
- package/dist/handler.js +2 -2
- package/dist/handler.mjs +2 -2
- package/dist/index.d.mts +28 -16
- package/dist/index.d.ts +28 -16
- package/dist/index.esm.js +65 -62
- package/dist/index.js +58 -52
- package/dist/index.mjs +65 -62
- package/package.json +16 -16
package/dist/index.esm.js
CHANGED
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
|
|
14
14
|
} from "@uniformdev/canvas";
|
|
15
15
|
import { draftMode } from "next/headers";
|
|
16
|
-
var isDraftModeEnabled =
|
|
16
|
+
var isDraftModeEnabled = ({
|
|
17
17
|
searchParams
|
|
18
18
|
}) => {
|
|
19
19
|
if (isDevelopmentEnvironment()) {
|
|
@@ -21,7 +21,7 @@ var isDraftModeEnabled = async ({
|
|
|
21
21
|
}
|
|
22
22
|
let draftModeEnabled = false;
|
|
23
23
|
try {
|
|
24
|
-
draftModeEnabled =
|
|
24
|
+
draftModeEnabled = draftMode().isEnabled;
|
|
25
25
|
} catch (e) {
|
|
26
26
|
}
|
|
27
27
|
return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
|
|
@@ -63,8 +63,8 @@ var isDevelopmentEnvironment = () => {
|
|
|
63
63
|
var getServerConfig = () => {
|
|
64
64
|
return serverConfig;
|
|
65
65
|
};
|
|
66
|
-
var shouldCacheBeDisabled =
|
|
67
|
-
if (
|
|
66
|
+
var shouldCacheBeDisabled = (options) => {
|
|
67
|
+
if (isDraftModeEnabled(options)) {
|
|
68
68
|
return { disabled: true, reason: "DRAFT" };
|
|
69
69
|
}
|
|
70
70
|
if (isIncontextEditingEnabled(options)) {
|
|
@@ -78,8 +78,8 @@ var shouldCacheBeDisabled = async (options) => {
|
|
|
78
78
|
reason: void 0
|
|
79
79
|
};
|
|
80
80
|
};
|
|
81
|
-
var getCanvasCacheStrategy =
|
|
82
|
-
const { disabled, reason } =
|
|
81
|
+
var getCanvasCacheStrategy = (options) => {
|
|
82
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
83
83
|
const config = getServerConfig();
|
|
84
84
|
if (disabled) {
|
|
85
85
|
if (reason === "DEV" && config.canvasCache) {
|
|
@@ -98,8 +98,8 @@ var getCanvasCacheStrategy = async (options) => {
|
|
|
98
98
|
type: "force-cache"
|
|
99
99
|
};
|
|
100
100
|
};
|
|
101
|
-
var getManifestCacheStrategy =
|
|
102
|
-
const { disabled, reason } =
|
|
101
|
+
var getManifestCacheStrategy = (options) => {
|
|
102
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
103
103
|
const config = getServerConfig();
|
|
104
104
|
if (disabled) {
|
|
105
105
|
if (reason === "DEV" && config.manifestCache) {
|
|
@@ -117,8 +117,8 @@ var getManifestCacheStrategy = async (options) => {
|
|
|
117
117
|
type: "force-cache"
|
|
118
118
|
};
|
|
119
119
|
};
|
|
120
|
-
var getProjectMapCacheStrategy =
|
|
121
|
-
const { disabled, reason } =
|
|
120
|
+
var getProjectMapCacheStrategy = (options) => {
|
|
121
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
122
122
|
const config = getServerConfig();
|
|
123
123
|
if (disabled) {
|
|
124
124
|
if (reason === "DEV" && config.projectMapCache) {
|
|
@@ -227,9 +227,13 @@ var getCanvasClient = (options) => {
|
|
|
227
227
|
}
|
|
228
228
|
});
|
|
229
229
|
};
|
|
230
|
-
var getDefaultCanvasClient =
|
|
230
|
+
var getDefaultCanvasClient = ({
|
|
231
|
+
searchParams
|
|
232
|
+
}) => {
|
|
231
233
|
return getCanvasClient({
|
|
232
|
-
cache:
|
|
234
|
+
cache: getCanvasCacheStrategy({
|
|
235
|
+
searchParams
|
|
236
|
+
})
|
|
233
237
|
});
|
|
234
238
|
};
|
|
235
239
|
|
|
@@ -258,13 +262,19 @@ var getManifestClient = (options) => {
|
|
|
258
262
|
});
|
|
259
263
|
return manifestClient;
|
|
260
264
|
};
|
|
261
|
-
var getDefaultManifestClient =
|
|
265
|
+
var getDefaultManifestClient = ({
|
|
266
|
+
searchParams
|
|
267
|
+
}) => {
|
|
262
268
|
return getManifestClient({
|
|
263
|
-
cache:
|
|
269
|
+
cache: getManifestCacheStrategy({
|
|
270
|
+
searchParams
|
|
271
|
+
})
|
|
264
272
|
});
|
|
265
273
|
};
|
|
266
|
-
var getManifest =
|
|
267
|
-
const manifestClient =
|
|
274
|
+
var getManifest = ({ searchParams }) => {
|
|
275
|
+
const manifestClient = getDefaultManifestClient({
|
|
276
|
+
searchParams
|
|
277
|
+
});
|
|
268
278
|
return manifestClient.get();
|
|
269
279
|
};
|
|
270
280
|
|
|
@@ -292,9 +302,13 @@ var getProjectMapClient = (options) => {
|
|
|
292
302
|
});
|
|
293
303
|
return manifestClient;
|
|
294
304
|
};
|
|
295
|
-
var getDefaultProjectMapClient =
|
|
305
|
+
var getDefaultProjectMapClient = ({
|
|
306
|
+
searchParams
|
|
307
|
+
}) => {
|
|
296
308
|
return getProjectMapClient({
|
|
297
|
-
cache:
|
|
309
|
+
cache: getProjectMapCacheStrategy({
|
|
310
|
+
searchParams
|
|
311
|
+
})
|
|
298
312
|
});
|
|
299
313
|
};
|
|
300
314
|
|
|
@@ -345,9 +359,11 @@ var getRouteClient = (options) => {
|
|
|
345
359
|
});
|
|
346
360
|
return client;
|
|
347
361
|
};
|
|
348
|
-
var getDefaultRouteClient =
|
|
362
|
+
var getDefaultRouteClient = ({ searchParams }) => {
|
|
349
363
|
return getRouteClient({
|
|
350
|
-
cache:
|
|
364
|
+
cache: getCanvasCacheStrategy({
|
|
365
|
+
searchParams
|
|
366
|
+
})
|
|
351
367
|
});
|
|
352
368
|
};
|
|
353
369
|
|
|
@@ -442,12 +458,11 @@ var createServerUniformContext = async (options) => {
|
|
|
442
458
|
var createServerUniformContextFromManifest = async (options) => {
|
|
443
459
|
var _a, _b, _c;
|
|
444
460
|
const quirksEnabled = (_a = getServerConfig().experimental) == null ? void 0 : _a.quirkSerialization;
|
|
445
|
-
const cookieValues = await cookies();
|
|
446
461
|
const context = createUniformContext({
|
|
447
462
|
...options || {},
|
|
448
|
-
serverCookieValue: (_b =
|
|
463
|
+
serverCookieValue: (_b = cookies().get(UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
|
|
449
464
|
experimental_quirksEnabled: quirksEnabled,
|
|
450
|
-
quirkCookieValue: quirksEnabled ? (_c =
|
|
465
|
+
quirkCookieValue: quirksEnabled ? (_c = cookies().get(UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
|
|
451
466
|
});
|
|
452
467
|
return context;
|
|
453
468
|
};
|
|
@@ -459,10 +474,7 @@ import {
|
|
|
459
474
|
CANVAS_PUBLISHED_STATE,
|
|
460
475
|
getDataSourceVariantFromRouteGetParams
|
|
461
476
|
} from "@uniformdev/canvas";
|
|
462
|
-
import {
|
|
463
|
-
getBaseUrl,
|
|
464
|
-
resolvePath
|
|
465
|
-
} from "@uniformdev/canvas-next-rsc-shared";
|
|
477
|
+
import { getBaseUrl, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
|
|
466
478
|
import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
|
|
467
479
|
var retrieveCompositionBySlug = async ({
|
|
468
480
|
slug,
|
|
@@ -479,12 +491,12 @@ var retrieveCompositionBySlug = async ({
|
|
|
479
491
|
});
|
|
480
492
|
}
|
|
481
493
|
let result;
|
|
482
|
-
const states =
|
|
494
|
+
const states = determineState({
|
|
483
495
|
searchParams
|
|
484
496
|
});
|
|
485
497
|
for (let i = 0; i < states.length; i++) {
|
|
486
498
|
const state = states[i];
|
|
487
|
-
const canvasClient =
|
|
499
|
+
const canvasClient = getDefaultCanvasClient({
|
|
488
500
|
searchParams
|
|
489
501
|
});
|
|
490
502
|
try {
|
|
@@ -513,17 +525,16 @@ var retrieveCompositionBySlug = async ({
|
|
|
513
525
|
type: "notFound"
|
|
514
526
|
};
|
|
515
527
|
};
|
|
516
|
-
var retrieveRoute = async ({ params, searchParams
|
|
517
|
-
const searchParams = await providedSearchParams;
|
|
528
|
+
var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
|
|
518
529
|
if (!skipPrefetch) {
|
|
519
530
|
void getManifest({
|
|
520
531
|
searchParams
|
|
521
532
|
});
|
|
522
533
|
}
|
|
523
534
|
const { value } = resolvePath({
|
|
524
|
-
params
|
|
535
|
+
params
|
|
525
536
|
});
|
|
526
|
-
const states =
|
|
537
|
+
const states = determineState({
|
|
527
538
|
searchParams
|
|
528
539
|
});
|
|
529
540
|
let result;
|
|
@@ -560,7 +571,7 @@ var retrieveRouteByPath = async ({
|
|
|
560
571
|
releaseId
|
|
561
572
|
}) => {
|
|
562
573
|
var _a;
|
|
563
|
-
const client =
|
|
574
|
+
const client = getDefaultRouteClient({
|
|
564
575
|
searchParams
|
|
565
576
|
});
|
|
566
577
|
let queryPath = path;
|
|
@@ -592,10 +603,8 @@ var resolveRedirectHref = (resolveResult, path) => {
|
|
|
592
603
|
const url = new URL(expandedUrl);
|
|
593
604
|
return url.pathname;
|
|
594
605
|
};
|
|
595
|
-
var determineState =
|
|
596
|
-
const
|
|
597
|
-
searchParams
|
|
598
|
-
});
|
|
606
|
+
var determineState = ({ searchParams }) => {
|
|
607
|
+
const draftMode2 = isDraftModeEnabled({ searchParams });
|
|
599
608
|
const previewEnvironment = isOnVercelPreviewEnvironment();
|
|
600
609
|
const isDevelopment = isDevelopmentEnvironment();
|
|
601
610
|
const isCanvasEditing = isIncontextEditingEnabled({
|
|
@@ -605,7 +614,7 @@ var determineState = async ({ searchParams }) => {
|
|
|
605
614
|
if (isCanvasEditing) {
|
|
606
615
|
states = [CANVAS_EDITOR_STATE, CANVAS_DRAFT_STATE];
|
|
607
616
|
} else {
|
|
608
|
-
states =
|
|
617
|
+
states = draftMode2 || previewEnvironment || isDevelopment ? [CANVAS_DRAFT_STATE] : [CANVAS_PUBLISHED_STATE];
|
|
609
618
|
}
|
|
610
619
|
return states;
|
|
611
620
|
};
|
|
@@ -613,9 +622,7 @@ var determineReleaseId = ({
|
|
|
613
622
|
searchParams,
|
|
614
623
|
state
|
|
615
624
|
}) => {
|
|
616
|
-
const draftMode2 = isDraftModeEnabled({
|
|
617
|
-
searchParams
|
|
618
|
-
});
|
|
625
|
+
const draftMode2 = isDraftModeEnabled({ searchParams });
|
|
619
626
|
if (!draftMode2 || state === CANVAS_PUBLISHED_STATE) {
|
|
620
627
|
return void 0;
|
|
621
628
|
}
|
|
@@ -756,15 +763,12 @@ var UniformComposition = async ({
|
|
|
756
763
|
if (props.mode === "static") {
|
|
757
764
|
searchParams = void 0;
|
|
758
765
|
} else if (props.mode === "server") {
|
|
759
|
-
searchParams = await props.searchParams;
|
|
760
766
|
serverContext = props.serverContext || await createServerUniformContext({
|
|
761
|
-
searchParams
|
|
767
|
+
searchParams: props.searchParams
|
|
762
768
|
});
|
|
769
|
+
searchParams = props.searchParams;
|
|
763
770
|
}
|
|
764
|
-
const
|
|
765
|
-
const { value: path } = resolvePath2({
|
|
766
|
-
params: awaitedParams
|
|
767
|
-
});
|
|
771
|
+
const { value: path } = resolvePath2(props);
|
|
768
772
|
if (!route || route.type === "notFound") {
|
|
769
773
|
notFound();
|
|
770
774
|
}
|
|
@@ -798,7 +802,7 @@ var UniformComposition = async ({
|
|
|
798
802
|
dynamicInputs: route.dynamicInputs,
|
|
799
803
|
type: "composition",
|
|
800
804
|
isContextualEditing: isIncontextEditingEnabled({ searchParams }),
|
|
801
|
-
isDraftMode:
|
|
805
|
+
isDraftMode: isDraftModeEnabled({ searchParams }),
|
|
802
806
|
state: route.compositionApiResponse.state,
|
|
803
807
|
path,
|
|
804
808
|
previewMode: determinePreviewMode({ searchParams })
|
|
@@ -813,14 +817,14 @@ var UniformComposition = async ({
|
|
|
813
817
|
});
|
|
814
818
|
let transfer = null;
|
|
815
819
|
if (props.mode === "server") {
|
|
816
|
-
const headersValue =
|
|
820
|
+
const headersValue = headers();
|
|
817
821
|
const missingQuirkValue = "unknown";
|
|
818
822
|
transfer = createElement3(ContextUpdateTransfer, {
|
|
819
823
|
serverContext,
|
|
820
824
|
update: {
|
|
821
|
-
params:
|
|
825
|
+
params: props.params,
|
|
822
826
|
searchParams,
|
|
823
|
-
cookies:
|
|
827
|
+
cookies: cookies2().getAll().reduce(
|
|
824
828
|
(acc, cookie) => {
|
|
825
829
|
acc[cookie.name] = cookie.value;
|
|
826
830
|
return acc;
|
|
@@ -1115,7 +1119,7 @@ import {
|
|
|
1115
1119
|
UniformScript
|
|
1116
1120
|
} from "@uniformdev/canvas-next-rsc-client";
|
|
1117
1121
|
import { Suspense as Suspense2 } from "react";
|
|
1118
|
-
import
|
|
1122
|
+
import React8 from "react";
|
|
1119
1123
|
var UniformContext = async ({
|
|
1120
1124
|
clientContextComponent,
|
|
1121
1125
|
children
|
|
@@ -1129,7 +1133,7 @@ var UniformContext = async ({
|
|
|
1129
1133
|
const disableDevTools = ((_a = serverConfig2.context) == null ? void 0 : _a.disableDevTools) || false;
|
|
1130
1134
|
const defaultConsent = serverConfig2.defaultConsent || false;
|
|
1131
1135
|
const experimentalQuirkSerialization = ((_b = serverConfig2.experimental) == null ? void 0 : _b.quirkSerialization) || false;
|
|
1132
|
-
return /* @__PURE__ */
|
|
1136
|
+
return /* @__PURE__ */ React8.createElement(React8.Fragment, null, children, /* @__PURE__ */ React8.createElement(
|
|
1133
1137
|
ContextComponent,
|
|
1134
1138
|
{
|
|
1135
1139
|
manifest,
|
|
@@ -1137,19 +1141,18 @@ var UniformContext = async ({
|
|
|
1137
1141
|
defaultConsent,
|
|
1138
1142
|
experimentalQuirkSerialization
|
|
1139
1143
|
}
|
|
1140
|
-
), /* @__PURE__ */
|
|
1144
|
+
), /* @__PURE__ */ React8.createElement(Suspense2, { fallback: /* @__PURE__ */ React8.createElement(React8.Fragment, null) }, /* @__PURE__ */ React8.createElement(UniformScript, null)));
|
|
1141
1145
|
};
|
|
1142
1146
|
|
|
1143
1147
|
// src/components/UniformPlayground.tsx
|
|
1144
1148
|
import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3, CANVAS_EDITOR_STATE as CANVAS_EDITOR_STATE3 } from "@uniformdev/canvas";
|
|
1145
1149
|
import { notFound as notFound2 } from "next/navigation";
|
|
1146
|
-
import
|
|
1150
|
+
import React9 from "react";
|
|
1147
1151
|
var UniformPlayground = async ({ searchParams, ...rest }) => {
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
return /* @__PURE__ */ React10.createElement("div", null, /* @__PURE__ */ React10.createElement("h1", null, "Playground is only available in draft mode"));
|
|
1152
|
+
if (!isDraftModeEnabled({ searchParams })) {
|
|
1153
|
+
return /* @__PURE__ */ React9.createElement("div", null, /* @__PURE__ */ React9.createElement("h1", null, "Playground is only available in draft mode"));
|
|
1151
1154
|
}
|
|
1152
|
-
const id =
|
|
1155
|
+
const id = searchParams["id"];
|
|
1153
1156
|
if (!id) {
|
|
1154
1157
|
notFound2();
|
|
1155
1158
|
}
|
|
@@ -1178,11 +1181,11 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
|
|
|
1178
1181
|
if (!composition) {
|
|
1179
1182
|
notFound2();
|
|
1180
1183
|
}
|
|
1181
|
-
return /* @__PURE__ */
|
|
1184
|
+
return /* @__PURE__ */ React9.createElement(
|
|
1182
1185
|
UniformComposition,
|
|
1183
1186
|
{
|
|
1184
1187
|
mode: "server",
|
|
1185
|
-
params:
|
|
1188
|
+
params: {},
|
|
1186
1189
|
searchParams,
|
|
1187
1190
|
route: {
|
|
1188
1191
|
type: "composition",
|
package/dist/index.js
CHANGED
|
@@ -66,7 +66,7 @@ var import_uniform_server = __toESM(require("uniform.server.config"));
|
|
|
66
66
|
// src/utils/draft.ts
|
|
67
67
|
var import_canvas = require("@uniformdev/canvas");
|
|
68
68
|
var import_headers = require("next/headers");
|
|
69
|
-
var isDraftModeEnabled =
|
|
69
|
+
var isDraftModeEnabled = ({
|
|
70
70
|
searchParams
|
|
71
71
|
}) => {
|
|
72
72
|
if (isDevelopmentEnvironment()) {
|
|
@@ -74,7 +74,7 @@ var isDraftModeEnabled = async ({
|
|
|
74
74
|
}
|
|
75
75
|
let draftModeEnabled = false;
|
|
76
76
|
try {
|
|
77
|
-
draftModeEnabled = (
|
|
77
|
+
draftModeEnabled = (0, import_headers.draftMode)().isEnabled;
|
|
78
78
|
} catch (e) {
|
|
79
79
|
}
|
|
80
80
|
return draftModeEnabled || isIncontextEditingEnabled({ searchParams });
|
|
@@ -116,8 +116,8 @@ var isDevelopmentEnvironment = () => {
|
|
|
116
116
|
var getServerConfig = () => {
|
|
117
117
|
return import_uniform_server.default;
|
|
118
118
|
};
|
|
119
|
-
var shouldCacheBeDisabled =
|
|
120
|
-
if (
|
|
119
|
+
var shouldCacheBeDisabled = (options) => {
|
|
120
|
+
if (isDraftModeEnabled(options)) {
|
|
121
121
|
return { disabled: true, reason: "DRAFT" };
|
|
122
122
|
}
|
|
123
123
|
if (isIncontextEditingEnabled(options)) {
|
|
@@ -131,8 +131,8 @@ var shouldCacheBeDisabled = async (options) => {
|
|
|
131
131
|
reason: void 0
|
|
132
132
|
};
|
|
133
133
|
};
|
|
134
|
-
var getCanvasCacheStrategy =
|
|
135
|
-
const { disabled, reason } =
|
|
134
|
+
var getCanvasCacheStrategy = (options) => {
|
|
135
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
136
136
|
const config = getServerConfig();
|
|
137
137
|
if (disabled) {
|
|
138
138
|
if (reason === "DEV" && config.canvasCache) {
|
|
@@ -151,8 +151,8 @@ var getCanvasCacheStrategy = async (options) => {
|
|
|
151
151
|
type: "force-cache"
|
|
152
152
|
};
|
|
153
153
|
};
|
|
154
|
-
var getManifestCacheStrategy =
|
|
155
|
-
const { disabled, reason } =
|
|
154
|
+
var getManifestCacheStrategy = (options) => {
|
|
155
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
156
156
|
const config = getServerConfig();
|
|
157
157
|
if (disabled) {
|
|
158
158
|
if (reason === "DEV" && config.manifestCache) {
|
|
@@ -170,8 +170,8 @@ var getManifestCacheStrategy = async (options) => {
|
|
|
170
170
|
type: "force-cache"
|
|
171
171
|
};
|
|
172
172
|
};
|
|
173
|
-
var getProjectMapCacheStrategy =
|
|
174
|
-
const { disabled, reason } =
|
|
173
|
+
var getProjectMapCacheStrategy = (options) => {
|
|
174
|
+
const { disabled, reason } = shouldCacheBeDisabled(options);
|
|
175
175
|
const config = getServerConfig();
|
|
176
176
|
if (disabled) {
|
|
177
177
|
if (reason === "DEV" && config.projectMapCache) {
|
|
@@ -280,9 +280,13 @@ var getCanvasClient = (options) => {
|
|
|
280
280
|
}
|
|
281
281
|
});
|
|
282
282
|
};
|
|
283
|
-
var getDefaultCanvasClient =
|
|
283
|
+
var getDefaultCanvasClient = ({
|
|
284
|
+
searchParams
|
|
285
|
+
}) => {
|
|
284
286
|
return getCanvasClient({
|
|
285
|
-
cache:
|
|
287
|
+
cache: getCanvasCacheStrategy({
|
|
288
|
+
searchParams
|
|
289
|
+
})
|
|
286
290
|
});
|
|
287
291
|
};
|
|
288
292
|
|
|
@@ -311,13 +315,19 @@ var getManifestClient = (options) => {
|
|
|
311
315
|
});
|
|
312
316
|
return manifestClient;
|
|
313
317
|
};
|
|
314
|
-
var getDefaultManifestClient =
|
|
318
|
+
var getDefaultManifestClient = ({
|
|
319
|
+
searchParams
|
|
320
|
+
}) => {
|
|
315
321
|
return getManifestClient({
|
|
316
|
-
cache:
|
|
322
|
+
cache: getManifestCacheStrategy({
|
|
323
|
+
searchParams
|
|
324
|
+
})
|
|
317
325
|
});
|
|
318
326
|
};
|
|
319
|
-
var getManifest =
|
|
320
|
-
const manifestClient =
|
|
327
|
+
var getManifest = ({ searchParams }) => {
|
|
328
|
+
const manifestClient = getDefaultManifestClient({
|
|
329
|
+
searchParams
|
|
330
|
+
});
|
|
321
331
|
return manifestClient.get();
|
|
322
332
|
};
|
|
323
333
|
|
|
@@ -345,9 +355,13 @@ var getProjectMapClient = (options) => {
|
|
|
345
355
|
});
|
|
346
356
|
return manifestClient;
|
|
347
357
|
};
|
|
348
|
-
var getDefaultProjectMapClient =
|
|
358
|
+
var getDefaultProjectMapClient = ({
|
|
359
|
+
searchParams
|
|
360
|
+
}) => {
|
|
349
361
|
return getProjectMapClient({
|
|
350
|
-
cache:
|
|
362
|
+
cache: getProjectMapCacheStrategy({
|
|
363
|
+
searchParams
|
|
364
|
+
})
|
|
351
365
|
});
|
|
352
366
|
};
|
|
353
367
|
|
|
@@ -398,9 +412,11 @@ var getRouteClient = (options) => {
|
|
|
398
412
|
});
|
|
399
413
|
return client;
|
|
400
414
|
};
|
|
401
|
-
var getDefaultRouteClient =
|
|
415
|
+
var getDefaultRouteClient = ({ searchParams }) => {
|
|
402
416
|
return getRouteClient({
|
|
403
|
-
cache:
|
|
417
|
+
cache: getCanvasCacheStrategy({
|
|
418
|
+
searchParams
|
|
419
|
+
})
|
|
404
420
|
});
|
|
405
421
|
};
|
|
406
422
|
|
|
@@ -478,12 +494,11 @@ var createServerUniformContext = async (options) => {
|
|
|
478
494
|
var createServerUniformContextFromManifest = async (options) => {
|
|
479
495
|
var _a, _b, _c;
|
|
480
496
|
const quirksEnabled = (_a = getServerConfig().experimental) == null ? void 0 : _a.quirkSerialization;
|
|
481
|
-
const cookieValues = await (0, import_headers2.cookies)();
|
|
482
497
|
const context = (0, import_canvas_next_rsc_shared.createUniformContext)({
|
|
483
498
|
...options || {},
|
|
484
|
-
serverCookieValue: (_b =
|
|
499
|
+
serverCookieValue: (_b = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_COOKIE_NAME)) == null ? void 0 : _b.value,
|
|
485
500
|
experimental_quirksEnabled: quirksEnabled,
|
|
486
|
-
quirkCookieValue: quirksEnabled ? (_c =
|
|
501
|
+
quirkCookieValue: quirksEnabled ? (_c = (0, import_headers2.cookies)().get(import_context.UNIFORM_DEFAULT_QUIRK_COOKIE_NAME)) == null ? void 0 : _c.value : void 0
|
|
487
502
|
});
|
|
488
503
|
return context;
|
|
489
504
|
};
|
|
@@ -507,12 +522,12 @@ var retrieveCompositionBySlug = async ({
|
|
|
507
522
|
});
|
|
508
523
|
}
|
|
509
524
|
let result;
|
|
510
|
-
const states =
|
|
525
|
+
const states = determineState({
|
|
511
526
|
searchParams
|
|
512
527
|
});
|
|
513
528
|
for (let i = 0; i < states.length; i++) {
|
|
514
529
|
const state = states[i];
|
|
515
|
-
const canvasClient =
|
|
530
|
+
const canvasClient = getDefaultCanvasClient({
|
|
516
531
|
searchParams
|
|
517
532
|
});
|
|
518
533
|
try {
|
|
@@ -541,17 +556,16 @@ var retrieveCompositionBySlug = async ({
|
|
|
541
556
|
type: "notFound"
|
|
542
557
|
};
|
|
543
558
|
};
|
|
544
|
-
var retrieveRoute = async ({ params, searchParams
|
|
545
|
-
const searchParams = await providedSearchParams;
|
|
559
|
+
var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
|
|
546
560
|
if (!skipPrefetch) {
|
|
547
561
|
void getManifest({
|
|
548
562
|
searchParams
|
|
549
563
|
});
|
|
550
564
|
}
|
|
551
565
|
const { value } = (0, import_canvas_next_rsc_shared2.resolvePath)({
|
|
552
|
-
params
|
|
566
|
+
params
|
|
553
567
|
});
|
|
554
|
-
const states =
|
|
568
|
+
const states = determineState({
|
|
555
569
|
searchParams
|
|
556
570
|
});
|
|
557
571
|
let result;
|
|
@@ -588,7 +602,7 @@ var retrieveRouteByPath = async ({
|
|
|
588
602
|
releaseId
|
|
589
603
|
}) => {
|
|
590
604
|
var _a;
|
|
591
|
-
const client =
|
|
605
|
+
const client = getDefaultRouteClient({
|
|
592
606
|
searchParams
|
|
593
607
|
});
|
|
594
608
|
let queryPath = path;
|
|
@@ -620,10 +634,8 @@ var resolveRedirectHref = (resolveResult, path) => {
|
|
|
620
634
|
const url = new URL(expandedUrl);
|
|
621
635
|
return url.pathname;
|
|
622
636
|
};
|
|
623
|
-
var determineState =
|
|
624
|
-
const
|
|
625
|
-
searchParams
|
|
626
|
-
});
|
|
637
|
+
var determineState = ({ searchParams }) => {
|
|
638
|
+
const draftMode2 = isDraftModeEnabled({ searchParams });
|
|
627
639
|
const previewEnvironment = isOnVercelPreviewEnvironment();
|
|
628
640
|
const isDevelopment = isDevelopmentEnvironment();
|
|
629
641
|
const isCanvasEditing = isIncontextEditingEnabled({
|
|
@@ -633,7 +645,7 @@ var determineState = async ({ searchParams }) => {
|
|
|
633
645
|
if (isCanvasEditing) {
|
|
634
646
|
states = [import_canvas4.CANVAS_EDITOR_STATE, import_canvas4.CANVAS_DRAFT_STATE];
|
|
635
647
|
} else {
|
|
636
|
-
states =
|
|
648
|
+
states = draftMode2 || previewEnvironment || isDevelopment ? [import_canvas4.CANVAS_DRAFT_STATE] : [import_canvas4.CANVAS_PUBLISHED_STATE];
|
|
637
649
|
}
|
|
638
650
|
return states;
|
|
639
651
|
};
|
|
@@ -641,9 +653,7 @@ var determineReleaseId = ({
|
|
|
641
653
|
searchParams,
|
|
642
654
|
state
|
|
643
655
|
}) => {
|
|
644
|
-
const draftMode2 = isDraftModeEnabled({
|
|
645
|
-
searchParams
|
|
646
|
-
});
|
|
656
|
+
const draftMode2 = isDraftModeEnabled({ searchParams });
|
|
647
657
|
if (!draftMode2 || state === import_canvas4.CANVAS_PUBLISHED_STATE) {
|
|
648
658
|
return void 0;
|
|
649
659
|
}
|
|
@@ -779,15 +789,12 @@ var UniformComposition = async ({
|
|
|
779
789
|
if (props.mode === "static") {
|
|
780
790
|
searchParams = void 0;
|
|
781
791
|
} else if (props.mode === "server") {
|
|
782
|
-
searchParams = await props.searchParams;
|
|
783
792
|
serverContext = props.serverContext || await createServerUniformContext({
|
|
784
|
-
searchParams
|
|
793
|
+
searchParams: props.searchParams
|
|
785
794
|
});
|
|
795
|
+
searchParams = props.searchParams;
|
|
786
796
|
}
|
|
787
|
-
const
|
|
788
|
-
const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)({
|
|
789
|
-
params: awaitedParams
|
|
790
|
-
});
|
|
797
|
+
const { value: path } = (0, import_canvas_next_rsc_shared7.resolvePath)(props);
|
|
791
798
|
if (!route || route.type === "notFound") {
|
|
792
799
|
(0, import_navigation.notFound)();
|
|
793
800
|
}
|
|
@@ -821,7 +828,7 @@ var UniformComposition = async ({
|
|
|
821
828
|
dynamicInputs: route.dynamicInputs,
|
|
822
829
|
type: "composition",
|
|
823
830
|
isContextualEditing: isIncontextEditingEnabled({ searchParams }),
|
|
824
|
-
isDraftMode:
|
|
831
|
+
isDraftMode: isDraftModeEnabled({ searchParams }),
|
|
825
832
|
state: route.compositionApiResponse.state,
|
|
826
833
|
path,
|
|
827
834
|
previewMode: determinePreviewMode({ searchParams })
|
|
@@ -836,14 +843,14 @@ var UniformComposition = async ({
|
|
|
836
843
|
});
|
|
837
844
|
let transfer = null;
|
|
838
845
|
if (props.mode === "server") {
|
|
839
|
-
const headersValue =
|
|
846
|
+
const headersValue = (0, import_headers3.headers)();
|
|
840
847
|
const missingQuirkValue = "unknown";
|
|
841
848
|
transfer = (0, import_react10.createElement)(ContextUpdateTransfer, {
|
|
842
849
|
serverContext,
|
|
843
850
|
update: {
|
|
844
|
-
params:
|
|
851
|
+
params: props.params,
|
|
845
852
|
searchParams,
|
|
846
|
-
cookies: (
|
|
853
|
+
cookies: (0, import_headers3.cookies)().getAll().reduce(
|
|
847
854
|
(acc, cookie) => {
|
|
848
855
|
acc[cookie.name] = cookie.value;
|
|
849
856
|
return acc;
|
|
@@ -1165,11 +1172,10 @@ var import_canvas9 = require("@uniformdev/canvas");
|
|
|
1165
1172
|
var import_navigation2 = require("next/navigation");
|
|
1166
1173
|
var import_react13 = __toESM(require("react"));
|
|
1167
1174
|
var UniformPlayground = async ({ searchParams, ...rest }) => {
|
|
1168
|
-
|
|
1169
|
-
if (!isDraftModeEnabled({ searchParams: awaitedSearchParams })) {
|
|
1175
|
+
if (!isDraftModeEnabled({ searchParams })) {
|
|
1170
1176
|
return /* @__PURE__ */ import_react13.default.createElement("div", null, /* @__PURE__ */ import_react13.default.createElement("h1", null, "Playground is only available in draft mode"));
|
|
1171
1177
|
}
|
|
1172
|
-
const id =
|
|
1178
|
+
const id = searchParams["id"];
|
|
1173
1179
|
if (!id) {
|
|
1174
1180
|
(0, import_navigation2.notFound)();
|
|
1175
1181
|
}
|
|
@@ -1202,7 +1208,7 @@ var UniformPlayground = async ({ searchParams, ...rest }) => {
|
|
|
1202
1208
|
UniformComposition,
|
|
1203
1209
|
{
|
|
1204
1210
|
mode: "server",
|
|
1205
|
-
params:
|
|
1211
|
+
params: {},
|
|
1206
1212
|
searchParams,
|
|
1207
1213
|
route: {
|
|
1208
1214
|
type: "composition",
|