Skip to content

Commit 513ea2d

Browse files
Merge branch 'refs/heads/main' into pr-tracker
# Conflicts: # src/lib/server/github-cache.ts
2 parents a977e96 + 9ee49b9 commit 513ea2d

24 files changed

+470
-279
lines changed

.prettierrc

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
"trailingComma": "none",
44
"printWidth": 100,
55
"arrowParens": "avoid",
6-
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
6+
"plugins": [
7+
"prettier-plugin-svelte",
8+
"prettier-plugin-tailwindcss",
9+
"@trivago/prettier-plugin-sort-imports"
10+
],
711
"overrides": [
812
{
913
"files": "*.svelte",
@@ -12,5 +16,18 @@
1216
}
1317
}
1418
],
15-
"tailwindStylesheet": "./src/app.css"
19+
"tailwindStylesheet": "./src/app.css",
20+
"importOrder": [
21+
"^\\.\\./app.css$",
22+
"^svelte$",
23+
"^@sveltejs/kit.*$",
24+
"^svelte/.*$",
25+
"\\$(app|env)/.+$",
26+
"<THIRD_PARTY_MODULES>",
27+
"\\$lib/(?!components).+$",
28+
"\\$lib/components/ui/.+$",
29+
"\\$lib/components/.+$",
30+
"^\\.*/.+$"
31+
],
32+
"importOrderSortSpecifiers": true
1633
}

eslint.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import eslint from "@eslint/js";
2-
import tseslint from "typescript-eslint";
3-
import svelte from "eslint-plugin-svelte";
42
import prettierConfig from "eslint-config-prettier/flat";
3+
import svelte from "eslint-plugin-svelte";
54
import globals from "globals";
5+
import tseslint from "typescript-eslint";
66
import svelteConfig from "./svelte.config.js";
77

88
export default tseslint.config(

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@tailwindcss/typography": "^0.5.16",
3131
"@tailwindcss/vite": "^4.1.5",
3232
"@total-typescript/ts-reset": "^0.6.1",
33+
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
3334
"@types/eslint-config-prettier": "^6.11.3",
3435
"@types/node": "^22.15.14",
3536
"@types/semver": "^7.7.0",
@@ -51,6 +52,7 @@
5152
"prettier-plugin-svelte": "^3.3.3",
5253
"prettier-plugin-tailwindcss": "^0.6.11",
5354
"rehype-raw": "^7.0.0",
55+
"runed": "^0.26.0",
5456
"semver": "^7.7.1",
5557
"shiki": "^3.4.0",
5658
"svelte": "^5.28.2",

pnpm-lock.yaml

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

src/lib/components/AnimatedCollapsibleContent.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
Based on https://bits-ui.com/docs/components/collapsible#best-practices
55
-->
66
<script lang="ts">
7-
import { Collapsible, type WithoutChildrenOrChild } from "bits-ui";
8-
import { slide, type SlideParams } from "svelte/transition";
97
import type { Snippet } from "svelte";
8+
import { type SlideParams, slide } from "svelte/transition";
9+
import { Collapsible, type WithoutChildrenOrChild } from "bits-ui";
1010
1111
let {
1212
ref = $bindable(null),

0 commit comments

Comments
 (0)