From 812da3b4aa7612b104e1ea252b02e790ff9888fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Mon, 11 Mar 2024 15:35:03 +0100 Subject: [PATCH] docs: move to @nuxt/fonts --- docs/nuxt.config.ts | 3 +- docs/package.json | 3 +- docs/tailwind.config.ts | 2 +- pnpm-lock.yaml | 135 +++++++++++++++++++++++----------------- 4 files changed, 82 insertions(+), 61 deletions(-) diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts index 13c1106b0..f68a6a012 100644 --- a/docs/nuxt.config.ts +++ b/docs/nuxt.config.ts @@ -4,11 +4,10 @@ export default defineNuxtConfig({ modules: [ '@nuxt/image', '@nuxt/content', + '@nuxt/fonts', '@nuxt/ui', '@nuxthq/studio', '@vueuse/nuxt', - '@nuxtjs/fontaine', - '@nuxtjs/google-fonts', '@nuxtjs/plausible', 'nuxt-og-image', ], diff --git a/docs/package.json b/docs/package.json index 56fbc13c0..c8be1a0b1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -12,11 +12,10 @@ "@iconify-json/ph": "^1.1.11", "@iconify-json/simple-icons": "^1.1.94", "@nuxt/content": "^2.12.0", + "@nuxt/fonts": "^0.2.0", "@nuxt/image": "link:..", "@nuxt/ui-pro": "^1.0.1", "@nuxthq/studio": "^1.0.12", - "@nuxtjs/fontaine": "^0.4.1", - "@nuxtjs/google-fonts": "^3.1.3", "@nuxtjs/plausible": "^0.2.4", "@vueuse/core": "^10.9.0", "@vueuse/nuxt": "^10.9.0", diff --git a/docs/tailwind.config.ts b/docs/tailwind.config.ts index 4f87a6058..e9c4d6c0d 100644 --- a/docs/tailwind.config.ts +++ b/docs/tailwind.config.ts @@ -33,7 +33,7 @@ export default >{ }, }, fontFamily: { - sans: ['DM Sans', 'DM Sans fallback', ...defaultTheme.fontFamily.sans], + sans: ['Inter var', 'Inter', ...defaultTheme.fontFamily.sans], }, }, }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64ed5f3d1..187e26fc0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,6 +125,9 @@ importers: '@nuxt/content': specifier: ^2.12.0 version: 2.12.0(nuxt@3.10.3)(rollup@3.29.4)(vue@3.4.21) + '@nuxt/fonts': + specifier: ^0.2.0 + version: 0.2.0(nuxt@3.10.3)(rollup@3.29.4)(vite@5.1.4) '@nuxt/image': specifier: link:.. version: link:.. @@ -134,12 +137,6 @@ importers: '@nuxthq/studio': specifier: ^1.0.12 version: 1.0.12(rollup@3.29.4) - '@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) @@ -650,12 +647,12 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@capsizecss/metrics@1.3.0: - resolution: {integrity: sha512-dcAXsrrNs2zF3MC4T5iMGsiPm1NqTSdGgYI4YG17tAXL7jxKq0eWRsOWsY/gaYMTLXllgmZ+yaiKEVQ9UmEZrA==} + /@capsizecss/metrics@2.2.0: + resolution: {integrity: sha512-DkFIser1KbGxWyG2hhQQeCit72TnOQDx5pr9bkA7+XlIy7qv+4lYtslH3bidVxm2qkY2guAgypSIPYuQQuk70A==} dev: false - /@capsizecss/unpack@1.0.0: - resolution: {integrity: sha512-cXPI7IWQrPANXKYZwqZf53q2SuYnDkexpi9KzGNWls1NDK26lZqkE1Ry2XuMo9eGkqcmMSgVI8gJbMEgjX7bTQ==} + /@capsizecss/unpack@2.1.0: + resolution: {integrity: sha512-k+wAZylHNaBwfcGGeKV+tTf6G0Zd4SyiTMmzlVFKkkBVV70DzwC7KOtmV/ojLbjwRT4QSPcMvjmiws309CSPgQ==} dependencies: blob-to-buffer: 1.2.9 cross-fetch: 3.1.8 @@ -1665,6 +1662,49 @@ packages: - supports-color - utf-8-validate + /@nuxt/fonts@0.2.0(nuxt@3.10.3)(rollup@3.29.4)(vite@5.1.4): + resolution: {integrity: sha512-Iflg2n90bsYtC1f4kangrNaKomMRLkd2vPxhZyNxNhiptNiNzA8bVydLeoFxjuxlQbXjUuAzOCjYyPP7lT+q9A==} + dependencies: + '@nuxt/devtools-kit': 1.0.8(nuxt@3.10.3)(rollup@3.29.4)(vite@5.1.4) + '@nuxt/kit': 3.10.3(rollup@3.29.4) + chalk: 5.3.0 + css-tree: 2.3.1 + defu: 6.1.4 + esbuild: 0.20.1 + fontaine: 0.5.0 + globby: 14.0.1 + h3: 1.11.1 + jiti: 1.21.0 + magic-regexp: 0.8.0 + magic-string: 0.30.8 + ofetch: 1.3.3 + ohash: 1.1.3 + pathe: 1.1.2 + sirv: 2.0.4 + ufo: 1.4.0 + unplugin: 1.9.0 + 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 + - nuxt + - rollup + - supports-color + - uWebSockets.js + - vite + dev: false + /@nuxt/kit@3.10.3(rollup@3.29.4): resolution: {integrity: sha512-PUjYB9Mvx0qD9H1QZBwwtY4fLlCLET+Mm9BVqUOtXCaGoXd6u6BE4e/dGFPk2UEKkIcDGrUMSbqkHYvsEuK9NQ==} engines: {node: ^14.18.0 || >=16.10.0} @@ -2046,31 +2086,6 @@ packages: - supports-color dev: true - /@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: false - - /@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: false - /@nuxtjs/mdc@0.5.0(rollup@3.29.4): resolution: {integrity: sha512-480Ajc7o/YAl9b21btd0oRtVe/UjUWmVSEWauS+H+izwEGdGvJTVfZRdaiAXcXKl+UmUTpf+POel027sE9HAZQ==} dependencies: @@ -6778,16 +6793,16 @@ packages: tabbable: 6.2.0 dev: false - /fontaine@0.4.1: - resolution: {integrity: sha512-Ps7KS0xFkbeZWa+ynuNQncHYz6j7gs6+SXcWWeA7+HCeidXTnIQNryCuUxQdjxBwmRBY0Or998brldt4WFwfcQ==} + /fontaine@0.5.0: + resolution: {integrity: sha512-vPDSWKhVAfTx4hRKT777+N6Szh2pAosAuzLpbppZ6O3UdD/1m6OlHjNcC3vIbgkRTIcLjzySLHXzPeLO2rE8cA==} dependencies: - '@capsizecss/metrics': 1.3.0 - '@capsizecss/unpack': 1.0.0 - magic-regexp: 0.7.0 - magic-string: 0.30.7 + '@capsizecss/metrics': 2.2.0 + '@capsizecss/unpack': 2.1.0 + magic-regexp: 0.8.0 + magic-string: 0.30.8 pathe: 1.1.2 ufo: 1.4.0 - unplugin: 1.7.1 + unplugin: 1.9.0 transitivePeerDependencies: - encoding dev: false @@ -7122,15 +7137,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: false - /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -8292,15 +8298,16 @@ packages: dependencies: yallist: 4.0.0 - /magic-regexp@0.7.0: - resolution: {integrity: sha512-C9m5/JqFV1/CMrMFDf1PqmvMc8ohrssmlF5bdgea7nUqqn6D9xzKVTa6DIm0LReCqvEPS35o1UElmb7PmoSfHQ==} + /magic-regexp@0.8.0: + resolution: {integrity: sha512-lOSLWdE156csDYwCTIGiAymOLN7Epu/TU5e/oAnISZfU6qP+pgjkE+xbVjVn3yLPKN8n1G2yIAYTAM5KRk6/ow==} dependencies: estree-walker: 3.0.3 - magic-string: 0.30.7 + magic-string: 0.30.8 mlly: 1.6.1 + regexp-tree: 0.1.27 type-level-regexp: 0.1.17 ufo: 1.4.0 - unplugin: 1.7.1 + unplugin: 1.9.0 dev: false /magic-string-ast@0.3.0: @@ -8315,6 +8322,13 @@ packages: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + /magic-string@0.30.8: + resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: false + /magicast@0.3.3: resolution: {integrity: sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==} dependencies: @@ -10657,7 +10671,6 @@ packages: /regexp-tree@0.1.27: resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} hasBin: true - dev: true /regexp.prototype.flags@1.5.2: resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} @@ -12346,6 +12359,16 @@ packages: webpack-sources: 3.2.3 webpack-virtual-modules: 0.6.1 + /unplugin@1.9.0: + resolution: {integrity: sha512-14PslvMY3gNbXnQtNIRB566Q057L5Fe7f5LDEamxVi0QQVxoz5hrveBwwZLcKyHtZ09ysmipxRRj5Lv+BGz2Iw==} + engines: {node: '>=14.0.0'} + dependencies: + acorn: 8.11.3 + chokidar: 3.6.0 + webpack-sources: 3.2.3 + webpack-virtual-modules: 0.6.1 + dev: false + /unstorage@1.10.1: resolution: {integrity: sha512-rWQvLRfZNBpF+x8D3/gda5nUCQL2PgXy2jNG4U7/Rc9BGEv9+CAJd0YyGCROUBKs9v49Hg8huw3aih5Bf5TAVw==} peerDependencies: