161sh/jointrashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/Crimekillz/jointrashposs.git synced 2024-11-21 08:23:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "performance: フォント定義を非同期に読み込むように（おためし）"

Browse Source 
This reverts commit 5ba8bf7ea9.
This commit is contained in:
kakkokari-gtyih 2024-04-05 21:36:26 +09:00
parent 5ba8bf7ea9
commit e2949ccc79
2 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app.vue
View File

@ -99,34 +99,19 @@ const i18nLinks = computed(() => head.value.link?.map((e: any) => {
return e;
}));
const loadSettled = ref(false);
const cssLinks = computed<{
rel: string;
href: string;
as?: string;
}[]>(() => {
/**
* 中国大陸で Google Fonts を使う裏技
* fonts.googleapis.com → fonts.googleapis.cn
**/
const cssLinksRaw = (locale.value === 'cn') ? [
{ rel: 'preconnect', href: 'https://fonts.googleapis.cn' },
{ rel: 'preconnect', href: 'https://fonts.gstatic.cn' },
{ rel: 'stylesheet', href: '/fonts/fonts.css'},
{ rel: 'stylesheet', href: 'https://fonts.googleapis.cn/css2?family=Capriola&family=Nunito:ital,wght@0,400;0,700;1,400;1,700&display=swap' }
] : [
{ rel: 'preconnect', href: 'https://fonts.googleapis.com' },
{ rel: 'preconnect', href: 'https://fonts.gstatic.com' },
{ rel: 'stylesheet', href: '/fonts/fonts.css'},
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Capriola&family=Nunito:ital,wght@0,400;0,700;1,400;1,700&display=swap' },
];
if (loadSettled.value) {
return cssLinksRaw;
} else {
return cssLinksRaw.map((e) => e.rel === 'stylesheet' ? ({ ...e, rel: 'preload', as: 'style' }) : e);
}
});
/**
* 中国大陸で Google Fonts を使う裏技
* fonts.googleapis.com → fonts.googleapis.cn
**/
const cnHead = (locale.value === 'cn') ? [
{ rel: 'preconnect', href: 'https://fonts.googleapis.cn' },
{ rel: 'preconnect', href: 'https://fonts.gstatic.cn' },
{ rel: 'stylesheet', href: 'https://fonts.googleapis.cn/css2?family=Capriola&family=Nunito:ital,wght@0,400;0,700;1,400;1,700&display=swap' }
] : [
{ rel: 'preconnect', href: 'https://fonts.googleapis.com' },
{ rel: 'preconnect', href: 'https://fonts.gstatic.com' },
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Capriola&family=Nunito:ital,wght@0,400;0,700;1,400;1,700&display=swap' },
];
useHead((): Record<string, any> => ({
htmlAttrs: {
@ -156,18 +141,15 @@ useHead((): Record<string, any> => ({
// TODO
content: () => route.meta.thumbnail ? route.meta.thumbnail : `${baseUrl}/img/og/misskey-hub-screenshot-l.png`,
},
...(head.value.meta?.map((e) => ({ property: e.property, content: e.content })) || []),
...(head.value.meta?.map((e) => ({ property: e.property, content: e.content, })) || []),
],
link: [
...(i18nLinks.value || []),
...cssLinks.value,
...cnHead,
],
script: [
{ type: "application/ld+json", children: getLdJson(route.meta.graph) }
],
noscript: [
{ children: cssLinks.value.filter((e) => e.rel === 'stylesheet' || (e.rel === 'preload' && e.as === 'style')).map((e) => `<link rel="stylesheet" href="${e.href}">`).join('') },
]
}));
/** サイト全体でひとつのScroll Posiitionを使う */
@ -182,12 +164,6 @@ if (import.meta.client) {
window.addEventListener('resize', updatePos);
}
onMounted(() => {
nextTick(() => {
loadSettled.value = true;
});
});
onUnmounted(() => {
if (import.meta.client) {
window.removeEventListener('scroll', updatePos);

1
nuxt.config.ts
View File

@ -85,6 +85,7 @@ export default defineNuxtConfig({
app: {
head: {
link: [
{ rel: 'stylesheet', href: '/fonts/fonts.css' },
{ rel: 'apple-touch-icon', href: '/img/icons/apple-touch-icon.png' },
{ rel: 'shortcut icon', type: 'image/vnd.microsoft.icon', href: '/favicon.ico' },
{ rel: 'icon', type: 'image/vnd.microsoft.icon', href: '/favicon.ico' },