Skip to content

Commit fd9159e

Browse files
Merge branch 'main' into fix-ui-leave
2 parents 4e00572 + cfef9ed commit fd9159e

21 files changed

+259
-55
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### PR Checklist
2+
3+
- [ ] The PR title follows
4+
[conventional commits](https://www.conventionalcommits.org/en/v1.0.0/)
5+
- [ ] Is this closing an open issue? If so, link it, else include a proper
6+
description of the changes and rason behind them.
7+
- [ ] Does the PR have changes to the frontend? If so, include screenshots or a
8+
recording of the changes.
9+
<br/>If it affect colors, please include screenshots/recording in both
10+
light and dark mode.
11+
- [ ] Does the PR have changes to the backend? If so, make sure tests are added.
12+
<br/>And if changing dababase queries, be sure you have ran `sqlx prepare`
13+
and committed the changes in the `.sqlx` directory.

api/.sqlx/query-3dd014058228dbf8302c4944de5c85a1983483c17ca3d6bb7f66cc5c3c88c07e.json renamed to api/.sqlx/query-ce01c6670f8e63d237eedc39bc4e9e1709dc92b0b12e9f7b9e12ba57630faf9a.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/src/db/database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ impl Database {
13851385
FROM packages
13861386
LEFT JOIN github_repositories ON packages.github_repository_id = github_repositories.id
13871387
WHERE packages.scope = $1 AND ($2 = true OR packages.is_archived = false)
1388-
ORDER BY packages.name
1388+
ORDER BY packages.is_archived ASC, packages.name
13891389
OFFSET $3 LIMIT $4"#,
13901390
scope as _,
13911391
show_archived,

deno.lock

Lines changed: 176 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/components/PackageHit.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { Package, RuntimeCompat } from "../utils/api_types.ts";
44
import { getScoreBgColorClass } from "../utils/score_ring_color.ts";
55
import type { ListDisplayItem } from "./List.tsx";
66
import { RuntimeCompatIndicator } from "./RuntimeCompatIndicator.tsx";
7+
import TbArchive from "tb-icons/TbArchive";
78

89
const runtimeCompatExists = (compat: RuntimeCompat) => {
910
return compat?.browser || compat?.deno || compat?.node || compat?.workerd ||
@@ -16,7 +17,7 @@ export function PackageHit(pkg: OramaPackageHit | Package): ListDisplayItem {
1617
content: (
1718
<div class="grow-1 w-full flex flex-col md:flex-row gap-2 justify-between">
1819
<div class="grow-1">
19-
<div class="flex flex-wrap items-baseline gap-2">
20+
<div class="flex flex-wrap items-baseline gap-x-2 mb-2 md:mb-0">
2021
<span class="text-jsr-cyan-700 dark:text-cyan-400 font-semibold">
2122
{`@${pkg.scope}/${pkg.name}`}
2223
</span>
@@ -25,6 +26,12 @@ export function PackageHit(pkg: OramaPackageHit | Package): ListDisplayItem {
2526
{`v${(pkg as Package).latestVersion}`}
2627
</div>
2728
)}
29+
{(pkg as Package).isArchived && (
30+
<div class="text-xs flex items-center gap-1 bg-jsr-yellow-600 text-white px-2 py-0.5 rounded-full">
31+
<TbArchive class="size-3" />
32+
Archived
33+
</div>
34+
)}
2835
</div>
2936
<div class="text-sm text-tertiary">
3037
{pkg.description}

frontend/docs/about-slow-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ to `jsr publish` or `deno publish`.
413413
When using Deno, one can supress slow type diagnostics from being surfaced in
414414
`deno lint` by adding an exclude for the `no-slow-types` rule. This can be done
415415
by specifying `--rules-exclude=no-slow-types` when running `deno lint`, or by
416-
adding the following to your `deno.json` configuration file:
416+
adding the following to your `deno.json(c)` configuration file:
417417
418418
```json
419419
{

frontend/docs/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ like the name, version, and entrypoint(s). The
8080
modules should be importable by users of your package.
8181

8282
```json
83-
// jsr.json / deno.json
83+
// jsr.json / deno.json(c)
8484
{
8585
"name": "@luca/greet",
8686
"version": "1.0.0",

frontend/docs/migrate-x-to-jsr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ build for your platform with:
5050
deno upgrade --canary
5151
```
5252

53-
Then, from within your package folder (probably the one with your `deno.json` or
54-
`mod.ts`), execute the following command:
53+
Then, from within your package folder (probably the one with your `deno.json(c)`
54+
or `mod.ts`), execute the following command:
5555

5656
```bash
5757
deno run -Ar jsr:@deno/x-to-jsr
@@ -99,7 +99,7 @@ _Vendor dependencies_
9999

100100
You can also
101101
[vendor your dependencies](https://docs.deno.com/runtime/manual/basics/vendoring/)
102-
by adding `"vendor": true` to your `deno.json` file. This will download local
102+
by adding `"vendor": true` to your `deno.json(c)` file. This will download local
103103
versions of your HTTPS dependencies to a `vendor` directory when the project is
104104
ran.
105105

frontend/docs/native-imports.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ constraints in your code, you can use
5454
to map the `jsr:` scheme to a different prefix.
5555

5656
In **Deno** you can do this by adding a line to the `"imports"` section in your
57-
`deno.json`. You can do this manually, or by using the `deno add` command:
57+
`deno.json(c)`. You can do this manually, or by using the `deno add` command:
5858

5959
```diff
6060
{
@@ -64,7 +64,7 @@ In **Deno** you can do this by adding a line to the `"imports"` section in your
6464
}
6565
```
6666

67-
You can then import packages using the alias defined in the `deno.json`:
67+
You can then import packages using the alias defined in the `deno.json(c)`:
6868

6969
```ts
7070
import { camelCase } from "@luca/cases";

frontend/docs/npm-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ are generated by JSR, and contain all source code reachable from the entrypoint
172172
of the package. This source code is transpiled to JavaScript, and TypeScript
173173
type declarations (`.d.ts` files) are generated for all TypeScript files. The
174174
tarball also contains a `package.json` file that contains the `exports` field
175-
from the original `jsr.json` / `deno.json` file.
175+
from the original `jsr.json` / `deno.json(c)` file.
176176

177177
Yanked versions of packages are not advertised in the package version manifest
178178
of the npm registry endpoint. Tarballs for yanked versions are still available

frontend/docs/package-configuration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ file can instead be placed in the
99
[`deno.json`](https://docs.deno.com/runtime/manual/getting_started/configuration_file).
1010

1111
```json
12-
// jsr.json / deno.json
12+
// jsr.json / deno.json(c)
1313
{
1414
"name": "@luca/greet",
1515
"version": "1.0.0",
@@ -36,7 +36,7 @@ your package. The `exports` field can either be specified as a single string, or
3636
as an object mapping entrypoint names to paths in your package.
3737

3838
```json
39-
// jsr.json / deno.json
39+
// jsr.json / deno.json(c)
4040
{
4141
"name": "@luca/greet",
4242
"version": "1.0.0",
@@ -58,7 +58,7 @@ you only have a single entrypoint in your package. It is semantically equivalent
5858
to specifying a default entrypoint in the object form.
5959

6060
```diff
61-
// deno.json
61+
// deno.json(c)
6262
{
6363
"name": "@luca/greet",
6464
"version": "1.0.0",
@@ -72,9 +72,9 @@ to specifying a default entrypoint in the object form.
7272
### `include` and `exclude`
7373

7474
You can also use the `include` and `exclude` options to include and exclude
75-
files during publishing. When using a `deno.json`, you can use `publish.include`
76-
and `publish.exclude` to include and exclude files only for publishing, rather
77-
than for all Deno subcommands.
75+
files during publishing. When using a `deno.json(c)`, you can use
76+
`publish.include` and `publish.exclude` to include and exclude files only for
77+
publishing, rather than for all Deno subcommands.
7878
[Learn more about filtering files](/docs/publishing-packages#filtering-files).
7979

8080
## JSON Schema

0 commit comments

Comments
 (0)