diff --git a/website/blog/_common/_download-analytics.mdx b/website/blog/_common/_download-analytics.mdx deleted file mode 100644 index 7666161..0000000 --- a/website/blog/_common/_download-analytics.mdx +++ /dev/null @@ -1,20 +0,0 @@ -{/* DO NOT EDIT! */} -{/* Automatically generated from docusaurus-template-liquid/templates/docusaurus. */} - -import Image from '@theme/IdealImage'; - -{/* ------------------------------------------------------------------------ */} - -## Analytics - -- GitHub [xpack-dev-tools/xpack-dev-tools.github.io](https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/) - - this release <a href={`https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/releases/v${props.version}/`} ><Image img={`https://img.shields.io/github/downloads/xpack-dev-tools/xpack-dev-tools.github.io/v${props.version}/total.svg`} alt='Github Release' /></a> - - all xPack releases [](https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/releases/) - - [individual file counters](https://somsubhra.github.io/github-release-stats/?username=xpack-dev-tools&repository=xpack-dev-tools.github.io) (grouped by release) -- npmjs.com [@xpack-dev-tools/xpack-dev-tools.github.io](https://www.npmjs.com/package/@xpack-dev-tools/xpack-dev-tools.github.io) - - latest releases [](https://www.npmjs.com/package/@xpack-dev-tools/xpack-dev-tools.github.io/) - - all @xpack-dev-tools releases [](https://www.npmjs.com/package/@xpack-dev-tools/xpack-dev-tools.github.io/) - -Credit to [Shields IO](https://shields.io) for the badges and to -[Somsubhra/github-release-stats](https://github.com/Somsubhra/github-release-stats) -for the individual file counters. diff --git a/website/docs/about/_common/HistoryXpm/index.tsx b/website/docs/about/_common/HistoryXpm/index.tsx deleted file mode 100644 index d36509e..0000000 --- a/website/docs/about/_common/HistoryXpm/index.tsx +++ /dev/null @@ -1,21 +0,0 @@ -/* - * DO NOT EDIT! - * Automatically generated from docusaurus-template-liquid/templates/docusaurus. - * - * This file is part of the xPack project (http://xpack.github.io). - * Copyright (c) 2024 Liviu Ionescu. All rights reserved. - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose is hereby granted, under the terms of the MIT license. - * - * If a copy of the license was not distributed with this file, it can - * be obtained from https://opensource.org/licenses/MIT/. - */ - -import customField from '@site/src/libs/customField'; - -export default function HistoryXpm({specifier}): JSX.Element { - return ( - <>The xPack metadata has been added, and the package can now be more conveniently installed via <b>xpm</b>. It is available from <code>npmjs.com</code> as <code>{specifier ? specifier : '@xpack-dev-tools/xpack-dev-tools.github.io'}</code></> - ); -} diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts index 8489719..48ef9f5 100644 --- a/website/docusaurus.config.ts +++ b/website/docusaurus.config.ts @@ -57,13 +57,7 @@ function getCustomFields() { const customFields = websitePackageJson?.websiteConfig?.customFields ?? {}; - let upstreamVersion - if (customFields.hasTwoNumbersVersion === 'true' && xpackSemver.endsWith('.0')) { - // Remove the patch number if zero (wine uses both 2 and 3 numbers). - upstreamVersion = xpackSemver.replace(/[.]0*$/, ''); - } else { - upstreamVersion = xpackSemver; - } + let upstreamVersion = xpackSemver; return { version: jsonVersion, @@ -88,7 +82,7 @@ console.log('customFields: ' + util.inspect(customFields)); const config: Config = { title: 'xPack Binary Development Tools' + ((process.env.DOCUSAURUS_IS_PREVIEW === 'true') ? ' (preview)' : ''), - tagline: 'A binary distribution of Binary Development Tools', + tagline: 'Cross-platform binary tools for software development, aimed at reproducible builds', // Explicitly set in headTags. // favicon: '/img/favicon.ico', @@ -97,12 +91,12 @@ const config: Config = { // Set the /<baseUrl>/ pathname under which your site is served // For GitHub pages deployment, it is often '/<projectName>/' baseUrl: process.env.DOCUSAURUS_BASEURL ?? - '/xpack-dev-tools.github.io-xpack/', + '/', // GitHub pages deployment config. // If you aren't using GitHub pages, you don't need these. organizationName: 'xpack-dev-tools', // Usually your GitHub org/user name. - projectName: 'xpack-dev-tools.github.io-xpack', // Usually your repo name. + projectName: 'xpack-dev-tools.github.io', // Usually your repo name. onBrokenAnchors: 'throw', onBrokenLinks: 'throw', @@ -131,7 +125,7 @@ const config: Config = { // Please change this to your repo. // Remove this to remove the "edit this page" links. editUrl: - 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/edit/xpack/website/', + 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/edit/xpack/website/', // showLastUpdateAuthor: true, showLastUpdateTime: true, }, @@ -140,7 +134,7 @@ const config: Config = { // Please change this to your repo. // Remove this to remove the "edit this page" links. editUrl: - 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/edit/xpack/website/', + 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/edit/xpack/website/', showLastUpdateTime: true, blogSidebarCount: 8, }, @@ -153,9 +147,9 @@ const config: Config = { changefreq: 'weekly', priority: 0.5, ignorePatterns: [ - '/xpack-dev-tools.github.io-xpack/blog/archive/**', - '/xpack-dev-tools.github.io-xpack/blog/authors/**', - '/xpack-dev-tools.github.io-xpack/blog/tags/**' + '/blog/archive/**', + '/blog/authors/**', + '/blog/tags/**' ], filename: 'sitemap.xml', }, @@ -298,20 +292,20 @@ const config: Config = { ] }, { - href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/', + href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/', position: 'right', className: 'header-github-link', 'aria-label': 'GitHub repository', }, { type: 'dropdown', - href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/', + href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/', position: 'right', label: 'GitHub', items: [ { - label: `xpack-dev-tools.github.io-xpack`, - href: `https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/`, + label: `xpack-dev-tools.github.io`, + href: `https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/`, }, { label: 'xpack-dev-tools org', @@ -350,7 +344,7 @@ const config: Config = { items: [ { label: 'GitHub Discussions', - href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/discussions', + href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/discussions', }, { label: 'Stack Overflow', @@ -374,8 +368,8 @@ const config: Config = { href: 'https://www.paypal.com/donate/?hosted_button_id=5MFRG9ZRBETQ8', }, { - label: 'GitHub xpack-dev-tools.github.io-xpack', - href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io-xpack/', + label: 'GitHub xpack-dev-tools.github.io', + href: 'https://github.com/xpack-dev-tools/xpack-dev-tools.github.io/', }, { label: 'GitHub xpack-dev-tools org', diff --git a/website/package.json b/website/package.json index d89ae17..a80bd34 100644 --- a/website/package.json +++ b/website/package.json @@ -58,17 +58,13 @@ }, "websiteConfig": { "skipInstallCommand": "true", - "customFields": { - "isOrganizationWeb": "true", - "docusaurusTagline": "Cross-platform binary tools for software development, aimed at reproducible builds", - "docusaurusBaseUrl": "/", - "gitHubProjectName": "xpack-dev-tools.github.io", - "hasCustomDeveloper": "true", - "hasCustomInstall": "true", - "hasCustomMaintainer": "true", - "hasCustomUser": "true", - "usePluralGuides": "true" - } + "usePluralGuides": "true", + "hasCustomInstall": "true", + "hasCustomUser": "true", + "hasCustomMaintainer": "true", + "hasCustomDeveloper": "true", + "docusaurusTagline": "Cross-platform binary tools for software development, aimed at reproducible builds", + "docusaurusBaseUrl": "/" }, "engines": { "node": ">=18.0" diff --git a/website/src/components/HomepageTools/index.tsx b/website/src/components/HomepageTools/index.tsx index 0206707..494ead1 100644 --- a/website/src/components/HomepageTools/index.tsx +++ b/website/src/components/HomepageTools/index.tsx @@ -28,10 +28,10 @@ function Tool({ longName, shortName }) { <b><Link to={'https://xpack-dev-tools.github.io/' + shortName + '-xpack/'}>{shortName}</Link></b> - <b>xPack {longName}</b> </div> <div className="padding-top--xs"> - <Link to={'https://github.com/xpack-dev-tools/' + shortName + '-xpack/releases/'}><img alt="GitHub Release" src={'https://img.shields.io/github/v/release/xpack-dev-tools/' + shortName + '-xpack?color=blue'} /></Link> - <Link to={'https://github.com/xpack-dev-tools/' + shortName + '-xpack/releases/'}><img alt="GitHub Release Date" src={'https://img.shields.io/github/release-date/xpack-dev-tools/' + shortName + '-xpack?label=date&color=yellowgreen'} /></Link> - <Link to={'https://github.com/xpack-dev-tools/' + shortName + '-xpack/releases/'}><img alt="GitHub Downloads (all assets, all releases)" src={'https://img.shields.io/github/downloads/xpack-dev-tools/' + shortName + '-xpack/total.svg'} /></Link> - <Link to={'https://github.com/xpack-dev-tools/' + shortName + '-xpack/'}><img alt="GitHub Repo stars" src={'https://img.shields.io/github/stars/xpack-dev-tools/' + shortName + '-xpack'} /></Link> + <Link to={'https://github.com/{{githubProjectOrganization}}/' + shortName + '-xpack/releases/'}><img alt="GitHub Release" src={'https://img.shields.io/github/v/release/{{githubProjectOrganization}}/' + shortName + '-xpack?color=blue'} /></Link> + <Link to={'https://github.com/{{githubProjectOrganization}}/' + shortName + '-xpack/releases/'}><img alt="GitHub Release Date" src={'https://img.shields.io/github/release-date/{{githubProjectOrganization}}/' + shortName + '-xpack?label=date&color=yellowgreen'} /></Link> + <Link to={'https://github.com/{{githubProjectOrganization}}/' + shortName + '-xpack/releases/'}><img alt="GitHub Downloads (all assets, all releases)" src={'https://img.shields.io/github/downloads/{{githubProjectOrganization}}/' + shortName + '-xpack/total.svg'} /></Link> + <Link to={'https://github.com/{{githubProjectOrganization}}/' + shortName + '-xpack/'}><img alt="GitHub Repo stars" src={'https://img.shields.io/github/stars/{{githubProjectOrganization}}/' + shortName + '-xpack'} /></Link> </div> </div> </>