Skip to content

chore: Switch from Prettier to oxfmt #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niclimcy merged 1 commit into from
Apr 23, 2026
Merged

chore: Switch from Prettier to oxfmt #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .oxfmtrc.json
View file
Open in desktop
Comment thread
celarye marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"sortImports": {
"newlinesBetween": false,
"groups": [
["value-builtin", "value-external"],
["value-internal", "value-parent", "value-sibling", "value-index"],
{
"newlinesBetween": true
},
"type-import",
"unknown"
]
}
}
3 changes: 0 additions & 3 deletions .prettierignore
View file
Open in desktop

This file was deleted.

1,636 changes: 903 additions & 733 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "inkdex.github.io",
"description": "The Inkdex website.",
"private": true,
"description": "The Inkdex website.",
"type": "module",
"scripts": {
"lint": "oxlint --type-aware --fix",
"lint:check": "oxlint --type-aware --deny-warnings",
"format": "prettier --write '**/*{.md,.yml,.yaml,.json,.js,.ts,.vue}' --cache",
"format:check": "prettier --check '**/*{.md,.yml,.yaml,.json,.js,.ts,.vue}' --cache",
"format": "oxfmt .",
"format:check": "oxfmt --check .",
"vue-tsc": "vue-tsc",
"build": "vitepress build src",
"preview": "vitepress preview src",
Expand All @@ -16,13 +16,12 @@
"prepare": "husky"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.7.1",
"husky": "^9.1.7",
"oxlint": "^1.56.0",
"oxlint-tsgolint": "^0.17.1",
"prettier": "^3.8.1",
"oxfmt": "^0.45.0",
"oxlint": "^1.60.0",
"oxlint-tsgolint": "^0.21.1",
"vitepress": "^2.0.0-alpha.17",
"vue": "^3.5.30",
"vue-tsc": "^3.2.6"
"vue": "^3.5.32",
"vue-tsc": "^3.2.7"
}
}
21 changes: 0 additions & 21 deletions prettier.config.js
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/.vitepress/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ export default defineConfig({
sidebar: sidebarConfig,

editLink: {
pattern:
"https://github.com/inkdex/inkdex.github.io/tree/master/src/:path",
pattern: "https://github.com/inkdex/inkdex.github.io/tree/master/src/:path",
},

footer: {
Expand Down
5 changes: 1 addition & 4 deletions src/.vitepress/config/headConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ const headConfig: HeadConfig[] = [
["meta", { name: "msapplication-TileColor", content: "#e72323" }],

["meta", { name: "charset", content: "utf-8" }],
[
"meta",
{ name: "viewport", content: "width=device-width, initial-scale=1.0" },
],
["meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" }],
["meta", { name: "referrer", content: "no-referrer-when-downgrade" }],

[
Expand Down
15 changes: 4 additions & 11 deletions src/.vitepress/theme/components/ExtensionCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,8 @@ const handleImageError = (event: Event) => {
class="rating-badge"
:style="{
color: getContentRatingColor(extension.metadata.contentRating),
backgroundColor: getContentRatingBg(
extension.metadata.contentRating,
),
borderColor: getContentRatingColor(
extension.metadata.contentRating,
),
backgroundColor: getContentRatingBg(extension.metadata.contentRating),
borderColor: getContentRatingColor(extension.metadata.contentRating),
}"
>
{{ formatRating(extension.metadata.contentRating) }}
Expand All @@ -84,8 +80,7 @@ const handleImageError = (event: Event) => {
<div class="extension-tags-row">
<span
v-if="
extension.metadata.capabilities &&
hasChapterProviding(extension.metadata.capabilities)
extension.metadata.capabilities && hasChapterProviding(extension.metadata.capabilities)
"
class="service-badge service-content"
>Content Service</span
Expand Down Expand Up @@ -135,9 +130,7 @@ const handleImageError = (event: Event) => {
<div class="extension-footer">
<span v-if="selected" class="selected-indicator"> ✓ Selected </span>
<div class="extension-actions" @click.stop>
<button class="btn-secondary details-btn" @click="handleDetailsClick">
Details
</button>
<button class="btn-secondary details-btn" @click="handleDetailsClick">Details</button>
</div>
</div>
</div>
Expand Down
54 changes: 12 additions & 42 deletions src/.vitepress/theme/components/ExtensionDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ const sourceDisplayName = computed(() => {
}

const repo = props.customRepos.find((r) => r.id === props.extension?.source);
return repo
? `${repo.owner}/${repo.name}`
: props.extension.repoId || props.extension.source;
return repo ? `${repo.owner}/${repo.name}` : props.extension.repoId || props.extension.source;
});

const emit = defineEmits<{
Expand Down Expand Up @@ -100,9 +98,7 @@ watch(
:alt="`${extension.name} icon`"
class="details-icon"
@error="
(e) =>
((e.target as HTMLImageElement).src =
'https://paperback.moe/pb-logo.png')
(e) => ((e.target as HTMLImageElement).src = 'https://paperback.moe/pb-logo.png')
"
/>
<div class="details-header-text">
Expand All @@ -113,23 +109,14 @@ watch(
<span
class="details-rating-badge"
:style="{
color: getContentRatingColor(
extension.metadata.contentRating,
),
backgroundColor: getContentRatingBg(
extension.metadata.contentRating,
),
borderColor: getContentRatingColor(
extension.metadata.contentRating,
),
color: getContentRatingColor(extension.metadata.contentRating),
backgroundColor: getContentRatingBg(extension.metadata.contentRating),
borderColor: getContentRatingColor(extension.metadata.contentRating),
}"
>
{{ formatRating(extension.metadata.contentRating) }}
</span>
<span
v-if="extension.metadata.version"
class="details-version-badge"
>
<span v-if="extension.metadata.version" class="details-version-badge">
v{{ extension.metadata.version }}
</span>
</div>
Expand All @@ -155,9 +142,7 @@ watch(
>Tracker Service</span
>
<span
v-if="
hasCloudflareBypassProviding(extension.metadata.capabilities)
"
v-if="hasCloudflareBypassProviding(extension.metadata.capabilities)"
class="service-badge service-cloudflare"
>Cloudflare</span
>
Expand All @@ -168,17 +153,13 @@ watch(
<h3>Language</h3>
<span class="language-badge">
<template v-if="getLanguageEmoji(extension.metadata.language)"
>{{
getLanguageEmoji(extension.metadata.language)
}}&nbsp;</template
>{{ getLanguageEmoji(extension.metadata.language) }}&nbsp;</template
>{{ getLanguageName(extension.metadata.language) }}
</span>
</div>

<div
v-if="
extension.metadata?.badges && extension.metadata.badges.length > 0
"
v-if="extension.metadata?.badges && extension.metadata.badges.length > 0"
class="details-section"
>
<h3>Badges</h3>
Expand Down Expand Up @@ -211,11 +192,7 @@ watch(
rel="noopener noreferrer"
class="source-link"
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
<path
d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"
/>
Expand All @@ -226,10 +203,7 @@ watch(
</div>

<div
v-if="
extension.metadata?.developers &&
extension.metadata.developers.length > 0
"
v-if="extension.metadata?.developers && extension.metadata.developers.length > 0"
class="details-section"
>
<h3>Developers</h3>
Expand All @@ -248,11 +222,7 @@ watch(
rel="noopener noreferrer"
class="dev-link"
>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
<path
d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/.vitepress/theme/components/ExtensionList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,8 +1172,8 @@
.details-overlay {
padding: 1rem;
/* Use viewport units that account for dynamic viewport height on mobile */
inset: env(safe-area-inset-top, 0) env(safe-area-inset-right, 0)
env(safe-area-inset-bottom, 0) env(safe-area-inset-left, 0);
inset: env(safe-area-inset-top, 0) env(safe-area-inset-right, 0) env(safe-area-inset-bottom, 0)
env(safe-area-inset-left, 0);
}
.details-modal {
/* Use max-height with min to ensure proper sizing on mobile */
Expand Down Expand Up @@ -1852,8 +1852,8 @@
padding: 1rem;
align-items: center;
/* Use safe area insets for mobile browser UI */
inset: env(safe-area-inset-top, 0) env(safe-area-inset-right, 0)
env(safe-area-inset-bottom, 0) env(safe-area-inset-left, 0);
inset: env(safe-area-inset-top, 0) env(safe-area-inset-right, 0) env(safe-area-inset-bottom, 0)
env(safe-area-inset-left, 0);
}
.extension-search-modal {
/* Use dynamic viewport height to account for mobile browser UI */
Expand Down
Loading
Loading