Skip to content

Commit bbb937b

Browse files
alex-keyalexdln
andauthored
fix: use resolvedVersion on package page to display data correctly (#1969)
Co-authored-by: Alex Savelyev <91429106+alexdln@users.noreply.github.com>
1 parent 8baf1a5 commit bbb937b

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

app/pages/package/[[org]]/[name].vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ const navExtraOffsetStyle = computed(() => ({
106106
107107
const { packageName, requestedVersion, orgName } = usePackageRoute()
108108
109+
const { data: resolvedVersion, status: resolvedStatus } = await useResolvedVersion(
110+
packageName,
111+
requestedVersion,
112+
)
113+
109114
if (import.meta.server) {
110115
assertValidPackageName(packageName.value)
111116
}
@@ -114,7 +119,7 @@ if (import.meta.server) {
114119
const { data: readmeData } = useLazyFetch<ReadmeResponse>(
115120
() => {
116121
const base = `/api/registry/readme/${packageName.value}`
117-
const version = requestedVersion.value
122+
const version = resolvedVersion.value
118123
return version ? `${base}/v/${version}` : base
119124
},
120125
{
@@ -150,7 +155,7 @@ const {
150155
} = useLazyFetch<ReadmeMarkdownResponse>(
151156
() => {
152157
const base = `/api/registry/readme/markdown/${packageName.value}`
153-
const version = requestedVersion.value
158+
const version = resolvedVersion.value
154159
return version ? `${base}/v/${version}` : base
155160
},
156161
{
@@ -200,7 +205,7 @@ const {
200205
} = useLazyFetch<InstallSizeResult | null>(
201206
() => {
202207
const base = `/api/registry/install-size/${packageName.value}`
203-
const version = requestedVersion.value
208+
const version = resolvedVersion.value
204209
return version ? `${base}/v/${version}` : base
205210
},
206211
{
@@ -213,7 +218,7 @@ onMounted(() => fetchInstallSize())
213218
const { data: skillsData } = useLazyFetch<SkillsListResponse>(
214219
() => {
215220
const base = `/skills/${packageName.value}`
216-
const version = requestedVersion.value
221+
const version = resolvedVersion.value
217222
return version ? `${base}/v/${version}` : base
218223
},
219224
{ default: () => ({ package: '', version: '', skills: [] }) },
@@ -222,11 +227,6 @@ const { data: skillsData } = useLazyFetch<SkillsListResponse>(
222227
const { data: packageAnalysis } = usePackageAnalysis(packageName, requestedVersion)
223228
const { data: moduleReplacement } = useModuleReplacement(packageName)
224229
225-
const { data: resolvedVersion, status: resolvedStatus } = await useResolvedVersion(
226-
packageName,
227-
requestedVersion,
228-
)
229-
230230
if (
231231
import.meta.server &&
232232
!resolvedVersion.value &&
@@ -1365,7 +1365,7 @@ const showSkeleton = shallowRef(false)
13651365
</div>
13661366
<TerminalInstall
13671367
:package-name="pkg.name"
1368-
:requested-version="requestedVersion ? resolvedVersion : requestedVersion"
1368+
:requested-version="resolvedVersion"
13691369
:install-version-override="installVersionOverride"
13701370
:jsr-info="jsrInfo"
13711371
:dev-dependency-suggestion="packageAnalysis?.devDependencySuggestion"

server/api/atproto/bluesky-author-profiles.get.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as v from 'valibot'
2+
import crypto from 'node:crypto'
23
import { CACHE_MAX_AGE_ONE_DAY, BLUESKY_API } from '#shared/utils/constants'
34
import { AuthorSchema } from '#shared/schemas/blog'
45
import { Client } from '@atproto/lex'
@@ -75,7 +76,11 @@ export default defineCachedEventHandler(
7576
maxAge: CACHE_MAX_AGE_ONE_DAY,
7677
getKey: event => {
7778
const { authors } = getQuery(event)
78-
return `author-profiles:${authors ?? 'npmx.dev'}`
79+
const hash = crypto
80+
.createHash('md5')
81+
.update(JSON.stringify(authors ?? 'npmx.dev'))
82+
.digest('hex')
83+
return `author-profiles:${hash}`
7984
},
8085
},
8186
)

0 commit comments

Comments
 (0)