From 43dc7d8e74f317aa94b190cc2a7e5a1b863f04c7 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Thu, 11 Jul 2024 08:05:06 +0200 Subject: [PATCH] chore: small fixes and formatting (#3002) --- .gitignore | 1 - docs/.vitepress/config.ts | 2 ++ docs/.vitepress/versions.ts | 36 ++++++++++++++------------ src/locales/de/location/street_name.ts | 2 +- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3321a37d5..19f17cba164 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,6 @@ versions.json /docs/.vitepress/cache /docs/.vitepress/dist /docs/public/api-diff-index.json -/lib # Faker TAGS diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index bbe311b2fd6..593b413e899 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -91,9 +91,11 @@ function getSideBarWithExpandedEntry(entryToExpand: string): SidebarItem[] { ], }, ]; + for (const entry of links) { entry.collapsed = entry.text !== entryToExpand; } + return links; } diff --git a/docs/.vitepress/versions.ts b/docs/.vitepress/versions.ts index 9d693e3d730..93414dc8143 100644 --- a/docs/.vitepress/versions.ts +++ b/docs/.vitepress/versions.ts @@ -9,24 +9,25 @@ function readBranchName(): string { } function readOtherLatestReleaseTagNames(): string[] { - const latestReleaseTagNames = execSync('git tag -l') - .toString('utf8') - .split('\n') - .filter((tag) => semver.valid(tag)) - // Only consider tags for our deployed website versions - .filter((tag) => semver.major(tag) >= 6) - // Find the latest tag for each major version - .reduce>((latestTagByMajor, tag) => { - const majorVersion = semver.major(tag); + const tags = execSync('git tag -l').toString('utf8').split('\n'); + const latestTagByMajor: Record = {}; + for (const tag of tags) { + if (!semver.valid(tag)) { + continue; + } - const latestTag = latestTagByMajor[majorVersion]; - if (latestTag == null || semver.lt(latestTag, tag)) { - latestTagByMajor[majorVersion] = tag; - } + const majorVersion = semver.major(tag); + if (majorVersion < 6) { + continue; + } - return latestTagByMajor; - }, {}); - return Object.values(latestReleaseTagNames).sort(semver.rcompare); + const latestTag = latestTagByMajor[majorVersion]; + if (latestTag == null || semver.lt(latestTag, tag)) { + latestTagByMajor[majorVersion] = tag; + } + } + + return Object.values(latestTagByMajor).sort(semver.rcompare); } // Set by netlify @@ -42,12 +43,15 @@ export const versionBannerInfix: string | null = (() => { if (deployContext === 'production') { return null; } + if (isReleaseBranch) { return '"an old version"'; } + if (branchName === 'next') { return '"the next (unreleased) version"'; } + return '"a development version"'; })(); diff --git a/src/locales/de/location/street_name.ts b/src/locales/de/location/street_name.ts index 6a8dd8503d0..a477dc7e5a0 100644 --- a/src/locales/de/location/street_name.ts +++ b/src/locales/de/location/street_name.ts @@ -954,7 +954,7 @@ export default [ 'Unterölbach', 'Unterstr.', 'Uppersberg', - "Van\\'t-Hoff-Str.", + "Van't-Hoff-Str.", 'Veit-Stoß-Str.', 'Vereinsstr.', 'Viktor-Meyer-Str.',