fix(plugin-slimsearch): correct worker file position (#658)

Author: Mister-Hope

plugins/search/plugin-slimsearch/src/client/components/SearchResult.ts

@@ -5,14 +5,14 @@ import type { PropType, VNode } from 'vue'
 import { computed, defineComponent, h, reactive, ref, toRef, watch } from 'vue'
 import { RouteLink, useRouteLocale, useRouter } from 'vuepress/client'
 
+import type { MatchedItem, Word } from '../../shared/index.js'
 import {
   useQueryHistory,
   useResultHistory,
   useResults,
 } from '../composables/index.js'
 import { customFieldConfig, locales } from '../define.js'
 import { CLOSE_ICON } from '../icons/index.js'
-import type { MatchedItem, Word } from '../typings/index.js'
 import { getResultPath } from '../utils/index.js'
 import { HeadingIcon, HeartIcon, HistoryIcon, TitleIcon } from './icons.js'
 import { SearchLoading } from './SearchLoading.js'

plugins/search/plugin-slimsearch/src/client/composables/useResultHistory.ts

@@ -1,8 +1,8 @@
 import { useLocalStorage } from '@vueuse/core'
 import type { Ref } from 'vue'
 
+import type { MatchedItem, Word } from '../../shared/index.js'
 import { options } from '../define.js'
-import type { MatchedItem, Word } from '../typings/index.js'
 import { getResultPath } from '../utils/index.js'
 
 const SLIMSEARCH_RESULT_HISTORY_STORAGE = 'SLIMSEARCH_RESULT_HISTORY'

plugins/search/plugin-slimsearch/src/client/composables/useResults.ts

@@ -3,9 +3,9 @@ import type { Ref } from 'vue'
 import { computed, onMounted, onUnmounted, ref, shallowRef } from 'vue'
 import { useData } from 'vuepress/client'
 
+import type { SearchResult } from '../../shared/index.js'
 import { options } from '../define.js'
 import { useSearchOptions } from '../helpers/index.js'
-import type { SearchResult } from '../typings/index.js'
 import { createSearchWorker } from '../utils/index.js'
 
 export interface Results {

plugins/search/plugin-slimsearch/src/client/helpers/search.ts

@@ -5,7 +5,7 @@ import type { PageData } from 'vuepress/client'
 import { useRouteLocale } from 'vuepress/client'
 import { isFunction } from 'vuepress/shared'
 
-import type { SearchResult, WorkerSearchOptions } from '../typings/index.js'
+import type { SearchResult, WorkerSearchOptions } from '../../shared/index.js'
 
 declare const __VUEPRESS_DEV__: boolean
 

plugins/search/plugin-slimsearch/src/client/typings/index.ts

@@ -1,9 +1,12 @@
 import { values } from '@vuepress/helper/client'
 import type { SearchOptions } from 'slimsearch'
 
-import type { IndexItem } from '../../shared/index.js'
+import type {
+  IndexItem,
+  QueryResult,
+  SearchResult,
+} from '../../shared/index.js'
 import { options } from '../define.js'
-import type { QueryResult, SearchResult } from '../typings/index.js'
 
 declare const __VUEPRESS_BASE__: string
 declare const __VUEPRESS_DEV__: boolean
@@ -73,8 +76,9 @@ const ERR_MSG = 'Canceled because of new search request.'
 
 export const createSearchWorker = (): SearchWorker => {
   const worker = new Worker(
+    // FIXME: Currently rolldown does not respect `import.meta.url` here. Might need another fix in the future.
     __VUEPRESS_DEV__
-      ? new URL('worker.js', import.meta.url)
+      ? new URL('worker/dev.js', import.meta.url)
       : `${__VUEPRESS_BASE__}${options.worker}`,
     __VUEPRESS_DEV__ ? { type: 'module' } : {},
   )

plugins/search/plugin-slimsearch/src/client/utils/createSearchWorker.ts

@@ -1,6 +1,6 @@
 import { store } from '@temp/slimsearch/store.js'
 
-import type { MatchedItem } from '../typings/index.js'
+import type { MatchedItem } from '../../shared/index.js'
 
 export const getResultPath = (item: MatchedItem): string =>
   store[item.id] + ('anchor' in item ? `#${item.anchor}` : '')

plugins/search/plugin-slimsearch/src/client/utils/getResultPath.ts

@@ -11,7 +11,7 @@ export const CLIENT_FOLDER = ensureEndingSlash(
   path.resolve(__dirname, '../client/'),
 )
 
-export const WORKER_FILE = path.resolve(__dirname, '../worker/index.js')
+export const WORKER_FILE = path.resolve(__dirname, '../worker/build.js')
 
 export const getLocaleChunkName = (locale: string): string =>
   locale.replaceAll('/', '') || 'root'

plugins/search/plugin-slimsearch/src/node/utils.ts

@@ -1,4 +1,7 @@
+export type SlimSearchSortStrategy = 'max' | 'total'
+
 export * from './data.js'
 export type * from './formatter.js'
 export type * from './locales.js'
-export type SlimSearchSortStrategy = 'max' | 'total'
+export type * from './result.js'
+export type * from './worker.js'