diff --git a/.changeset/neat-moons-admire.md b/.changeset/neat-moons-admire.md deleted file mode 100644 index 931e5b1f..00000000 --- a/.changeset/neat-moons-admire.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@galactiks/astro-integration': patch -'@galactiks/config': patch -'@galactiks/contentlayer': patch -'@galactiks/explorer': patch ---- - -fixes some bugs and add sitemap news support diff --git a/packages/adapters/astro/CHANGELOG.md b/packages/adapters/astro/CHANGELOG.md index 240e20e2..541868a2 100644 --- a/packages/adapters/astro/CHANGELOG.md +++ b/packages/adapters/astro/CHANGELOG.md @@ -1,5 +1,15 @@ # @galactiks/astro-integration +## 0.2.5 + +### Patch Changes + +- [`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8) Thanks [@emmanuelgautier](https://github.com/emmanuelgautier)! - fixes some bugs and add sitemap news support + +- Updated dependencies [[`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8)]: + - @galactiks/config@0.2.5 + - @galactiks/explorer@0.2.5 + ## 0.2.4 ### Patch Changes diff --git a/packages/adapters/astro/package.json b/packages/adapters/astro/package.json index 860a6cde..297328f2 100644 --- a/packages/adapters/astro/package.json +++ b/packages/adapters/astro/package.json @@ -1,6 +1,6 @@ { "name": "@galactiks/astro-integration", - "version": "0.2.4", + "version": "0.2.5", "description": "Galactiks Astro integration", "author": "thegalactiks", "types": "./dist/index.d.ts", diff --git a/packages/adapters/astro/src/preset.mts b/packages/adapters/astro/src/preset.mts index 2db8f797..2110ca94 100644 --- a/packages/adapters/astro/src/preset.mts +++ b/packages/adapters/astro/src/preset.mts @@ -16,31 +16,41 @@ export const integrationsPreset = (): AstroIntegration[] => [ partytown(), prefetch(), sitemap({ - i18n: defaultLocale ? { - defaultLocale, - locales: Object.fromEntries(getLanguages().map(lang => ([lang, lang]))) - } : undefined, + i18n: defaultLocale + ? { + defaultLocale, + locales: Object.fromEntries( + getLanguages().map((lang) => [lang, lang]) + ), + } + : undefined, serialize: async (item) => { const page = await getPageByURL(item.url); if (!page) { return undefined; } - return ({ + return { url: page.url, - lastmod: isValid(page.dateModified) ? page.dateModified.toISOString() : undefined, + lastmod: isValid(page.dateModified) + ? page.dateModified.toISOString() + : undefined, news: page.type === 'Article' && { publication: { name: getConfig().webManifest.name, - language: (page.inLanguage && getDefaultLanguage())?.substring(0, 2).toLowerCase(), + language: (page.inLanguage && getDefaultLanguage()) + ?.substring(0, 2) + .toLowerCase(), }, - publication_date: isValid(page.datePublished) ? page.datePublished.toISOString() : undefined, + publication_date: isValid(page.datePublished) + ? page.datePublished.toISOString() + : undefined, title: page.name, keywords: page.keywords?.join(', '), }, - }); - } + }; + }, }), robotsTxt(), critters(), diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index dc9c38df..1c1dbe26 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -1,5 +1,11 @@ # @galactiks/config +## 0.2.5 + +### Patch Changes + +- [`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8) Thanks [@emmanuelgautier](https://github.com/emmanuelgautier)! - fixes some bugs and add sitemap news support + ## 0.2.4 ### Patch Changes diff --git a/packages/config/package.json b/packages/config/package.json index 9e42bf97..507dc873 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@galactiks/config", - "version": "0.2.4", + "version": "0.2.5", "description": "Reading Galactiks configurations files and get config during website generation", "author": "thegalactiks", "types": "./dist/index.d.mts", diff --git a/packages/contentlayer/CHANGELOG.md b/packages/contentlayer/CHANGELOG.md index 7bf54101..ac32adce 100644 --- a/packages/contentlayer/CHANGELOG.md +++ b/packages/contentlayer/CHANGELOG.md @@ -1,5 +1,11 @@ # @galactiks/contentlayer +## 0.1.4 + +### Patch Changes + +- [`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8) Thanks [@emmanuelgautier](https://github.com/emmanuelgautier)! - fixes some bugs and add sitemap news support + ## 0.1.3 ### Patch Changes diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index 3dde2377..a68da868 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "@galactiks/contentlayer", - "version": "0.1.3", + "version": "0.1.4", "description": "Galactiks contentlayer configurations", "author": "galactiks", "types": "./dist/index.d.mts", diff --git a/packages/explorer/CHANGELOG.md b/packages/explorer/CHANGELOG.md index 95318cb6..a4891ffa 100644 --- a/packages/explorer/CHANGELOG.md +++ b/packages/explorer/CHANGELOG.md @@ -1,5 +1,15 @@ # @galactiks/explorer +## 0.2.5 + +### Patch Changes + +- [`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8) Thanks [@emmanuelgautier](https://github.com/emmanuelgautier)! - fixes some bugs and add sitemap news support + +- Updated dependencies [[`9e1871e`](https://github.com/thegalactiks/explorer/commit/9e1871e5918a76e65113010815a3437f97cbdec8)]: + - @galactiks/config@0.2.5 + - @galactiks/contentlayer@0.1.4 + ## 0.2.4 ### Patch Changes diff --git a/packages/explorer/package.json b/packages/explorer/package.json index 50b80396..6a6ef0c5 100644 --- a/packages/explorer/package.json +++ b/packages/explorer/package.json @@ -1,6 +1,6 @@ { "name": "@galactiks/explorer", - "version": "0.2.4", + "version": "0.2.5", "description": "Ensure Galactiks content model consistence, explore content built with ContentLayer and create dynamically missing pages and fields for SEO purposes", "author": "thegalactiks", "type": "module", diff --git a/packages/explorer/src/core/content/compute.mts b/packages/explorer/src/core/content/compute.mts index 4bbe50fb..e6ebc183 100644 --- a/packages/explorer/src/core/content/compute.mts +++ b/packages/explorer/src/core/content/compute.mts @@ -57,10 +57,10 @@ function createPage( body: document.body?.raw ? addBodyRender(document.body) : { - raw: '', - code: '', - render: emptyRender, - }, + raw: '', + code: '', + render: emptyRender, + }, } as T; } @@ -106,21 +106,25 @@ const computeRemainingListingPages = async ( ) { let translationOfWork: Id | undefined = undefined; if (_d.translationOfWork && _d.translationOfWork['@id']) { - const translationOfWorkDocument = getDocumentByIdentifier(_d.translationOfWork['@id']); - console.log(_d.translationOfWork, translationOfWorkDocument) + const translationOfWorkDocument = getDocumentByIdentifier( + _d.translationOfWork['@id'] + ); + console.log(_d.translationOfWork, translationOfWorkDocument); if (translationOfWorkDocument?.isPartOf) { translationOfWork = { - "type": "Id", - "@id": translationOfWorkDocument.isPartOf, + type: 'Id', + '@id': translationOfWorkDocument.isPartOf, }; } } - acc = acc.concat(createListingPage(_d.isPartOf, { - ...templateDocument, - translationOfWork, - })); + acc = acc.concat( + createListingPage(_d.isPartOf, { + ...templateDocument, + translationOfWork, + }) + ); } // Create all keywords pages not existing yet @@ -145,71 +149,71 @@ const computeRemainingListingPages = async ( return acc; }, documents); -} +}; const computeMissingFields = (_: GalactiksConfig, people: ContentlayerPerson[]) => - async ( - documents: Array< - ContentlayerDocumentWithURL & ContentlayerWebPageDocumentWithRender - > - ): Promise => { - const buildBreadcrumb = breadcrumbBuilder(documents); - const buildAlternates = alternatesHeaderBuilder(documents); - const selectPersonByIdentifierAndLanguage = - documentByTypeAndIdentifierAndLanguageSelector('Person', documents); - - const getAuthor = ( - identifier?: string, - inLanguage?: string - ): Person | undefined => { - let author; - if (identifier) { - author = selectPersonByIdentifierAndLanguage(identifier, inLanguage); - } else if (people.length === 1) { - author = people[0]; + async ( + documents: Array< + ContentlayerDocumentWithURL & ContentlayerWebPageDocumentWithRender + > + ): Promise => { + const buildBreadcrumb = breadcrumbBuilder(documents); + const buildAlternates = alternatesHeaderBuilder(documents); + const selectPersonByIdentifierAndLanguage = + documentByTypeAndIdentifierAndLanguageSelector('Person', documents); + + const getAuthor = ( + identifier?: string, + inLanguage?: string + ): Person | undefined => { + let author; + if (identifier) { + author = selectPersonByIdentifierAndLanguage(identifier, inLanguage); + } else if (people.length === 1) { + author = people[0]; + } + + return ( + author && { + identifier: author.identifier, + name: author.name, + description: author.description, + url: author.url, + image: author.image, } + ); + }; - return ( - author && { - identifier: author.identifier, - name: author.name, - description: author.description, - url: author.url, - image: author.image, - } - ); + return documents.map((document) => { + const dateCreated = new Date(document.dateCreated); + const contentWithoutHeaders: Omit = { + ...document, + author: getAuthor(document.author, document.inLanguage), + breadcrumb: buildBreadcrumb(document), + dateCreated, + dateModified: document.dateModified + ? new Date(document.dateModified) + : dateCreated, + datePublished: document.datePublished + ? new Date(document.datePublished) + : dateCreated, }; - return documents.map((document) => { - const dateCreated = new Date(document.dateCreated); - const contentWithoutHeaders: Omit = { - ...document, - author: getAuthor(document.author, document.inLanguage), - breadcrumb: buildBreadcrumb(document), - dateCreated, - dateModified: document.dateModified - ? new Date(document.dateModified) - : dateCreated, - datePublished: document.datePublished - ? new Date(document.datePublished) - : dateCreated, - }; - - return { - ...contentWithoutHeaders, - headers: { - ...getBasicHeaders(contentWithoutHeaders), - alternates: buildAlternates(contentWithoutHeaders), - structuredDataSchemas: getStructuredDataSchemas( - contentWithoutHeaders - ), - openGraph: getOpenGraphObjects(contentWithoutHeaders), - twitterCard: getTwitterCard(contentWithoutHeaders), - }, - }; - }); - }; + return { + ...contentWithoutHeaders, + headers: { + ...getBasicHeaders(contentWithoutHeaders), + alternates: buildAlternates(contentWithoutHeaders), + structuredDataSchemas: getStructuredDataSchemas( + contentWithoutHeaders + ), + openGraph: getOpenGraphObjects(contentWithoutHeaders), + twitterCard: getTwitterCard(contentWithoutHeaders), + }, + }; + }); + }; export const computeDocuments = async ({ config, diff --git a/packages/explorer/src/core/content/repositories/index.mts b/packages/explorer/src/core/content/repositories/index.mts index 5f41166e..5d7de262 100644 --- a/packages/explorer/src/core/content/repositories/index.mts +++ b/packages/explorer/src/core/content/repositories/index.mts @@ -33,7 +33,8 @@ export const getPageByIdentifier = async ( filters?: RepositoryFilters ) => documentByIdentifierSelector(await getPages(filters))(identifier); -export const getPageByURL = async (url: string) => (await getPages()).find(_p => _p.url === url) +export const getPageByURL = async (url: string) => + (await getPages()).find((_p) => _p.url === url); export const getTagPageByKeyword = async ( keyword: string,