Skip to content

Commit b91bcee

Browse files
authored
Merge branch 'main' into Fix/add-missing-norwegian-nb-NO-translations
2 parents b47013f + 018097e commit b91bcee

6 files changed

Lines changed: 1860 additions & 1484 deletions

File tree

app/composables/useClipboardAsync.ts

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

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

package.json

Lines changed: 3 additions & 3 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",
@@ -77,7 +77,7 @@
7777
"@vercel/speed-insights": "2.0.0",
7878
"@vite-pwa/assets-generator": "1.0.2",
7979
"@vite-pwa/nuxt": "1.1.1",
80-
"@vueuse/core": "14.2.1",
80+
"@vueuse/core": "14.3.0",
8181
"@vueuse/integrations": "14.2.1",
8282
"@vueuse/nuxt": "14.2.1",
8383
"@vueuse/router": "^14.2.1",
@@ -91,7 +91,7 @@
9191
"ipaddr.js": "2.3.0",
9292
"marked": "18.0.0",
9393
"module-replacements": "3.0.0-beta.7",
94-
"nuxt": "4.4.2",
94+
"nuxt": "4.4.4",
9595
"nuxt-og-image": "^6.4.3",
9696
"ofetch": "1.5.1",
9797
"ohash": "2.0.11",

0 commit comments

Comments
 (0)