字体压缩有问题，先回退

rebron1900 · Sep 14, 2024 · 305079b · 305079b
1 parent 6c2b0d5
commit 305079b
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 1,567 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
         "astro-compress": "^2.3.1",
         "astro-remote": "^0.3.3",
         "cheerio": "^1.0.0",
-        "fontmin": "^1.1.0",
         "fuse.js": "^7.0.0",
         "html-parse-stringify": "^3.0.1",
         "mapbox-gl": "^3.6.0",

diff --git a/src/components/Menu.astro b/src/components/Menu.astro
@@ -6,14 +6,14 @@ import MenuSearch from './MenuSearch.astro';
 import MenuTaxonomy from './MenuTaxonomy.astro';
 import MenuTheme from './MenuTheme';
 
-const { site, post } = Astro.props;
+const { site, title } = Astro.props;
 ---
 
 <nav>
     <Brand />
     <MenuSearch />
     <MenuTheme client:load />
-    <MenuNav post={post} />
+    <MenuNav title={title} />
     <MenuTaxonomy />
     <MenuOther />
 </nav>
diff --git a/src/components/MenuNav.astro b/src/components/MenuNav.astro
@@ -1,7 +1,7 @@
 ---
 import { settings } from '../data/ghost-store';
 
-const { post } = Astro.props;
+const { title } = Astro.props;
 ---
 
 <ul class="book-menu-nav" transition:name="fdsafds">
@@ -10,11 +10,11 @@ const { post } = Astro.props;
         <span class=""></span>
         <ul>
             {
-                post && post.type === 'post' && (
-                    <li transition:name={Astro.url.pathname == post.slug ? post.slug : ''}>
+                title && (
+                    <li transition:name="page-current">
                         <span class={`menu-flag current ellipsis`} />
                         <a href="javascript:void(0)" style="display: block;" class="menu-flag current">
-                            {post.title}
+                            {title}
                         </a>
                     </li>
                 )

diff --git a/src/data/ghost-store.ts b/src/data/ghost-store.ts
@@ -1,6 +1,6 @@
 import { getSettings, getPosts, getAllTags, getAllPages, getAllPosts, getNeodb, getFlux, getMemos, getAllAuthors } from '../utils/api';
 import { atom } from 'nanostores';
-import { minfont } from '../utils/help';
+// import { minfont } from '../utils/help';
 
 const settingsStore = atom(await getSettings());
 const postsStore = atom(await getPosts());
@@ -22,15 +22,15 @@ export const flux = fluxStore.get();
 export const memos = memosStore.get();
 export const authors = authorsStore.get();
 
-export function buildFonts() {
-    const titleText = postsAll
-        .map(function (item) {
-            let tags = item.tags.map((tag) => tag.name).join(',');
-            let desc = item.excerpt != null ? item.excerpt.substring(0, 100) : '';
-            return item.title + desc + tags;
-        })
-        .join(',');
-    minfont(titleText);
-}
+// export function buildFonts() {
+//     const titleText = postsAll
+//         .map(function (item) {
+//             let tags = item.tags.map((tag) => tag.name).join(',');
+//             let desc = item.excerpt != null ? item.excerpt.substring(0, 100) : '';
+//             return item.title + desc + tags;
+//         })
+//         .join(',');
+//     minfont(titleText);
+// }
 
-buildFonts();
+// buildFonts();
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
@@ -2,8 +2,6 @@
 // import lib
 import type { Tag } from '@ts-ghost/content-api';
 import { settings } from '../data/ghost-store';
-// import components
-// import styles
 import '../styles/book.scss';
 // ...
 const { post } = Astro.props;

diff --git a/src/pages/[slug].astro b/src/pages/[slug].astro
@@ -87,7 +87,7 @@ const tocHtml = tocGen(await post.html);
 
     <Header slot="header" title={post.title} />
 
-    <Menu slot="menu" post={post} />
+    <Menu slot="menu" title={post.title} />
     <article slot="content" class="markdown book-article">
         <h1 class="book-title">
             {post.title}

diff --git a/src/pages/tag/[slug]/[...page].astro b/src/pages/tag/[slug]/[...page].astro
@@ -18,20 +18,23 @@ export async function getStaticPaths({ paginate }: GetStaticPathsOptions) {
     return tags.flatMap((tag) => {
         return paginate(tag.posts, {
             params: { slug: tag.slug },
+            props: {
+                tag
+            },
             pageSize: 10
         });
     });
 }
 
-const { page } = Astro.props;
+const { page, tag } = Astro.props;
 ---
 
 <BaseLayout>
     <Head slot="head" site={settings} title={settings?.title + ' | ' + settings?.description} />
 
     <Header slot="header" title={settings?.title} />
 
-    <Menu slot="menu" />
+    <Menu slot="menu" title={tag.name} />
 
     <List slot="content" page={page} isFeature={false} />
 

diff --git a/src/utils/help.ts b/src/utils/help.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash-es'; // 获取一个svg字符串
-import Fontmin from 'fontmin';
+// import Fontmin from 'fontmin-esm';
 export function getSvg(name: string = '', viewbox: string = '0 0 24 24', classes: string = 'book-icon'): string {
     return `
     <svg viewBox="${viewbox}" aria-hidden="true"${classes ? ` class="${classes}"` : ''}>
@@ -76,19 +76,19 @@ export function normalizeData(data: string): string | null {
     }
 }
 
-export function minfont(titleText: string) {
-    const fontmin = new Fontmin()
-        .src('src/font/SmileySans.ttf')
-        .use(
-            Fontmin.glyph({
-                text: titleText,
-                hinting: false
-            })
-        )
-        .dest('public');
+// export function minfont(titleText: string) {
+//     const fontmin = new Fontmin()
+//         .src('src/font/SmileySans.ttf')
+//         .use(
+//             Fontmin.glyph({
+//                 text: titleText,
+//                 hinting: false
+//             })
+//         )
+//         .dest('public');
 
-    fontmin.run((err, files) => {
-        if (err) throw err;
-        console.log('compress font success\n');
-    });
-}
+//     fontmin.run((err, files) => {
+//         if (err) throw err;
+//         console.log('compress font success\n');
+//     });
+// }
diff --git a/src/utils/minfont.js b/src/utils/minfont.js