improve safety

ppy-sb · Jul 7, 2023 · e6de7ee · e6de7ee
1 parent 63f7606
commit e6de7ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/scripts/gen-hljs.mjs b/scripts/gen-hljs.mjs
@@ -14,7 +14,7 @@ const files = readdirSync('./node_modules/highlight.js/es/languages').filter(fil
 ;(async () => {
   await Promise.all (files.map(async (file) => {
     const mod = await import(`highlight.js/lib/languages/${file}`)
-    const { aliases } = mod.default(highlight)
+    const { aliases } = mod.default(highlight.newInstance())
     const language = file
     hljs[language] = language
     if (!aliases) {

diff --git a/src/components/T/modal.client.vue b/src/components/T/modal.client.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Callback } from '~/composables/useZoomModal'
+import type { Callback } from '~/composables/useZoomModal'
 
 const emits = defineEmits<{
   (e: 'cancel', v: Event): void

diff --git a/src/composables/useSearch.ts b/src/composables/useSearch.ts
@@ -41,9 +41,11 @@ const includes = shallowReactive({
   users: true,
 })
 const searchMode = computed(() => ((includes.beatmaps || includes.beatmapsets) && !includes.users) ? 'beatmap' : 'all')
-const autoResultSize = computed(() => searchMode.value === 'all' ? 5 : 10)
 
 export async function useSearchResult() {
+  if (process.server) {
+    throw new Error('only useable in client.')
+  }
   const app = useNuxtApp()
 
   const {
@@ -56,7 +58,7 @@ export async function useSearchResult() {
     }
     return await app.$client.search.searchUser.query({
       keyword: keyword.value,
-      limit: autoResultSize.value,
+      limit: autoResultSize(),
     })
   })
 
@@ -71,7 +73,7 @@ export async function useSearchResult() {
     return await app.$client.search.searchBeatmap.query({
       keyword: keyword.value,
       filters: tags.value,
-      limit: autoResultSize.value,
+      limit: autoResultSize(),
     })
   })
 
@@ -86,7 +88,7 @@ export async function useSearchResult() {
     return await app.$client.search.searchBeatmapset.query({
       keyword: keyword.value,
       filters: tags.value,
-      limit: autoResultSize.value,
+      limit: autoResultSize(),
     })
   })
 
@@ -111,7 +113,7 @@ export async function useSearchResult() {
 
   const search = useDebounceFn(raw, 500)
 
-  watch(tags, () => raw(), { deep: true })
+  watch(tags, raw.bind(null, undefined), { deep: true })
 
   const searchablePages = useSearchablePages()
 
@@ -240,3 +242,6 @@ function extract(force = false) {
     extractQueries(force)
   }
 }
+function autoResultSize() {
+  return searchMode.value === 'all' ? 5 : 10
+}