@snokam/page-content 6.9.5 → 6.9.6
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/CHANGELOG.md +6 -0
- package/dist/providers/merge-content.d.ts.map +1 -1
- package/dist/providers/merge-content.js +1 -6
- package/dist/providers/merge-content.js.map +1 -1
- package/dist/server/content-api.d.ts.map +1 -1
- package/dist/server/content-api.js +5 -2
- package/dist/server/content-api.js.map +1 -1
- package/dist/server/organization.d.ts.map +1 -1
- package/dist/server/organization.js +5 -2
- package/dist/server/organization.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [6.9.6](https://github.com/snokam/monorepo/compare/@snokam/page-content@6.9.5...@snokam/page-content@6.9.6) (2026-11-06)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- **telemetry:** log less so prod Log Analytics stays under its daily cap ([#3223](https://github.com/snokam/monorepo/issues/3223)) ([bc90902](https://github.com/snokam/monorepo/commit/bc909026f5c421f4013963814fcc86ee922dc644))
|
|
11
|
+
|
|
6
12
|
## 6.9.5 (2026-11-05)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @snokam/page-content
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-content.d.ts","sourceRoot":"","sources":["../../src/providers/merge-content.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"merge-content.d.ts","sourceRoot":"","sources":["../../src/providers/merge-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEnD,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,IAAI,CAAC,CAEpE;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC;AAU3D,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzE,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,wBAAgB,YAAY,CAC1B,eAAe,EAAE,WAAW,CAAC,WAAW,CAAC,EACzC,UAAU,EAAE,cAAc,GACzB,aAAa,CAoEf"}
|
|
@@ -21,12 +21,7 @@ export function mergeContent(mainPageContent, appContent) {
|
|
|
21
21
|
];
|
|
22
22
|
componentSources.forEach(({ sanityId, sanityType, components }) => components
|
|
23
23
|
?.filter(isNotNull)
|
|
24
|
-
.forEach((component) => {
|
|
25
|
-
if (componentMap.has(component.key)) {
|
|
26
|
-
console.warn(`Duplicate component key found: "${component.key}"`);
|
|
27
|
-
}
|
|
28
|
-
componentMap.set(component.key, { sanityId, sanityType });
|
|
29
|
-
}));
|
|
24
|
+
.forEach((component) => componentMap.set(component.key, { sanityId, sanityType })));
|
|
30
25
|
const pageContent = {
|
|
31
26
|
...mainExtraPages
|
|
32
27
|
.filter(isNotNull)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-content.js","sourceRoot":"","sources":["../../src/providers/merge-content.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-content.js","sourceRoot":"","sources":["../../src/providers/merge-content.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-api.d.ts","sourceRoot":"","sources":["../../src/server/content-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAIhF,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAE9C,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC;AACzC,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,UAAU,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC;AAMhD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,UAEtE;
|
|
1
|
+
{"version":3,"file":"content-api.d.ts","sourceRoot":"","sources":["../../src/server/content-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAIhF,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAE9C,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC;AACzC,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,UAAU,CAAC;AAEvD,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC;AAMhD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,UAEtE;AAgBD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,CAiBhC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { knownTenantApiBaseUrl } from "@snokam/tenant/server";
|
|
2
2
|
import { contentClient } from "./clients";
|
|
3
3
|
export const CONTENT_REVALIDATE_SECONDS = 600;
|
|
4
4
|
export function contentTag(host, kind, key) {
|
|
5
5
|
return `content:${host}:${kind}:${key}`;
|
|
6
6
|
}
|
|
7
7
|
async function contentReads(host) {
|
|
8
|
-
|
|
8
|
+
const apiBaseUrl = await knownTenantApiBaseUrl(host);
|
|
9
|
+
return apiBaseUrl ? contentClient(apiBaseUrl) : null;
|
|
9
10
|
}
|
|
10
11
|
function cacheFor(host, kind, key) {
|
|
11
12
|
return {
|
|
@@ -18,6 +19,8 @@ function cacheFor(host, kind, key) {
|
|
|
18
19
|
export async function fetchContentLayers(kind, key, host, language) {
|
|
19
20
|
try {
|
|
20
21
|
const reads = await contentReads(host);
|
|
22
|
+
if (!reads)
|
|
23
|
+
return null;
|
|
21
24
|
const init = cacheFor(host, kind, key);
|
|
22
25
|
const answer = kind === "page"
|
|
23
26
|
? await reads.getPageContent({ pageKey: key, language }, init)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-api.js","sourceRoot":"","sources":["../../src/server/content-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"content-api.js","sourceRoot":"","sources":["../../src/server/content-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAW9C,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,IAAiB,EAAE,GAAW;IACrE,OAAO,WAAW,IAAI,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;AAC1C,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,IAAY;IACtC,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAiB,EAAE,GAAW;IAC5D,OAAO;QACL,IAAI,EAAE;YACJ,UAAU,EAAE,0BAA0B;YACtC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;SACpC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAiB,EACjB,GAAW,EACX,IAAY,EACZ,QAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAgB,CAAC;QACtD,MAAM,MAAM,GACV,IAAI,KAAK,MAAM;YACb,CAAC,CAAC,MAAM,KAAK,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC;YAC9D,CAAC,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,kDAAkD,IAAI,KAAK,GAAG,SAAS,IAAI,GAAG,EAC9E,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAC/C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.d.ts","sourceRoot":"","sources":["../../src/server/organization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AASjE,YAAY,EAAE,YAAY,EAAE,CAAC;AAM7B,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"organization.d.ts","sourceRoot":"","sources":["../../src/server/organization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AASjE,YAAY,EAAE,YAAY,EAAE,CAAC;AAM7B,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgB9B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { apiScope,
|
|
1
|
+
import { apiScope, knownTenantApiBaseUrl, managedBearer, } from "@snokam/tenant/server";
|
|
2
2
|
import { organizationClient } from "./clients";
|
|
3
3
|
import { CONTENT_REVALIDATE_SECONDS } from "./content-api";
|
|
4
4
|
const cacheInit = {
|
|
@@ -6,7 +6,10 @@ const cacheInit = {
|
|
|
6
6
|
};
|
|
7
7
|
export async function fetchOrganization(host) {
|
|
8
8
|
try {
|
|
9
|
-
const
|
|
9
|
+
const apiBaseUrl = await knownTenantApiBaseUrl(host);
|
|
10
|
+
if (!apiBaseUrl)
|
|
11
|
+
return null;
|
|
12
|
+
const client = organizationClient(apiBaseUrl, async () => (await managedBearer(apiScope())) ?? "");
|
|
10
13
|
return await client.getOrganization(cacheInit);
|
|
11
14
|
}
|
|
12
15
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.js","sourceRoot":"","sources":["../../src/server/organization.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"organization.js","sourceRoot":"","sources":["../../src/server/organization.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAI3D,MAAM,SAAS,GAAG;IAChB,IAAI,EAAE,EAAE,UAAU,EAAE,0BAA0B,EAAE;CAClC,CAAC;AAEjB,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,kBAAkB,CAC/B,UAAU,EACV,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CACpD,CAAC;QACF,OAAO,MAAM,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,8CAA8C,IAAI,GAAG,EACrD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAC/C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@snokam/page-content",
|
|
3
3
|
"description": "Snøkam page content: apps, pages and parts read from the content api",
|
|
4
|
-
"version": "6.9.
|
|
4
|
+
"version": "6.9.6",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"@portabletext/types": "^4.0.2",
|
|
22
22
|
"@snokam/api-client": "1.0.0",
|
|
23
23
|
"@snokam/identity": "1.1.0",
|
|
24
|
-
"@snokam/tenant": "4.5.
|
|
24
|
+
"@snokam/tenant": "4.5.3",
|
|
25
25
|
"@snokam/ui": "7.2.2"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|