Skip to content

Commit aa4bf07

Browse files
committed
Fix browser tests?
1 parent 9e30e9f commit aa4bf07

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

app/composables/npm/usePackage.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ const RECENT_VERSIONS_COUNT = 5
1212
* - Including only: 5 most recent versions + one version per dist-tag + requested version
1313
* - Stripping unnecessary fields from version objects
1414
*/
15-
function transformPackument(pkg: Packument, requestedVersion?: string | null): SlimPackument {
15+
export function transformPackument(
16+
pkg: Packument,
17+
requestedVersion?: string | null,
18+
): SlimPackument {
1619
// Get versions pointed to by dist-tags
1720
const distTagVersions = new Set(Object.values(pkg['dist-tags'] ?? {}))
1821

@@ -53,7 +56,9 @@ function transformPackument(pkg: Packument, requestedVersion?: string | null): S
5356
}
5457
}
5558
filteredVersions[v] = {
56-
...((version?.dist as { attestations?: unknown }) ? { hasProvenance: true } : {}),
59+
...((version?.dist as { attestations?: unknown } | undefined)?.attestations
60+
? { hasProvenance: true }
61+
: {}),
5762
version: version.version,
5863
deprecated: version.deprecated,
5964
tags: version.tags as string[],

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import type {
33
NpmVersionDist,
4+
PackageVersionInfo,
45
PackumentVersion,
56
ProvenanceDetails,
67
ReadmeResponse,
@@ -13,7 +14,6 @@ import { areUrlsEquivalent } from '#shared/utils/url'
1314
import { isEditableElement } from '~/utils/input'
1415
import { formatBytes } from '~/utils/formatters'
1516
import { getDependencyCount } from '~/utils/npm/dependency-count'
16-
import { fetchAllPackageVersions } from '~/utils/npm/api'
1717
import { detectPublishSecurityDowngradeForVersion } from '~/utils/publish-security'
1818
import { NuxtLink } from '#components'
1919
import { useModal } from '~/composables/useModal'
@@ -126,15 +126,6 @@ const {
126126
error: versionError,
127127
} = await useResolvedVersion(packageName, requestedVersion)
128128
129-
const { data: allVersionMetadata } = useLazyAsyncData(
130-
() => `package:version-meta:${packageName.value}`,
131-
() => fetchAllPackageVersions(packageName.value),
132-
{
133-
default: () => [],
134-
server: false,
135-
},
136-
)
137-
138129
if (
139130
versionStatus.value === 'error' &&
140131
versionError.value?.statusCode &&
@@ -154,6 +145,16 @@ const {
154145
error,
155146
} = usePackage(packageName, resolvedVersion.value ?? requestedVersion.value)
156147
const displayVersion = computed(() => pkg.value?.requestedVersion ?? null)
148+
const versionSecurityMetadata = computed<PackageVersionInfo[]>(() => {
149+
if (!pkg.value) return []
150+
151+
return Object.entries(pkg.value.versions).map(([version, metadata]) => ({
152+
version,
153+
time: pkg.value?.time?.[version],
154+
hasProvenance: !!metadata.hasProvenance,
155+
deprecated: metadata.deprecated,
156+
}))
157+
})
157158
158159
// Process package description
159160
const pkgDescription = useMarkdown(() => ({
@@ -239,7 +240,7 @@ const deprecationNoticeMessage = useMarkdown(() => ({
239240
const publishSecurityDowngrade = computed(() => {
240241
const currentVersion = displayVersion.value?.version
241242
if (!currentVersion) return null
242-
return detectPublishSecurityDowngradeForVersion(allVersionMetadata.value ?? [], currentVersion)
243+
return detectPublishSecurityDowngradeForVersion(versionSecurityMetadata.value, currentVersion)
243244
})
244245
245246
const installVersionOverride = computed(() => {

0 commit comments

Comments
 (0)