@decocms/tanstack 8.6.0 → 8.8.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/README.md +4 -4
- package/dist/draft.d.ts +21 -5
- package/dist/draft.d.ts.map +1 -1
- package/dist/draft.js +23 -7
- package/dist/draft.js.map +1 -1
- package/dist/react/DecoDocument.d.ts.map +1 -1
- package/dist/react/DecoDocument.js +4 -4
- package/dist/react/DecoDocument.js.map +1 -1
- package/dist/react/pageValues.d.ts +3 -0
- package/dist/react/pageValues.d.ts.map +1 -1
- package/dist/react/pageValues.js +13 -4
- package/dist/react/pageValues.js.map +1 -1
- package/dist/scope/server.d.ts +5 -0
- package/dist/scope/server.d.ts.map +1 -1
- package/dist/scope/server.js.map +1 -1
- package/dist/server/index.d.ts +5 -3
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +6 -2
- package/dist/server/index.js.map +1 -1
- package/dist/worker/cache.d.ts +4 -2
- package/dist/worker/cache.d.ts.map +1 -1
- package/dist/worker/cache.js +6 -2
- package/dist/worker/cache.js.map +1 -1
- package/dist/worker/drafts.d.ts +32 -3
- package/dist/worker/drafts.d.ts.map +1 -1
- package/dist/worker/drafts.js +59 -4
- package/dist/worker/drafts.js.map +1 -1
- package/dist/worker/index.d.ts +8 -3
- package/dist/worker/index.d.ts.map +1 -1
- package/dist/worker/index.js +79 -35
- package/dist/worker/index.js.map +1 -1
- package/package.json +2 -2
- package/src/draft.ts +27 -7
- package/src/react/DecoDocument.tsx +20 -4
- package/src/react/pageValues.ts +12 -4
- package/src/scope/server.ts +5 -0
- package/src/server/index.ts +11 -5
- package/src/worker/cache.ts +6 -2
- package/src/worker/drafts.ts +81 -6
- package/src/worker/index.ts +93 -41
package/dist/worker/index.d.ts
CHANGED
|
@@ -8,14 +8,19 @@
|
|
|
8
8
|
* - Versions: the host allowlist (`./drafts.ts`) for a Studio link's version
|
|
9
9
|
* (a draft, or a published release by its commit SHA, with the preview's
|
|
10
10
|
* moment and switched tests and campaigns), the draft cookie, the
|
|
11
|
-
* `x-deco-version` request header the page reads
|
|
12
|
-
*
|
|
11
|
+
* `x-deco-version` request header the page reads. A preview (any request
|
|
12
|
+
* with `?__draft=`, `off` included, or the draft cookie) never goes through
|
|
13
|
+
* `pageCache` and answers `Cache-Control: max-age=0, no-cache,
|
|
14
|
+
* must-revalidate`, `Vary: Cookie` and `noindex`. A link's cookie is set
|
|
15
|
+
* only with a response below 500; a link to a draft that can't be read
|
|
16
|
+
* anymore renders the release, expires the cookie and tells the page
|
|
17
|
+
* (`draftUnavailable`), never a 500.
|
|
13
18
|
* - The CMS redirects, before any route.
|
|
14
19
|
* - No page cache: caching is the site's (`pageCache`, the README's
|
|
15
20
|
* worker-entry recipe), with the helpers it needs exported here
|
|
16
21
|
* (`assignmentsKey`, `cacheVersion`, `isCacheable`, …).
|
|
17
22
|
* The worker calls `pageCache` only for a request `isCacheable` accepts,
|
|
18
|
-
* never for a preview, and adds the visitor's cookie after it, so a stored
|
|
23
|
+
* never for a preview (any draft signal), and adds the visitor's cookie after it, so a stored
|
|
19
24
|
* copy never carries one. A page request with `Authorization` is never
|
|
20
25
|
* handed to it and answers `private, no-cache, no-store`. A response with no
|
|
21
26
|
* `CDN-Cache-Control` tells the CDN `no-store`, at one exit.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/index.js
CHANGED
|
@@ -8,14 +8,19 @@
|
|
|
8
8
|
* - Versions: the host allowlist (`./drafts.ts`) for a Studio link's version
|
|
9
9
|
* (a draft, or a published release by its commit SHA, with the preview's
|
|
10
10
|
* moment and switched tests and campaigns), the draft cookie, the
|
|
11
|
-
* `x-deco-version` request header the page reads
|
|
12
|
-
*
|
|
11
|
+
* `x-deco-version` request header the page reads. A preview (any request
|
|
12
|
+
* with `?__draft=`, `off` included, or the draft cookie) never goes through
|
|
13
|
+
* `pageCache` and answers `Cache-Control: max-age=0, no-cache,
|
|
14
|
+
* must-revalidate`, `Vary: Cookie` and `noindex`. A link's cookie is set
|
|
15
|
+
* only with a response below 500; a link to a draft that can't be read
|
|
16
|
+
* anymore renders the release, expires the cookie and tells the page
|
|
17
|
+
* (`draftUnavailable`), never a 500.
|
|
13
18
|
* - The CMS redirects, before any route.
|
|
14
19
|
* - No page cache: caching is the site's (`pageCache`, the README's
|
|
15
20
|
* worker-entry recipe), with the helpers it needs exported here
|
|
16
21
|
* (`assignmentsKey`, `cacheVersion`, `isCacheable`, …).
|
|
17
22
|
* The worker calls `pageCache` only for a request `isCacheable` accepts,
|
|
18
|
-
* never for a preview, and adds the visitor's cookie after it, so a stored
|
|
23
|
+
* never for a preview (any draft signal), and adds the visitor's cookie after it, so a stored
|
|
19
24
|
* copy never carries one. A page request with `Authorization` is never
|
|
20
25
|
* handed to it and answers `private, no-cache, no-store`. A response with no
|
|
21
26
|
* `CDN-Cache-Control` tells the CDN `no-store`, at one exit.
|
|
@@ -44,13 +49,13 @@ import { readVisitor, serializeVisitor } from "@decocms/blocks/experiments";
|
|
|
44
49
|
import { recordServerRequest } from "@decocms/blocks/metrics";
|
|
45
50
|
import { runInScope } from "@decocms/tanstack/scope";
|
|
46
51
|
import { ASSIGNMENTS_HEADER, serializeAssignments } from "../assignments.js";
|
|
47
|
-
import { draftResponseHeaders, VERSION_HEADER } from "../draft.js";
|
|
52
|
+
import { draftResponseHeaders, RELEASE_CHECK_HEADER, VERSION_HEADER } from "../draft.js";
|
|
48
53
|
import { PAGE_STATUS_HEADER } from "../shared.js";
|
|
49
54
|
import { VISITOR_HEADER } from "../visitor.js";
|
|
50
55
|
import { readAssignments } from "./assignments.js";
|
|
51
56
|
import { isCacheable } from "./cache.js";
|
|
52
57
|
import { dedupeSetCookies } from "./cookies.js";
|
|
53
|
-
import { decideDraft } from "./drafts.js";
|
|
58
|
+
import { decideDraft, hasDraftSignal } from "./drafts.js";
|
|
54
59
|
import { htmlSecurityHeaders } from "./security.js";
|
|
55
60
|
import { detectDevice } from "./segment.js";
|
|
56
61
|
import { isServerFnPath } from "./serverFn.js";
|
|
@@ -83,7 +88,8 @@ function fixedRoute(pathname) {
|
|
|
83
88
|
*/
|
|
84
89
|
const REDIRECT_ROUTE = "redirect";
|
|
85
90
|
/**
|
|
86
|
-
* The cache label of `http.server.request.duration`: `DRAFT` for a preview
|
|
91
|
+
* The cache label of `http.server.request.duration`: `DRAFT` for a preview
|
|
92
|
+
* (any draft signal),
|
|
87
93
|
* otherwise what the site's `pageCache` said in `X-Cache`. A response that
|
|
88
94
|
* never went through it (a redirect, the site's `routes`, an asset, a page
|
|
89
95
|
* without a `pageCache`) is `BYPASS` whatever `X-Cache` an upstream put on it.
|
|
@@ -130,13 +136,13 @@ export function createDecoWorker(options) {
|
|
|
130
136
|
];
|
|
131
137
|
// The release's redirects, read once per revision (a draft's are read each time).
|
|
132
138
|
let releaseRedirects;
|
|
133
|
-
async function redirectsFor(pointer) {
|
|
139
|
+
async function redirectsFor(pointer, releaseCheck) {
|
|
134
140
|
const read = async (client) => {
|
|
135
141
|
const [list] = await client.list("redirect");
|
|
136
142
|
return list ?? [];
|
|
137
143
|
};
|
|
138
144
|
if (pointer)
|
|
139
|
-
return read(cms.client({ version: pointer }));
|
|
145
|
+
return read(cms.client({ version: pointer, releaseCheck }));
|
|
140
146
|
const client = cms.client();
|
|
141
147
|
const revision = await client.revision();
|
|
142
148
|
if (releaseRedirects?.revision !== revision) {
|
|
@@ -197,9 +203,9 @@ export function createDecoWorker(options) {
|
|
|
197
203
|
// A metric never breaks a response.
|
|
198
204
|
}
|
|
199
205
|
}
|
|
200
|
-
async function findRedirect(url, pointer) {
|
|
206
|
+
async function findRedirect(url, pointer, releaseCheck) {
|
|
201
207
|
try {
|
|
202
|
-
const redirects = await redirectsFor(pointer);
|
|
208
|
+
const redirects = await redirectsFor(pointer, releaseCheck);
|
|
203
209
|
if (!redirects.length)
|
|
204
210
|
return null;
|
|
205
211
|
const match = matchRoute(url, { routes: [], redirects });
|
|
@@ -225,7 +231,13 @@ export function createDecoWorker(options) {
|
|
|
225
231
|
return { request, visitor: null };
|
|
226
232
|
}
|
|
227
233
|
const { visitor, cookie } = readVisitor(request);
|
|
228
|
-
|
|
234
|
+
// A draft's read shares the request's release check (`decideDraft`), never one of its own.
|
|
235
|
+
const releaseCheck = draft.version ? draft.releaseCheck : undefined;
|
|
236
|
+
const assignments = await readAssignments(cms, {
|
|
237
|
+
visitor,
|
|
238
|
+
...draft.version,
|
|
239
|
+
...(releaseCheck ? { releaseCheck } : {}),
|
|
240
|
+
});
|
|
229
241
|
const headers = new Headers(request.headers);
|
|
230
242
|
headers.set(VISITOR_HEADER, serializeVisitor(visitor));
|
|
231
243
|
headers.set(ASSIGNMENTS_HEADER, serializeAssignments(assignments));
|
|
@@ -235,7 +247,7 @@ export function createDecoWorker(options) {
|
|
|
235
247
|
}
|
|
236
248
|
return { request: forwarded, visitor, assignments, visitorCookie: cookie };
|
|
237
249
|
}
|
|
238
|
-
async function handle(request, env, ctx, decision) {
|
|
250
|
+
async function handle(request, env, ctx, decision, preview) {
|
|
239
251
|
const draft = decision.version?.version ?? null;
|
|
240
252
|
const url = new URL(request.url);
|
|
241
253
|
const method = request.method;
|
|
@@ -264,7 +276,7 @@ export function createDecoWorker(options) {
|
|
|
264
276
|
!asset &&
|
|
265
277
|
!isServerFnPath(url.pathname) &&
|
|
266
278
|
!BYPASS_PATHS.some((p) => url.pathname.startsWith(p))) {
|
|
267
|
-
const redirect = await findRedirect(url, draft);
|
|
279
|
+
const redirect = await findRedirect(url, draft, decision.releaseCheck);
|
|
268
280
|
if (redirect)
|
|
269
281
|
return { response: redirect, redirect: true };
|
|
270
282
|
}
|
|
@@ -276,33 +288,42 @@ export function createDecoWorker(options) {
|
|
|
276
288
|
if (asset) {
|
|
277
289
|
const origin = await serverEntry.fetch(request, env, ctx);
|
|
278
290
|
if (origin.status !== 200)
|
|
279
|
-
return { response: origin };
|
|
280
|
-
if (isHtml(origin))
|
|
281
|
-
return { response: new Response("Not Found", { status: 404 }) };
|
|
291
|
+
return { response: origin, asset: true };
|
|
292
|
+
if (isHtml(origin)) {
|
|
293
|
+
return { response: new Response("Not Found", { status: 404 }), asset: true };
|
|
294
|
+
}
|
|
282
295
|
const resp = mutable(origin);
|
|
283
296
|
resp.headers.set("Cache-Control", "public, max-age=31536000, immutable");
|
|
284
297
|
resp.headers.set("Vary", "Accept-Encoding");
|
|
285
|
-
return { response: resp };
|
|
298
|
+
return { response: resp, asset: true };
|
|
286
299
|
}
|
|
287
300
|
const visited = await withDecisions(request, decision);
|
|
288
|
-
const served = await page(visited.request, env, ctx,
|
|
301
|
+
const served = await page(visited.request, env, ctx, {
|
|
302
|
+
draft,
|
|
303
|
+
preview,
|
|
304
|
+
unavailable: decision.unavailable === true,
|
|
305
|
+
url,
|
|
306
|
+
visitor: visited.visitor,
|
|
307
|
+
assignments: visited.assignments,
|
|
308
|
+
});
|
|
289
309
|
return visited.visitorCookie === undefined
|
|
290
310
|
? served
|
|
291
311
|
: { ...served, visitorCookie: visited.visitorCookie };
|
|
292
312
|
}
|
|
293
|
-
/**
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
}
|
|
304
|
-
|
|
305
|
-
|
|
313
|
+
/**
|
|
314
|
+
* A page or server-function request: the site's `pageCache` when it may
|
|
315
|
+
* cache it, else the app. A preview (any draft signal) always renders: its
|
|
316
|
+
* headers are set at the exit (`serve`).
|
|
317
|
+
*/
|
|
318
|
+
async function page(request, env, ctx, inputs) {
|
|
319
|
+
const { draft, preview, unavailable, url, visitor, assignments } = inputs;
|
|
320
|
+
const render = async (scope) => withPageStatus(await runInScope({
|
|
321
|
+
csegToken: scope?.csegToken,
|
|
322
|
+
draft: draft ?? undefined,
|
|
323
|
+
...(unavailable ? { draftUnavailable: true } : {}),
|
|
324
|
+
}, () => serverEntry.fetch(request, env, ctx)));
|
|
325
|
+
if (draft !== null || preview)
|
|
326
|
+
return { response: await render() };
|
|
306
327
|
// A signed request's page is that caller's: no shared cache may keep it,
|
|
307
328
|
// whatever the app said (RFC 9111 lets one store a `public` answer to it).
|
|
308
329
|
if (request.headers.has("authorization")) {
|
|
@@ -329,6 +350,8 @@ export function createDecoWorker(options) {
|
|
|
329
350
|
return { response, cached: true };
|
|
330
351
|
}
|
|
331
352
|
async function serve(incoming, env, ctx) {
|
|
353
|
+
// Any draft signal makes the request a preview, whatever the decision.
|
|
354
|
+
const preview = hasDraftSignal(incoming);
|
|
332
355
|
let decision = { version: null, setCookie: null };
|
|
333
356
|
try {
|
|
334
357
|
decision = await decideDraft(cms, incoming);
|
|
@@ -339,17 +362,21 @@ export function createDecoWorker(options) {
|
|
|
339
362
|
// The page reads the version, the visitor and the assignments from these
|
|
340
363
|
// headers; a copy from outside never counts.
|
|
341
364
|
let request = incoming;
|
|
342
|
-
const own = [VERSION_HEADER, VISITOR_HEADER, ASSIGNMENTS_HEADER];
|
|
365
|
+
const own = [VERSION_HEADER, VISITOR_HEADER, ASSIGNMENTS_HEADER, RELEASE_CHECK_HEADER];
|
|
343
366
|
if (own.some((name) => incoming.headers.has(name)) || decision.version !== null) {
|
|
344
367
|
const headers = new Headers(incoming.headers);
|
|
345
368
|
for (const name of own)
|
|
346
369
|
headers.delete(name);
|
|
347
370
|
if (decision.version !== null)
|
|
348
371
|
headers.set(VERSION_HEADER, decision.version.version);
|
|
372
|
+
// The page's draft reads wait for the request's release check, never one of their own.
|
|
373
|
+
if (decision.version !== null && decision.releaseCheck !== undefined) {
|
|
374
|
+
headers.set(RELEASE_CHECK_HEADER, decision.releaseCheck);
|
|
375
|
+
}
|
|
349
376
|
request = new Request(incoming, { headers });
|
|
350
377
|
}
|
|
351
|
-
const served = await handle(request, env, ctx, decision);
|
|
352
|
-
const draft = decision.version !== null;
|
|
378
|
+
const served = await handle(request, env, ctx, decision, preview);
|
|
379
|
+
const draft = decision.version !== null || preview;
|
|
353
380
|
let response = served.response;
|
|
354
381
|
// A WebSocket upgrade passes through untouched.
|
|
355
382
|
if (response.status === 101)
|
|
@@ -361,8 +388,25 @@ export function createDecoWorker(options) {
|
|
|
361
388
|
if (!response.headers.has("CDN-Cache-Control")) {
|
|
362
389
|
response.headers.set("CDN-Cache-Control", "no-store");
|
|
363
390
|
}
|
|
364
|
-
|
|
391
|
+
// A preview's response is never answered from a cache: the exact header,
|
|
392
|
+
// whatever the app or a route said. A fingerprinted asset stays immutable.
|
|
393
|
+
if (preview && !served.asset) {
|
|
394
|
+
for (const [k, v] of Object.entries(draftResponseHeaders(true))) {
|
|
395
|
+
if (k.toLowerCase() !== "vary")
|
|
396
|
+
response.headers.set(k, v);
|
|
397
|
+
else
|
|
398
|
+
appendVary(response.headers, v);
|
|
399
|
+
}
|
|
400
|
+
// Nor kept by the CDN, whatever a route said: with the draft in a cookie
|
|
401
|
+
// a preview shares its URL with the published page.
|
|
402
|
+
response.headers.set("CDN-Cache-Control", "no-store");
|
|
403
|
+
}
|
|
404
|
+
// A link's cookie only with a page that rendered: a failed render never
|
|
405
|
+
// pins the preview to it. The cookie that ends a preview always goes.
|
|
406
|
+
const ending = decision.version === null;
|
|
407
|
+
if (decision.setCookie && (ending || response.status < 500)) {
|
|
365
408
|
response.headers.append("Set-Cookie", decision.setCookie);
|
|
409
|
+
}
|
|
366
410
|
if (served.visitorCookie)
|
|
367
411
|
response.headers.append("Set-Cookie", served.visitorCookie);
|
|
368
412
|
dedupeSetCookies(response);
|
package/dist/worker/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@decocms/tanstack",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.8.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=24"
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
|
-
"@decocms/blocks": "8.
|
|
97
|
+
"@decocms/blocks": "8.8.0",
|
|
98
98
|
"@tanstack/react-router": "1.170.39",
|
|
99
99
|
"@tanstack/react-start": "1.168.58",
|
|
100
100
|
"@types/react": "^19.0.0",
|
package/src/draft.ts
CHANGED
|
@@ -31,15 +31,35 @@ export const DRAFT_COOKIE = "__deco_draft";
|
|
|
31
31
|
export const VERSION_HEADER = "x-deco-version";
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
|
-
* The
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
34
|
+
* The request header the worker sets on a draft request: the id of the
|
|
35
|
+
* release check it made for it (`cms.checkRelease()`), so the page's draft
|
|
36
|
+
* reads wait for that check instead of making their own (one `latest.json`
|
|
37
|
+
* read per preview request). The worker removes any copy that arrives from
|
|
38
|
+
* outside; an id the CMS didn't make is a check of its own anyway.
|
|
38
39
|
*/
|
|
39
|
-
export
|
|
40
|
-
|
|
40
|
+
export const RELEASE_CHECK_HEADER = "x-deco-release-check";
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* The `Cache-Control` of every response to a preview request (a request with
|
|
44
|
+
* `?__draft=`, whatever its value, or the draft cookie): always revalidated,
|
|
45
|
+
* never answered from a cache (PO 2026-10-23).
|
|
46
|
+
*/
|
|
47
|
+
export const DRAFT_CACHE_CONTROL = "max-age=0, no-cache, must-revalidate";
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* The response headers of a preview: never answered from a browser's or a
|
|
51
|
+
* CDN's cache (`Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary:
|
|
52
|
+
* Cookie`) and never indexed (`X-Robots-Tag: noindex, nofollow`). `{}` when
|
|
53
|
+
* `preview` is `null`, `false` or empty, so the result of the draft decision
|
|
54
|
+
* applies as is: pass the version, or whether the request carries a draft
|
|
55
|
+
* signal at all (`?__draft=off` and a refused or unavailable draft too).
|
|
56
|
+
*/
|
|
57
|
+
export function draftResponseHeaders(
|
|
58
|
+
preview: string | boolean | null | undefined,
|
|
59
|
+
): Record<string, string> {
|
|
60
|
+
if (!preview) return {};
|
|
41
61
|
return {
|
|
42
|
-
"Cache-Control":
|
|
62
|
+
"Cache-Control": DRAFT_CACHE_CONTROL,
|
|
43
63
|
Vary: "Cookie",
|
|
44
64
|
"X-Robots-Tag": "noindex, nofollow",
|
|
45
65
|
};
|
|
@@ -101,7 +101,11 @@ function StudioPieces({
|
|
|
101
101
|
editShortcut,
|
|
102
102
|
nonce,
|
|
103
103
|
draft,
|
|
104
|
-
|
|
104
|
+
draftUnavailable,
|
|
105
|
+
}: Pick<DecoPreviewProps, "site" | "editShortcut" | "nonce"> & {
|
|
106
|
+
draft: string | undefined;
|
|
107
|
+
draftUnavailable?: boolean;
|
|
108
|
+
}) {
|
|
105
109
|
// Two primitives, so a navigation that keeps the page doesn't re-render the document.
|
|
106
110
|
const pathTemplate = useRouterState({ select: (s) => studioPageOf(s.matches)?.pathTemplate });
|
|
107
111
|
const pageId = useRouterState({ select: (s) => studioPageOf(s.matches)?.id });
|
|
@@ -114,7 +118,7 @@ function StudioPieces({
|
|
|
114
118
|
page={{ pathTemplate, id: pageId }}
|
|
115
119
|
nonce={nonce}
|
|
116
120
|
/>
|
|
117
|
-
<DraftBadge pointer={draft ?? null} />
|
|
121
|
+
<DraftBadge pointer={draft ?? null} unavailable={draftUnavailable} />
|
|
118
122
|
</>
|
|
119
123
|
);
|
|
120
124
|
}
|
|
@@ -151,7 +155,13 @@ export function DecoPreview({ site, editShortcut, nonce }: DecoPreviewProps) {
|
|
|
151
155
|
dangerouslySetInnerHTML={{ __html: publish }}
|
|
152
156
|
/>
|
|
153
157
|
)}
|
|
154
|
-
<StudioPieces
|
|
158
|
+
<StudioPieces
|
|
159
|
+
site={site}
|
|
160
|
+
editShortcut={editShortcut}
|
|
161
|
+
nonce={nonce}
|
|
162
|
+
draft={values.draft}
|
|
163
|
+
draftUnavailable={values.draftUnavailable}
|
|
164
|
+
/>
|
|
155
165
|
</>
|
|
156
166
|
);
|
|
157
167
|
}
|
|
@@ -225,7 +235,13 @@ export function DecoDocument({
|
|
|
225
235
|
<StableOutlet />
|
|
226
236
|
</Outer>
|
|
227
237
|
{children}
|
|
228
|
-
<StudioPieces
|
|
238
|
+
<StudioPieces
|
|
239
|
+
site={site}
|
|
240
|
+
editShortcut={editShortcut}
|
|
241
|
+
nonce={nonce}
|
|
242
|
+
draft={values.draft}
|
|
243
|
+
draftUnavailable={values.draftUnavailable}
|
|
244
|
+
/>
|
|
229
245
|
<ScriptOnce>{DATA_EVENT_OBSERVER}</ScriptOnce>
|
|
230
246
|
<Scripts />
|
|
231
247
|
</body>
|
package/src/react/pageValues.ts
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* What the worker handed this request's render (the CDN segment token
|
|
3
|
-
* draft), and the inline script that publishes it to the browser.
|
|
2
|
+
* What the worker handed this request's render (the CDN segment token, the
|
|
3
|
+
* draft, and whether the link's draft can't be read anymore), and the inline script that publishes it to the browser.
|
|
4
4
|
*/
|
|
5
5
|
import { currentScope } from "@decocms/tanstack/scope";
|
|
6
6
|
import { CSEG_GLOBAL } from "../shared.ts";
|
|
7
7
|
|
|
8
8
|
export const DRAFT_GLOBAL = "__DECO_DRAFT";
|
|
9
|
+
export const DRAFT_UNAVAILABLE_GLOBAL = "__DECO_DRAFT_UNAVAILABLE";
|
|
9
10
|
|
|
10
11
|
export interface PageValues {
|
|
11
12
|
cseg?: string;
|
|
12
13
|
draft?: string;
|
|
14
|
+
/** The link named a draft that can't be read anymore: the page shows the release. */
|
|
15
|
+
draftUnavailable?: boolean;
|
|
13
16
|
}
|
|
14
17
|
|
|
15
18
|
/** On the server, the request scope; in the browser, what the server published on `window`. */
|
|
@@ -18,10 +21,14 @@ export function pageValues(): PageValues {
|
|
|
18
21
|
const w = window as unknown as Record<string, unknown>;
|
|
19
22
|
const pick = (k: string) =>
|
|
20
23
|
typeof w[k] === "string" && w[k] !== "" ? (w[k] as string) : undefined;
|
|
21
|
-
|
|
24
|
+
const values: PageValues = { cseg: pick(CSEG_GLOBAL), draft: pick(DRAFT_GLOBAL) };
|
|
25
|
+
if (w[DRAFT_UNAVAILABLE_GLOBAL] === true) values.draftUnavailable = true;
|
|
26
|
+
return values;
|
|
22
27
|
}
|
|
23
28
|
const scope = currentScope();
|
|
24
|
-
|
|
29
|
+
const values: PageValues = { cseg: scope?.csegToken, draft: scope?.draft };
|
|
30
|
+
if (scope?.draftUnavailable === true) values.draftUnavailable = true;
|
|
31
|
+
return values;
|
|
25
32
|
}
|
|
26
33
|
|
|
27
34
|
/** The script that publishes `pageValues()`; the same markup on the server and in the browser. */
|
|
@@ -31,5 +38,6 @@ export function publishScript(values: PageValues): string | null {
|
|
|
31
38
|
const literal = (v: string) => JSON.stringify(v).replace(/</g, "\\u003c");
|
|
32
39
|
if (values.cseg) parts.push(`window.${CSEG_GLOBAL}=${literal(values.cseg)}`);
|
|
33
40
|
if (values.draft) parts.push(`window.${DRAFT_GLOBAL}=${literal(values.draft)}`);
|
|
41
|
+
if (values.draftUnavailable) parts.push(`window.${DRAFT_UNAVAILABLE_GLOBAL}=true`);
|
|
34
42
|
return parts.length ? parts.join(";") : null;
|
|
35
43
|
}
|
package/src/scope/server.ts
CHANGED
|
@@ -15,6 +15,11 @@ export interface RequestScope {
|
|
|
15
15
|
csegToken?: string;
|
|
16
16
|
/** The draft this request renders (after the worker's host check). */
|
|
17
17
|
draft?: string;
|
|
18
|
+
/**
|
|
19
|
+
* The request's link named a draft that can't be read anymore: the page
|
|
20
|
+
* renders the release, and `DecoPreview` says so calmly (outside Studio's frame).
|
|
21
|
+
*/
|
|
22
|
+
draftUnavailable?: boolean;
|
|
18
23
|
}
|
|
19
24
|
|
|
20
25
|
const KEY = Symbol.for("decocms.tanstack.requestScope");
|
package/src/server/index.ts
CHANGED
|
@@ -7,15 +7,17 @@
|
|
|
7
7
|
* outside: the version on `x-deco-version` (a Studio link's draft or old
|
|
8
8
|
* release, after the host allowlist), the visitor on `x-deco-visitor`
|
|
9
9
|
* (`readVisitor` from `@decocms/blocks/experiments`) and each test and
|
|
10
|
-
* campaign on or off on `x-deco-assignments
|
|
11
|
-
*
|
|
12
|
-
*
|
|
10
|
+
* campaign on or off on `x-deco-assignments`, and for a draft the release
|
|
11
|
+
* check it made on `x-deco-release-check`. These read them, and
|
|
12
|
+
* `contentClient` builds `cms.client({ version, releaseCheck, experiments,
|
|
13
|
+
* campaigns })` from them: the page decides nothing again, and its draft
|
|
14
|
+
* reads share the worker's check of the latest release.
|
|
13
15
|
*/
|
|
14
16
|
import type { Client, CMS } from "@decocms/blocks";
|
|
15
17
|
import { parseVisitor, type Visitor } from "@decocms/blocks/experiments";
|
|
16
18
|
import { getRequest, setResponseHeader } from "@tanstack/react-start/server";
|
|
17
19
|
import { ASSIGNMENTS_HEADER, type DecidedAssignments, parseAssignments } from "../assignments.ts";
|
|
18
|
-
import { VERSION_HEADER } from "../draft.ts";
|
|
20
|
+
import { RELEASE_CHECK_HEADER, VERSION_HEADER } from "../draft.ts";
|
|
19
21
|
import { VISITOR_HEADER } from "../visitor.ts";
|
|
20
22
|
|
|
21
23
|
/**
|
|
@@ -54,8 +56,12 @@ export function requestAssignments(request: Request = getRequest()): DecidedAssi
|
|
|
54
56
|
*/
|
|
55
57
|
export function contentClient(cms: CMS, request: Request = getRequest()): Client {
|
|
56
58
|
const decided = requestAssignments(request);
|
|
59
|
+
const version = requestVersion(request);
|
|
60
|
+
// The worker's release check for this draft request: the draft waits for it, never one of its own.
|
|
61
|
+
const releaseCheck = version === null ? null : request.headers.get(RELEASE_CHECK_HEADER);
|
|
57
62
|
return cms.client({
|
|
58
|
-
version
|
|
63
|
+
version,
|
|
64
|
+
...(releaseCheck ? { releaseCheck } : {}),
|
|
59
65
|
visitor: requestVisitor(request),
|
|
60
66
|
experiments: decided?.experiments,
|
|
61
67
|
campaigns: decided?.campaigns,
|
package/src/worker/cache.ts
CHANGED
|
@@ -6,12 +6,15 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import type { CMS } from "@decocms/blocks";
|
|
8
8
|
import { VERSION_HEADER } from "../draft.ts";
|
|
9
|
+
import { hasDraftSignal } from "./drafts.ts";
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* Whether a request may be served from or stored in a shared cache at all:
|
|
12
13
|
* a GET of the current release (`version` `null`: never a preview, a draft
|
|
13
|
-
* or an old release),
|
|
14
|
-
* and
|
|
14
|
+
* or an old release), carrying no draft signal at all (no `?__draft=`, `off`
|
|
15
|
+
* included, and no draft cookie: a preview always renders), outside local
|
|
16
|
+
* development, without `Authorization`, and not one of TanStack Start's own
|
|
17
|
+
* `/_build` files. The worker calls a
|
|
15
18
|
* site's `pageCache` only for these.
|
|
16
19
|
*/
|
|
17
20
|
export function isCacheable(
|
|
@@ -23,6 +26,7 @@ export function isCacheable(
|
|
|
23
26
|
inputs.version === null &&
|
|
24
27
|
inputs.dev !== true &&
|
|
25
28
|
!request.headers.has("authorization") &&
|
|
29
|
+
!hasDraftSignal(request) &&
|
|
26
30
|
!new URL(request.url).pathname.startsWith("/_build")
|
|
27
31
|
);
|
|
28
32
|
}
|