From ec00e7836271b7089fc5b08ebfa6effd6a041865 Mon Sep 17 00:00:00 2001
From: pengzhanbo <volodymyr@foxmail.com>
Date: Fri, 31 May 2024 00:30:22 +0800
Subject: [PATCH] feat: move fonts to `plugin-fonts`

---
 plugins/plugin-fonts/README.md                |   1 +
 plugins/plugin-fonts/package.json             |  47 ++++++++++++++++++
 plugins/plugin-fonts/src/client/config.ts     |   3 ++
 .../fonts/inter-italic-cyrillic-ext.woff2     | Bin
 .../client/fonts/inter-italic-cyrillic.woff2  | Bin
 .../client/fonts/inter-italic-greek-ext.woff2 | Bin
 .../src/client/fonts/inter-italic-greek.woff2 | Bin
 .../client/fonts/inter-italic-latin-ext.woff2 | Bin
 .../src/client/fonts/inter-italic-latin.woff2 | Bin
 .../fonts/inter-italic-vietnamese.woff2       | Bin
 .../fonts/inter-roman-cyrillic-ext.woff2      | Bin
 .../client/fonts/inter-roman-cyrillic.woff2   | Bin
 .../client/fonts/inter-roman-greek-ext.woff2  | Bin
 .../src/client/fonts/inter-roman-greek.woff2  | Bin
 .../client/fonts/inter-roman-latin-ext.woff2  | Bin
 .../src/client/fonts/inter-roman-latin.woff2  | Bin
 .../client/fonts/inter-roman-vietnamese.woff2 | Bin
 .../plugin-fonts/src/client/styles/fonts.css  |   2 -
 plugins/plugin-fonts/src/node/index.ts        |   1 +
 plugins/plugin-fonts/src/node/plugin.ts       |  12 +++++
 plugins/plugin-fonts/tsconfig.build.json      |   8 +++
 pnpm-lock.yaml                                |   9 ++++
 theme/package.json                            |   1 +
 theme/src/client/styles/index.scss            |   1 -
 theme/src/node/plugins/getPlugins.ts          |   3 ++
 25 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 plugins/plugin-fonts/README.md
 create mode 100644 plugins/plugin-fonts/package.json
 create mode 100644 plugins/plugin-fonts/src/client/config.ts
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-cyrillic-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-cyrillic.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-greek-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-greek.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-latin-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-latin.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-italic-vietnamese.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-cyrillic-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-cyrillic.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-greek-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-greek.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-latin-ext.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-latin.woff2 (100%)
 rename {theme => plugins/plugin-fonts}/src/client/fonts/inter-roman-vietnamese.woff2 (100%)
 rename theme/src/client/styles/fonts.scss => plugins/plugin-fonts/src/client/styles/fonts.css (96%)
 create mode 100644 plugins/plugin-fonts/src/node/index.ts
 create mode 100644 plugins/plugin-fonts/src/node/plugin.ts
 create mode 100644 plugins/plugin-fonts/tsconfig.build.json

