+10

pnpm-lock.yaml

Reviewed

··· 2136 2136 specifier: workspace:* 2137 2137 version: link:../../packages/vitest 2138 2138 2139 2139 + test/ws-api: 2140 2140 + devDependencies: 2141 2141 + '@vitejs/plugin-basic-ssl': 2142 2142 + specifier: ^1.0.2 2143 2143 + version: 1.0.2(vite@5.0.12) 2144 2144 + vitest: 2145 2145 + specifier: workspace:* 2146 2146 + version: link:../../packages/vitest 2147 2147 + 2139 2148 packages: 2140 2149 2141 2150 /@aashutoshrathi/word-wrap@1.2.6: ··· 27570 27579 27571 27580 /workbox-google-analytics@7.0.0: 27572 27581 resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==} 27582 27582 + deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained 27573 27583 dependencies: 27574 27584 workbox-background-sync: 7.0.0 27575 27585 workbox-core: 7.0.0

+12

test/ws-api/package.json

Reviewed

··· 1 1 + { 2 2 + "name": "@vitest/test-ws-api", 3 3 + "type": "module", 4 4 + "private": true, 5 5 + "scripts": { 6 6 + "test": "vitest" 7 7 + }, 8 8 + "devDependencies": { 9 9 + "@vitejs/plugin-basic-ssl": "^1.0.2", 10 10 + "vitest": "workspace:*" 11 11 + } 12 12 + }

+7

test/ws-api/vitest.config.ts

Reviewed

··· 1 1 + import { defineConfig } from 'vitest/config' 2 2 + 3 3 + export default defineConfig({ 4 4 + test: { 5 5 + include: ['tests/**/*.test.ts'], 6 6 + }, 7 7 + })

+20

test/ws-api/tests/server-url.test.ts

Reviewed

··· 1 1 + import { join } from 'node:path' 2 2 + import { expect, it } from 'vitest' 3 3 + 4 4 + import { runVitestCli } from '../../test-utils' 5 5 + 6 6 + it('api server-url http', async () => { 7 7 + delete process.env.TEST_HTTPS 8 8 + const { stdout } = await runVitestCli('run', '--root', join(process.cwd(), './fixtures/server-url'), '--api') 9 9 + expect(stdout).toContain('API started at http://localhost:51204/') 10 10 + expect(stdout).toContain('Test Files 1 passed') 11 11 + }) 12 12 + 13 13 + it('api server-url https', async () => { 14 14 + process.env.TEST_HTTPS = '1' 15 15 + const { stdout } = await runVitestCli('run', '--root', join(process.cwd(), './fixtures/server-url'), '--api') 16 16 + expect(stdout).toContain('API started at https://localhost:51204/') 17 17 + expect(stdout).toContain('Test Files 1 passed') 18 18 + }) 19 19 + 20 20 + it.todo('api server-url fallback if resolvedUrls is null')

+9 -3

packages/vitest/src/node/logger.ts

Reviewed

··· 171 171 this.log(c.dim(c.green(` ${output} Browser runner started at ${new URL('/', origin)}`))) 172 172 }) 173 173 174 174 - if (this.ctx.config.ui) 174 174 + if (this.ctx.config.ui) { 175 175 this.log(c.dim(c.green(` UI started at http://${this.ctx.config.api?.host || 'localhost'}:${c.bold(`${this.ctx.server.config.server.port}`)}${this.ctx.config.uiBase}`))) 176 176 - else if (this.ctx.config.api?.port) 177 177 - this.log(c.dim(c.green(` API started at http://${this.ctx.config.api?.host || 'localhost'}:${c.bold(`${this.ctx.config.api.port}`)}`))) 176 176 + } 177 177 + else if (this.ctx.config.api?.port) { 178 178 + const resolvedUrls = this.ctx.server.resolvedUrls 179 179 + // workaround for https://github.com/vitejs/vite/issues/15438, it was fixed in vite 5.1 180 180 + const fallbackUrl = `http://${this.ctx.config.api.host || 'localhost'}:${this.ctx.config.api.port}` 181 181 + const origin = resolvedUrls?.local[0] ?? resolvedUrls?.network[0] ?? fallbackUrl 182 182 + this.log(c.dim(c.green(` API started at ${new URL('/', origin)}`))) 183 183 + } 178 184 179 185 if (this.ctx.coverageProvider) 180 186 this.log(c.dim(' Coverage enabled with ') + c.yellow(this.ctx.coverageProvider.name))

+5

test/ws-api/fixtures/server-url/basic.test.ts

Reviewed

··· 1 1 + import { expect, test } from "vitest"; 2 2 + 3 3 + test("basic", () => { 4 4 + expect(1).toBe(1); 5 5 + })

+11

test/ws-api/fixtures/server-url/vitest.config.ts

Reviewed

··· 1 1 + import { defineConfig } from 'vitest/config' 2 2 + import basicSsl from '@vitejs/plugin-basic-ssl' 3 3 + 4 4 + // test https by 5 5 + // TEST_HTTPS=1 pnpm test --root fixtures/server-url --api 6 6 + 7 7 + export default defineConfig({ 8 8 + plugins: [ 9 9 + !!process.env.TEST_HTTPS && basicSsl(), 10 10 + ], 11 11 + })