fix: need to add fonts back in

This commit is contained in:
Derrick Hammer 2023-12-27 10:18:07 -05:00
parent 2b637cca37
commit 37ae9f7044
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
6 changed files with 85 additions and 8 deletions

View File

@ -12,11 +12,10 @@ import Footer from "@/components/LayoutFooter"; // Adjust the import path as nee
import "../styles/global.scss"; import "../styles/global.scss";
import { cssBundleHref } from "@remix-run/css-bundle"; // Adjust the import path as needed import { cssBundleHref } from "@remix-run/css-bundle"; // Adjust the import path as needed
import "unfonts.css";
export const links: LinksFunction = () => [ export const links: LinksFunction = () => [
...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []), ...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
// Add your Google font links here
// Example: { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Be+Vietnam+Pro:wght@400&display=swap" },
// Example: { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Jaldi:wght@400&display=swap" },
]; ];
export const meta: MetaFunction = () => [ export const meta: MetaFunction = () => [
@ -33,7 +32,7 @@ export default function Root() {
<Meta /> <Meta />
<Links /> <Links />
</head> </head>
<body className="font-main bg-gray-900 flex"> <body className={`font-main bg-gray-900 flex`}>
<main className="dark flex w-full min-h-screen flex-col md:px-40 items-center py-16 mx-auto"> <main className="dark flex w-full min-h-screen flex-col md:px-40 items-center py-16 mx-auto">
<Header /> <Header />
<Outlet /> <Outlet />

59
package-lock.json generated
View File

@ -9,6 +9,8 @@
"version": "0.1.0", "version": "0.1.0",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@fontsource/be-vietnam-pro": "^5.0.18",
"@fontsource/jaldi": "^5.0.8",
"@heroicons/react": "^2.0.18", "@heroicons/react": "^2.0.18",
"@lumeweb/s5-js": "^0.1.0-develop.24", "@lumeweb/s5-js": "^0.1.0-develop.24",
"@prisma/client": "^5.6.0", "@prisma/client": "^5.6.0",
@ -55,6 +57,7 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"unplugin-fonts": "^1.1.1",
"vite": "^5.0.10", "vite": "^5.0.10",
"vite-tsconfig-paths": "^4.2.2" "vite-tsconfig-paths": "^4.2.2"
} }
@ -1283,6 +1286,16 @@
"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
}, },
"node_modules/@fontsource/be-vietnam-pro": {
"version": "5.0.18",
"resolved": "https://registry.npmjs.org/@fontsource/be-vietnam-pro/-/be-vietnam-pro-5.0.18.tgz",
"integrity": "sha512-deIb6HgHYbz2onsmTC678cFvnQTZ4vojdn/LY+y/GTX12zAW4TWrw7C/4QwoTNgmzHROx7Rrazi2WGj6iogEgg=="
},
"node_modules/@fontsource/jaldi": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/@fontsource/jaldi/-/jaldi-5.0.8.tgz",
"integrity": "sha512-SVOKAId55vGfjDvRBu6OAyN4tLVGk/G+AOGM+aFgGy16DvC+9/nH1qgJNGMyHX0blnH/01DWV3vyy/l60EceMg=="
},
"node_modules/@heroicons/react": { "node_modules/@heroicons/react": {
"version": "2.0.18", "version": "2.0.18",
"resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.0.18.tgz", "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.0.18.tgz",
@ -13346,6 +13359,37 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/unplugin": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.6.0.tgz",
"integrity": "sha512-BfJEpWBu3aE/AyHx8VaNE/WgouoQxgH9baAiH82JjX8cqVyi3uJQstqwD5J+SZxIK326SZIhsSZlALXVBCknTQ==",
"dev": true,
"dependencies": {
"acorn": "^8.11.2",
"chokidar": "^3.5.3",
"webpack-sources": "^3.2.3",
"webpack-virtual-modules": "^0.6.1"
}
},
"node_modules/unplugin-fonts": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unplugin-fonts/-/unplugin-fonts-1.1.1.tgz",
"integrity": "sha512-/Aw/rL9D2aslGGM0vi+2R2aG508RSwawLnnBuo+JDSqYc4cHJO1R1phllhN6GysEhBp/6a4B6+vSFPVapWyAAw==",
"dev": true,
"dependencies": {
"fast-glob": "^3.2.12",
"unplugin": "^1.3.1"
},
"peerDependencies": {
"@nuxt/kit": "^3.0.0",
"vite": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
"@nuxt/kit": {
"optional": true
}
}
},
"node_modules/update-browserslist-db": { "node_modules/update-browserslist-db": {
"version": "1.0.13", "version": "1.0.13",
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
@ -14560,6 +14604,21 @@
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
}, },
"node_modules/webpack-sources": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"dev": true,
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/webpack-virtual-modules": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz",
"integrity": "sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==",
"dev": true
},
"node_modules/whatwg-fetch": { "node_modules/whatwg-fetch": {
"version": "3.6.20", "version": "3.6.20",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",

View File

@ -20,6 +20,8 @@
"postinstall": "patch-package" "postinstall": "patch-package"
}, },
"dependencies": { "dependencies": {
"@fontsource/be-vietnam-pro": "^5.0.18",
"@fontsource/jaldi": "^5.0.8",
"@heroicons/react": "^2.0.18", "@heroicons/react": "^2.0.18",
"@lumeweb/s5-js": "^0.1.0-develop.24", "@lumeweb/s5-js": "^0.1.0-develop.24",
"@prisma/client": "^5.6.0", "@prisma/client": "^5.6.0",
@ -66,6 +68,7 @@
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"unplugin-fonts": "^1.1.1",
"vite": "^5.0.10", "vite": "^5.0.10",
"vite-tsconfig-paths": "^4.2.2" "vite-tsconfig-paths": "^4.2.2"
} }

View File

@ -13,8 +13,8 @@ const config: Config = {
}, },
extend: { extend: {
fontFamily: { fontFamily: {
main: "var(--font-be-vietnam-pro)", main: '"Be Vietnam Pro"',
secondary: "var(--font-jaldi)", secondary: '"Jaldi"',
}, },
colors: { colors: {
border: "hsl(var(--border))", border: "hsl(var(--border))",

View File

@ -30,6 +30,7 @@
] ]
}, },
// Remix takes care of building everything in `remix build`. // Remix takes care of building everything in `remix build`.
"noEmit": true "noEmit": true,
"types": ["unplugin-fonts/client"]
} }
} }

View File

@ -2,9 +2,24 @@ import { unstable_vitePlugin as remix } from "@remix-run/dev";
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import { installGlobals } from "@remix-run/node"; import { installGlobals } from "@remix-run/node";
import tsconfigPaths from "vite-tsconfig-paths"; import tsconfigPaths from "vite-tsconfig-paths";
import Unfonts from "unplugin-fonts/vite";
installGlobals(); installGlobals();
export default defineConfig({ export default defineConfig({
plugins: [remix({ ignoredRouteFiles: ["**/.*"] }), tsconfigPaths()], plugins: [
remix({ ignoredRouteFiles: ["**/.*"] }),
tsconfigPaths(),
Unfonts({
fontsource: {
/**
* Fonts families lists
*/
families: [
{ name: "Be Vietnam Pro", weights: [400], subset: "latin" },
{ name: "Jaldi", weights: [400], subset: "latin" },
],
},
}),
],
}); });