From f4e6321a87ac121e0b03306e1f17e3f6c9565eff Mon Sep 17 00:00:00 2001 From: yixiaojiu Date: Thu, 8 Feb 2024 10:55:31 +0800 Subject: [PATCH 1/2] feat: integrate bilibili-bangumi-component --- demo/yun/pages/bangumi/index.md | 2 +- demo/yun/valaxy.config.ts | 4 +- packages/valaxy-addon-bangumi/README.md | 34 +++++++++++-- .../components/ValaxyBangumi.vue | 27 ++++++++-- packages/valaxy-addon-bangumi/node/index.ts | 11 +--- packages/valaxy-addon-bangumi/node/utils.ts | 13 ----- packages/valaxy-addon-bangumi/package.json | 2 +- packages/valaxy-addon-bangumi/tests/index.ts | 3 -- packages/valaxy-addon-bangumi/types.ts | 8 --- pnpm-lock.yaml | 50 ++++++------------- 10 files changed, 74 insertions(+), 80 deletions(-) delete mode 100644 packages/valaxy-addon-bangumi/node/utils.ts delete mode 100644 packages/valaxy-addon-bangumi/tests/index.ts delete mode 100644 packages/valaxy-addon-bangumi/types.ts diff --git a/demo/yun/pages/bangumi/index.md b/demo/yun/pages/bangumi/index.md index 9b7625830..c301bfcc8 100644 --- a/demo/yun/pages/bangumi/index.md +++ b/demo/yun/pages/bangumi/index.md @@ -5,4 +5,4 @@ description: Bangumi 追番列表 # links: https://friends.yunyoujun.cn/links.json --- - + diff --git a/demo/yun/valaxy.config.ts b/demo/yun/valaxy.config.ts index 201b371fb..f76777ff0 100644 --- a/demo/yun/valaxy.config.ts +++ b/demo/yun/valaxy.config.ts @@ -75,9 +75,7 @@ export default defineValaxyConfig({ apiKey: '805f2584a8866388aa1631ff0348ddae', indexName: 'valaxy', }), - addonBangumi({ - uid: 378106, - }), + addonBangumi(), addonComponents(), addonWaline({ serverURL: 'https://waline.yunyoujun.cn', diff --git a/packages/valaxy-addon-bangumi/README.md b/packages/valaxy-addon-bangumi/README.md index e4cb82ae0..67c9e8a15 100644 --- a/packages/valaxy-addon-bangumi/README.md +++ b/packages/valaxy-addon-bangumi/README.md @@ -1,7 +1,35 @@ # valaxy-addon-bangumi -- [[功能建议] 追番列表](https://github.com/YunYouJun/valaxy/issues/296) +关联 issue [[功能建议] 追番列表](https://github.com/YunYouJun/valaxy/issues/296) -## Ref +依赖 [bilibili-bangumi-component](https://github.com/yixiaojiu/bilibili-bangumi-component)，需要部署后端服务，可参考 [bilibili-bangumi 使用](https://github.com/yixiaojiu/bilibili-bangumi-component?tab=readme-ov-file#%E4%BD%BF%E7%94%A8)进行搭建 -- [hexo-bilibili-bangumi](https://github.com/HCLonely/hexo-bilibili-bangumi) +## 如何集成 + +```bash +npm i valaxy-addon-bangumi +``` + +`valaxy-addon-bangumi` 暴露了 `ValaxyBangumi` 组件 + +使用示例： + +```md +--- +title: Bangumi 追番列表 +keywords: Bangumi +description: Bangumi 追番列表 +--- + + +``` + +## API + +| 字段 | 描述 | 默认值 | +|:--------------:|:----------------------------------------:|:------:| +| api | 后端 api 地址 | - | +| bilibili-uid | Bilibili 的 uid，在后端中引入 uid 的 env 后可以不设置 | - | +| bgm-uid | Bangumi 的 uid，在后端中引入 uid 的 env 后可以不设置 | - | +| bilibili-enabled | 是否展示 Bilibili | true | +| bgm-enabled | 是否展示 Bangumi | true| diff --git a/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue b/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue index 432b1f156..a4dc3a70b 100644 --- a/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue +++ b/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue @@ -1,5 +1,26 @@ + + diff --git a/packages/valaxy-addon-bangumi/node/index.ts b/packages/valaxy-addon-bangumi/node/index.ts index 59154f526..54d6f1532 100644 --- a/packages/valaxy-addon-bangumi/node/index.ts +++ b/packages/valaxy-addon-bangumi/node/index.ts @@ -1,17 +1,8 @@ import { defineValaxyAddon } from 'valaxy' -import consola from 'consola' import pkg from '../package.json' -import type { BangumiOptions } from '../types' - -export const addonBangumi = defineValaxyAddon(options => ({ +export const addonBangumi = defineValaxyAddon(options => ({ name: pkg.name, enable: true, options, - - setup(valaxy) { - valaxy.hook('build:before', () => { - consola.info('[valaxy-addon-bangumi] build:before') - }) - }, })) diff --git a/packages/valaxy-addon-bangumi/node/utils.ts b/packages/valaxy-addon-bangumi/node/utils.ts deleted file mode 100644 index c1e27d2de..000000000 --- a/packages/valaxy-addon-bangumi/node/utils.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { createBangumiApi } from 'bangumi-api' -import consola from 'consola' -import pkg from '../package.json' - -const bangumiApi = createBangumiApi() -bangumiApi.axios.defaults.headers.common['User-Agent'] = `YunYouJun/girid + (${pkg.repository.url})` - -export async function getBangumiDataFromBangumiApi() { - const data = await bangumiApi.subjects({ - subject_id: 1, - }).get() - consola.log(data) -} diff --git a/packages/valaxy-addon-bangumi/package.json b/packages/valaxy-addon-bangumi/package.json index 725a35e30..e4b9e2ea0 100644 --- a/packages/valaxy-addon-bangumi/package.json +++ b/packages/valaxy-addon-bangumi/package.json @@ -15,6 +15,6 @@ "valaxy": "latest" }, "dependencies": { - "bangumi-api": "^0.0.1" + "bilibili-bangumi-component": "^0.1.0" } } diff --git a/packages/valaxy-addon-bangumi/tests/index.ts b/packages/valaxy-addon-bangumi/tests/index.ts deleted file mode 100644 index 3ebb07367..000000000 --- a/packages/valaxy-addon-bangumi/tests/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { getBangumiDataFromBangumiApi } from '../node/utils' - -getBangumiDataFromBangumiApi() diff --git a/packages/valaxy-addon-bangumi/types.ts b/packages/valaxy-addon-bangumi/types.ts deleted file mode 100644 index 25385b37a..000000000 --- a/packages/valaxy-addon-bangumi/types.ts +++ /dev/null @@ -1,8 +0,0 @@ -export interface BangumiOptions { - /** - * @url https://bgm.tv/ - * Bangumi uid - * 登录 Bangumi 后打开控制台，输入 `CHOBITS_UID` 回车，下面会输出 id - */ - uid: number -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d414836b..d632d63ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -517,9 +517,9 @@ importers: packages/valaxy-addon-bangumi: dependencies: - bangumi-api: - specifier: ^0.0.1 - version: 0.0.1 + bilibili-bangumi-component: + specifier: ^0.1.0 + version: 0.1.0 valaxy: specifier: latest version: link:../valaxy @@ -3087,6 +3087,12 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true + /@stencil/core@4.12.1: + resolution: {integrity: sha512-l7UUCEV+4Yr1i6BL2DGSQPAzM3x/V4Fx9n9Z0/gdAgX11I25xY0MnH5jbQ69ug6ms/8KUV6SouS1R7MjjM/JnQ==} + engines: {node: '>=16.0.0', npm: '>=7.10.0'} + hasBin: true + dev: false + /@stylistic/eslint-plugin-js@1.5.4(eslint@8.56.0): resolution: {integrity: sha512-3ctWb3NvJNV1MsrZN91cYp2EGInLPSoZKphXIbIRx/zjZxKwLDr9z4LMOWtqjq14li/OgqUUcMq5pj8fgbLoTw==} engines: {node: ^16.0.0 || >=18.0.0} @@ -4548,16 +4554,6 @@ packages: resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==} dev: true - /axios@1.6.5: - resolution: {integrity: sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==} - dependencies: - follow-redirects: 1.15.5 - form-data: 4.0.0 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - dev: false - /babel-plugin-polyfill-corejs2@0.4.8(@babel/core@7.23.7): resolution: {integrity: sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==} peerDependencies: @@ -4601,14 +4597,6 @@ packages: resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==} dev: true - /bangumi-api@0.0.1: - resolution: {integrity: sha512-P9mZvNdhoF/IQZcoInfHfMNaCGb8LbeCQmoQeyoC7LTYHvjoaRWmtG8wn1jhwhAIkFhbzfhIdS+yhDQ5uGMFNQ==} - dependencies: - axios: 1.6.5 - transitivePeerDependencies: - - debug - dev: false - /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} dev: true @@ -4625,6 +4613,12 @@ packages: require-from-string: 2.0.2 dev: false + /bilibili-bangumi-component@0.1.0: + resolution: {integrity: sha512-2WYzrvnhHz9N8Gi2TX8HnEe7myBjoNmOB50mMZNq7YPnoyUjSBwKZ/iU3BsHtFCZFUJU76/bFq+ChT8ZoFXnYA==} + dependencies: + '@stencil/core': 4.12.1 + dev: false + /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} @@ -6575,16 +6569,6 @@ packages: tabbable: 6.2.0 dev: true - /follow-redirects@1.15.5: - resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dev: false - /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} dependencies: @@ -9277,10 +9261,6 @@ packages: resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==} dev: true - /proxy-from-env@1.1.0: - resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: false - /ps-tree@1.2.0: resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==} engines: {node: '>= 0.10'} From 4d59d88a1b5a53135a85728ad6683cf50cec380f Mon Sep 17 00:00:00 2001 From: yixiaojiu Date: Thu, 8 Feb 2024 11:17:31 +0800 Subject: [PATCH 2/2] fix: ssg build error --- packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue b/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue index a4dc3a70b..a14387337 100644 --- a/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue +++ b/packages/valaxy-addon-bangumi/components/ValaxyBangumi.vue @@ -1,5 +1,5 @@