worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat(client): update fontawesome v6 and self-hosting

Browse source 
Resolve #7475
This commit is contained in:
syuilo 2022-02-09 13:23:29 +09:00
parent baca9e48d4
commit 1162f8bcff
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,6 +26,8 @@ You should also include the user name that made the change.
- networkチャート廃止 - networkチャート廃止
- クライアント: 自インスタンス情報ページでチャートを見れるように @syuilo - クライアント: 自インスタンス情報ページでチャートを見れるように @syuilo
- クライアント: デバイスの種類を手動指定できるように @syuilo - クライアント: デバイスの種類を手動指定できるように @syuilo
- クライアント: UIのアイコンを更新 @syuilo
- クライアント: UIのアイコンをセルフホスティングするように @syuilo
- NodeInfo のユーザー数と投稿数の内容を見直す @xianonn - NodeInfo のユーザー数と投稿数の内容を見直す @xianonn
### Bugfixes ### Bugfixes

6
gulpfile.js
View file

@ -19,6 +19,10 @@ gulp.task('copy:client:fonts', () =>
gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/')) gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
); );
gulp.task('copy:client:fontawesome', () =>
gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
);
gulp.task('copy:client:locales', cb => { gulp.task('copy:client:locales', cb => {
fs.mkdirSync('./built/_client_dist_/locales', { recursive: true }); fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
@ -50,7 +54,7 @@ gulp.task('build:backend:style', () => {
}); });
gulp.task('build', gulp.parallel( gulp.task('build', gulp.parallel(
'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts' 'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome'
)); ));
gulp.task('default', gulp.task('build')); gulp.task('default', gulp.task('build'));

4
packages/backend/src/server/web/views/base.pug
View file

@ -30,8 +30,8 @@ html
link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
link(rel='preload' href='https://use.fontawesome.com/releases/v5.15.3/css/all.css' as='style') link(rel='preload' href='/assets/fontawesome/css/all.css' as='style')
link(rel='stylesheet' href='https://use.fontawesome.com/releases/v5.15.3/css/all.css') link(rel='stylesheet' href='/assets/fontawesome/css/all.css')
title title
block title block title

1
packages/client/package.json
View file

@ -11,6 +11,7 @@
}, },
"dependencies": { "dependencies": {
"@discordapp/twemoji": "13.1.0", "@discordapp/twemoji": "13.1.0",
"@fortawesome/fontawesome-free": "6.0.0-beta3",
"@syuilo/aiscript": "0.11.1", "@syuilo/aiscript": "0.11.1",
"@types/escape-regexp": "0.0.1", "@types/escape-regexp": "0.0.1",
"@types/glob": "7.2.0", "@types/glob": "7.2.0",

5
packages/client/yarn.lock
View file

@ -130,6 +130,11 @@
minimatch "^3.0.4" minimatch "^3.0.4"
strip-json-comments "^3.1.1" strip-json-comments "^3.1.1"
"@fortawesome/fontawesome-free@6.0.0-beta3":
version "6.0.0-beta3"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0-beta3.tgz#120e4a158a0de983924ce151bc35f27de46398b7"
integrity sha512-4SqOuhC8tSLeQvbW1nDmq6T7+8vdSgHy/w7PRwCFzMQCbKuYFIir/3UuWsV1QblX1lt7SGlSgwbaCv9XhRt8HA==
"@hapi/hoek@^9.0.0": "@hapi/hoek@^9.0.0":
version "9.2.0" version "9.2.0"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131"