Skip to content

Commit a98247a

Browse files
chore: use resolve even more, faster toString
1 parent cf7bc18 commit a98247a

File tree

15 files changed

+60
-33
lines changed

15 files changed

+60
-33
lines changed

src/routes/+layout.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,22 @@
127127
alt="Svelte"
128128
class="size-8"
129129
/>
130-
{#if !page.route.id?.startsWith("/devlog")}
130+
{#if !page.route.id?.startsWith(resolve("/devlog"))}
131131
<span class="hidden text-xl font-semibold text-shadow-xs/10 xs:inline-block">
132132
<span class="font-display">Svelte</span>
133133
<span class="text-primary">Changelog</span>
134134
</span>
135135
{/if}
136136
</a>
137-
{#if page.route.id?.startsWith("/devlog")}
137+
{#if page.route.id?.startsWith(resolve("/devlog"))}
138138
<div class="mx-4 h-8 w-0.5 rotate-25 rounded-full bg-muted-foreground/40"></div>
139139
<span class="text-xl font-semibold">Blog</span>
140140
{/if}
141141

142142
<!-- Navigation -->
143-
{#if !page.route.id?.startsWith("/devlog")}
143+
{#if !page.route.id?.startsWith(resolve("/devlog"))}
144144
<ul class="ml-6 hidden sm:flex">
145-
{#each [{ link: "/packages", title: "Packages" }, { link: "/tracker", title: "Tracker" }, { link: "/devlog", title: "Devlog" }] as { link, title } (link)}
145+
{#each [{ link: resolve("/packages"), title: "Packages" }, { link: resolve("/tracker"), title: "Tracker" }, { link: resolve("/devlog"), title: "Devlog" }] as { link, title } (link)}
146146
{@const disabled = page.url.pathname.startsWith(link)}
147147
<li>
148148
<Button

src/routes/+page.server.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export async function load({ parent }) {
45
const { displayablePackages } = await parent();
56
const firstCategory = displayablePackages[0];
6-
if (!firstCategory) redirect(307, "/packages");
7+
if (!firstCategory) redirect(307, resolve("/packages"));
78
const firstPackage = firstCategory.packages[0];
8-
if (!firstPackage) redirect(307, "/packages");
9-
redirect(307, `/package/${firstPackage.pkg.name}`);
9+
if (!firstPackage) redirect(307, resolve("/packages"));
10+
redirect(307, resolve("/package/[...package]", { package: firstPackage.pkg.name }));
1011
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export function load() {
4-
redirect(308, "/");
5+
redirect(308, resolve("/"));
56
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export function load() {
4-
redirect(308, "/");
5+
redirect(308, resolve("/"));
56
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export function load() {
4-
redirect(308, "/");
5+
redirect(308, resolve("/"));
56
}

src/routes/[pid=pid]/[org]/[repo]/[id=number]/+page.server.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { error, redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23
import { publicRepos } from "$lib/repositories";
34
import { githubCache } from "$lib/server/github-cache";
45
import type { BranchCommit } from "$lib/types";
@@ -14,7 +15,7 @@ export async function load({ params, fetch }) {
1415

1516
const realType = "commits" in item ? "pull" : "category" in item.info ? "discussions" : "issues";
1617
if (type !== realType) {
17-
redirect(307, `/${realType}/${org}/${repo}/${id}`);
18+
redirect(307, resolve("/[pid=pid]/[org]/[repo]/[id=number]", { pid: realType, org, repo, id }));
1819
}
1920

2021
const matchingRepo = publicRepos.find(r => r.repoOwner === org && r.repoName === repo);

src/routes/[pid=pid]/[org]/[repo]/[id=number]/PageRenderer.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
* Returns the previous page to go back to
228228
*/
229229
function getPreviousPath() {
230-
if (!browser || !document.referrer) return "/";
230+
if (!browser || !document.referrer) return resolve("/");
231231
return new URL(document.referrer).pathname;
232232
}
233233
</script>
@@ -269,7 +269,7 @@
269269
</h3>
270270
<Accordion.Root type="single" class="mb-12">
271271
{#each linkedEntities as entity (entity.number)}
272-
<Accordion.Item value={entity.number.toString()}>
272+
<Accordion.Item value={`${entity.number}`}>
273273
<Accordion.Trigger class="group hover:no-underline [&>svg:last-child]:shrink-0">
274274
<div class="mr-2 flex w-full flex-col gap-4 xs:gap-2 md:flex-row md:gap-14">
275275
<!-- Title -->
@@ -660,7 +660,7 @@
660660
<Button href={getPreviousPath()} variant="link" class="group mr-auto gap-0 md:mr-0">
661661
<ChevronLeft class="mr-1 size-4 transition-transform duration-300 group-hover:-translate-x-1" />
662662
Back
663-
{#if getPreviousPath() === "/"}
663+
{#if getPreviousPath() === resolve("/")}
664664
to homepage
665665
{/if}
666666
</Button>

src/routes/devlog/+page.server.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export function load() {
4-
redirect(307, "/devlog/v2");
5+
redirect(307, resolve("/devlog/v2"));
56
}

src/routes/package/+page.server.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { redirect } from "@sveltejs/kit";
2+
import { resolve } from "$app/paths";
23

34
export function load() {
4-
redirect(307, "/packages");
5+
redirect(307, resolve("/packages"));
56
}

src/routes/package/[...package]/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
const maxDate = lastUpdateDate?.getTime() ?? aWeekAgo;
7676
return creationTimestamp > maxDate;
7777
})
78-
.map(({ id }) => id.toString());
78+
.map(({ id }) => `${id}`);
7979
});
8080
8181
// Hash management

0 commit comments

Comments
 (0)