@timber-js/app 0.2.0-alpha.243 → 0.2.0-alpha.244
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/_chunks/{actions-DoTj0Jd3.js → actions-D_LiN5xG.js} +4 -4
- package/dist/_chunks/actions-D_LiN5xG.js.map +1 -0
- package/dist/_chunks/{cli-check-DlQBSKIN.js → cli-check-BE9BnXwi.js} +5 -5
- package/dist/_chunks/cli-check-BE9BnXwi.js.map +1 -0
- package/dist/_chunks/{convention-lint-CGGcseNn.js → convention-lint-DkSDlsPH.js} +36 -8
- package/dist/_chunks/convention-lint-DkSDlsPH.js.map +1 -0
- package/dist/_chunks/{dev-server-LO4McfQi.js → dev-server-BZxFJNih.js} +66 -9
- package/dist/_chunks/{dev-server-LO4McfQi.js.map → dev-server-BZxFJNih.js.map} +1 -1
- package/dist/_chunks/dev-server-C72bB9Kg.js +1 -0
- package/dist/_chunks/{key-headers-uIig1_mU.js → key-headers-CVpa6fpW.js} +6 -2
- package/dist/_chunks/key-headers-CVpa6fpW.js.map +1 -0
- package/dist/cli-check.d.ts +3 -3
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +2 -2
- package/dist/config-types.d.ts +43 -22
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +1 -0
- package/dist/native/rsc/server/route-element-builder.js +1 -1
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/route-module-loader.js +5 -4
- package/dist/native/rsc/server/route-module-loader.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js +2 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-rule.js +2 -2
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +13 -8
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +5 -4
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -1
- package/dist/native/rsc/shared/key-headers.js +4 -1
- package/dist/native/rsc/shared/key-headers.js.map +1 -1
- package/dist/native/rsc/shared/layout-defaults.js +19 -0
- package/dist/native/rsc/shared/layout-defaults.js.map +1 -0
- package/dist/native/ssr/manifest.json +1 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js +1 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +2 -2
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/ssr/shared/key-headers.js +4 -1
- package/dist/native/ssr/shared/key-headers.js.map +1 -1
- package/dist/native/ssr/shared/layout-defaults.js +9 -0
- package/dist/native/ssr/shared/layout-defaults.js.map +1 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/routing/convention-lint.d.ts +2 -2
- package/dist/routing/convention-lint.d.ts.map +1 -1
- package/dist/routing/route-options-lint.d.ts +2 -2
- package/dist/routing/route-options-lint.d.ts.map +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/internal.js +1 -1
- package/dist/server/route-module-loader.d.ts +4 -3
- package/dist/server/route-module-loader.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts +3 -3
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts +3 -3
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/segment-lifetime/outlet-gate.d.ts +5 -5
- package/dist/server/segment-lifetime/outlet-gate.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/segment-key.d.ts +21 -18
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -1
- package/dist/server/segment-lifetime/slot-outlets.d.ts +2 -3
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -1
- package/dist/server/types.d.ts +4 -3
- package/dist/server/types.d.ts.map +1 -1
- package/dist/shared/key-headers.d.ts +2 -0
- package/dist/shared/key-headers.d.ts.map +1 -1
- package/dist/shared/layout-defaults.d.ts +30 -0
- package/dist/shared/layout-defaults.d.ts.map +1 -0
- package/docs/api/30-api-server.mdx +1 -1
- package/docs/api/34-api-config.mdx +20 -3
- package/package.json +1 -1
- package/src/cli-check.ts +6 -6
- package/src/config-types.ts +44 -22
- package/src/config-validation.ts +96 -20
- package/src/index.ts +1 -1
- package/src/plugins/entries.ts +6 -3
- package/src/plugins/routing.ts +1 -1
- package/src/routing/convention-lint.ts +5 -3
- package/src/routing/route-options-lint.ts +6 -6
- package/src/server/route-element-builder.ts +1 -1
- package/src/server/route-module-loader.ts +7 -6
- package/src/server/rsc-entry/index.ts +7 -8
- package/src/server/rsc-entry/render-route.ts +4 -4
- package/src/server/rsc-entry/revalidate-renderer.ts +4 -4
- package/src/server/segment-lifetime/outlet-gate.ts +6 -6
- package/src/server/segment-lifetime/read-rule.ts +5 -2
- package/src/server/segment-lifetime/segment-key.ts +32 -24
- package/src/server/segment-lifetime/slot-outlets.ts +7 -11
- package/src/server/types.ts +4 -3
- package/src/shared/key-headers.ts +5 -0
- package/src/shared/layout-defaults.ts +43 -0
- package/dist/_chunks/actions-DoTj0Jd3.js.map +0 -1
- package/dist/_chunks/cli-check-DlQBSKIN.js.map +0 -1
- package/dist/_chunks/convention-lint-CGGcseNn.js.map +0 -1
- package/dist/_chunks/dev-server-DrjLscqT.js +0 -1
- package/dist/_chunks/key-headers-uIig1_mU.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { t as RESTART_EXIT_CODE } from "./dev-server-BZxFJNih.js";
|
|
@@ -25,6 +25,10 @@ var UNKEYABLE_HEADERS = /* @__PURE__ */ new Map([
|
|
|
25
25
|
["proxy-authorization", CREDENTIAL],
|
|
26
26
|
["x-api-key", CREDENTIAL]
|
|
27
27
|
]);
|
|
28
|
+
/** Whether `value` has the shape of `key.headers`: an array of strings. */
|
|
29
|
+
function isHeaderList(value) {
|
|
30
|
+
return Array.isArray(value) && value.every((h) => typeof h === "string");
|
|
31
|
+
}
|
|
28
32
|
/** Why a key may not name `name`, or undefined when it may. */
|
|
29
33
|
function headerKeyProblem(name) {
|
|
30
34
|
if (!HEADER_NAME.test(name)) return `key.headers names "${name}", which is not a valid header name.`;
|
|
@@ -35,6 +39,6 @@ function headerKeyProblem(name) {
|
|
|
35
39
|
function isUnkeyableHeader(name) {
|
|
36
40
|
return UNKEYABLE_HEADERS.has(name.toLowerCase());
|
|
37
41
|
}
|
|
38
|
-
export {
|
|
42
|
+
export { isHeaderList as n, isUnkeyableHeader as r, headerKeyProblem as t };
|
|
39
43
|
|
|
40
|
-
//# sourceMappingURL=key-headers-
|
|
44
|
+
//# sourceMappingURL=key-headers-CVpa6fpW.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"key-headers-CVpa6fpW.js","names":[],"sources":["../../src/shared/key-headers.ts"],"sourcesContent":["/**\n * Which request headers a `'document'` segment's key may name\n * (design/53-segment-lifetime.md §\"Segment keys\"). One rule for the build\n * (`routing/route-options.ts`), which reports it from source, and for the\n * runtime (`server/segment-lifetime/segment-key.ts`), which refuses it too —\n * the build cannot read every file kind (MDX pages are not linted), and a\n * credential must not become keyable by skipping the lint.\n */\n\n/** RFC 9110 §5.6.2 `token`: what a header field name may be. */\nconst HEADER_NAME = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;\n\n/**\n * Headers a key may not name. `cookie` is read through cookie definitions\n * (`key.cookies`). Credentials are secret, and a key answers guesses about\n * its values to whoever holds a digest (design/53 §\"The key digest\").\n */\nconst CREDENTIAL = 'It carries a credential, and a key must not hold secret values.';\n\n/**\n * A `Map`, not an object literal: a header may be named `constructor` or\n * `__proto__`, and an index lookup would find `Object.prototype`'s.\n */\nconst UNKEYABLE_HEADERS: ReadonlyMap<string, string> = new Map([\n ['cookie', 'Key on cookie definitions with key.cookies instead.'],\n ['authorization', CREDENTIAL],\n ['proxy-authorization', CREDENTIAL],\n ['x-api-key', CREDENTIAL],\n]);\n\n/** Whether `value` has the shape of `key.headers`: an array of strings. */\nexport function isHeaderList(value: unknown): value is readonly string[] {\n return Array.isArray(value) && value.every((h) => typeof h === 'string');\n}\n\n/** Why a key may not name `name`, or undefined when it may. */\nexport function headerKeyProblem(name: string): string | undefined {\n if (!HEADER_NAME.test(name))\n return `key.headers names \"${name}\", which is not a valid header name.`;\n const refused = UNKEYABLE_HEADERS.get(name.toLowerCase());\n return refused ? `key.headers may not name \"${name}\". ${refused}` : undefined;\n}\n\n/** Whether a key may never name `name` (case-insensitive): a cookie or credential header. */\nexport function isUnkeyableHeader(name: string): boolean {\n return UNKEYABLE_HEADERS.has(name.toLowerCase());\n}\n"],"mappings":";;;;;;;;;;AAUA,IAAM,cAAc;;;;;;AAOpB,IAAM,aAAa;;;;;AAMnB,IAAM,oCAAiD,IAAI,IAAI;CAC7D,CAAC,UAAU,qDAAqD;CAChE,CAAC,iBAAiB,UAAU;CAC5B,CAAC,uBAAuB,UAAU;CAClC,CAAC,aAAa,UAAU;AAC1B,CAAC;;AAGD,SAAgB,aAAa,OAA4C;CACvE,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,OAAO,MAAM,OAAO,MAAM,QAAQ;AACzE;;AAGA,SAAgB,iBAAiB,MAAkC;CACjE,IAAI,CAAC,YAAY,KAAK,IAAI,GACxB,OAAO,sBAAsB,KAAK;CACpC,MAAM,UAAU,kBAAkB,IAAI,KAAK,YAAY,CAAC;CACxD,OAAO,UAAU,6BAA6B,KAAK,KAAK,YAAY,KAAA;AACtE;;AAGA,SAAgB,kBAAkB,MAAuB;CACvD,OAAO,kBAAkB,IAAI,KAAK,YAAY,CAAC;AACjD"}
|
package/dist/cli-check.d.ts
CHANGED
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
* Design docs: 11-platform.md §CLI, 09-typescript.md, 28-npm-packaging.md
|
|
31
31
|
*/
|
|
32
32
|
import { type ResolveViteConfig } from './cli-context.ts';
|
|
33
|
-
import type {
|
|
33
|
+
import type { LayoutDefaults } from './config-types.ts';
|
|
34
34
|
/**
|
|
35
35
|
* Run the compiler to completion.
|
|
36
36
|
*
|
|
@@ -90,8 +90,8 @@ export interface RouteInputs {
|
|
|
90
90
|
root: string;
|
|
91
91
|
appDir: string;
|
|
92
92
|
pageExtensions: string[] | undefined;
|
|
93
|
-
/** Read by the route-options lint (design/53 §"App-wide
|
|
94
|
-
|
|
93
|
+
/** Read by the route-options lint (design/53 §"App-wide defaults"). */
|
|
94
|
+
layoutDefaults: LayoutDefaults | undefined;
|
|
95
95
|
}
|
|
96
96
|
/**
|
|
97
97
|
* Resolve root, appDir and pageExtensions the way `timber build` resolves them
|
package/dist/cli-check.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-check.d.ts","sourceRoot":"","sources":["../src/cli-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAQH,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-check.d.ts","sourceRoot":"","sources":["../src/cli-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAQH,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAaxD;;;;;;;GAOG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAE/F;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAE/F,kDAAkD;AAClD,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,WAAW,GAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,MACV,GACvC,MAAM,CAwBR;AAED,uDAAuD;AACvD,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wEAAwE;AACxE,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACrC,uEAAuE;IACvE,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,GAAE,YAAiB,EAC1B,IAAI,GAAE,SAAc,GACnB,OAAO,CAAC,WAAW,CAAC,CAQtB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,OAAO,GAAE,YAAiB,EAC1B,IAAI,GAAE,SAAc,GACnB,OAAO,CAAC,WAAW,CAAC,CAiCtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAmCvD;AAqGD;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,OAAO,GAAE,YAAiB,EAC1B,IAAI,GAAE,SAAc,GACnB,OAAO,CAAC,IAAI,CAAC,CAiDf"}
|
package/dist/cli.js
CHANGED
|
@@ -99,7 +99,7 @@ async function runDev(options, _deps) {
|
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
101
101
|
const { fork } = await import("node:child_process");
|
|
102
|
-
const { RESTART_EXIT_CODE } = await import("./_chunks/dev-server-
|
|
102
|
+
const { RESTART_EXIT_CODE } = await import("./_chunks/dev-server-C72bB9Kg.js");
|
|
103
103
|
while (true) {
|
|
104
104
|
const result = await new Promise((resolve) => {
|
|
105
105
|
const child = fork(process.argv[1], process.argv.slice(2), {
|
|
@@ -179,7 +179,7 @@ async function runPreview(options, _deps) {
|
|
|
179
179
|
* `--project` names the tsconfig handed to tsgo.
|
|
180
180
|
*/
|
|
181
181
|
async function runCheck(options, _deps) {
|
|
182
|
-
const { checkRoutes, runTypeCheck } = await import("./_chunks/cli-check-
|
|
182
|
+
const { checkRoutes, runTypeCheck } = await import("./_chunks/cli-check-BE9BnXwi.js");
|
|
183
183
|
const { root } = await checkRoutes({ viteConfigFile: options.config }, _deps);
|
|
184
184
|
await runTypeCheck({
|
|
185
185
|
root,
|
package/dist/config-types.d.ts
CHANGED
|
@@ -15,6 +15,46 @@ export interface ClientJavascriptConfig {
|
|
|
15
15
|
*/
|
|
16
16
|
enableHMRInDev?: boolean;
|
|
17
17
|
}
|
|
18
|
+
/**
|
|
19
|
+
* What every layout takes when it does not declare its own (`layoutDefaults`).
|
|
20
|
+
* An explicit subset of `LayoutOptions`: options that already apply app-wide
|
|
21
|
+
* from a root layout (`prerender`, `deferSuspenseFor`) are not here.
|
|
22
|
+
*/
|
|
23
|
+
export interface LayoutDefaults {
|
|
24
|
+
/**
|
|
25
|
+
* The lifetime of every layout that does not declare one. A layout's own
|
|
26
|
+
* `layoutOptions.lifetime` wins.
|
|
27
|
+
*
|
|
28
|
+
* `'document'` renders each layout on the document request and skips it on
|
|
29
|
+
* client navigations until its key changes. Every `'document'` rule
|
|
30
|
+
* applies: the default key is every param on the layout's path (plus
|
|
31
|
+
* `key.headers` below), and the layout may read only the request inputs in
|
|
32
|
+
* its key. Check three things before turning it on: a layout that reads
|
|
33
|
+
* anything else (a header, a cookie outside its key) is reported (the dev
|
|
34
|
+
* overlay, or a warning) and renders as `'request'` for that visitor; a
|
|
35
|
+
* layout that shows data that changes during a visit (a cart badge) keeps
|
|
36
|
+
* the value it had at load; and a layout that hides its children in its
|
|
37
|
+
* body no longer keeps them out of the payload, since a skip never runs it.
|
|
38
|
+
* Declare `layoutOptions = { lifetime: 'request' }` on those, and gate in
|
|
39
|
+
* `access.ts`. Layouts in and below an intercepting directory take no
|
|
40
|
+
* options and no defaults, and stay `'request'`.
|
|
41
|
+
*
|
|
42
|
+
* Default: `'request'`.
|
|
43
|
+
*/
|
|
44
|
+
lifetime?: SegmentLifetime;
|
|
45
|
+
key?: {
|
|
46
|
+
/**
|
|
47
|
+
* The `key.headers` of every `'document'` layout whose key does not
|
|
48
|
+
* declare `headers` — declared `'document'` or defaulted. A layout that
|
|
49
|
+
* declares `key.headers` replaces this list rather than adding to it.
|
|
50
|
+
* Each header in it makes those layouts re-render when its value changes,
|
|
51
|
+
* so name headers that are stable across a visit (`user-agent`). The
|
|
52
|
+
* same names are refused as in a layout's own key: `cookie`, credential
|
|
53
|
+
* headers and invalid names stop startup.
|
|
54
|
+
*/
|
|
55
|
+
headers?: readonly string[];
|
|
56
|
+
};
|
|
57
|
+
}
|
|
18
58
|
export interface TimberUserConfig {
|
|
19
59
|
output?: 'server' | 'static';
|
|
20
60
|
/**
|
|
@@ -327,29 +367,10 @@ export interface TimberUserConfig {
|
|
|
327
367
|
*/
|
|
328
368
|
buildDir?: string;
|
|
329
369
|
/**
|
|
330
|
-
*
|
|
331
|
-
*
|
|
332
|
-
* `layoutOptions.lifetime` wins.
|
|
333
|
-
*
|
|
334
|
-
* `'document'` renders each layout on the document request and skips it on
|
|
335
|
-
* client navigations until its key changes. Every `'document'` rule
|
|
336
|
-
* applies: the default key is every param on the layout's path, and the
|
|
337
|
-
* layout may read only the request inputs in its key. Check three things
|
|
338
|
-
* before turning it on: a layout that reads anything else (a header, a
|
|
339
|
-
* cookie outside its key) is reported (the dev overlay, or a warning) and
|
|
340
|
-
* renders as `'request'` for that visitor; a layout that shows data that changes
|
|
341
|
-
* during a visit (a cart badge) keeps the value it had at load; and a layout
|
|
342
|
-
* that hides its children in its body no longer keeps them out of the
|
|
343
|
-
* payload, since a skip never runs it. Declare
|
|
344
|
-
* `layoutOptions = { lifetime: 'request' }` on those, and gate in
|
|
345
|
-
* `access.ts`. Layouts in and below an intercepting directory take no
|
|
346
|
-
* options and stay `'request'`.
|
|
347
|
-
*
|
|
348
|
-
* Default: `'request'`.
|
|
349
|
-
*
|
|
350
|
-
* See design/53-segment-lifetime.md §"App-wide default".
|
|
370
|
+
* Defaults for every layout, slot layouts included. Pages are unaffected.
|
|
371
|
+
* See `LayoutDefaults` and design/53-segment-lifetime.md §"App-wide defaults".
|
|
351
372
|
*/
|
|
352
|
-
|
|
373
|
+
layoutDefaults?: LayoutDefaults;
|
|
353
374
|
/**
|
|
354
375
|
* Cache behavior configuration.
|
|
355
376
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config-types.d.ts","sourceRoot":"","sources":["../src/config-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-validation.d.ts","sourceRoot":"","sources":["../src/config-validation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"config-validation.d.ts","sourceRoot":"","sources":["../src/config-validation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAkB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAO1E,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,IAAI,CAAC;CACd;AAuCD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,GAAG,WAAW,EAAE,CAsPtE;AA+ED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EAAE,EACrB,EAAE,KAAY,EAAE,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GACzC,MAAM,CAkBR;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EAAE,EACrB,KAAK,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAA2C,GACnE,IAAI,CAKN;AAeD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAOpE;AAID,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,IAAI,GAAG,SAAS,CAAC;CAC1B;AAOD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CAmB1E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAgBnE"}
|
package/dist/index.d.ts
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import type { PluginOption } from 'vite';
|
|
13
13
|
import type { TimberUserConfig } from './config-types.ts';
|
|
14
|
-
export type { TimberUserConfig } from './config-types.ts';
|
|
14
|
+
export type { LayoutDefaults, TimberUserConfig } from './config-types.ts';
|
|
15
15
|
export type { Metadata, MetadataRoute, MetadataHandler, MetadataResult } from './server/types.ts';
|
|
16
16
|
export type { LayoutOptions, PageOptions, RoutePrerender } from './server/types.ts';
|
|
17
17
|
/**
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AA+CjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AA+CjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1E,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAClG,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEpF;;;;;;;;;;;;;;GAcG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAmHD,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAoXhE;eAEc,MAAM"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { a as generateManifestModule, c as formatMissingPeers, i as VIRTUAL_IDS, l as reportConfigErrors, n as timberDevServer, o as generateSchemaModule, s as checkPeerDependencies, u as validateConfig } from "./_chunks/dev-server-
|
|
1
|
+
import { a as generateManifestModule, c as formatMissingPeers, i as VIRTUAL_IDS, l as reportConfigErrors, n as timberDevServer, o as generateSchemaModule, s as checkPeerDependencies, u as validateConfig } from "./_chunks/dev-server-BZxFJNih.js";
|
|
2
2
|
import { i as resolveRenderTimeoutMs } from "./_chunks/render-timeout-MrrqD1wd.js";
|
|
3
3
|
import { n as scanRoutes } from "./_chunks/scanner-B6V2RqqF.js";
|
|
4
|
-
import { c as writeRouteCodegen, i as readRouteOptions, l as buildDirToRouteMap, n as formatConventionWarnings, r as lintConventions, s as flushCodegenWrites, t as checkAppDirExists } from "./_chunks/convention-lint-
|
|
4
|
+
import { c as writeRouteCodegen, i as readRouteOptions, l as buildDirToRouteMap, n as formatConventionWarnings, r as lintConventions, s as flushCodegenWrites, t as checkAppDirExists } from "./_chunks/convention-lint-DkSDlsPH.js";
|
|
5
5
|
import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-BAZoAlfI.js";
|
|
6
6
|
import { i as poisonPillSource, r as markerFor, t as EXPLICIT_MARKERS } from "./_chunks/poison-rules-Bmz-lCPi.js";
|
|
7
7
|
import { t as writeFileAtomic } from "./_chunks/write-file-atomic-DW8m_Atv.js";
|
|
@@ -230,7 +230,7 @@ function generateConfigModule(ctx) {
|
|
|
230
230
|
sitemap: ctx.config.sitemap,
|
|
231
231
|
forms: serializeFormsConfig(ctx.config.forms),
|
|
232
232
|
deploymentId: ctx.deploymentId ?? null,
|
|
233
|
-
|
|
233
|
+
layoutDefaults: ctx.config.layoutDefaults ?? null,
|
|
234
234
|
cache: { strictKeyDiscipline: ctx.config.cache?.strictKeyDiscipline ?? false },
|
|
235
235
|
devBrowserLogs: ctx.config.devBrowserLogs
|
|
236
236
|
};
|
|
@@ -607,7 +607,7 @@ function timberRouting(ctx) {
|
|
|
607
607
|
ctx.timer.start("route-scan");
|
|
608
608
|
const tree = scanRoutes(ctx.appDir, { pageExtensions: ctx.config.pageExtensions });
|
|
609
609
|
ctx.timer.end("route-scan");
|
|
610
|
-
const conventionWarnings = lintConventions(tree, ctx.appDir, {
|
|
610
|
+
const conventionWarnings = lintConventions(tree, ctx.appDir, { layoutDefaults: ctx.config.layoutDefaults });
|
|
611
611
|
const fatal = conventionWarnings.filter((w) => w.level === "error");
|
|
612
612
|
if (fatal.length > 0) throw new Error(formatConventionWarnings(fatal, { color: false }));
|
|
613
613
|
ctx.routeTree = tree;
|