Merge branch 'main' into fix-coverage-url-in-html-report-mode2

.vscode/settings.json

@@ -13,8 +13,8 @@
 
   // Auto fix
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
   },
 
   // Silent the stylistic rules in you IDE, but still auto fix them

docs/package.json

@@ -17,8 +17,8 @@
     "vue": "latest"
   },
   "devDependencies": {
-    "@iconify-json/carbon": "^1.1.25",
-    "@iconify-json/logos": "^1.1.40",
+    "@iconify-json/carbon": "^1.1.27",
+    "@iconify-json/logos": "^1.1.41",
     "@unocss/reset": "^0.57.4",
     "@vite-pwa/assets-generator": "^0.0.11",
     "@vite-pwa/vitepress": "^0.2.3",

package.json

@@ -49,7 +49,7 @@
     "@vitest/coverage-istanbul": "workspace:*",
     "@vitest/coverage-v8": "workspace:*",
     "@vitest/ui": "workspace:*",
-    "bumpp": "^9.2.0",
+    "bumpp": "^9.2.1",
     "esbuild": "^0.19.5",
     "eslint": "^8.54.0",
     "fast-glob": "^3.3.2",

packages/ui/client/components/views/ViewConsoleOutput.vue

@@ -3,18 +3,13 @@ import { getNames } from '@vitest/ws-client'
 import { client, currentLogs as logs } from '~/composables/client'
 import { isDark } from '~/composables/dark'
 import { createAnsiToHtmlFilter } from '~/composables/error'
+import { escapeHtml } from "~/utils/escape"
 
 const formattedLogs = computed(() => {
   const data = logs.value
   if (data) {
     const filter = createAnsiToHtmlFilter(isDark.value)
-    return data.map(({ taskId, type, time, content }) => {
-      const trimmed = content.trim()
-      const value = filter.toHtml(trimmed)
-      return value !== trimmed
-        ? { taskId, type, time, html: true, content: value }
-        : { taskId, type, time, html: false, content }
-    })
+    return data.map(({ taskId, type, time, content }) => ({ taskId, type, time, content: filter.toHtml(escapeHtml(content)) }))
   }
 })
 
@@ -26,13 +21,12 @@ function getTaskName(id?: string) {
 
 <template>
   <div v-if="formattedLogs?.length" h-full class="scrolls" flex flex-col data-testid="logs">
-    <div v-for="{ taskId, type, time, html, content } of formattedLogs" :key="taskId" font-mono>
+    <div v-for="{ taskId, type, time, content } of formattedLogs" :key="taskId" font-mono>
       <ViewConsoleOutputEntry
         :task-name="getTaskName(taskId)"
         :type="type"
         :time="time"
         :content="content"
-        :html="html"
       />
     </div>
   </div>

packages/ui/client/components/views/ViewConsoleOutputEntry.cy.tsx

@@ -2,25 +2,8 @@ import Filter from 'ansi-to-html'
 import ViewConsoleOutputEntry from './ViewConsoleOutputEntry.vue'
 
 const htmlSelector = '[data-type=html]'
-const textSelector = '[data-type=text]'
 
 describe('ViewConsoleOutputEntry', () => {
-  it('test plain entry', () => {
-    const content = new Date().toISOString()
-    const container = cy.mount(
-      <ViewConsoleOutputEntry
-        task-name="test/text"
-        type="stderr"
-        time={Date.now()}
-        html={false}
-        content={content}
-      />,
-    ).get(textSelector)
-    container.should('exist')
-    container.invoke('text').then((t) => {
-      expect(t, 'the message has the correct message').equals(content)
-    })
-  })
   it('test html entry', () => {
     const now = new Date().toISOString()
     const content = new Filter().toHtml(`\x1B[33m${now}\x1B[0m`)
@@ -29,7 +12,6 @@ describe('ViewConsoleOutputEntry', () => {
         task-name="test/html"
         type="stderr"
         time={Date.now()}
-        html={true}
         content={content}
       />,
     ).get(htmlSelector)

packages/ui/client/components/views/ViewConsoleOutputEntry.vue

@@ -6,7 +6,6 @@ defineProps<{
   type: UserConsoleLog['type']
   time: UserConsoleLog['time']
   content: UserConsoleLog['content']
-  html: boolean
 }>()
 
 function formatTime(t: number) {
@@ -22,7 +21,6 @@ function formatTime(t: number) {
     >
       {{ formatTime(time) }} | {{ taskName }} | {{ type }}
     </div>
-    <pre v-if="html" data-type="html" v-html="content" />
-    <pre v-else data-type="text" v-text="content" />
+    <pre data-type="html" v-html="content" />
   </div>
 </template>

packages/ui/client/components/views/ViewReport.vue

@@ -5,6 +5,7 @@ import ViewReportError from './ViewReportError.vue'
 import { isDark } from '~/composables/dark'
 import { createAnsiToHtmlFilter } from '~/composables/error'
 import { config } from '~/composables/client'
+import { escapeHtml } from '~/utils/escape'
 
 const props = defineProps<{
   file?: File
@@ -24,15 +25,6 @@ function collectFailed(task: Task, level: number): LeveledTask[] {
     return [{ ...task, level }, ...task.tasks.flatMap(t => collectFailed(t, level + 1))]
 }
 
-function escapeHtml(unsafe: string) {
-  return unsafe
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#039;')
-}
-
 function createHtmlError(filter: Convert, error: ErrorWithDiff) {
   let htmlError = ''
   if (error.message?.includes('\x1B'))

packages/ui/client/utils/escape.ts

@@ -0,0 +1,8 @@
+export function escapeHtml(unsafe: string) {
+  return unsafe
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+}

packages/ui/package.json

@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^8.2.0",
-    "@iconify-json/logos": "^1.1.40",
+    "@iconify-json/logos": "^1.1.41",
     "@testing-library/cypress": "^10.0.1",
     "@types/codemirror": "^5.60.13",
     "@types/d3-force": "^3.0.9",

packages/vitest/src/node/core.ts

@@ -264,8 +264,11 @@ export class Vitest {
       'testTimeout',
       'pool',
       'globals',
-      'mode',
       'expandSnapshotDiff',
+      'retry',
+      'testNamePattern',
+      'passWithNoTests',
+      'bail',
     ] as const
 
     const cliOverrides = overridesOptions.reduce((acc, name) => {

packages/vitest/src/node/workspace.ts

@@ -41,7 +41,7 @@ export async function initializeProject(workspacePath: string | number, ctx: Vit
     logLevel: 'error',
     configFile,
     // this will make "mode": "test" | "benchmark" inside defineConfig
-    mode: options.mode || ctx.config.mode,
+    mode: options.test?.mode || options.mode || ctx.config.mode,
     plugins: [
       ...options.plugins || [],
       WorkspaceVitestPlugin(project, { ...options, root, workspacePath }),
@@ -360,8 +360,7 @@ export class WorkspaceProject {
         this.server.close(),
         this.typechecker?.stop(),
         this.browser?.close(),
-        () => this._provided = ({} as any),
-      ].filter(Boolean))
+      ].filter(Boolean)).then(() => this._provided = {} as any)
     }
     return this.closingPromise
   }

packages/web-worker/package.json

@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/ungap__structured-clone": "^0.3.2",
+    "@types/ungap__structured-clone": "^0.3.3",
     "@ungap/structured-clone": "^1.2.0"
   }
 }