Skip to content

Commit 6aca002

Browse files
committed
conflict
2 parents 0786c87 + 3b7c027 commit 6aca002

14 files changed

Lines changed: 436 additions & 49 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,6 @@ jobs:
140140

141141
- name: 🔍 Check for unused code
142142
run: pnpm knip
143+
144+
- name: 🧹 Check for unused production code
145+
run: pnpm knip --production

app/components/ProvenanceBadge.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ const title = computed(() =>
3535
class="inline-flex items-center justify-center gap-1 text-xs font-mono text-fg-muted hover:text-fg transition-colors duration-200 min-w-6 min-h-6"
3636
:title="title"
3737
>
38-
<span
39-
class="i-solar-shield-check-outline shrink-0"
40-
:class="compact ? 'w-3.5 h-3.5' : 'w-4 h-4'"
41-
/>
38+
<span class="i-lucide-shield-check shrink-0" :class="compact ? 'w-3.5 h-3.5' : 'w-4 h-4'" />
4239
<span v-if="!compact" class="sr-only sm:not-sr-only">{{
4340
$t('badges.provenance.verified')
4441
}}</span>
@@ -48,10 +45,7 @@ const title = computed(() =>
4845
class="inline-flex items-center gap-1 text-xs font-mono text-fg-muted"
4946
:title="title"
5047
>
51-
<span
52-
class="i-solar-shield-check-outline shrink-0"
53-
:class="compact ? 'w-3.5 h-3.5' : 'w-4 h-4'"
54-
/>
48+
<span class="i-lucide-shield-check shrink-0" :class="compact ? 'w-3.5 h-3.5' : 'w-4 h-4'" />
5549
<span v-if="!compact" class="sr-only sm:not-sr-only">{{
5650
$t('badges.provenance.verified')
5751
}}</span>

app/components/compare/ComparisonGrid.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ defineProps<{
2222
:key="index"
2323
class="comparison-cell comparison-cell-header"
2424
>
25-
<span class="font-mono text-sm font-medium text-fg truncate" :title="header">
25+
<NuxtLink
26+
:to="`/package/${header}`"
27+
class="link-subtle font-mono text-sm font-medium text-fg truncate"
28+
:title="header"
29+
>
2630
{{ header }}
27-
</span>
31+
</NuxtLink>
2832
</div>
2933
</div>
3034

app/error.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const props = defineProps<{
55
error: NuxtError
66
}>()
77
8-
const status = computed(() => props.error.status || 500)
8+
const status = computed(() => props.error.statusCode || 500)
99
const statusText = computed(() => {
10-
if (props.error.statusText) return props.error.statusText
10+
if (props.error.statusMessage) return props.error.statusMessage
1111
switch (status.value) {
1212
case 404:
1313
return 'Page not found'

app/pages/package-docs/[...path].vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,4 +472,11 @@ const showEmptyState = computed(() => docsData.value?.status !== 'ok')
472472
.docs-content .docs-members pre code {
473473
@apply text-fg-muted;
474474
}
475+
476+
.docs-content .docs-symbol-name,
477+
.docs-content .docs-members dl dd,
478+
.docs-content .docs-members dl dt code,
479+
.docs-content .docs-section .docs-symbol .docs-description {
480+
word-break: break-all;
481+
}
475482
</style>

app/pages/package/[...package].vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ defineOgImageComponent('Package', {
486486
class="inline-flex items-center justify-center gap-1.5 text-fg-muted hover:text-fg transition-colors duration-200 min-w-6 min-h-6"
487487
:title="$t('package.verified_provenance')"
488488
>
489-
<span class="i-solar:shield-check-outline w-3.5 h-3.5 shrink-0" aria-hidden="true" />
489+
<span class="i-lucide-shield-check w-3.5 h-3.5 shrink-0" aria-hidden="true" />
490490
</a>
491491
<span
492492
v-if="requestedVersion && latestVersion && resolvedVersion !== latestVersion.version"
@@ -787,7 +787,7 @@ defineOgImageComponent('Package', {
787787
class="text-fg-subtle hover:text-fg transition-colors duration-200 inline-flex items-center justify-center min-w-6 min-h-6 -m-1 p-1"
788788
:title="$t('package.stats.inspect_dependency_tree')"
789789
>
790-
<span class="i-solar:eye-scan-outline w-3.5 h-3.5" aria-hidden="true" />
790+
<span class="i-lucide-view w-3.5 h-3.5" aria-hidden="true" />
791791
<span class="sr-only">{{ $t('package.stats.inspect_dependency_tree') }}</span>
792792
</a>
793793
</dd>

docs/content/2.guide/1.features.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,32 @@ You can add custom npmx badges to your markdown files using the following syntax
154154

155155
You can further customize your badges by appending query parameters to the badge URL.
156156

157+
##### `labelColor`
158+
159+
Overrides the default label color. You can pass a standard hex code (with or without the `#` prefix).
160+
161+
- **Default**: `#0a0a0a`
162+
- **Usage**: `?labelColor=HEX_CODE`
163+
164+
##### `label`
165+
166+
Overrides the default label text. You can pass any string to customize the label displayed on the badge.
167+
168+
- **Default**: Depends on the badge type (e.g., "version", "downloads/mo").
169+
- **Usage**: `?label=YOUR_LABEL`
170+
157171
##### `color`
158172

159173
Overrides the default strategy color. You can pass a standard hex code (with or without the `#` prefix).
160174

161175
- **Default**: Depends on the badge type (e.g., version is blue, downloads are orange).
162176
- **Usage**: `?color=HEX_CODE`
163177

164-
| Example | URL |
165-
| :------------- | :------------------------------------ |
166-
| **Hot Pink** | `.../badge/version/nuxt?color=ff69b4` |
167-
| **Pure Black** | `.../badge/version/nuxt?color=000000` |
168-
| **Brand Blue** | `.../badge/version/nuxt?color=3b82f6` |
178+
| Example | URL |
179+
| :------------- | :------------------------------------- |
180+
| **Hot Pink** | `.../badge/version/nuxt?colorB=ff69b4` |
181+
| **Pure Black** | `.../badge/version/nuxt?colorB=000000` |
182+
| **Brand Blue** | `.../badge/version/nuxt?colorB=3b82f6` |
169183

170184
##### `name`
171185

knip.ts

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import type { KnipConfig } from 'knip'
2+
3+
const config: KnipConfig = {
4+
workspaces: {
5+
'.': {
6+
entry: [
7+
'app/app.vue!',
8+
'app/error.vue!',
9+
'app/pages/**/*.vue!',
10+
'app/components/**/*.vue!',
11+
'app/composables/**/*.ts!',
12+
'app/middleware/**/*.ts!',
13+
'app/plugins/**/*.ts!',
14+
'app/utils/**/*.ts!',
15+
'server/**/*.ts!',
16+
'modules/**/*.ts!',
17+
'config/**/*.ts!',
18+
'lunaria/**/*.ts!',
19+
'shared/**/*.ts!',
20+
'i18n/**/*.ts',
21+
'lunaria.config.ts',
22+
'pwa-assets.config.ts',
23+
'.lighthouserc.cjs',
24+
'lighthouse-setup.cjs',
25+
'uno-preset-rtl.ts!',
26+
'scripts/**/*.ts',
27+
],
28+
project: ['**/*.{ts,vue,cjs,mjs}', '!test/fixtures/**'],
29+
ignoreDependencies: [
30+
'@iconify-json/*',
31+
'@vercel/kv',
32+
'@voidzero-dev/vite-plus-core',
33+
'vite-plus!',
34+
'h3',
35+
/** Needs to be explicitly installed, even though it is not imported, to avoid type errors. */
36+
'unplugin-vue-router',
37+
'vite-plugin-pwa',
38+
39+
/** Some components import types from here, but installing it directly could lead to a version mismatch */
40+
'vue-router',
41+
],
42+
ignoreUnresolved: ['#components', '#oauth/config'],
43+
},
44+
'cli': {
45+
project: ['src/**/*.ts!'],
46+
},
47+
'docs': {
48+
entry: ['app/**/*.{ts,vue}'],
49+
ignoreDependencies: ['docus', 'better-sqlite3', 'nuxt!'],
50+
},
51+
},
52+
}
53+
54+
export default config

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"@iconify-json/carbon": "1.2.18",
4545
"@iconify-json/lucide": "1.2.87",
4646
"@iconify-json/simple-icons": "1.2.68",
47-
"@iconify-json/solar": "1.2.5",
4847
"@iconify-json/svg-spinners": "1.2.4",
4948
"@iconify-json/vscode-icons": "1.2.40",
5049
"@intlify/core-base": "11.2.8",
@@ -110,7 +109,6 @@
110109
"lint-staged": "16.2.7",
111110
"oxfmt": "0.27.0",
112111
"oxlint": "1.42.0",
113-
"playwright-core": "1.58.0",
114112
"schema-dts": "1.1.5",
115113
"simple-git-hooks": "2.13.1",
116114
"typescript": "5.9.3",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)