;
@@ -406,7 +406,7 @@ export function CreatePackage({ scope, name, pkg, fromCli }: {
{pkg.value.description || No description}
- Created {twas(new Date(pkg.value.createdAt))}.
+ Created {twas(new Date(pkg.value.createdAt).getTime())}.
{fromCli && (
diff --git a/frontend/main.ts b/frontend/main.ts
index e6bb1299..12e39b49 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -1,12 +1,17 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-///
-///
-///
-///
-///
+import { App, fsRoutes, staticFiles, trailingSlashes } from "fresh";
+import { State } from "./util.ts";
-import { start } from "$fresh/server.ts";
-import manifest from "./fresh.gen.ts";
-import config from "./fresh.config.ts";
+export const app = new App()
+ .use(trailingSlashes("never"))
+ .use(staticFiles());
-await start(manifest, config);
+await fsRoutes(app, {
+ dir: "./",
+ loadIsland: (path) => import(`./islands/${path}`),
+ loadRoute: (path) => import(`./routes/${path}`),
+});
+
+if (import.meta.main) {
+ await app.listen();
+}
diff --git a/frontend/routes/@[scope]/(_islands)/ScopeMemberRole.tsx b/frontend/routes/@[scope]/(_islands)/ScopeMemberRole.tsx
index 0043ba30..ead3cd83 100644
--- a/frontend/routes/@[scope]/(_islands)/ScopeMemberRole.tsx
+++ b/frontend/routes/@[scope]/(_islands)/ScopeMemberRole.tsx
@@ -2,7 +2,7 @@
import { useSignal } from "@preact/signals";
import { useCallback } from "preact/hooks";
import { api, path } from "../../../utils/api.ts";
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
export interface ScopeMemberRoleProps {
scope: string;
diff --git a/frontend/routes/@[scope]/index.tsx b/frontend/routes/@[scope]/index.tsx
index 472cddb7..af85322e 100644
--- a/frontend/routes/@[scope]/index.tsx
+++ b/frontend/routes/@[scope]/index.tsx
@@ -1,47 +1,23 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { PaginationData, State } from "../../util.ts";
-import type {
- FullScope,
- List,
- Package,
- Scope,
- ScopeInvite,
- ScopeMember,
-} from "../../utils/api_types.ts";
+import { HttpError } from "fresh";
+import { define } from "../../util.ts";
+import type { List, Package, ScopeInvite } from "../../utils/api_types.ts";
import { APIResponse, path } from "../../utils/api.ts";
import { ScopeNav } from "./(_components)/ScopeNav.tsx";
import { ScopeHeader } from "./(_components)/ScopeHeader.tsx";
import { scopeDataWithMember } from "../../utils/data.ts";
import { ScopePendingInvite } from "./(_components)/ScopePendingInvite.tsx";
-import { Head } from "$fresh/runtime.ts";
import { ListDisplay } from "../../components/List.tsx";
import { PackageHit } from "../../components/PackageHit.tsx";
import { scopeIAM } from "../../utils/iam.ts";
-interface Data extends PaginationData {
- scope: Scope | FullScope;
- scopeMember: ScopeMember | null;
- packages: Package[];
- userInvites: ScopeInvite[] | null;
-}
-
-export default function ScopePackagesPage(
- { params, data, url, state }: PageProps,
+export default define.page(function ScopePackagesPage(
+ { params, data, url, state },
) {
const iam = scopeIAM(state, data.scopeMember);
return (
-
-
- @{params.scope} - JSR
-
-
-
@@ -53,10 +29,10 @@ export default function ScopePackagesPage(
);
-}
+});
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const page = +(ctx.url.searchParams.get("page") || 1);
// Default to large enough to display all of @std.
const limit = +(ctx.url.searchParams.get("limit") || 50);
@@ -71,24 +47,29 @@ export const handler: Handlers = {
? ctx.state.api.get(path`/user/invites`)
: Promise.resolve(null),
]);
- if (data === null) return ctx.renderNotFound();
+ if (data === null) throw new HttpError(404, "The scope was not found.");
if (!packagesResp.ok) {
- if (packagesResp.code === "scopeNotFound") return ctx.renderNotFound();
+ if (packagesResp.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw packagesResp; // graceful handle errors
}
if (userInvitesResp && !userInvitesResp.ok) throw userInvitesResp;
- return ctx.render({
- scope: data.scope,
- scopeMember: data.scopeMember,
- packages: packagesResp.data.items,
- userInvites: userInvitesResp?.data ?? null,
- page,
- limit,
- total: packagesResp.data.total,
- });
+ return {
+ data: {
+ scope: data.scope,
+ scopeMember: data.scopeMember,
+ packages: packagesResp.data.items,
+ userInvites: userInvitesResp?.data ?? null,
+ page,
+ limit,
+ total: packagesResp.data.total,
+ },
+ };
},
- async POST(req, ctx) {
+ async POST(ctx) {
+ const req = ctx.req;
const scope = ctx.params.scope;
const form = await req.formData();
const action = form.get("action");
@@ -101,9 +82,10 @@ export const handler: Handlers = {
throw new Error("invalid action");
}
if (!res.ok) throw res; // graceful handle errors
- return new Response(null, {
- status: 303,
- headers: { location: `/@${scope}` },
- });
+ ctx.state.meta = {
+ title: `@${scope} - JSR`,
+ description: `@${scope} on JSR`,
+ };
+ return ctx.redirect(`/@${scope}`, 303);
},
-};
+});
diff --git a/frontend/routes/@[scope]/~/index.tsx b/frontend/routes/@[scope]/~/index.tsx
index dbf0fe6a..6d9f948e 100644
--- a/frontend/routes/@[scope]/~/index.tsx
+++ b/frontend/routes/@[scope]/~/index.tsx
@@ -1,9 +1,8 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers } from "$fresh/server.ts";
-import { State } from "../../../util.ts";
+import { define } from "../../../util.ts";
-export const handler: Handlers = {
- GET(_req, ctx) {
+export const handler = define.handlers({
+ GET(ctx) {
return new Response("", {
status: 302,
headers: {
@@ -11,4 +10,4 @@ export const handler: Handlers = {
},
});
},
-};
+});
diff --git a/frontend/routes/@[scope]/~/members.tsx b/frontend/routes/@[scope]/~/members.tsx
index 2d15bda1..4490fea7 100644
--- a/frontend/routes/@[scope]/~/members.tsx
+++ b/frontend/routes/@[scope]/~/members.tsx
@@ -1,6 +1,6 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { Head } from "$fresh/runtime.ts";
+import { HttpError } from "fresh";
+import { define } from "../../../util.ts";
import { ScopeHeader } from "../(_components)/ScopeHeader.tsx";
import { ScopeNav } from "../(_components)/ScopeNav.tsx";
import { ScopePendingInvite } from "../(_components)/ScopePendingInvite.tsx";
@@ -8,12 +8,9 @@ import { ScopeInviteForm } from "../(_islands)/ScopeInviteForm.tsx";
import { ScopeMemberRole } from "../(_islands)/ScopeMemberRole.tsx";
import { Table, TableData, TableRow } from "../../../components/Table.tsx";
import { CopyButton } from "../../../islands/CopyButton.tsx";
-import { State } from "../../../util.ts";
import { path } from "../../../utils/api.ts";
import {
- FullScope,
FullUser,
- Scope,
ScopeInvite,
ScopeMember,
} from "../../../utils/api_types.ts";
@@ -22,20 +19,14 @@ import { TrashCan } from "../../../components/icons/TrashCan.tsx";
import { scopeIAM } from "../../../utils/iam.ts";
import { ScopeIAM } from "../../../utils/iam.ts";
-interface Data {
- scope: Scope | FullScope;
- scopeMember: ScopeMember | null;
- members: ScopeMember[];
- invites: ScopeInvite[];
-}
-
-export default function ScopeMembersPage(
- { params, data, state, url }: PageProps,
+export default define.page(function ScopeMembersPage(
+ { params, data, state, url },
) {
const iam = scopeIAM(state, data.scopeMember);
- const hasOneAdmin =
- data.members.filter((member) => member.isAdmin).length === 1;
+ const hasOneAdmin = data.members.filter((member) =>
+ member.isAdmin
+ ).length === 1;
const isLastAdmin = (data.scopeMember?.isAdmin || false) && hasOneAdmin;
@@ -43,11 +34,6 @@ export default function ScopeMembersPage(
return (
-
-
- Members - @{params.scope} - JSR
-
-
);
-}
+});
interface MemberItemProps {
isLastAdmin: boolean;
@@ -244,8 +230,8 @@ function MemberLeave(
);
}
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
let [user, data, membersResp, invitesResp] = await Promise.all([
ctx.state.userPromise,
scopeData(ctx.state, ctx.params.scope),
@@ -259,9 +245,11 @@ export const handler: Handlers = {
: Promise.resolve(null),
]);
if (user instanceof Response) return user;
- if (data === null) return ctx.renderNotFound();
+ if (data === null) throw new HttpError(404, "The scope was not found.");
if (!membersResp.ok) {
- if (membersResp.code === "scopeNotFound") return ctx.renderNotFound();
+ if (membersResp.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw membersResp; // graceful handle errors
}
if (invitesResp && !invitesResp.ok) {
@@ -271,24 +259,32 @@ export const handler: Handlers = {
) {
invitesResp = null;
} else {
- if (invitesResp.code === "scopeNotFound") return ctx.renderNotFound();
+ if (invitesResp.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw invitesResp; // graceful handle errors
}
}
- const scopeMember =
- membersResp.data.find((member) =>
- member.user.id === (user as FullUser | null)?.id
- ) ?? null;
+ const scopeMember = membersResp.data.find((member) =>
+ member.user.id === (user as FullUser | null)?.id
+ ) ?? null;
- return ctx.render({
- scope: data.scope,
- scopeMember: scopeMember,
- members: membersResp.data,
- invites: invitesResp?.data ?? [],
- });
+ ctx.state.meta = {
+ title: `Members - @${ctx.params.scope} - JSR`,
+ description: `List of members of the @${ctx.params.scope} scope on JSR.`,
+ };
+ return {
+ data: {
+ scope: data.scope,
+ scopeMember: scopeMember,
+ members: membersResp.data,
+ invites: invitesResp?.data ?? [],
+ },
+ };
},
- async POST(req, ctx) {
+ async POST(ctx) {
+ const req = ctx.req;
const scope = ctx.params.scope;
const form = await req.formData();
const action = form.get("action");
@@ -298,7 +294,9 @@ export const handler: Handlers = {
path`/scopes/${scope}/invites/${userId}`,
);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
} else if (action === "deleteMember") {
@@ -307,7 +305,9 @@ export const handler: Handlers = {
path`/scopes/${scope}/members/${userId}`,
);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
} else if (action === "invite") {
@@ -317,7 +317,9 @@ export const handler: Handlers = {
{ githubLogin },
);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
} else {
@@ -328,4 +330,4 @@ export const handler: Handlers = {
headers: { Location: `/@${scope}/~/members` },
});
},
-};
+});
diff --git a/frontend/routes/@[scope]/~/settings.tsx b/frontend/routes/@[scope]/~/settings.tsx
index a416567f..20997b11 100644
--- a/frontend/routes/@[scope]/~/settings.tsx
+++ b/frontend/routes/@[scope]/~/settings.tsx
@@ -1,32 +1,21 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
+import { HttpError } from "fresh";
import { ComponentChildren } from "preact";
+import { define } from "../../../util.ts";
import { ScopeHeader } from "../(_components)/ScopeHeader.tsx";
import { ScopeNav } from "../(_components)/ScopeNav.tsx";
-import { State } from "../../../util.ts";
import { FullScope, User } from "../../../utils/api_types.ts";
import { scopeDataWithMember } from "../../../utils/data.ts";
import { path } from "../../../utils/api.ts";
import { QuotaCard } from "../../../components/QuotaCard.tsx";
-import { Head } from "$fresh/runtime.ts";
import { Check } from "../../../components/icons/Check.tsx";
-import { ScopeIAM, scopeIAM } from "../../../utils/iam.ts";
+import { scopeIAM } from "../../../utils/iam.ts";
-interface Data {
- scope: FullScope;
- iam: ScopeIAM;
-}
-
-export default function ScopeSettingsPage(
- { params, data, state }: PageProps,
+export default define.page(function ScopeSettingsPage(
+ { data, state },
) {
return (
-
-
- Settings - @{params.scope} - JSR
-
-
@@ -35,7 +24,7 @@ export default function ScopeSettingsPage(
);
-}
+});
function ScopeQuotas({ scope, user }: { scope: FullScope; user: User }) {
const requestLimitIncreaseBody = `Hello JSR team,
@@ -261,24 +250,28 @@ function DeleteScope({ scope }: { scope: FullScope }) {
);
}
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const [user, data] = await Promise.all([
ctx.state.userPromise,
scopeDataWithMember(ctx.state, ctx.params.scope),
]);
if (user instanceof Response) return user;
- if (data === null) return ctx.renderNotFound();
+ if (data === null) throw new HttpError(404, "The scope was not found.");
const iam = scopeIAM(ctx.state, data?.scopeMember, user);
- if (!iam.canAdmin) return ctx.renderNotFound();
+ if (!iam.canAdmin) throw new HttpError(404, "The scope was not found.");
- return ctx.render({
- scope: data.scope as FullScope,
- iam,
- });
+ ctx.state.meta = { title: `Settings - @${data.scope.scope} - JSR` };
+ return {
+ data: {
+ scope: data.scope as FullScope,
+ iam,
+ },
+ };
},
- async POST(req, ctx) {
+ async POST(ctx) {
+ const req = ctx.req;
const scope = ctx.params.scope;
const form = await req.formData();
const action = String(form.get("action"));
@@ -293,7 +286,9 @@ export const handler: Handlers = {
{ ghActionsVerifyActor: enableGhActionsVerifyActor },
);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
return new Response(null, {
@@ -308,7 +303,9 @@ export const handler: Handlers = {
{ requirePublishingFromCI: value },
);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
return new Response(null, {
@@ -319,7 +316,9 @@ export const handler: Handlers = {
case "deleteScope": {
const res = await ctx.state.api.delete(path`/scopes/${scope}`);
if (!res.ok) {
- if (res.code === "scopeNotFound") return ctx.renderNotFound();
+ if (res.code === "scopeNotFound") {
+ throw new HttpError(404, "The scope was not found.");
+ }
throw res; // graceful handle errors
}
return new Response(null, {
@@ -331,4 +330,4 @@ export const handler: Handlers = {
throw new Error("Invalid action " + action);
}
},
-};
+});
diff --git a/frontend/routes/_404.tsx b/frontend/routes/_404.tsx
deleted file mode 100644
index 0f30a0c2..00000000
--- a/frontend/routes/_404.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Head } from "$fresh/runtime.ts";
-
-export default function NotFoundPage() {
- return (
- <>
-
-
-
-
-
-
-
-
- Couldn't find what you're looking for.
-
-
-
-
-
Error
-
{JSON.stringify(error, null, 2)}
-
+
+
+
+
+ {error.message}
+
+
+
+
+
Error
+
{JSON.stringify(error, null, 2)}
+
GitHub
- {state?.span.isSampled ? ` — x-deno-ray: ${state.span.traceId}` : null}
+ {state.span?.isSampled ? ` — x-deno-ray: ${state.span.traceId}` : null}
);
diff --git a/frontend/routes/_middleware.ts b/frontend/routes/_middleware.ts
index 59a37dab..92dcb2b5 100644
--- a/frontend/routes/_middleware.ts
+++ b/frontend/routes/_middleware.ts
@@ -1,20 +1,21 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import type { MiddlewareHandler } from "$fresh/server.ts";
-import { deleteCookie, getCookies } from "$std/http/cookie";
+import type { Middleware } from "fresh";
+import { deleteCookie, getCookies } from "@std/http/cookie";
import { State } from "../util.ts";
import { API, path } from "../utils/api.ts";
import { FullUser } from "../utils/api_types.ts";
import { Tracer } from "../utils/tracing.ts";
+import { define } from "../util.ts";
export const API_ROOT = Deno.env.get("API_ROOT") ?? "http://api.jsr.test";
export const tracer = new Tracer();
-const tracing: MiddlewareHandler
= async (req, ctx) => {
- ctx.state.span = tracer.spanForRequest(req, ctx.destination);
+const tracing = define.middleware(async (ctx) => {
+ ctx.state.span = tracer.spanForRequest(ctx.req);
const attributes: Record = {
"http.url": ctx.url.href,
- "http.method": req.method,
+ "http.method": ctx.req.method,
"http.host": ctx.url.host,
};
const start = new Date();
@@ -27,14 +28,14 @@ const tracing: MiddlewareHandler = async (req, ctx) => {
const end = new Date();
ctx.state.span.record(ctx.url.pathname, start, end, attributes);
}
-};
+});
-const auth: MiddlewareHandler = async (req, ctx) => {
- const interactive =
- (ctx.destination === "route" || ctx.destination === "notFound") &&
- !(ctx.url.pathname === "/gfm.css" ||
- ctx.url.pathname === "/_frsh/client.js.map");
- const { token, sudo } = getCookies(req.headers);
+const auth = define.middleware(async (ctx) => {
+ const pathname = ctx.url.pathname;
+ const interactive = !pathname.startsWith("/_fresh") &&
+ !pathname.startsWith("/api") &&
+ !ctx.url.searchParams.has("__frsh_c");
+ const { token, sudo } = getCookies(ctx.req.headers);
if (interactive) {
ctx.state.sudo = sudo === "1";
ctx.state.api = new API(API_ROOT, {
@@ -81,6 +82,6 @@ const auth: MiddlewareHandler = async (req, ctx) => {
});
}
return await ctx.next();
-};
+});
-export const handler: MiddlewareHandler[] = [tracing, auth];
+export const handler: Middleware = [tracing, auth];
diff --git a/frontend/routes/account/(_components)/AccountLayout.tsx b/frontend/routes/account/(_components)/AccountLayout.tsx
index 39a59bfe..a39cd584 100644
--- a/frontend/routes/account/(_components)/AccountLayout.tsx
+++ b/frontend/routes/account/(_components)/AccountLayout.tsx
@@ -1,7 +1,7 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
import { FullUser, User } from "../../../utils/api_types.ts";
import { AccountNav, AccountNavTab } from "./AccountNav.tsx";
-import twas from "$twas";
+import twas from "twas";
import { ComponentChildren } from "preact";
import { GitHubUserLink } from "../../../islands/GithubUserLink.tsx";
@@ -25,7 +25,7 @@ export function AccountLayout({ user, active, children }: AccountLayoutProps) {
{user.name}
- Created account {twas(new Date(user.createdAt))}
+ Created account {twas(new Date(user.createdAt).getTime())}
diff --git a/frontend/routes/account/index.tsx b/frontend/routes/account/index.tsx
index f37f7377..6cea020a 100644
--- a/frontend/routes/account/index.tsx
+++ b/frontend/routes/account/index.tsx
@@ -1,13 +1,13 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers } from "$fresh/server.ts";
-import { State } from "../../util.ts";
+import { HttpError } from "fresh";
+import { define } from "../../util.ts";
-export const handler: Handlers = {
- async GET(_, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const currentUser = await ctx.state.userPromise;
if (currentUser instanceof Response) return currentUser;
- if (!currentUser) return ctx.renderNotFound();
+ if (!currentUser) throw new HttpError(404, "No signed in user found.");
return new Response("", {
headers: {
@@ -16,4 +16,4 @@ export const handler: Handlers = {
status: 303,
});
},
-};
+});
diff --git a/frontend/routes/account/invites.tsx b/frontend/routes/account/invites.tsx
index 6336d121..53727eca 100644
--- a/frontend/routes/account/invites.tsx
+++ b/frontend/routes/account/invites.tsx
@@ -1,27 +1,16 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { State } from "../../util.ts";
+import { HttpError } from "fresh";
+import { define } from "../../util.ts";
import { APIResponse, path } from "../../utils/api.ts";
-import { FullUser, ScopeInvite } from "../../utils/api_types.ts";
+import { ScopeInvite } from "../../utils/api_types.ts";
import { Table, TableData, TableRow } from "../../components/Table.tsx";
import { AccountLayout } from "../account/(_components)/AccountLayout.tsx";
-import { Head } from "$fresh/runtime.ts";
-interface Data {
- user: FullUser;
- invites: ScopeInvite[];
-}
-
-export default function AccountInvitesPage(
- { data, url }: PageProps,
+export default define.page(function AccountInvitesPage(
+ { data, url },
) {
return (
-
-
- Your invites - JSR
-
-
{data.invites.length
? (
@@ -53,7 +42,7 @@ export default function AccountInvitesPage(
);
-}
+});
function InviteRow({ invite }: { invite: ScopeInvite }) {
return (
@@ -107,23 +96,26 @@ function InviteRow({ invite }: { invite: ScopeInvite }) {
);
}
-export const handler: Handlers = {
- async GET(_, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const [currentUser, invitesRes] = await Promise.all([
ctx.state.userPromise,
ctx.state.api.get(path`/user/invites`),
]);
if (currentUser instanceof Response) return currentUser;
- if (!currentUser) return ctx.renderNotFound();
+ if (!currentUser) throw new HttpError(404, "No signed in user found.");
if (!invitesRes.ok) throw invitesRes; // gracefully handle errors
-
- return ctx.render({
- user: currentUser,
- invites: invitesRes.data,
- });
+ ctx.state.meta = { title: "Your invites - JSR" };
+ return {
+ data: {
+ user: currentUser,
+ invites: invitesRes.data,
+ },
+ };
},
- async POST(req, ctx) {
+ async POST(ctx) {
+ const req = ctx.req;
const form = await req.formData();
const action = form.get("action");
const scope = String(form.get("scope"));
@@ -138,9 +130,6 @@ export const handler: Handlers = {
throw new Error("invalid action");
}
if (!res.ok) throw res; // graceful handle errors
- return new Response(null, {
- status: 303,
- headers: { location },
- });
+ return ctx.redirect(location, 303);
},
-};
+});
diff --git a/frontend/routes/account/settings.tsx b/frontend/routes/account/settings.tsx
index aad6c1c8..3fdf8c72 100644
--- a/frontend/routes/account/settings.tsx
+++ b/frontend/routes/account/settings.tsx
@@ -1,16 +1,12 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { State } from "../../util.ts";
-import { FullUser } from "../../utils/api_types.ts";
+import { HttpError } from "fresh";
import { AccountLayout } from "../account/(_components)/AccountLayout.tsx";
import { QuotaCard } from "../../components/QuotaCard.tsx";
-import { Head } from "$fresh/runtime.ts";
+import { define } from "../../util.ts";
-interface Data {
- user: FullUser;
-}
-
-export default function AccountInvitesPage({ data }: PageProps) {
+export default define.page(function AccountInvitesPage({
+ data,
+}) {
const requestLimitIncreaseBody = `Hello JSR team,
I would like to request a scope quota increase for my account.
My user ID is '${data.user!.id}'.
@@ -19,11 +15,6 @@ Reason: `;
return (
-
-
- Account Settings - JSR
-
-
Quotas
@@ -74,18 +65,21 @@ Reason: `;
);
-}
+});
-export const handler: Handlers
= {
- async GET(_, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const [currentUser] = await Promise.all([
ctx.state.userPromise,
]);
if (currentUser instanceof Response) return currentUser;
- if (!currentUser) return ctx.renderNotFound();
+ if (!currentUser) throw new HttpError(404, "No signed in user found.");
- return ctx.render({
- user: currentUser,
- });
+ ctx.state.meta = { title: "Account Settings - JSR" };
+ return {
+ data: {
+ user: currentUser,
+ },
+ };
},
-};
+});
diff --git a/frontend/routes/account/tokens/(_islands)/CreateToken.tsx b/frontend/routes/account/tokens/(_islands)/CreateToken.tsx
index 97878db6..7afd6183 100644
--- a/frontend/routes/account/tokens/(_islands)/CreateToken.tsx
+++ b/frontend/routes/account/tokens/(_islands)/CreateToken.tsx
@@ -1,7 +1,7 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
import { useCallback, useEffect, useRef } from "preact/hooks";
import { Signal, useComputed, useSignal } from "@preact/signals";
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
import { CopyButton } from "../../../../islands/CopyButton.tsx";
import { ChevronLeft } from "../../../../components/icons/ChevronLeft.tsx";
import { api, APIResponseError, path } from "../../../../utils/api.ts";
diff --git a/frontend/routes/account/tokens/create.tsx b/frontend/routes/account/tokens/create.tsx
index efff860d..18f9690c 100644
--- a/frontend/routes/account/tokens/create.tsx
+++ b/frontend/routes/account/tokens/create.tsx
@@ -1,23 +1,12 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers } from "$fresh/server.ts";
-import { State } from "../../../util.ts";
-import { FullUser } from "../../../utils/api_types.ts";
-import { Head } from "$fresh/runtime.ts";
+import { HttpError } from "fresh";
+import { define } from "../../../util.ts";
import { ChevronLeft } from "../../../components/icons/ChevronLeft.tsx";
import { CreateToken } from "./(_islands)/CreateToken.tsx";
-interface Data {
- user: FullUser;
-}
-
-export default function AccountCreateTokenPage() {
+export default define.page(function AccountCreateTokenPage() {
return (
-
-
- Create a personal access token - JSR
-
-
Personal access tokens
@@ -82,7 +74,7 @@ export default function AccountTokensPage({ data }: PageProps) {
);
-}
+});
function PersonalTokenRow({ token }: { token: Token }) {
const expiresAt = token.expiresAt ? new Date(token.expiresAt) : null;
@@ -111,18 +103,21 @@ function PersonalTokenRow({ token }: { token: Token }) {
Active {expiresAt === null
? "forever"
: `– expires ${
- twas(new Date(), expiresAt).replace("ago", "from now")
+ twas(new Date().getTime(), expiresAt.getTime()).replace(
+ "ago",
+ "from now",
+ )
}`}
)
: (
- Inactive - expired {twas(expiresAt)}
+ Inactive - expired {twas(expiresAt.getTime())}
)}
- Created {twas(new Date(token.createdAt))}
+ Created {twas(new Date(token.createdAt).getTime())}
@@ -163,13 +158,16 @@ function SessionRow({ token }: { token: Token }) {
Active {expiresAt === null
? "forever"
: `– expires ${
- twas(new Date(), expiresAt).replace("ago", "from now")
+ twas(new Date().getTime(), expiresAt.getTime()).replace(
+ "ago",
+ "from now",
+ )
}`}
)
: (
- Inactive - expired {twas(expiresAt)}
+ Inactive - expired {twas(expiresAt.getTime())}
)}
@@ -178,7 +176,7 @@ function SessionRow({ token }: { token: Token }) {
- Created {twas(new Date(token.createdAt))}
+ Created {twas(new Date(token.createdAt).getTime())}
@@ -80,7 +77,7 @@ export default function PublishingTasks({ data, url }: PageProps
) {
10,
)}
>
- {twas(new Date(publishingTask.createdAt))}
+ {twas(new Date(publishingTask.createdAt).getTime())}
) {
10,
)}
>
- {twas(new Date(publishingTask.updatedAt))}
+ {twas(new Date(publishingTask.updatedAt).getTime())}
@@ -98,10 +95,10 @@ export default function PublishingTasks({ data, url }: PageProps) {
);
-}
+});
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const query = ctx.url.searchParams.get("search") || "";
const page = +(ctx.url.searchParams.get("page") || 1);
const limit = +(ctx.url.searchParams.get("limit") || 20);
@@ -116,12 +113,14 @@ export const handler: Handlers = {
);
if (!resp.ok) throw resp; // gracefully handle this
- return ctx.render({
- publishingTasks: resp.data.items,
- query,
- page,
- limit,
- total: resp.data.total,
- });
+ return {
+ data: {
+ publishingTasks: resp.data.items,
+ query,
+ page,
+ limit,
+ total: resp.data.total,
+ },
+ };
},
-};
+});
diff --git a/frontend/routes/admin/scopes/assign.tsx b/frontend/routes/admin/scopes/assign.tsx
index 48a539ee..f242e5cc 100644
--- a/frontend/routes/admin/scopes/assign.tsx
+++ b/frontend/routes/admin/scopes/assign.tsx
@@ -1,10 +1,9 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import type { State } from "../../../util.ts";
import { AdminNav } from "../(_components)/AdminNav.tsx";
+import { define } from "../../../util.ts";
import { path } from "../../../utils/api.ts";
-export default function Scopes({}: PageProps) {
+export default define.page(function Scopes() {
return (
@@ -35,11 +34,11 @@ export default function Scopes({}: PageProps
) {
);
-}
+});
-export const handler: Handlers = {
- async POST(req, ctx) {
- const form = await req.formData();
+export const handler = define.handlers({
+ async POST(ctx) {
+ const form = await ctx.req.formData();
const scope = form.get("scope");
const userId = form.get("user_id");
@@ -54,4 +53,4 @@ export const handler: Handlers = {
headers: { Location: "/admin/scopes" },
});
},
-};
+});
diff --git a/frontend/routes/admin/scopes/index.tsx b/frontend/routes/admin/scopes/index.tsx
index 0f57e1e2..fe7d6021 100644
--- a/frontend/routes/admin/scopes/index.tsx
+++ b/frontend/routes/admin/scopes/index.tsx
@@ -1,20 +1,14 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import type { PaginationData, State } from "../../../util.ts";
import type { FullScope, List } from "../../../utils/api_types.ts";
import ScopeEdit from "../../../islands/admin/ScopeEdit.tsx";
import { Table } from "../../../components/Table.tsx";
import { path } from "../../../utils/api.ts";
import { AdminNav } from "../(_components)/AdminNav.tsx";
import { URLQuerySearch } from "../../../components/URLQuerySearch.tsx";
+import { define } from "../../../util.ts";
import IconArrowRight from "$tabler_icons/arrow-right.tsx";
-interface Data extends PaginationData {
- scopes: FullScope[];
- query: string;
-}
-
-export default function Scopes({ data, url }: PageProps) {
+export default define.page(function Scopes({ data, url }) {
return (
@@ -42,10 +36,10 @@ export default function Scopes({ data, url }: PageProps
) {
);
-}
+});
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const query = ctx.url.searchParams.get("search") || "";
const page = +(ctx.url.searchParams.get("page") || 1);
const limit = +(ctx.url.searchParams.get("limit") || 20);
@@ -57,12 +51,14 @@ export const handler: Handlers = {
});
if (!resp.ok) throw resp; // gracefully handle this
- return ctx.render({
- scopes: resp.data.items,
- query,
- page,
- limit,
- total: resp.data.total,
- });
+ return {
+ data: {
+ scopes: resp.data.items,
+ query,
+ page,
+ limit,
+ total: resp.data.total,
+ },
+ };
},
-};
+});
diff --git a/frontend/routes/admin/users.tsx b/frontend/routes/admin/users.tsx
index a66d8416..1c4ad01e 100644
--- a/frontend/routes/admin/users.tsx
+++ b/frontend/routes/admin/users.tsx
@@ -1,19 +1,13 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import type { PaginationData, State } from "../../util.ts";
import UserEdit from "../../islands/admin/UserEdit.tsx";
import { Table } from "../../components/Table.tsx";
import { path } from "../../utils/api.ts";
import { FullUser, List } from "../../utils/api_types.ts";
import { AdminNav } from "./(_components)/AdminNav.tsx";
import { URLQuerySearch } from "../../components/URLQuerySearch.tsx";
+import { define } from "../../util.ts";
-interface Data extends PaginationData {
- users: FullUser[];
- query: string;
-}
-
-export default function Users({ data, url }: PageProps) {
+export default define.page(function Users({ data, url }) {
return (
@@ -37,10 +31,10 @@ export default function Users({ data, url }: PageProps
) {
);
-}
+});
-export const handler: Handlers = {
- async GET(_req, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
const query = ctx.url.searchParams.get("search") || "";
const page = +(ctx.url.searchParams.get("page") || 1);
const limit = +(ctx.url.searchParams.get("limit") || 20);
@@ -52,12 +46,14 @@ export const handler: Handlers = {
});
if (!resp.ok) throw resp; // gracefully handle this
- return ctx.render({
- users: resp.data.items,
- query,
- page,
- limit,
- total: resp.data.total,
- });
+ return {
+ data: {
+ users: resp.data.items,
+ query,
+ page,
+ limit,
+ total: resp.data.total,
+ },
+ };
},
-};
+});
diff --git a/frontend/routes/auth.tsx b/frontend/routes/auth.tsx
index ab28dc5d..ebe20627 100644
--- a/frontend/routes/auth.tsx
+++ b/frontend/routes/auth.tsx
@@ -1,33 +1,21 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps, RouteConfig } from "$fresh/server.ts";
+import { HttpError, RouteConfig } from "fresh";
import { ComponentChild } from "preact";
+import { define } from "../util.ts";
import Authorize from "../islands/Authorize.tsx";
-import { State } from "../util.ts";
import { path } from "../utils/api.ts";
import type {
Authorization,
Permission,
PermissionPackagePublishVersion,
} from "../utils/api_types.ts";
-import { Head } from "$fresh/runtime.ts";
import { ChevronRight } from "../components/icons/ChevronRight.tsx";
-interface Data {
- code: string;
- authorization: Authorization | null;
-}
-
-export default function AuthPage({ data }: PageProps) {
+export default define.page(function AuthPage({ data }) {
if (data.code === "" || data.authorization === null) {
return (
-
-
- Authorize - JSR
-
-
-
Authorization
To authorize a request, enter the code shown in the application.
@@ -51,33 +39,12 @@ export default function AuthPage({ data }: PageProps) {
);
}
- const publishPermissions = data.authorization.permissions?.filter(
- (perm) => perm.permission === "package/publish" && "version" in perm,
- ) as PermissionPackagePublishVersion[] ?? [];
-
- const title = !data.authorization.permissions
- ? "full access"
- : publishPermissions.length >= 1 &&
- publishPermissions.length == data.authorization.permissions.length
- ? `publishing @${publishPermissions[0].scope}/${
- publishPermissions[0].package
- }${
- publishPermissions.length > 1
- ? ` and ${publishPermissions.length - 1} more`
- : ""
- }`
- : "access";
-
+ const { publishPermissions } = data;
const packageNames = publishPermissions.map((perm) =>
`@${perm.scope}/${perm.package}@${perm.version}`
);
return (
-
-
- Authorize {title} - JSR
-
-
Authorization
An application is requesting access to your account. It is requesting
@@ -96,7 +63,7 @@ export default function AuthPage({ data }: PageProps) {
-
-
{data.title} - Docs - JSR
-
-
-
);
-}
+});
-export const handler: Handlers
= {
- async GET(_, ctx) {
+export const handler = define.handlers({
+ async GET(ctx) {
ctx.state.searchKind = "docs";
const { id } = ctx.params;
- if (!files.has(id)) return ctx.renderNotFound();
+ if (!files.has(id)) {
+ throw new HttpError(404, "This docs page was not found.");
+ }
- const title = files.get(id)!;
const path = new URL(`../../docs/${id}.md`, import.meta.url);
const markdown = await Deno.readTextFile(path);
const { body, attrs } = extract<{ title: string; description: string }>(
markdown,
);
+ const title = attrs.title as string ?? files.get(id)!;
- return ctx.render({
- content: body,
- id,
- title: attrs.title as string ?? title,
+ ctx.state.meta = {
+ title: `${title} - Docs - JSR`,
description: attrs.description as string,
- });
+ };
+ return {
+ data: {
+ content: body,
+ id,
+ title,
+ },
+ };
},
-};
+});
diff --git a/frontend/routes/docs/api-reference.tsx b/frontend/routes/docs/api-reference.tsx
index 1ece743b..9a164d1f 100644
--- a/frontend/routes/docs/api-reference.tsx
+++ b/frontend/routes/docs/api-reference.tsx
@@ -1,5 +1,5 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { RouteConfig } from "$fresh/server.ts";
+import { RouteConfig } from "fresh";
const style = `body:not(:has(div[data-v-app])) {
margin: 0;
diff --git a/frontend/routes/docs/index.ts b/frontend/routes/docs/index.ts
index 7aedb1c2..1ccf4130 100644
--- a/frontend/routes/docs/index.ts
+++ b/frontend/routes/docs/index.ts
@@ -1,8 +1,7 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers } from "$fresh/server.ts";
-import { State } from "../../util.ts";
+import { define } from "../../util.ts";
-export const handler: Handlers = {
+export const handler = define.handlers({
GET() {
return new Response("", {
status: 302,
@@ -11,4 +10,4 @@ export const handler: Handlers = {
},
});
},
-};
+});
diff --git a/frontend/routes/go/[id].ts b/frontend/routes/go/[id].ts
index 7a2015f1..60e2e360 100644
--- a/frontend/routes/go/[id].ts
+++ b/frontend/routes/go/[id].ts
@@ -1,9 +1,9 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers } from "$fresh/server.ts";
import { go } from "../../docs/go.ts";
+import { define } from "../../util.ts";
-export const handler: Handlers = {
- GET(_, { params }) {
+export const handler = define.handlers({
+ GET({ params }) {
const id = params.id as string;
const redirect = go(id) ?? "/docs";
return new Response(null, {
@@ -13,4 +13,4 @@ export const handler: Handlers = {
},
});
},
-};
+});
diff --git a/frontend/routes/index.tsx b/frontend/routes/index.tsx
index a84ef3dd..cbc06cfd 100644
--- a/frontend/routes/index.tsx
+++ b/frontend/routes/index.tsx
@@ -1,11 +1,9 @@
// Copyright 2024 the JSR authors. All rights reserved. MIT license.
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { State } from "../util.ts";
+import { define } from "../util.ts";
import { path } from "../utils/api.ts";
import type { Package, PackageVersion, Stats } from "../utils/api_types.ts";
import type { PanelEntry } from "../components/ListPanel.tsx";
import { ListPanel } from "../components/ListPanel.tsx";
-import { Head } from "$fresh/runtime.ts";
import { ComponentChildren } from "preact";
import { HomepageHero } from "../components/HomepageHero.tsx";
import { Logo } from "../components/Logo.tsx";
@@ -18,25 +16,9 @@ interface Post {
link: string;
}
-interface Data {
- stats: Stats;
- posts: Post[];
-}
-
-export default function Home({ data }: PageProps) {
+export default define.page(function Home({ data }) {
return (
-
-
- JSR: the JavaScript Registry
-
-
-
-
-
) {