diff --git a/plugins/plugin-fonts/README.md b/plugins/plugin-fonts/README.md
new file mode 100644
index 00000000..55c819a7
--- /dev/null
+++ b/plugins/plugin-fonts/README.md
@@ -0,0 +1 @@
+# @vuepress-plume/plugin-fonts
diff --git a/plugins/plugin-fonts/package.json b/plugins/plugin-fonts/package.json
new file mode 100644
index 00000000..a9bd0bdc
--- /dev/null
+++ b/plugins/plugin-fonts/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@vuepress-plume/plugin-fonts",
+  "type": "module",
+  "version": "1.0.0-rc.61",
+  "description": "The Plugin for VuePres 2 - fonts",
+  "author": "pengzhanbo <volodymyr@foxmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/pengzhanbo/vuepress-theme-plume#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pengzhanbo/vuepress-theme-plume.git",
+    "directory": "plugins/plugin-fonts"
+  },
+  "bugs": {
+    "url": "https://github.com/pengzhanbo/vuepress-theme-plume/issues"
+  },
+  "exports": {
+    ".": {
+      "types": "./lib/node/index.d.ts",
+      "import": "./lib/node/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "lib/node/index.js",
+  "types": "./lib/node/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "pnpm run copy && pnpm run ts",
+    "clean": "rimraf --glob ./lib ./*.tsbuildinfo",
+    "copy": "cpx \"src/**/*.{d.ts,vue,css,scss,jpg,png,woff2}\" lib",
+    "ts": "tsc -b tsconfig.build.json"
+  },
+  "peerDependencies": {
+    "vuepress": "2.0.0-rc.12"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keyword": [
+    "VuePress",
+    "vuepress plugin",
+    "fonts",
+    "vuepress-plugin-fonts"
+  ]
+}
diff --git a/plugins/plugin-fonts/src/client/config.ts b/plugins/plugin-fonts/src/client/config.ts
new file mode 100644
index 00000000..b37a3ac3
--- /dev/null
+++ b/plugins/plugin-fonts/src/client/config.ts
@@ -0,0 +1,3 @@
+import './styles/fonts.css'
+
+export default {}
diff --git a/theme/src/client/fonts/inter-italic-cyrillic-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-cyrillic-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-cyrillic-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-cyrillic-ext.woff2
diff --git a/theme/src/client/fonts/inter-italic-cyrillic.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-cyrillic.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-cyrillic.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-cyrillic.woff2
diff --git a/theme/src/client/fonts/inter-italic-greek-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-greek-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-greek-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-greek-ext.woff2
diff --git a/theme/src/client/fonts/inter-italic-greek.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-greek.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-greek.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-greek.woff2
diff --git a/theme/src/client/fonts/inter-italic-latin-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-latin-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-latin-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-latin-ext.woff2
diff --git a/theme/src/client/fonts/inter-italic-latin.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-latin.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-latin.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-latin.woff2
diff --git a/theme/src/client/fonts/inter-italic-vietnamese.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-italic-vietnamese.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-italic-vietnamese.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-italic-vietnamese.woff2
diff --git a/theme/src/client/fonts/inter-roman-cyrillic-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-cyrillic-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-cyrillic-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-cyrillic-ext.woff2
diff --git a/theme/src/client/fonts/inter-roman-cyrillic.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-cyrillic.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-cyrillic.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-cyrillic.woff2
diff --git a/theme/src/client/fonts/inter-roman-greek-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-greek-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-greek-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-greek-ext.woff2
diff --git a/theme/src/client/fonts/inter-roman-greek.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-greek.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-greek.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-greek.woff2
diff --git a/theme/src/client/fonts/inter-roman-latin-ext.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-latin-ext.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-latin-ext.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-latin-ext.woff2
diff --git a/theme/src/client/fonts/inter-roman-latin.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-latin.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-latin.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-latin.woff2
diff --git a/theme/src/client/fonts/inter-roman-vietnamese.woff2 b/plugins/plugin-fonts/src/client/fonts/inter-roman-vietnamese.woff2
similarity index 100%
rename from theme/src/client/fonts/inter-roman-vietnamese.woff2
rename to plugins/plugin-fonts/src/client/fonts/inter-roman-vietnamese.woff2
diff --git a/theme/src/client/styles/fonts.scss b/plugins/plugin-fonts/src/client/styles/fonts.css
similarity index 96%
rename from theme/src/client/styles/fonts.scss
rename to plugins/plugin-fonts/src/client/styles/fonts.css
index 84a1399d..a2ea3387 100644
--- a/theme/src/client/styles/fonts.scss
+++ b/plugins/plugin-fonts/src/client/styles/fonts.css
@@ -248,5 +248,3 @@
     local("Source Han Sans SC");
   unicode-range: U+2018, U+2019, U+201C, U+201D; /* 分别是 ‘’“” */
 }
