Skip to content

Commit fee5e56

Browse files
danielroedanielroe
committed
Merge remote-tracking branch 'origin/main' into add-lunaria-merging
# Conflicts: # lunaria/files/az-AZ.json # lunaria/files/bg-BG.json # lunaria/files/cs-CZ.json # lunaria/files/de-DE.json # lunaria/files/en-GB.json # lunaria/files/en-US.json # lunaria/files/es-419.json # lunaria/files/es-ES.json # lunaria/files/fr-FR.json # lunaria/files/hu-HU.json # lunaria/files/id-ID.json # lunaria/files/ja-JP.json # lunaria/files/pl-PL.json # lunaria/files/ru-RU.json # lunaria/files/tr-TR.json # lunaria/files/uk-UA.json # lunaria/files/zh-CN.json # lunaria/files/zh-TW.json
2 parents ccb93af + 33e9814 commit fee5e56

25 files changed

Lines changed: 172 additions & 133 deletions

‎app/components/Package/TrendsChart.vue‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,18 @@ watch(selectedMetric, value => {
20362036
<template #optionSvg>
20372037
<span class="text-fg-subtle font-mono pointer-events-none">SVG</span>
20382038
</template>
2039+
<template #optionStack="{ isStack }">
2040+
<span
2041+
v-if="isStack"
2042+
class="i-lucide:layers-2 text-fg-subtle w-6 h-6 pointer-events-none"
2043+
aria-hidden="true"
2044+
/>
2045+
<span
2046+
v-else
2047+
class="i-lucide:chart-line text-fg-subtle w-6 h-6 pointer-events-none"
2048+
aria-hidden="true"
2049+
/>
2050+
</template>
20392051

20402052
<template #annotator-action-close>
20412053
<span
@@ -2047,6 +2059,28 @@ watch(selectedMetric, value => {
20472059
<template #annotator-action-color="{ color }">
20482060
<span class="i-lucide:palette w-6 h-6" :style="{ color }" aria-hidden="true" />
20492061
</template>
2062+
<template #annotator-action-draw="{ mode }">
2063+
<span
2064+
v-if="mode === 'arrow'"
2065+
class="i-lucide:move-up-right text-fg-subtle w-6 h-6"
2066+
aria-hidden="true"
2067+
/>
2068+
<span
2069+
v-if="mode === 'text'"
2070+
class="i-lucide:type text-fg-subtle w-6 h-6"
2071+
aria-hidden="true"
2072+
/>
2073+
<span
2074+
v-if="mode === 'line'"
2075+
class="i-lucide:pen-line text-fg-subtle w-6 h-6"
2076+
aria-hidden="true"
2077+
/>
2078+
<span
2079+
v-if="mode === 'draw'"
2080+
class="i-lucide:line-squiggle text-fg-subtle w-6 h-6"
2081+
aria-hidden="true"
2082+
/>
2083+
</template>
20502084
<template #annotator-action-undo>
20512085
<span
20522086
class="i-lucide:undo-2 w-6 h-6 text-fg-subtle"

‎app/components/Package/VersionDistribution.vue‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,29 @@ const chartConfig = computed<VueUiXyConfig>(() => {
551551
<span class="i-lucide:palette w-6 h-6" :style="{ color }" aria-hidden="true" />
552552
</template>
553553

554+
<template #annotator-action-draw="{ mode }">
555+
<span
556+
v-if="mode === 'arrow'"
557+
class="i-lucide:move-up-right text-fg-subtle w-6 h-6"
558+
aria-hidden="true"
559+
/>
560+
<span
561+
v-if="mode === 'text'"
562+
class="i-lucide:type text-fg-subtle w-6 h-6"
563+
aria-hidden="true"
564+
/>
565+
<span
566+
v-if="mode === 'line'"
567+
class="i-lucide:pen-line text-fg-subtle w-6 h-6"
568+
aria-hidden="true"
569+
/>
570+
<span
571+
v-if="mode === 'draw'"
572+
class="i-lucide:line-squiggle text-fg-subtle w-6 h-6"
573+
aria-hidden="true"
574+
/>
575+
</template>
576+
554577
<template #annotator-action-undo>
555578
<span
556579
class="i-lucide:undo-2 w-6 h-6 text-fg-subtle"

‎app/components/Package/WeeklyDownloadStats.vue‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ const { colors } = useCssVariables(
9797
},
9898
)
9999
100-
function toggleSparklineAnimation() {
101-
settings.value.sidebar.animateSparkline = !settings.value.sidebar.animateSparkline
102-
}
103-
104-
const hasSparklineAnimation = computed(() => settings.value.sidebar.animateSparkline)
105-
106100
const isDarkMode = computed(() => resolvedMode.value === 'dark')
107101
108102
const accentColorValueById = computed<Record<string, string>>(() => {
@@ -254,8 +248,8 @@ const config = computed<VueUiSparklineConfig>(() => {
254248
line: {
255249
color: colors.value.borderHover,
256250
pulse: {
257-
show: hasSparklineAnimation.value, // the pulse will not show if prefers-reduced-motion (enforced by vue-data-ui)
258-
loop: true, // runs only once if false
251+
show: true, // the pulse will not show if prefers-reduced-motion (enforced by vue-data-ui)
252+
loop: false,
259253
radius: 1.5,
260254
color: pulseColor.value!,
261255
easing: 'ease-in-out',
@@ -333,23 +327,9 @@ const config = computed<VueUiSparklineConfig>(() => {
333327
<SkeletonInline class="h-px w-full" />
334328
</div>
335329
</div>
336-
<!-- Animation toggle placeholder -->
337-
<div class="w-full hidden motion-safe:flex flex-1 items-end justify-end">
338-
<SkeletonInline class="h-[20px] w-30" />
339-
</div>
340330
</div>
341331
</template>
342332
</ClientOnly>
343-
344-
<div v-if="hasWeeklyDownloads" class="hidden motion-safe:flex justify-end p-1">
345-
<ButtonBase size="small" @click="toggleSparklineAnimation">
346-
{{
347-
hasSparklineAnimation
348-
? $t('package.trends.pause_animation')
349-
: $t('package.trends.play_animation')
350-
}}
351-
</ButtonBase>
352-
</div>
353333
</template>
354334
<p v-else class="py-2 text-sm font-mono text-fg-subtle">
355335
{{ $t('package.trends.no_data') }}

‎app/composables/useSettings.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export interface AppSettings {
3838
}
3939
sidebar: {
4040
collapsed: string[]
41-
animateSparkline: boolean
4241
}
4342
chartFilter: {
4443
averageWindow: number
@@ -61,7 +60,6 @@ const DEFAULT_SETTINGS: AppSettings = {
6160
},
6261
sidebar: {
6362
collapsed: [],
64-
animateSparkline: true,
6563
},
6664
chartFilter: {
6765
averageWindow: 0,

‎app/pages/blog/alpha-release.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ headline="Read more from the community"
176176
authorHandle: 'jensroemer.com',
177177
description: 'Reflections on learning, community, and change.'
178178
},
179+
{
180+
url: 'https://voidzero.dev/posts/npmx-alpha',
181+
title: 'VoidZero and npmx: Building Better Tools Together',
182+
authorHandle: 'voidzero.dev',
183+
description: 'How VoidZero and npmx.dev share a vision for making JavaScript developers more productive, and how real-world feedback from open-source builders helps improve our tooling.',
184+
},
179185
{
180186
url: 'https://paulie.codes/blog/3mfs2stugzp2v',
181187
title: 'Overcoming Imposter Syndrome: My First Open Source Contribution',

‎i18n/locales/az-AZ.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,6 @@
384384
"likes": "Bəyənmələr",
385385
"contributors": "Əməkdaşlar"
386386
},
387-
"play_animation": "Animasiyanı başlat",
388-
"pause_animation": "Animasiyanı dayandır",
389387
"copy_alt": {
390388
"trend_none": "əsasən sabit",
391389
"trend_strong": "güclü",

‎i18n/locales/bg-BG.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@
410410
"likes": "Харесвания",
411411
"contributors": "Сътрудници"
412412
},
413-
"play_animation": "Пускане на анимация",
414-
"pause_animation": "Пауза на анимация",
415413
"data_correction": "Корекция на данни",
416414
"average_window": "Прозорец за средна стойност",
417415
"smoothing": "Изглаждане",

‎i18n/locales/cs-CZ.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,6 @@
389389
"likes": "Lajky",
390390
"contributors": "Přispěvatelé"
391391
},
392-
"play_animation": "Přehrát animaci",
393-
"pause_animation": "Pozastavit animaci",
394392
"data_correction": "Oprava dat",
395393
"average_window": "Okno průměru",
396394
"smoothing": "Vyhlazování",

‎i18n/locales/de-DE.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,6 @@
389389
"likes": "Likes",
390390
"contributors": "Mitwirkende"
391391
},
392-
"play_animation": "Animation abspielen",
393-
"pause_animation": "Animation pausieren",
394392
"data_correction": "Datenkorrektur",
395393
"average_window": "Durchschnittsfenster",
396394
"smoothing": "Glättung",

‎i18n/locales/en.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,6 @@
443443
"likes": "Likes",
444444
"contributors": "Contributors"
445445
},
446-
"play_animation": "Play animation",
447-
"pause_animation": "Pause animation",
448446
"data_correction": "Data correction",
449447
"average_window": "Average window",
450448
"smoothing": "Smoothing",

0 commit comments

Comments
 (0)