Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,12 @@
"@opentelemetry/auto-instrumentations-node@^0.62.0": "^0.75.0",
"@opentelemetry/sdk-node@^0.203.0": "^0.217.0",
"turbo-stream": "^3.0.0",
"@remix-run/server-runtime": "^2.17.5"
"@remix-run/server-runtime": "^2.17.5",
"vitest": "^4.1.0",
"vitest@^1": "^4.1.0",
"vitest@^1.4.0": "^4.1.0",
"vitest@^4": "^4.1.0",
"vitest@^4.1.0": "^4.1.0"
},
"dependenciesMeta": {
"puppeteer@9.1.1": {
Expand Down
17 changes: 9 additions & 8 deletions sdk/highlight-run/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"url": "https://github.com/launchdarkly/observability-sdk.git"
},
"scripts": {
"build": "yarn build:umd && vite build",
"build:umd": "FORMAT=umd vite build",
"build:watch": "vite build --watch",
"build": "yarn build:umd && node ./node_modules/vite5/bin/vite.js build",
"build:umd": "FORMAT=umd node ./node_modules/vite5/bin/vite.js build",
"build:watch": "node ./node_modules/vite5/bin/vite.js build --watch",
"codegen": "graphql-codegen --config codegen.yml",
"dev": "run-p dev:server dev:watch",
"dev:server": "vite dev",
"dev:watch": "yarn build:watch",
"enforce-size": "size-limit",
"test": "vitest --run",
"test:watch": "vitest",
"typegen": "yarn typegen:check && FORMAT=d.ts vite build",
"typegen": "yarn typegen:check && FORMAT=d.ts node ./node_modules/vite5/bin/vite.js build",
"typegen:check": "tsc --noEmit",
"docs": "typedoc"
},
Expand Down Expand Up @@ -114,8 +114,8 @@
"@types/js-cookie": "^3.0.6",
"@types/json-stringify-safe": "^5.0.3",
"@types/node": "^16.3.1",
"@vitest/coverage-v8": "^1.6.1",
"@vitest/web-worker": "^1.6.1",
"@vitest/coverage-v8": "^4.1.0",
"@vitest/web-worker": "^4.1.0",
"error-stack-parser": "2.0.6",
"fflate": "^0.8.1",
"graphql": "^16.8.1",
Expand All @@ -131,9 +131,10 @@
"tslib": "^2.6.2",
"typedoc": "^0.28.4",
"typescript": "^5.0.4",
"vite": "^5.4.21",
"vite": "^6.4.3",
"vite-plugin-dts": "^4.5.3",
"vitest": "^1.6.1",
"vite5": "npm:vite@^5.4.21",
"vitest": "^4.1.0",
"vitest-canvas-mock": "^0.3.3",
"web-vitals": "^3.5.0",
"zone.js": "^0.15.0"
Expand Down
1 change: 1 addition & 0 deletions sdk/highlight-run/src/__tests__/setup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { vi } from 'vitest'
import '@vitest/web-worker'
import 'vitest-canvas-mock'

vi.mock('import.meta.env.REACT_APP_PUBLIC_GRAPH_URI', () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,20 +300,24 @@ describe('highlight-client-worker', () => {
// Initialize
worker.postMessage(createInitializeMessage())

// Wait for after-reset message to be processed
await vi.waitFor(() => {
const afterResetEvent = getCustomEventResponses(responses).find(
(e) => e.payload?.includes('after-reset'),
)
expect(afterResetEvent).toBeDefined()
})
// Wait for after-reset message to be processed (use longer timeout
// because worker module loading may be slower after repeated resets)
await vi.waitFor(
() => {
const afterResetEvent = getCustomEventResponses(
responses,
).find((e) => e.payload?.includes('after-reset'))
expect(afterResetEvent).toBeDefined()
},
{ timeout: 10000 },
)

// Verify before-reset message was NOT processed
const beforeResetEvent = getCustomEventResponses(responses).find(
(e) => e.payload?.includes('before-reset'),
)
expect(beforeResetEvent).toBeUndefined()
})
}, 15000)

it('queues messages sent after Reset but before new Initialize', async () => {
const responses = createResponseCollector(worker)
Expand Down
3 changes: 0 additions & 3 deletions sdk/highlight-run/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,4 @@ export default defineConfig({
cache: false,
},
},
test: {
environment: 'jsdom',
},
})
11 changes: 11 additions & 0 deletions sdk/highlight-run/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { defineConfig } from 'vitest/config'

export default defineConfig({
test: {
globals: true,
environment: 'jsdom',
include: ['src/**/*.test.{ts,tsx}'],
setupFiles: ['src/__tests__/setup.ts'],
retry: 2,
},
})
Loading
Loading