@yimingliao/cms 0.0.235 → 0.0.237

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 (7) hide show
  1. package/dist/src/shared/seo-metadata/build-article-metadata.js +8 -14
  2. package/dist/src/shared/seo-metadata/build-website-metadata.js +4 -4
  3. package/dist/types/src/shared/seo-metadata/build-article-metadata.d.ts +4 -1
  4. package/dist/types/src/shared/seo-metadata/build-article-metadata.d.ts.map +1 -1
  5. package/dist/types/src/shared/seo-metadata/build-website-metadata.d.ts +4 -1
  6. package/dist/types/src/shared/seo-metadata/build-website-metadata.d.ts.map +1 -1
  7. package/package.json +1 -1
package/dist/src/shared/seo-metadata/build-article-metadata.js CHANGED
@@ -7,16 +7,9 @@ import { sanitizeStringArray } from './utils/sanitize-string-array.js';
7
7
  import { toIsoTime } from './utils/to-iso-time.js';
8
8
  import { toOgLocale } from './utils/to-og-locale.js';
9
9
 
10
- function createBuildArticleMetadata(siteConfig, storageUrl) {
10
+ function createBuildArticleMetadata(siteConfig, urls, storageUrl) {
11
11
  return function buildArticleMetadata(post, locale) {
12
- const {
13
- defaultLocale,
14
- locales,
15
- siteUrl,
16
- siteName,
17
- siteDescription,
18
- defaultImage
19
- } = siteConfig;
12
+ const { defaultLocale, locales, siteUrl, siteName, siteDescription } = siteConfig;
20
13
  const resolvedLocale = locale ?? defaultLocale;
21
14
  const seoMetadata = findTranslation(post?.seoMetadatas, locale);
22
15
  const authorT = findTranslation(post?.author?.translations, locale);
@@ -39,9 +32,10 @@ function createBuildArticleMetadata(siteConfig, storageUrl) {
39
32
  }
40
33
  ],
41
34
  // url
35
+ // url
42
36
  alternates: {
43
- canonical: seoMetadata.canonical,
44
- languages: buildAlternateMap(seoMetadata.alternate)
37
+ canonical: seoMetadata.canonical ?? urls.canonical,
38
+ languages: seoMetadata.alternate?.length ? buildAlternateMap(seoMetadata.alternate) : urls.alternates
45
39
  },
46
40
  // robots
47
41
  robots: seoMetadata.robots || {
@@ -61,18 +55,18 @@ function createBuildArticleMetadata(siteConfig, storageUrl) {
61
55
  type: ensureOgType("article", seoMetadata.ogType),
62
56
  siteName: seoMetadata.ogSiteName || siteName[resolvedLocale],
63
57
  // image
64
- images: seoMetadata.ogImage ? buildOgImages({
58
+ images: buildOgImages({
65
59
  url: seoMetadata.ogImage || `${storageUrl}/${post?.coverImage?.key}`,
66
60
  secureUrl: seoMetadata.ogImage || `${storageUrl}/${post?.coverImage?.key}`,
67
61
  alt: seoMetadata.ogImageAlt || coverImageT.alt,
68
62
  type: seoMetadata.ogImageType,
69
63
  width: seoMetadata.ogImageWidth,
70
64
  height: seoMetadata.ogImageHeight
71
- }) : buildOgImages(defaultImage),
65
+ }),
72
66
  // locale
73
67
  locale: seoMetadata.ogLocale ?? toOgLocale(resolvedLocale),
74
68
  alternateLocale: sanitizeStringArray(
75
- seoMetadata.ogLocaleAlternate ?? locales.filter((l) => l !== resolvedLocale).map(toOgLocale)
69
+ seoMetadata.ogLocaleAlternate?.length ? seoMetadata.ogLocaleAlternate : locales.filter((l) => l !== resolvedLocale).map(toOgLocale)
76
70
  ),
77
71
  // article
78
72
  publishedTime: toIsoTime(seoMetadata.ogArticlePublishedTime),
package/dist/src/shared/seo-metadata/build-website-metadata.js CHANGED
@@ -6,7 +6,7 @@ import { ensureTwitterCard } from './utils/ensure-twitter-card.js';
6
6
  import { sanitizeStringArray } from './utils/sanitize-string-array.js';
7
7
  import { toOgLocale } from './utils/to-og-locale.js';
8
8
 
9
- function createBuildWebsiteMetadata(siteConfig) {
9
+ function createBuildWebsiteMetadata(siteConfig, urls) {
10
10
  return function buildWebsiteMetadata(post, locale) {
11
11
  const {
12
12
  defaultLocale,
@@ -27,8 +27,8 @@ function createBuildWebsiteMetadata(siteConfig) {
27
27
  description: seoMetadata.description || siteDescription[resolvedLocale],
28
28
  // url
29
29
  alternates: {
30
- canonical: seoMetadata.canonical,
31
- languages: buildAlternateMap(seoMetadata.alternate)
30
+ canonical: seoMetadata.canonical ?? urls.canonical,
31
+ languages: seoMetadata.alternate?.length ? buildAlternateMap(seoMetadata.alternate) : urls.alternates
32
32
  },
33
33
  // robots
34
34
  robots: seoMetadata.robots || {
@@ -59,7 +59,7 @@ function createBuildWebsiteMetadata(siteConfig) {
59
59
  // locale
60
60
  locale: seoMetadata.ogLocale ?? toOgLocale(resolvedLocale),
61
61
  alternateLocale: sanitizeStringArray(
62
- seoMetadata.ogLocaleAlternate ?? locales.filter((l) => l !== resolvedLocale).map(toOgLocale)
62
+ seoMetadata.ogLocaleAlternate?.length ? seoMetadata.ogLocaleAlternate : locales.filter((l) => l !== resolvedLocale).map(toOgLocale)
63
63
  )
64
64
  },
65
65
  // -----------------------------------------------------------------------
package/dist/types/src/shared/seo-metadata/build-article-metadata.d.ts CHANGED
@@ -1,5 +1,8 @@
1
1
  import type { SiteConfig } from "../../domain";
2
2
  import type { PostFull } from "../../domain/resources/post/full";
3
3
  import type { Metadata } from "next";
4
- export declare function createBuildArticleMetadata<Locale extends string = string>(siteConfig: SiteConfig<Locale>, storageUrl: string): (post?: PostFull, locale?: Locale) => Metadata;
4
+ export declare function createBuildArticleMetadata<Locale extends string = string>(siteConfig: SiteConfig<Locale>, urls: {
5
+ canonical: string;
6
+ alternates: Record<string, string>;
7
+ }, storageUrl: string): (post?: PostFull, locale?: Locale) => Metadata;
5
8
  //# sourceMappingURL=build-article-metadata.d.ts.map
package/dist/types/src/shared/seo-metadata/build-article-metadata.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"build-article-metadata.d.ts","sourceRoot":"","sources":["../../../../../src/shared/seo-metadata/build-article-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAUrC,wBAAgB,0BAA0B,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EACvE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAC9B,UAAU,EAAE,MAAM,IAGhB,OAAO,QAAQ,EACf,SAAS,MAAM,KACd,QAAQ,CAwGZ"}
1
+ {"version":3,"file":"build-article-metadata.d.ts","sourceRoot":"","sources":["../../../../../src/shared/seo-metadata/build-article-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAUrC,wBAAgB,0BAA0B,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EACvE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAC9B,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC/D,UAAU,EAAE,MAAM,IAGhB,OAAO,QAAQ,EACf,SAAS,MAAM,KACd,QAAQ,CAmGZ"}
package/dist/types/src/shared/seo-metadata/build-website-metadata.d.ts CHANGED
@@ -1,5 +1,8 @@
1
1
  import type { SiteConfig } from "../../domain";
2
2
  import type { PostFull } from "../../domain/resources/post/full";
3
3
  import type { Metadata } from "next";
4
- export declare function createBuildWebsiteMetadata<Locale extends string = string>(siteConfig: SiteConfig<Locale>): (post?: PostFull, locale?: Locale) => Metadata;
4
+ export declare function createBuildWebsiteMetadata<Locale extends string = string>(siteConfig: SiteConfig<Locale>, urls: {
5
+ canonical: string;
6
+ alternates: Record<string, string>;
7
+ }): (post?: PostFull, locale?: Locale) => Metadata;
5
8
  //# sourceMappingURL=build-website-metadata.d.ts.map
package/dist/types/src/shared/seo-metadata/build-website-metadata.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"build-website-metadata.d.ts","sourceRoot":"","sources":["../../../../../src/shared/seo-metadata/build-website-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AASrC,wBAAgB,0BAA0B,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EACvE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,IAG5B,OAAO,QAAQ,EACf,SAAS,MAAM,KACd,QAAQ,CAgFZ"}
1
+ {"version":3,"file":"build-website-metadata.d.ts","sourceRoot":"","sources":["../../../../../src/shared/seo-metadata/build-website-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AASrC,wBAAgB,0BAA0B,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EACvE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAC9B,IAAI,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,IAG7D,OAAO,QAAQ,EACf,SAAS,MAAM,KACd,QAAQ,CAmFZ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yimingliao/cms",
3
- "version": "0.0.235",
3
+ "version": "0.0.237",
4
4
  "author": "Yiming Liao",
5
5
  "license": "MIT",
6
6
  "type": "module",