From afe0198305a91ea2da27526ce91faf7c63b18f9a Mon Sep 17 00:00:00 2001 From: Neraste Date: Mon, 27 Jul 2026 00:33:10 +0200 Subject: [PATCH 1/2] Treat fonts as dependencies Fixes #268. --- index.html | 12 ++++-------- package-lock.json | 17 +++++++++++++++++ package.json | 2 ++ src/style/thirdparty/_index.scss | 11 ++++++++++- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index 275aaaad..a8ac7f38 100644 --- a/index.html +++ b/index.html @@ -4,14 +4,12 @@ + Dakara + + - - - - @@ -19,11 +17,9 @@ - - + - diff --git a/package-lock.json b/package-lock.json index d9de78a1..f0444ae8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,14 @@ "version": "1.10.0-dev", "license": "MIT", "dependencies": { + "@fontsource/roboto": "^5.3.0", "classnames": "^2.5.1", "color-convert": "^3.1.3", "dayjs": "^1.11.21", "embla-carousel-autoplay": "^8.6.0", "embla-carousel-react": "^8.6.0", "embla-carousel-wheel-gestures": "^8.1.0", + "line-awesome": "^1.3.0", "prop-types": "^15.8.1", "query-string": "^9.4.0", "react": "^19.2.7", @@ -652,6 +654,15 @@ "node": "^20.19.0 || ^22.13.0 || >=24" } }, + "node_modules/@fontsource/roboto": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.3.0.tgz", + "integrity": "sha512-BapRJOWYP+LZ21zp+wBQjfpPYKRoxc4LspJ/RLuI+HSMBD5u/X4O+ESDrSvEqDSy0rAl7GwBJ+09mdc16cVQ1Q==", + "license": "OFL-1.1", + "funding": { + "url": "https://github.com/sponsors/ayuhito" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -4463,6 +4474,12 @@ "node": ">=8" } }, + "node_modules/line-awesome": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/line-awesome/-/line-awesome-1.3.0.tgz", + "integrity": "sha512-Y0YHksL37ixDsHz+ihCwOtF5jwJgCDxQ3q+zOVgaSW8VugHGTsZZXMacPYZB1/JULBi6BAuTCTek+4ZY/UIwcw==", + "license": "MIT" + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", diff --git a/package.json b/package.json index e57c273a..cb9bb6de 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,14 @@ "lint-css" ], "dependencies": { + "@fontsource/roboto": "^5.3.0", "classnames": "^2.5.1", "color-convert": "^3.1.3", "dayjs": "^1.11.21", "embla-carousel-autoplay": "^8.6.0", "embla-carousel-react": "^8.6.0", "embla-carousel-wheel-gestures": "^8.1.0", + "line-awesome": "^1.3.0", "prop-types": "^15.8.1", "query-string": "^9.4.0", "react": "^19.2.7", diff --git a/src/style/thirdparty/_index.scss b/src/style/thirdparty/_index.scss index 168d745a..f9804f19 100644 --- a/src/style/thirdparty/_index.scss +++ b/src/style/thirdparty/_index.scss @@ -4,5 +4,14 @@ // Third party style file // -@use 'normalize.css/normalize.css'; +@forward 'normalize.css/normalize.css'; + +@forward '@fontsource/roboto/200.css'; +@forward '@fontsource/roboto/300.css'; +@forward '@fontsource/roboto/400.css'; +@forward '@fontsource/roboto/700.css'; +@forward '@fontsource/roboto/700.css'; + +@forward 'line-awesome/dist/line-awesome/css/line-awesome.min.css'; + @use 'preboot'; From ff48eac511d74968f61c2b8c5c302778342a32cc Mon Sep 17 00:00:00 2001 From: Neraste Date: Mon, 27 Jul 2026 00:42:21 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 098f741a..a69b1fbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Allow to display full lyrics of a song. - Add a return button in user edit page. +- Fonts are now bundled with the release archive. ### Changed