Skip to content

Commit 771aa74

Browse files
authored
Merge branch 'npmx-dev:main' into feat/changelog-1
2 parents 48a9f4e + 018097e commit 771aa74

11 files changed

Lines changed: 2302 additions & 1725 deletions

File tree

app/components/Package/TrendsChart.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@ const normalisedDataset = computed(() => {
10771077
const lastDateMs = chartData.value.dates.at(-1) ?? 0
10781078
const isAbsoluteMetric = selectedMetric.value === 'contributors'
10791079
1080+
// oxlint-disable-next-line oxc-no-map-spread
10801081
return (chartData.value.dataset || []).map(d => {
10811082
const series = applyDataPipeline(
10821083
d.series.map(v => v ?? 0),

app/composables/useClipboardAsync.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

app/composables/useSelectedPackageManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const useSelectedPackageManager = createSharedComposable(
1313
// Sync to data-pm attribute on the client
1414
if (import.meta.client) {
1515
const queryPM = new URLSearchParams(window.location.search).get('pm')
16-
if (queryPM && packageManagers.some(pm => pm.id === queryPM)) {
16+
if (queryPM && packageManagers.some(({ id }) => id === queryPM)) {
1717
pm.value = queryPM as PackageManagerId
1818
}
1919
// Watch for changes and update the attribute

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,20 @@ const {
108108
)
109109
110110
//copy README file as Markdown
111-
const { copied: copiedReadme, copy: copyReadme } = useClipboardAsync(
112-
async () => {
111+
const {
112+
copied: copiedReadme,
113+
copy,
114+
copyPending: copyReadmePending,
115+
} = useClipboard({
116+
copiedDuring: 2000,
117+
})
118+
119+
function copyReadme() {
120+
copy(async () => {
113121
await fetchReadmeMarkdown()
114122
return readmeMarkdownData.value?.markdown ?? ''
115-
},
116-
{
117-
copiedDuring: 2000,
118-
},
119-
)
123+
})
124+
}
120125
121126
function prefetchReadmeMarkdown() {
122127
if (readmeMarkdownStatus.value === 'idle') {
@@ -1040,7 +1045,11 @@ const showSkeleton = shallowRef(false)
10401045
"
10411046
:classicon="copiedReadme ? 'i-lucide:check' : 'i-simple-icons:markdown'"
10421047
>
1043-
{{ copiedReadme ? $t('common.copied') : $t('common.copy') }}
1048+
<span>{{ copiedReadme ? $t('common.copied') : $t('common.copy') }}</span>
1049+
<span
1050+
v-if="copyReadmePending"
1051+
class="i-lucide:loader-circle animate-spin size-4"
1052+
></span>
10441053
</ButtonBase>
10451054
</TooltipApp>
10461055
<ReadmeTocDropdown

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@nuxtjs/mdc": "0.20.2",
2424
"better-sqlite3": "12.8.0",
2525
"docus": "5.8.1",
26-
"nuxt": "4.4.2",
26+
"nuxt": "4.4.4",
2727
"tailwindcss": "4.2.2"
2828
}
2929
}

modules/runtime/server/cache.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,9 @@ export default defineNitroPlugin(nitroApp => {
863863
const original$fetch = globalThis.$fetch
864864

865865
// Override native fetch for esm.sh requests and to inject test fixture responses
866+
// @ts-expect-error @atcute/tid depends on @atcute/[email protected] which depends on @types/bun causing this type conflict.
867+
// they fixed this in @atcute/time-ms@^1.3.0 but the tid package needs an update. Doing a ts-expect-error rather than an override
868+
// so we remember to remove this when the tid package updates
866869
globalThis.fetch = async (input: URL | RequestInfo, init?: RequestInit): Promise<Response> => {
867870
const urlStr =
868871
typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url

nuxt.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const isStorybook = process.env.STORYBOOK === 'true' || process.env.VITEST_STORY
66

77
export default defineNuxtConfig({
88
modules: [
9+
'@vercel/speed-insights',
910
'@unocss/nuxt',
1011
'nuxt-og-image',
1112
'@nuxtjs/html-validator',

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@iconify-json/vscode-icons": "1.2.45",
5959
"@intlify/shared": "11.3.0",
6060
"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@904b935",
61-
"@napi-rs/canvas": "0.1.97",
61+
"@napi-rs/canvas": "1.0.0",
6262
"@nuxt/a11y": "1.0.0-alpha.1",
6363
"@nuxt/fonts": "0.14.0",
6464
"@nuxt/scripts": "1.0.1",
@@ -74,9 +74,10 @@
7474
"@unocss/nuxt": "66.6.7",
7575
"@unocss/preset-wind4": "66.6.7",
7676
"@upstash/redis": "1.37.0",
77+
"@vercel/speed-insights": "2.0.0",
7778
"@vite-pwa/assets-generator": "1.0.2",
7879
"@vite-pwa/nuxt": "1.1.1",
79-
"@vueuse/core": "14.2.1",
80+
"@vueuse/core": "14.3.0",
8081
"@vueuse/integrations": "14.2.1",
8182
"@vueuse/nuxt": "14.2.1",
8283
"@vueuse/router": "^14.2.1",
@@ -90,7 +91,7 @@
9091
"ipaddr.js": "2.3.0",
9192
"marked": "18.0.0",
9293
"module-replacements": "3.0.0-beta.7",
93-
"nuxt": "4.4.2",
94+
"nuxt": "4.4.4",
9495
"nuxt-og-image": "^6.4.3",
9596
"ofetch": "1.5.1",
9697
"ohash": "2.0.11",
@@ -113,7 +114,7 @@
113114
"vue-router": "5.0.4"
114115
},
115116
"devDependencies": {
116-
"@e18e/eslint-plugin": "0.3.0",
117+
"@e18e/eslint-plugin": "0.4.1",
117118
"@intlify/core-base": "11.3.0",
118119
"@npm/types": "2.1.0",
119120
"@playwright/test": "1.58.2",

0 commit comments

Comments
 (0)