From 174af3600097034903fec95cef24d2e04a346fef Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 4 Mar 2024 18:20:08 +0100 Subject: [PATCH] docs: switch to `@nuxt/fonts` --- .gitignore | 1 + docs/nuxt.config.ts | 3 +- docs/package.json | 3 +- docs/tailwind.config.ts | 2 +- pnpm-lock.yaml | 120 ++++++++++++++++++++++++---------------- 5 files changed, 77 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index e7474740..e431e6c3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ dist .vercel .idea .env +.data diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts index eb529ebe..4771a945 100644 --- a/docs/nuxt.config.ts +++ b/docs/nuxt.config.ts @@ -17,11 +17,10 @@ export default defineNuxtConfig({ ].filter(Boolean), modules: [ '@nuxt/content', + '@nuxt/fonts', '@nuxt/image', 'nuxt-og-image', module, - '@nuxtjs/fontaine', - '@nuxtjs/google-fonts', '@nuxtjs/plausible', '@vueuse/nuxt', 'nuxt-component-meta', diff --git a/docs/package.json b/docs/package.json index e9234c7f..fde8212f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -11,10 +11,9 @@ "@nuxt/content": "^2.12.0", "@nuxt/devtools": "^1.0.8", "@nuxt/eslint-config": "^0.2.0", + "@nuxt/fonts": "^0.0.1", "@nuxt/image": "^1.3.0", "@nuxt/ui-pro": "npm:@nuxt/ui-pro-edge@1.0.1-28492537.5f47527", - "@nuxtjs/fontaine": "^0.4.1", - "@nuxtjs/google-fonts": "^3.1.3", "@nuxtjs/plausible": "^0.2.4", "@octokit/rest": "^20.0.2", "@vueuse/nuxt": "^10.9.0", diff --git a/docs/tailwind.config.ts b/docs/tailwind.config.ts index 74acdba1..c5f32c00 100644 --- a/docs/tailwind.config.ts +++ b/docs/tailwind.config.ts @@ -5,7 +5,7 @@ export default >{ theme: { extend: { fontFamily: { - sans: ['DM Sans', 'DM Sans fallback', ...defaultTheme.fontFamily.sans] + sans: ['DM Sans', ...defaultTheme.fontFamily.sans] }, colors: { green: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57cf3b18..ea34fae7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,7 +93,7 @@ importers: version: 0.5.5(@nuxt/kit@3.10.3)(nuxi@3.10.1)(typescript@5.3.3) '@nuxt/test-utils': specifier: ^3.11.0 - version: 3.11.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) + version: 3.11.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) '@release-it/conventional-changelog': specifier: ^8.0.1 version: 8.0.1(release-it@17.1.1) @@ -129,7 +129,7 @@ importers: version: 1.3.1(happy-dom@13.6.2) vitest-environment-nuxt: specifier: ^1.0.0 - version: 1.0.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) + version: 1.0.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) vue-tsc: specifier: ^2.0.4 version: 2.0.4(typescript@5.3.3) @@ -161,18 +161,15 @@ importers: '@nuxt/eslint-config': specifier: ^0.2.0 version: 0.2.0(eslint@8.57.0) + '@nuxt/fonts': + specifier: ^0.0.1 + version: 0.0.1(rollup@3.29.4) '@nuxt/image': specifier: ^1.3.0 version: 1.3.0(rollup@3.29.4) '@nuxt/ui-pro': specifier: npm:@nuxt/ui-pro-edge@1.0.1-28492537.5f47527 version: /@nuxt/ui-pro-edge@1.0.1-28492537.5f47527(nuxt@3.10.3)(rollup@3.29.4)(vite@5.1.4)(vue@3.4.21) - '@nuxtjs/fontaine': - specifier: ^0.4.1 - version: 0.4.1(rollup@3.29.4) - '@nuxtjs/google-fonts': - specifier: ^3.1.3 - version: 3.1.3(rollup@3.29.4) '@nuxtjs/plausible': specifier: ^0.2.4 version: 0.2.4(rollup@3.29.4) @@ -1785,6 +1782,43 @@ packages: - supports-color dev: true + /@nuxt/fonts@0.0.1(rollup@3.29.4): + resolution: {integrity: sha512-HLEcQ8bguPsqWdf/QIgQmjd2m3wzzl4RnokQ+Mk6f6qjZMnWfEyGCdfvbCUoBdk3Sl6o+0pElTWb7bS8lcyI7A==} + dependencies: + '@nuxt/kit': 3.10.3(rollup@3.29.4) + chalk: 5.3.0 + css-tree: 2.3.1 + defu: 6.1.4 + fontaine: 0.4.1 + globby: 14.0.1 + h3: 1.11.1 + jiti: 1.21.0 + magic-string: 0.30.7 + ofetch: 1.3.3 + ohash: 1.1.3 + pathe: 1.1.2 + ufo: 1.4.0 + unplugin: 1.7.1 + unstorage: 1.10.1 + transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@netlify/blobs' + - '@planetscale/database' + - '@upstash/redis' + - '@vercel/kv' + - encoding + - idb-keyval + - rollup + - supports-color + - uWebSockets.js + dev: true + /@nuxt/image@1.3.0(rollup@3.29.4): resolution: {integrity: sha512-HoAvBImqRrAwCLhZe7IsRwUWvV0ZVqUKFE/GsT8Jo01NBEd+PXhhu2XgHKV+aasqPXdeaQjhL43CSIwuNEwG1w==} engines: {node: ^14.16.0 || >=16.11.0} @@ -1908,7 +1942,7 @@ packages: - rollup - supports-color - /@nuxt/test-utils@3.11.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21): + /@nuxt/test-utils@3.11.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21): resolution: {integrity: sha512-9ovgpQZkZpVg/MhYVVn2169WjH/IL0XUqwGryTa/lkx0/BCi1LMVEp3HTPkmt4qbRcxitO+kL4vFqqrFGVaSVg==} engines: {node: ^14.18.0 || >=16.10.0} peerDependencies: @@ -1956,7 +1990,7 @@ packages: execa: 8.0.1 fake-indexeddb: 5.0.2 get-port-please: 3.1.2 - h3: 1.10.2 + h3: 1.11.1 happy-dom: 13.6.2 local-pkg: 0.5.0 magic-string: 0.30.7 @@ -1972,7 +2006,7 @@ packages: unplugin: 1.7.1 vite: 5.1.4 vitest: 1.3.1(happy-dom@13.6.2) - vitest-environment-nuxt: 1.0.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) + vitest-environment-nuxt: 1.0.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) vue: 3.4.21(typescript@5.3.3) vue-router: 4.3.0(vue@3.4.21) transitivePeerDependencies: @@ -2135,31 +2169,6 @@ packages: - rollup - supports-color - /@nuxtjs/fontaine@0.4.1(rollup@3.29.4): - resolution: {integrity: sha512-8VnrFYnilfqlQVsCufiqoWusivYVOwP/0Nzu9FV44oryQlBa3qiT7EyOkKSmOxf9yZWCZBRc2wjTSxI+WTYlpg==} - dependencies: - '@nuxt/kit': 3.10.3(rollup@3.29.4) - fontaine: 0.4.1 - magic-string: 0.30.7 - pathe: 1.1.2 - ufo: 1.4.0 - transitivePeerDependencies: - - encoding - - rollup - - supports-color - dev: true - - /@nuxtjs/google-fonts@3.1.3(rollup@3.29.4): - resolution: {integrity: sha512-gHwstHXQKd/r9O2WnQR4UJbi7Rfb9No1/gF4gqP+y18h1DAAZUOYPBF5EAPGjZKgDOW2XbZHP8Rw3oSDTpIT1A==} - dependencies: - '@nuxt/kit': 3.10.3(rollup@3.29.4) - google-fonts-helper: 3.4.1 - pathe: 1.1.2 - transitivePeerDependencies: - - rollup - - supports-color - dev: true - /@nuxtjs/mdc@0.5.0(rollup@3.29.4): resolution: {integrity: sha512-480Ajc7o/YAl9b21btd0oRtVe/UjUWmVSEWauS+H+izwEGdGvJTVfZRdaiAXcXKl+UmUTpf+POel027sE9HAZQ==} dependencies: @@ -5397,6 +5406,15 @@ packages: /crossws@0.1.1: resolution: {integrity: sha512-c9c/o7bS3OjsdpSkvexpka0JNlesBF2JU9B2V1yNsYGwRbAafxhJQ7VI9b48D5bpONz/oxbPGMzBojy9sXoQIQ==} + /crossws@0.2.4: + resolution: {integrity: sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg==} + peerDependencies: + uWebSockets.js: '*' + peerDependenciesMeta: + uWebSockets.js: + optional: true + dev: true + /crypto-random-string@4.0.0: resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==} engines: {node: '>=12'} @@ -6834,15 +6852,6 @@ packages: slash: 5.1.0 unicorn-magic: 0.1.0 - /google-fonts-helper@3.4.1: - resolution: {integrity: sha512-unq9c1NF771916DrVR2MTpMJ5iHiMSjMBApErjhWT1FZIE+7x+Qik+w6cYi5jw/KtHELz+tyGAKgQetTU9wrlA==} - dependencies: - deepmerge: 4.3.1 - hookable: 5.5.3 - ofetch: 1.3.3 - ufo: 1.4.0 - dev: true - /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -6919,6 +6928,23 @@ packages: uncrypto: 0.1.3 unenv: 1.9.0 + /h3@1.11.1: + resolution: {integrity: sha512-AbaH6IDnZN6nmbnJOH72y3c5Wwh9P97soSVdGSBbcDACRdkC0FEWf25pzx4f/NuOCK6quHmW18yF2Wx+G4Zi1A==} + dependencies: + cookie-es: 1.0.0 + crossws: 0.2.4 + defu: 6.1.4 + destr: 2.0.3 + iron-webcrypto: 1.0.0 + ohash: 1.1.3 + radix3: 1.1.0 + ufo: 1.4.0 + uncrypto: 0.1.3 + unenv: 1.9.0 + transitivePeerDependencies: + - uWebSockets.js + dev: true + /handlebars@4.7.8: resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==} engines: {node: '>=0.4.7'} @@ -12572,10 +12598,10 @@ packages: optionalDependencies: fsevents: 2.3.3 - /vitest-environment-nuxt@1.0.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21): + /vitest-environment-nuxt@1.0.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21): resolution: {integrity: sha512-AWMO9h4HdbaFdPWZw34gALFI8gbBiOpvfbyeZwHIPfh4kWg/TwElYHvYMQ61WPUlCGaS5LebfHkaI0WPyb//Iw==} dependencies: - '@nuxt/test-utils': 3.11.0(@vue/test-utils@2.4.4)(h3@1.10.2)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) + '@nuxt/test-utils': 3.11.0(@vue/test-utils@2.4.4)(h3@1.11.1)(happy-dom@13.6.2)(rollup@3.29.4)(vite@5.1.4)(vitest@1.3.1)(vue-router@4.3.0)(vue@3.4.21) transitivePeerDependencies: - '@cucumber/cucumber' - '@jest/globals'