fix: recommend

Author: wenxig

.github/workflows/build.yaml

@@ -6,6 +6,7 @@ on:
 
 permissions:
   contents: write
+  id-token: write
 
 jobs:
   build:
@@ -49,10 +50,6 @@ jobs:
         run: |
           pnpm run build || pnpm run build
 
-      - name: Restore version
-        run: |
-          node ./script/set-version.mts ${{ steps.set-version.outputs.old_version }}
-
       #publish
       - name: Run semantic-release
         env:

.releaserc.mjs

@@ -15,7 +15,7 @@ const production = {
     [
       '@semantic-release/git',
       {
-        assets: ['CHANGELOG.md', './type/**/*', './type'],
+        assets: ['CHANGELOG.md'],
         message: 'chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}'
       }
     ]

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "editor.defaultFormatter": "oxc.oxc-vscode",
-  "oxc.path.oxfmt": "node_modules/oxfmt/bin/oxfmt",
   "[vue]": {
     "editor.defaultFormatter": "oxc.oxc-vscode"
   },

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "delta-comic-plugin-layout",
+  "name": "@delta-comic/plugin-layout",
   "version": "0.0.0-semantic-released",
   "description": "希望的涟漪",
   "homepage": "https://github.com/delta-comic/delta-comic-plugin-layout",
@@ -13,26 +13,30 @@
     "url": "https://github.com/delta-comic/delta-comic-plugin-layout.git"
   },
   "files": [
-    "./type/**/*",
+    "./dist/**/*",
     "./package.json"
   ],
   "type": "module",
-  "types": "./type/main.d.ts",
+  "types": "./dist/src/main.d.ts",
   "exports": {
-    "types": "./type/src/main.d.ts",
-    "import": "./type/src/main.d.ts",
-    "node": "./type/src/main.d.ts",
-    "require": "./type/src/main.d.ts",
-    "module-sync": "./type/src/main.d.ts",
-    "default": "./type/src/main.d.ts"
+    "types": "./dist/src/main.d.ts",
+    "import": "./dist/src/main.d.ts",
+    "node": "./dist/src/main.d.ts",
+    "require": "./dist/src/main.d.ts",
+    "module-sync": "./dist/src/main.d.ts",
+    "default": "./dist/src/main.d.ts"
+  },
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com"
   },
   "scripts": {
-    "dev": "vp dev",
     "build": "vp build && cd ./dist && zip -r plugin.zip ./*",
-    "preview": "vp preview",
+    "dev": "vp dev",
     "lint": "vp lint --type-aware",
-    "lint:fix": "vp lint --fix --type-aware",
     "lint-staged": "lint-staged",
+    "lint:fix": "vp lint --fix --type-aware",
+    "preview": "vp preview",
+    "set-ver": "node ./script/set-version.mts",
     "typecheck": "vue-tsc --noEmit -p ./tsconfig.json --composite false"
   },
   "dependencies": {
@@ -68,7 +72,7 @@
     "@commitlint/types": "^20.5.0",
     "@cspell/dict-npm": "^5.2.38",
     "@cspell/dict-rust": "^4.1.2",
-    "@delta-comic/vite": "^1.3.6",
+    "@delta-comic/vite": "^2.1.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^12.0.6",
@@ -94,6 +98,7 @@
     "vue-component-type-helpers": "^3.2.6",
     "vue-tsc": "^3.2.6"
   },
+  "packageManager": "pnpm@10.33.2",
   "pnpm": {
     "overrides": {
       "@microsoft/api-extractor": "7.48.1",
@@ -106,6 +111,5 @@
       "core-js",
       "esbuild"
     ]
-  },
-  "packageManager": "pnpm@10.33.0"
-}
+  }
+}

pnpm-lock.yaml

@@ -2,7 +2,7 @@
 import { uni } from '@delta-comic/model'
 import { useQuery } from '@pinia/colada'
 
-import ItemCard from '@/components/ItemCard'
+import ItemCard from '@/components/ItemCard.vue'
 
 import * as LayoutInject from '../default'
 
@@ -15,7 +15,9 @@ const getItemCard = (contentType: uni.content.ContentType_) =>
   uni.item.Item.itemCards.get(contentType) ?? ItemCard
 
 const recommendsQuery = useQuery({
-  key: () => [LayoutInject.QueryKey.Recommends]
+  key: () => [LayoutInject.QueryKey.Recommends],
+  query: async ({ signal }) =>
+    (await $props.page.fetchRecommends.query({}, $props.page.fetchRecommends.initPage, signal)).data
 })
 </script>
 
@@ -26,7 +28,7 @@ const recommendsQuery = useQuery({
     <component
       :is="getItemCard(item.contentType)"
       :item
-      v-for="item of page.recommends.content.data.value"
+      v-for="item of recommendsQuery.data.value"
     />
   </div>
 </template>

src/layout/default/Recommends.vue

@@ -86,4 +86,5 @@ const plugin = definePlugin({
   config: [imageViewConfig]
 })
 
-export type LayoutLib = PluginExpose<() => typeof plugin>
+export type LayoutLib = PluginExpose<() => typeof plugin>
+export default plugin

src/main.ts

@@ -16,7 +16,7 @@ export const useLike = defineMutation(() => {
       const key = createQueryKey(item)
       const oldItem = queryCache.getQueryData<uni.item.Item>(key)!
       const newItem = uni.item.Item.create({
-        ...oldItem,
+        ...oldItem.toJSON(),
         isLiked: !oldItem.isLiked,
         likeNumber: oldItem.isLiked ? (oldItem.likeNumber ?? 0) - 1 : (oldItem.likeNumber ?? 0) + 1
       })
@@ -33,17 +33,14 @@ export const useLike = defineMutation(() => {
     // on both error and success
     onSettled(_data, _error, item, { newItem }) {
       const key = createQueryKey(item)
-      if (newItem) {
-        queryCache.invalidateQueries({ key })
-      }
+      if (!newItem) return
+      return queryCache.invalidateQueries({ key })
     },
 
     onError(err, item, { newItem, oldItem }) {
       const key = createQueryKey(item)
-      if (newItem === queryCache.getQueryData(key)) {
+      if (newItem === queryCache.getQueryData(key))
         queryCache.setQueryData(key, oldItem)
-      }
-
       window.$message.error(err.message)
     }
   })

src/utils/content.ts

@@ -1,8 +1,12 @@
 <script setup lang="ts">
 import { SharedFunction, useFullscreen } from '@delta-comic/core'
+// @ts-ignore sideeffect no need to define
 import 'swiper/css'
+// @ts-ignore sideeffect no need to define
 import 'swiper/css/virtual'
+// @ts-ignore sideeffect no need to define
 import 'swiper/css/zoom'
+// @ts-ignore sideeffect no need to define
 import 'swiper/css/free-mode'
 import { uni } from '@delta-comic/model'
 import { Inject, useConfig } from '@delta-comic/plugin'