diff --git a/app/root.tsx b/app/root.tsx index 156fcf7..57a44a9 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -7,7 +7,7 @@ import { Text, } from "@chakra-ui/react"; import { ClientStyleContext, ServerStyleContext } from "./context.js"; -import fontStyle from "@fontsource/plus-jakarta-sans/index.css"; +import fontStyle from "@fontsource-variable/plus-jakarta-sans/index.css"; import Forbidden from "../components/Forbidden.js"; import globalStyles from "../index.css"; import { diff --git a/package-lock.json b/package-lock.json index 42a0b00..59b6468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,10 +11,10 @@ "@chakra-ui/react": "^2.10.4", "@emotion/react": "^11.13.5", "@emotion/styled": "^11.13.5", - "@fontsource/plus-jakarta-sans": "^5.1.0", - "@remix-run/cloudflare": "^2.15.0", - "@remix-run/cloudflare-pages": "^2.15.0", - "@remix-run/react": "^2.15.0", + "@fontsource-variable/plus-jakarta-sans": "^5.1.0", + "@remix-run/cloudflare": "^2.15.1", + "@remix-run/cloudflare-pages": "^2.15.1", + "@remix-run/react": "^2.15.1", "@sentry/react": "^8.42.0", "aws4fetch": "^1.0.20", "dayjs": "^1.11.13", @@ -24,7 +24,7 @@ "react-dom": "^18.3.1" }, "devDependencies": { - "@remix-run/dev": "^2.15.0", + "@remix-run/dev": "^2.15.1", "@types/node": "^22.10.1", "@types/react": "^18.3.12", "@types/react-big-calendar": "^1.16.0", @@ -1207,10 +1207,10 @@ "node": ">=12" } }, - "node_modules/@fontsource/plus-jakarta-sans": { + "node_modules/@fontsource-variable/plus-jakarta-sans": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@fontsource/plus-jakarta-sans/-/plus-jakarta-sans-5.1.0.tgz", - "integrity": "sha512-o6qReKG0r7+YyNzMe0CbIC4u8nsLwUHRe3btQU+cYI/UH8+Cbvv278WICqEuj7zsBRu1eiuBgvBG17+cU+PJIw==", + "resolved": "https://registry.npmjs.org/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.1.0.tgz", + "integrity": "sha512-K7o2GO7/quVFFyfjTqYZu0ng4KJGf60KSAGbvUWwKuH+/Giyl6Qe/EqnGLcjrl9AmXZzTvtRB1xpkASn8FNFoQ==", "license": "OFL-1.1" }, "node_modules/@isaacs/cliui": { @@ -1413,13 +1413,13 @@ } }, "node_modules/@remix-run/cloudflare": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/cloudflare/-/cloudflare-2.15.0.tgz", - "integrity": "sha512-X8Z3EDdlh/8Gjpu27gnJenN06Q9BtkxMEFt5op3y/qahCt0FH9A64DZQ5N47+WnFhySy6mOpzFwCAzPmGIuIeQ==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/cloudflare/-/cloudflare-2.15.1.tgz", + "integrity": "sha512-QQOyleNnI4bHjyxL75RBNmgIFTdMN7QgYWx6YhbSPCdopAw6PvuUwqKPExa8TZJQ/N4DuaiHUodTEYzdmETXkg==", "license": "MIT", "dependencies": { "@cloudflare/kv-asset-handler": "^0.1.3", - "@remix-run/server-runtime": "2.15.0" + "@remix-run/server-runtime": "2.15.1" }, "engines": { "node": ">=18.0.0" @@ -1435,12 +1435,12 @@ } }, "node_modules/@remix-run/cloudflare-pages": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/cloudflare-pages/-/cloudflare-pages-2.15.0.tgz", - "integrity": "sha512-3FjiON0BmEH3fwGdmP6eEf9TL5BejCt9LOMnszefDGdwY7kgXCodJNr8TAYseor6m7LlC4xgSkgkgj/YRIZTGA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/cloudflare-pages/-/cloudflare-pages-2.15.1.tgz", + "integrity": "sha512-LP6pdeQ2UI1FPZccOdIFbbijMi3w5PnpE1ESrEpgD5QXZ8Y+S9aqixf7Acul8O9yuqQHMpCnSxqTYwtIIit+NQ==", "license": "MIT", "dependencies": { - "@remix-run/cloudflare": "2.15.0" + "@remix-run/cloudflare": "2.15.1" }, "engines": { "node": ">=18.0.0" @@ -1456,9 +1456,9 @@ } }, "node_modules/@remix-run/dev": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.15.0.tgz", - "integrity": "sha512-iXV6u9PBwFc7KriDpVcjqLGJzZZd6ZOrxewen7hoH0OBzGwjkhtm46BTQEJrZ/e/dzlU1IU/0ylH29tN9BZoyg==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.15.1.tgz", + "integrity": "sha512-vuAVNCW0TsjdoLrpXRFTDJzWut+cfOYw6HVrwdin3J/isfZ2ZyRUNo4kdK4TkmEXoRtTWLk1MG6LbeTAJlg11g==", "dev": true, "license": "MIT", "dependencies": { @@ -1472,9 +1472,9 @@ "@babel/types": "^7.22.5", "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", - "@remix-run/node": "2.15.0", + "@remix-run/node": "2.15.1", "@remix-run/router": "1.21.0", - "@remix-run/server-runtime": "2.15.0", + "@remix-run/server-runtime": "2.15.1", "@types/mdx": "^2.0.5", "@vanilla-extract/integration": "^6.2.0", "arg": "^5.0.1", @@ -1525,8 +1525,8 @@ "node": ">=18.0.0" }, "peerDependencies": { - "@remix-run/react": "^2.15.0", - "@remix-run/serve": "^2.15.0", + "@remix-run/react": "^2.15.1", + "@remix-run/serve": "^2.15.1", "typescript": "^5.1.0", "vite": "^5.1.0", "wrangler": "^3.28.2" @@ -1639,13 +1639,13 @@ } }, "node_modules/@remix-run/node": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.15.0.tgz", - "integrity": "sha512-tWbR7pQ6gwj+MkGf6WVIYnjgfGfpdU8EOIa6xsCIRlrm0p3BtMz4jA3GvBWEpOuEnN5MV7CarVzhduaRzkZ0SQ==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.15.1.tgz", + "integrity": "sha512-23xWN3/yOohNUr27KS7hEcDMbtufMkniXfXkcLx8Dz2wUVNfJYGpICjeV48Ue/INtpiUCCzOYwkL9VRjIMEJbA==", "dev": true, "license": "MIT", "dependencies": { - "@remix-run/server-runtime": "2.15.0", + "@remix-run/server-runtime": "2.15.1", "@remix-run/web-fetch": "^4.4.2", "@web3-storage/multipart-parser": "^1.0.0", "cookie-signature": "^1.1.0", @@ -1666,13 +1666,13 @@ } }, "node_modules/@remix-run/react": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.15.0.tgz", - "integrity": "sha512-puqDbi9N/WfaUhzDnw2pACXtCB7ukrtFJ9ILwpEuhlaTBpjefifJ89igokW+tt1ePphIFMivAm/YspcbZdCQsA==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.15.1.tgz", + "integrity": "sha512-h0BVUeg87vt3FKbYfoF7Ln56MM3O8rvGLDKYOuPY0OgNlJVaQKQzWVX+mnlmzysX4hF7WnOPMw1q38Ow7N9wKg==", "license": "MIT", "dependencies": { "@remix-run/router": "1.21.0", - "@remix-run/server-runtime": "2.15.0", + "@remix-run/server-runtime": "2.15.1", "react-router": "6.28.0", "react-router-dom": "6.28.0", "turbo-stream": "2.4.0" @@ -1701,9 +1701,9 @@ } }, "node_modules/@remix-run/server-runtime": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.15.0.tgz", - "integrity": "sha512-FuM8vAg1sPskf4wn0ivbuj/7s9Qdh2wnKu+sVXqYz0a95gH5b73TuMzk6n3NMSkFVKKc6+UmlG1WLYre7L2LTg==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.15.1.tgz", + "integrity": "sha512-TDM3rzax//N2F5uNMV5pNTWAop8cYul6hteDu+Xmfwys/eRGlbzEf7YJzyRj6Kcsg2TFVHI7+xEPItGAVm1hHA==", "license": "MIT", "dependencies": { "@remix-run/router": "1.21.0", @@ -3819,9 +3819,9 @@ } }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, "license": "MIT", "dependencies": { @@ -3844,7 +3844,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -3859,6 +3859,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/cookie": { @@ -6462,9 +6466,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -6972,9 +6976,9 @@ "license": "ISC" }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index 4227c00..a7366c8 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,10 @@ "@chakra-ui/react": "^2.10.4", "@emotion/react": "^11.13.5", "@emotion/styled": "^11.13.5", - "@fontsource/plus-jakarta-sans": "^5.1.0", - "@remix-run/cloudflare": "^2.15.0", - "@remix-run/cloudflare-pages": "^2.15.0", - "@remix-run/react": "^2.15.0", + "@fontsource-variable/plus-jakarta-sans": "^5.1.0", + "@remix-run/cloudflare": "^2.15.1", + "@remix-run/cloudflare-pages": "^2.15.1", + "@remix-run/react": "^2.15.1", "@sentry/react": "^8.42.0", "aws4fetch": "^1.0.20", "dayjs": "^1.11.13", @@ -25,7 +25,7 @@ "react-dom": "^18.3.1" }, "devDependencies": { - "@remix-run/dev": "^2.15.0", + "@remix-run/dev": "^2.15.1", "@types/node": "^22.10.1", "@types/react": "^18.3.12", "@types/react-big-calendar": "^1.16.0", diff --git a/theme.ts b/theme.ts index 0767d04..a767a03 100644 --- a/theme.ts +++ b/theme.ts @@ -1,7 +1,7 @@ import { extendTheme } from "@chakra-ui/react"; const fontString = - '"Plus Jakarta Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;'; + '"Plus Jakarta Sans Variable", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;'; export default extendTheme({ config: {