diff --git a/package.json b/package.json index 9162062416db..0ec36e9c46a2 100644 --- a/package.json +++ b/package.json @@ -66,5 +66,23 @@ "overrides": { "vite": "^2.8.6" } + }, + "vite": { + "optimizeDeps": { + "include": [ + "@vueuse/core", + "birpc", + "codemirror", + "codemirror/addon/display/placeholder", + "codemirror/mode/javascript/javascript", + "codemirror/mode/jsx/jsx", + "codemirror/mode/xml/xml", + "d3-graph-controller", + "flatted", + "floating-vue", + "splitpanes", + "vue-router" + ] + } } } diff --git a/packages/ui/client/auto-imports.d.ts b/packages/ui/client/auto-imports.d.ts index 674b46219e36..981df43bc9af 100644 --- a/packages/ui/client/auto-imports.d.ts +++ b/packages/ui/client/auto-imports.d.ts @@ -39,7 +39,6 @@ declare global { const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable'] const markRaw: typeof import('vue')['markRaw'] const nextTick: typeof import('vue')['nextTick'] - const note: typeof import('@vueuse/core')['note'] const onActivated: typeof import('vue')['onActivated'] const onBeforeMount: typeof import('vue')['onBeforeMount'] const onBeforeUnmount: typeof import('vue')['onBeforeUnmount'] diff --git a/packages/ui/client/components/TaskTree.vue b/packages/ui/client/components/TaskTree.vue index f3600db14f80..f2af0de80965 100644 --- a/packages/ui/client/components/TaskTree.vue +++ b/packages/ui/client/components/TaskTree.vue @@ -1,5 +1,6 @@ + + search.value.trim() !== '') +const matchTasks = (tasks: Task[], search: string): boolean => { + let result = false + + for (let i = 0; i < tasks.length; i++) { + const task = tasks[i] + + if (caseInsensitiveMatch(task.name, search)) { + result = true + break + } + + // walk whole task tree + if (isSuite(task) && task.tasks) { + result = matchTasks(task.tasks, search) + if (result) + break + } + } + + return result +} + const filtered = computed(() => { if (!search.value.trim()) return props.tasks - return props.tasks.filter(task => task.name.includes(search.value)) + + return props.tasks.filter(task => matchTasks([task], search.value)) }) const filteredTests: ComputedRef = computed(() => isFiltered.value ? filtered.value.map(task => findById(task.id)!).filter(Boolean) : []) diff --git a/packages/ui/client/components/views/ViewReport.vue b/packages/ui/client/components/views/ViewReport.vue index f4d2faf21804..ece2d245013e 100644 --- a/packages/ui/client/components/views/ViewReport.vue +++ b/packages/ui/client/components/views/ViewReport.vue @@ -40,7 +40,7 @@ function relative(p: string) { - {{ relative(efile) }}:{{ line }}:{{ column }}
- {{ relative(efile) }}:{{ line }}:{{ column }}