From 08b3132abefd5fe3a49b55a6c67bb2608c3d565c Mon Sep 17 00:00:00 2001 From: LukaDev <47296785+lukadev-0@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:39:53 +0200 Subject: [PATCH] feat(website): use new /latest/any endpoint --- website/bun.lockb | Bin 201335 -> 201335 bytes .../[[version]]/[[target]]/+layout.server.ts | 41 ++++-------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/website/bun.lockb b/website/bun.lockb index 94c679ca75c8fab165f9402bc94fc288259d29dc..2c72e571c67a18f1e0941ced37ce09b64cc42601 100755 GIT binary patch delta 32 ocmeyqgy;Jbo`x32ElkY<9E@>>dWOb&2JPJfOxwE!nBOo00K>-$ivR!s delta 32 jcmeyqgy;Jbo`x32ElkY<983%l(B3V;w7pw^`3)lgu3QNX diff --git a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts index 7951665..87a5e07 100644 --- a/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts +++ b/website/src/routes/packages/[scope]/[name]/[[version]]/[[target]]/+layout.server.ts @@ -1,49 +1,26 @@ import { fetchRegistryJson, RegistryHttpError, - type PackageVersionsResponse, type PackageVersionResponse, } from "$lib/registry-api" import { error } from "@sveltejs/kit" import type { LayoutServerLoad } from "./$types" -type FetchPackageOptions = - | { - scope: string - name: string - } - | { - scope: string - name: string - version: string - target: string - } +type FetchPackageOptions = { + scope: string + name: string + version?: string + target?: string +} const fetchPackage = async (fetcher: typeof fetch, options: FetchPackageOptions) => { - const { scope, name } = options + const { scope, name, version = "latest", target = "any" } = options try { - if ("version" in options) { - if (options.target === undefined) { - error(404, "Not Found") - } - - const { version, target } = options - return fetchRegistryJson( - `packages/${encodeURIComponent(`${scope}/${name}`)}/${version}/${target}`, - fetcher, - ) - } - - const versions = await fetchRegistryJson( - `packages/${encodeURIComponent(`${scope}/${name}`)}`, + return await fetchRegistryJson( + `packages/${encodeURIComponent(`${scope}/${name}`)}/${version}/${target}`, fetcher, ) - - const latestVersion = versions.at(-1) - if (latestVersion === undefined) throw new Error("package has no versions *blows up*") - - return latestVersion } catch (e) { if (e instanceof RegistryHttpError && e.response.status === 404) { error(404, "This package does not exist.")