-
-/* Generate the subsetted fonts using: `pyftsubset <file>.woff2 --unicodes="<range>" --output-file="inter-<style>-<subset>.woff2" --flavor=woff2` */
diff --git a/plugins/plugin-fonts/src/node/index.ts b/plugins/plugin-fonts/src/node/index.ts
new file mode 100644
index 00000000..83723514
--- /dev/null
+++ b/plugins/plugin-fonts/src/node/index.ts
@@ -0,0 +1 @@
+export * from './plugin.js'
diff --git a/plugins/plugin-fonts/src/node/plugin.ts b/plugins/plugin-fonts/src/node/plugin.ts
new file mode 100644
index 00000000..6da2682f
--- /dev/null
+++ b/plugins/plugin-fonts/src/node/plugin.ts
@@ -0,0 +1,12 @@
+import type { Plugin } from 'vuepress/core'
+import { getDirname, path } from 'vuepress/utils'
+
+export function fontsPlugin(): Plugin {
+  return {
+    name: '@vuepress-plume/plugin-fonts',
+    clientConfigFile: path.resolve(
+      getDirname(import.meta.url),
+      '../client/config.js',
+    ),
+  }
+}
diff --git a/plugins/plugin-fonts/tsconfig.build.json b/plugins/plugin-fonts/tsconfig.build.json
new file mode 100644
index 00000000..6bf67375
--- /dev/null
+++ b/plugins/plugin-fonts/tsconfig.build.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib"
+  },
+  "include": ["./src"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b3feefbb..ece9315e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -191,6 +191,12 @@ importers:
         specifier: 2.0.0-rc.12
         version: 2.0.0-rc.12(@vuepress/bundler-vite@2.0.0-rc.12(@types/node@20.12.10)(sass@1.77.2)(typescript@5.4.5))(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5))
 
+  plugins/plugin-fonts:
+    dependencies:
+      vuepress:
+        specifier: 2.0.0-rc.12
+        version: 2.0.0-rc.12(@vuepress/bundler-vite@2.0.0-rc.12(@types/node@20.12.10)(sass@1.77.2)(typescript@5.4.5))(typescript@5.4.5)(vue@3.4.27(typescript@5.4.5))
+
   plugins/plugin-iconify:
     dependencies:
       '@iconify/vue':
@@ -396,6 +402,9 @@ importers:
       '@vuepress-plume/plugin-content-update':
         specifier: workspace:*
         version: link:../plugins/plugin-content-update
+      '@vuepress-plume/plugin-fonts':
+        specifier: workspace:*
+        version: link:../plugins/plugin-fonts
       '@vuepress-plume/plugin-iconify':
         specifier: workspace:*
         version: link:../plugins/plugin-iconify
diff --git a/theme/package.json b/theme/package.json
index e266b153..292cbd65 100644
--- a/theme/package.json
+++ b/theme/package.json
@@ -71,6 +71,7 @@
     "@vuepress-plume/plugin-baidu-tongji": "workspace:*",
     "@vuepress-plume/plugin-blog-data": "workspace:*",
     "@vuepress-plume/plugin-content-update": "workspace:*",
+    "@vuepress-plume/plugin-fonts": "workspace:*",
     "@vuepress-plume/plugin-iconify": "workspace:*",
     "@vuepress-plume/plugin-notes-data": "workspace:*",
     "@vuepress-plume/plugin-search": "workspace:*",
diff --git a/theme/src/client/styles/index.scss b/theme/src/client/styles/index.scss
index 724130f9..7067a35f 100644
--- a/theme/src/client/styles/index.scss
+++ b/theme/src/client/styles/index.scss
@@ -1,5 +1,4 @@
 @import "vars";
-@import "fonts";
 @import "normalize";
 @import "icons";
 @import "social-icons";
diff --git a/theme/src/node/plugins/getPlugins.ts b/theme/src/node/plugins/getPlugins.ts
index a808498b..0c25a8de 100644
--- a/theme/src/node/plugins/getPlugins.ts
+++ b/theme/src/node/plugins/getPlugins.ts
@@ -20,6 +20,7 @@ import { contentUpdatePlugin } from '@vuepress-plume/plugin-content-update'
 import { searchPlugin } from '@vuepress-plume/plugin-search'
 import { markdownPowerPlugin } from 'vuepress-plugin-md-power'
 import { watermarkPlugin } from '@vuepress/plugin-watermark'
+import { fontsPlugin } from '@vuepress-plume/plugin-fonts'
 import type {
   PlumeThemeEncrypt,
   PlumeThemeLocaleOptions,
@@ -64,6 +65,8 @@ export function getPlugins({
 
     iconifyPlugin(),
 
+    fontsPlugin(),
+
     contentUpdatePlugin(),
 
     activeHeaderLinksPlugin({