@uniformdev/canvas-next-rsc 19.88.0 → 19.89.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.
Files changed (8) hide show
  1. package/dist/handler.js +7 -11
  2. package/dist/handler.mjs +7 -11
  3. package/dist/index.d.mts +3 -2
  4. package/dist/index.d.ts +3 -2
  5. package/dist/index.esm.js +10 -17
  6. package/dist/index.js +10 -17
  7. package/dist/index.mjs +10 -17
  8. package/package.json +11 -11
package/dist/handler.js CHANGED
@@ -254,7 +254,8 @@ var getDefaultRouteClient = ({ searchParams }) => {
254
254
  var retrieveRouteByPath = async ({
255
255
  path,
256
256
  state,
257
- searchParams
257
+ searchParams,
258
+ fetchOptions
258
259
  }) => {
259
260
  var _a;
260
261
  const client = getDefaultRouteClient({
@@ -274,6 +275,7 @@ var retrieveRouteByPath = async ({
274
275
  }
275
276
  }
276
277
  return await client.getRoute({
278
+ ...fetchOptions,
277
279
  path: queryPath,
278
280
  state,
279
281
  withComponentIDs: true,
@@ -281,16 +283,10 @@ var retrieveRouteByPath = async ({
281
283
  });
282
284
  };
283
285
  var resolveRedirectHref = (resolveResult, path) => {
284
- let href;
285
- if (resolveResult.redirect.targetProjectMapNodeId) {
286
- const requestUrl = `${(0, import_canvas_next_rsc_shared2.getBaseUrl)()}${path}`;
287
- const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
288
- const url = new URL(expandedUrl);
289
- href = url.pathname;
290
- } else {
291
- href = resolveResult.redirect.targetUrl;
292
- }
293
- return href;
286
+ const requestUrl = `${(0, import_canvas_next_rsc_shared2.getBaseUrl)()}${path}`;
287
+ const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
288
+ const url = new URL(expandedUrl);
289
+ return url.pathname;
294
290
  };
295
291
 
296
292
  // src/handler/createPreviewGETRouteHandler.ts
package/dist/handler.mjs CHANGED
@@ -234,7 +234,8 @@ var getDefaultRouteClient = ({ searchParams }) => {
234
234
  var retrieveRouteByPath = async ({
235
235
  path,
236
236
  state,
237
- searchParams
237
+ searchParams,
238
+ fetchOptions
238
239
  }) => {
239
240
  var _a;
240
241
  const client = getDefaultRouteClient({
@@ -254,6 +255,7 @@ var retrieveRouteByPath = async ({
254
255
  }
255
256
  }
256
257
  return await client.getRoute({
258
+ ...fetchOptions,
257
259
  path: queryPath,
258
260
  state,
259
261
  withComponentIDs: true,
@@ -261,16 +263,10 @@ var retrieveRouteByPath = async ({
261
263
  });
262
264
  };
263
265
  var resolveRedirectHref = (resolveResult, path) => {
264
- let href;
265
- if (resolveResult.redirect.targetProjectMapNodeId) {
266
- const requestUrl = `${getBaseUrl()}${path}`;
267
- const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
268
- const url = new URL(expandedUrl);
269
- href = url.pathname;
270
- } else {
271
- href = resolveResult.redirect.targetUrl;
272
- }
273
- return href;
266
+ const requestUrl = `${getBaseUrl()}${path}`;
267
+ const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
268
+ const url = new URL(expandedUrl);
269
+ return url.pathname;
274
270
  };
275
271
 
276
272
  // src/handler/createPreviewGETRouteHandler.ts
package/dist/index.d.mts CHANGED
@@ -1,4 +1,4 @@
1
- import { CanvasClient, RouteClient, ResolvedRouteGetResponse } from '@uniformdev/canvas';
1
+ import { CanvasClient, RouteClient, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
2
2
  import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
3
3
  export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
4
4
  import { ManifestClient } from '@uniformdev/context/api';
@@ -248,6 +248,7 @@ type RetrieveRouteOptions = PageParameters & {
248
248
  */
249
249
  skipPrefetch?: boolean;
250
250
  };
251
- declare const retrieveRoute: ({ params, searchParams, skipPrefetch, }: RetrieveRouteOptions) => Promise<ResolvedRouteGetResponse>;
251
+ type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
252
+ declare const retrieveRoute: ({ params, searchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
252
253
 
253
254
  export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };
package/dist/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { CanvasClient, RouteClient, ResolvedRouteGetResponse } from '@uniformdev/canvas';
1
+ import { CanvasClient, RouteClient, ResolvedRouteGetResponse, RouteGetParameters } from '@uniformdev/canvas';
2
2
  import { CacheMode, PageParameters, AppDirectoryContextState, AppDirectoryServerContext, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
3
3
  export { PageParameters, PlaygroundParameters } from '@uniformdev/canvas-next-rsc-shared';
4
4
  import { ManifestClient } from '@uniformdev/context/api';
@@ -248,6 +248,7 @@ type RetrieveRouteOptions = PageParameters & {
248
248
  */
249
249
  skipPrefetch?: boolean;
250
250
  };
251
- declare const retrieveRoute: ({ params, searchParams, skipPrefetch, }: RetrieveRouteOptions) => Promise<ResolvedRouteGetResponse>;
251
+ type RetrieveRouteFetchOptions = Omit<RouteGetParameters, 'projectId' | 'path' | 'withComponentIDs' | 'withContentSourceMap' | 'state'>;
252
+ declare const retrieveRoute: ({ params, searchParams, skipPrefetch }: RetrieveRouteOptions, fetchOptions?: RetrieveRouteFetchOptions) => Promise<ResolvedRouteGetResponse>;
252
253
 
253
254
  export { ContextUpdateTransfer, type ContextUpdateTransferProps, type CreateServerUniformContextProps, type CreateStaticParamsOptions, type GetCanvasClientOptions, type GetManifestClientOptions, type GetProjectMapClientOptions, type GetRouteClientOptions, UniformCompositionProps, UniformContext, type UniformContextProps, UniformPlayground, type UniformPlaygroundProps, createServerUniformContext, createStaticParams, generateStaticParams, getCanvasClient, getDefaultCanvasClient, getDefaultManifestClient, getDefaultProjectMapClient, getDefaultRouteClient, getManifest, getManifestClient, getProjectMapClient, getRouteClient, isDevelopmentEnvironment, isDraftModeEnabled, isIncontextEditingEnabled, isOnVercelPreviewEnvironment, retrieveRoute };
package/dist/index.esm.js CHANGED
@@ -443,11 +443,7 @@ import {
443
443
  } from "@uniformdev/canvas";
444
444
  import { getBaseUrl, getServerConfig as getServerConfig2, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
445
445
  import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
446
- var retrieveRoute = async ({
447
- params,
448
- searchParams,
449
- skipPrefetch
450
- }) => {
446
+ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
451
447
  if (!skipPrefetch) {
452
448
  void getManifest({
453
449
  searchParams
@@ -467,7 +463,8 @@ var retrieveRoute = async ({
467
463
  result = await retrieveRouteByPath({
468
464
  path: value,
469
465
  state,
470
- searchParams
466
+ searchParams,
467
+ fetchOptions
471
468
  });
472
469
  } catch (e) {
473
470
  console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -501,7 +498,8 @@ var retrieveRoute = async ({
501
498
  var retrieveRouteByPath = async ({
502
499
  path,
503
500
  state,
504
- searchParams
501
+ searchParams,
502
+ fetchOptions
505
503
  }) => {
506
504
  var _a;
507
505
  const client = getDefaultRouteClient({
@@ -521,6 +519,7 @@ var retrieveRouteByPath = async ({
521
519
  }
522
520
  }
523
521
  return await client.getRoute({
522
+ ...fetchOptions,
524
523
  path: queryPath,
525
524
  state,
526
525
  withComponentIDs: true,
@@ -528,16 +527,10 @@ var retrieveRouteByPath = async ({
528
527
  });
529
528
  };
530
529
  var resolveRedirectHref = (resolveResult, path) => {
531
- let href;
532
- if (resolveResult.redirect.targetProjectMapNodeId) {
533
- const requestUrl = `${getBaseUrl()}${path}`;
534
- const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
535
- const url = new URL(expandedUrl);
536
- href = url.pathname;
537
- } else {
538
- href = resolveResult.redirect.targetUrl;
539
- }
540
- return href;
530
+ const requestUrl = `${getBaseUrl()}${path}`;
531
+ const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
532
+ const url = new URL(expandedUrl);
533
+ return url.pathname;
541
534
  };
542
535
  var determineState = ({ searchParams }) => {
543
536
  const draftMode2 = isDraftModeEnabled({ searchParams });
package/dist/index.js CHANGED
@@ -481,11 +481,7 @@ var createServerUniformContextFromManifest = async (options) => {
481
481
  var import_canvas4 = require("@uniformdev/canvas");
482
482
  var import_canvas_next_rsc_shared3 = require("@uniformdev/canvas-next-rsc-shared");
483
483
  var import_redirect = require("@uniformdev/redirect");
484
- var retrieveRoute = async ({
485
- params,
486
- searchParams,
487
- skipPrefetch
488
- }) => {
484
+ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
489
485
  if (!skipPrefetch) {
490
486
  void getManifest({
491
487
  searchParams
@@ -505,7 +501,8 @@ var retrieveRoute = async ({
505
501
  result = await retrieveRouteByPath({
506
502
  path: value,
507
503
  state,
508
- searchParams
504
+ searchParams,
505
+ fetchOptions
509
506
  });
510
507
  } catch (e) {
511
508
  console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -539,7 +536,8 @@ var retrieveRoute = async ({
539
536
  var retrieveRouteByPath = async ({
540
537
  path,
541
538
  state,
542
- searchParams
539
+ searchParams,
540
+ fetchOptions
543
541
  }) => {
544
542
  var _a;
545
543
  const client = getDefaultRouteClient({
@@ -559,6 +557,7 @@ var retrieveRouteByPath = async ({
559
557
  }
560
558
  }
561
559
  return await client.getRoute({
560
+ ...fetchOptions,
562
561
  path: queryPath,
563
562
  state,
564
563
  withComponentIDs: true,
@@ -566,16 +565,10 @@ var retrieveRouteByPath = async ({
566
565
  });
567
566
  };
568
567
  var resolveRedirectHref = (resolveResult, path) => {
569
- let href;
570
- if (resolveResult.redirect.targetProjectMapNodeId) {
571
- const requestUrl = `${(0, import_canvas_next_rsc_shared3.getBaseUrl)()}${path}`;
572
- const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
573
- const url = new URL(expandedUrl);
574
- href = url.pathname;
575
- } else {
576
- href = resolveResult.redirect.targetUrl;
577
- }
578
- return href;
568
+ const requestUrl = `${(0, import_canvas_next_rsc_shared3.getBaseUrl)()}${path}`;
569
+ const expandedUrl = (0, import_redirect.getTargetVariableExpandedUrl)(requestUrl, resolveResult.redirect);
570
+ const url = new URL(expandedUrl);
571
+ return url.pathname;
579
572
  };
580
573
  var determineState = ({ searchParams }) => {
581
574
  const draftMode2 = isDraftModeEnabled({ searchParams });
package/dist/index.mjs CHANGED
@@ -443,11 +443,7 @@ import {
443
443
  } from "@uniformdev/canvas";
444
444
  import { getBaseUrl, getServerConfig as getServerConfig2, resolvePath } from "@uniformdev/canvas-next-rsc-shared";
445
445
  import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
446
- var retrieveRoute = async ({
447
- params,
448
- searchParams,
449
- skipPrefetch
450
- }) => {
446
+ var retrieveRoute = async ({ params, searchParams, skipPrefetch }, fetchOptions) => {
451
447
  if (!skipPrefetch) {
452
448
  void getManifest({
453
449
  searchParams
@@ -467,7 +463,8 @@ var retrieveRoute = async ({
467
463
  result = await retrieveRouteByPath({
468
464
  path: value,
469
465
  state,
470
- searchParams
466
+ searchParams,
467
+ fetchOptions
471
468
  });
472
469
  } catch (e) {
473
470
  console.warn(`Failed to retrieve route by path: ${value} with state ${state}`, e);
@@ -501,7 +498,8 @@ var retrieveRoute = async ({
501
498
  var retrieveRouteByPath = async ({
502
499
  path,
503
500
  state,
504
- searchParams
501
+ searchParams,
502
+ fetchOptions
505
503
  }) => {
506
504
  var _a;
507
505
  const client = getDefaultRouteClient({
@@ -521,6 +519,7 @@ var retrieveRouteByPath = async ({
521
519
  }
522
520
  }
523
521
  return await client.getRoute({
522
+ ...fetchOptions,
524
523
  path: queryPath,
525
524
  state,
526
525
  withComponentIDs: true,
@@ -528,16 +527,10 @@ var retrieveRouteByPath = async ({
528
527
  });
529
528
  };
530
529
  var resolveRedirectHref = (resolveResult, path) => {
531
- let href;
532
- if (resolveResult.redirect.targetProjectMapNodeId) {
533
- const requestUrl = `${getBaseUrl()}${path}`;
534
- const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
535
- const url = new URL(expandedUrl);
536
- href = url.pathname;
537
- } else {
538
- href = resolveResult.redirect.targetUrl;
539
- }
540
- return href;
530
+ const requestUrl = `${getBaseUrl()}${path}`;
531
+ const expandedUrl = getTargetVariableExpandedUrl(requestUrl, resolveResult.redirect);
532
+ const url = new URL(expandedUrl);
533
+ return url.pathname;
541
534
  };
542
535
  var determineState = ({ searchParams }) => {
543
536
  const draftMode2 = isDraftModeEnabled({ searchParams });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uniformdev/canvas-next-rsc",
3
- "version": "19.88.0",
3
+ "version": "19.89.0",
4
4
  "license": "SEE LICENSE IN LICENSE.txt",
5
5
  "scripts": {
6
6
  "build": "tsup",
@@ -61,15 +61,15 @@
61
61
  "react-dom": "18.2.0"
62
62
  },
63
63
  "dependencies": {
64
- "@uniformdev/canvas": "19.88.0",
65
- "@uniformdev/canvas-next-rsc-client": "^19.88.0",
66
- "@uniformdev/canvas-next-rsc-shared": "^19.88.0",
67
- "@uniformdev/canvas-react": "19.88.0",
68
- "@uniformdev/context": "19.88.0",
69
- "@uniformdev/project-map": "19.88.0",
70
- "@uniformdev/redirect": "19.88.0",
71
- "@uniformdev/richtext": "19.88.0",
72
- "@uniformdev/webhooks": "19.88.0",
64
+ "@uniformdev/canvas": "19.89.0",
65
+ "@uniformdev/canvas-next-rsc-client": "^19.89.0",
66
+ "@uniformdev/canvas-next-rsc-shared": "^19.89.0",
67
+ "@uniformdev/canvas-react": "19.89.0",
68
+ "@uniformdev/context": "19.89.0",
69
+ "@uniformdev/project-map": "19.89.0",
70
+ "@uniformdev/redirect": "19.89.0",
71
+ "@uniformdev/richtext": "19.89.0",
72
+ "@uniformdev/webhooks": "19.89.0",
73
73
  "@vercel/edge-config": "^0.4.0",
74
74
  "encoding": "^0.1.13",
75
75
  "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
86
86
  "publishConfig": {
87
87
  "access": "public"
88
88
  },
89
- "gitHead": "0a02f919a6b0f0c41307f120adada2e5d45a947b"
89
+ "gitHead": "247189fb1039d0f81498949534646baaffb8bca7"
90
90
  }