From e7ad679c3464e207f6e2eea15fc1b4270b733d20 Mon Sep 17 00:00:00 2001 From: vikingowl Date: Wed, 24 Jan 2024 16:55:48 +0100 Subject: [PATCH] moved from font-auto-import to font package --- frontend/package.json | 1 + frontend/src/assets/styles/base.scss | 1 + frontend/vite.config.mts | 19 +++++-------------- frontend/yarn.lock | 5 +++++ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 9c21b73..25d9199 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,6 +7,7 @@ "preview": "vite preview" }, "dependencies": { + "@fontsource/roboto": "^5.0.8", "@mdi/font": "7.0.96", "fork-awesome": "^1.2.0", "roboto-fontface": "*", diff --git a/frontend/src/assets/styles/base.scss b/frontend/src/assets/styles/base.scss index 9de6160..8b25c14 100644 --- a/frontend/src/assets/styles/base.scss +++ b/frontend/src/assets/styles/base.scss @@ -1 +1,2 @@ +@import "@fontsource/roboto"; @import "fork-awesome/css/fork-awesome.min.css"; diff --git a/frontend/vite.config.mts b/frontend/vite.config.mts index b8d760e..6f1997c 100644 --- a/frontend/vite.config.mts +++ b/frontend/vite.config.mts @@ -1,32 +1,23 @@ // Plugins import Components from 'unplugin-vue-components/vite' import Vue from '@vitejs/plugin-vue' -import Vuetify, { transformAssetUrls } from 'vite-plugin-vuetify' -import ViteFonts from 'unplugin-fonts/vite' +import Vuetify, {transformAssetUrls} from 'vite-plugin-vuetify' // Utilities -import { defineConfig } from 'vite' -import { fileURLToPath, URL } from 'node:url' +import {defineConfig} from 'vite' +import {fileURLToPath, URL} from 'node:url' // https://vitejs.dev/config/ export default defineConfig({ plugins: [ Vue({ - template: { transformAssetUrls }, + template: {transformAssetUrls}, }), // https://github.com/vuetifyjs/vuetify-loader/tree/master/packages/vite-plugin#readme Vuetify(), Components(), - ViteFonts({ - google: { - families: [{ - name: 'Roboto', - styles: 'wght@100;300;400;500;700;900', - }], - }, - }), ], - define: { 'process.env': {} }, + define: {'process.env': {}}, resolve: { alias: { '@': fileURLToPath(new URL('./src', import.meta.url)), diff --git a/frontend/yarn.lock b/frontend/yarn.lock index f3b6fc3..27ced2e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -146,6 +146,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz#a5d300008960bb39677c46bf16f53ec70d8dee04" integrity sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw== +"@fontsource/roboto@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-5.0.8.tgz#613b477a56f21b5705db1a67e995c033ef317f76" + integrity sha512-XxPltXs5R31D6UZeLIV1td3wTXU3jzd3f2DLsXI8tytMGBkIsGcc9sIyiupRtA8y73HAhuSCeweOoBqf6DbWCA== + "@jridgewell/sourcemap-codec@^1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"