Skip to content

Commit 37a6188

Browse files
authored
fix: release pages order and rss pages exclusion (tauri-apps#2788)
1 parent 6e62ab3 commit 37a6188

File tree

7 files changed

+22
-314
lines changed

7 files changed

+22
-314
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"prettier-plugin-astro": "^0.14.0",
3838
"rehype-autolink-headings": "^7.1.0",
3939
"sass": "^1.77.2",
40-
"semver": "^7.6.0",
4140
"sharp": "^0.33.2",
4241
"shiki": "^1.1.7",
4342
"starlight-blog": "^0.13.0",

packages/releases-generator/build.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { writeFileSync, mkdirSync } from 'node:fs';
22
import { join } from 'node:path';
3+
import semver from 'semver';
34

45
const note =
56
'\n# NOTE: This file is auto-generated in packages/releases-generator/build.ts\n# For corrections please edit it directly';
@@ -65,6 +66,10 @@ async function generator() {
6566
.filter(({ version }) => !version.includes('Not Published'));
6667

6768
mkdirSync(join(baseDir, pkg.name), { recursive: true });
69+
70+
releases.sort((a, b) => {
71+
return semver.rcompare(a.version, b.version);
72+
});
6873
//
6974
/*
7075
* Write files for each version
@@ -87,11 +92,11 @@ async function generator() {
8792
`description: '${thisVersion}'`,
8893
`slug: 'release/${pkg.name}/v${thisVersion}'`,
8994
`tableOfContents: false`,
90-
`editUrl: 'https://github.com/tauri-apps/tauri-docs/packages/releases-generator/build.ts'`,
95+
`editUrl: 'https://github.com/tauri-apps/tauri-docs/blob/v2/packages/releases-generator/build.ts'`,
9196
'pagefind: false',
9297
'sidebar:',
9398
` label: ${thisVersion}`,
94-
` order: ${semverToInt(thisVersion)}`,
99+
` order: ${i}`,
95100
];
96101

97102
const frontmatter = ['---', ...pageFrontmatter, '---'].join('\n');
@@ -100,8 +105,6 @@ async function generator() {
100105
const viewInGitHub = `<a href="${pkg.tag}/${pkg.name}-v${thisVersion}">View on GitHub</a>`;
101106
const linksDiv = `<div style="margin-bottom:3rem; display: flex; justify-content: space-between; align-items: center"><span>${indexLink}</span><span>${viewInGitHub}</span></div>`;
102107
//
103-
const sidebar = `\nimport ReleaseSidebar from '@components/list/ReleaseSidebar.astro';
104-
\n\n<ReleaseSidebar slug="release/${pkg.name}" packageName="${pkg.name}" />\n`;
105108

106109
writeFileSync(
107110
join(baseDir, pkg.name, `v${thisVersion}.mdx`),
@@ -191,29 +194,6 @@ function entitify(str: string): string {
191194
.replace(/\$\{/g, '$\\{');
192195
}
193196

194-
const PRE_RELEASE_VALUES: any = {
195-
alpha: 1,
196-
'beta-rc': 100,
197-
beta: 1000,
198-
rc: 100000,
199-
};
200-
201-
function semverToInt(semver: string) {
202-
const BASE = 1000000000;
203-
let [version, preRelease] = semver.split('-');
204-
const [major, minor, patch] = version.split('.').map(Number);
205-
let preReleaseValue = 0;
206-
if (preRelease) {
207-
const match = preRelease.split('.');
208-
if (match) {
209-
const identifier = match[0];
210-
const number = match[1] !== undefined ? parseInt(match[1]) : 0;
211-
preReleaseValue = PRE_RELEASE_VALUES[identifier] + number;
212-
}
213-
}
214-
return BASE - (major * 100000000 + minor * 1000000 + patch * 10000 + preReleaseValue);
215-
}
216-
217197
if (process.env.CONTEXT === 'production' || process.env.HEAD?.startsWith('release-pages')) {
218198
generator();
219199
} else {

packages/releases-generator/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13+
"@types/semver": "^7.5.8",
14+
"semver": "^7.6.0",
1315
"tsm": "^2.3.0"
1416
}
1517
}

pnpm-lock.yaml

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)