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
1 change: 1 addition & 0 deletions client/env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="vite/client" />
2 changes: 1 addition & 1 deletion client/src/views/TrackMapPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ configStore.loadConfig(props.sid)
const mostRecentYear = years.value[0]
if (mostRecentYear !== undefined) {
loadTracksOfYear(mostRecentYear, true)
reportError("Initial load: most recent year is " + mostRecentYear)
// test line // reportError("Initial load: most recent year is " + mostRecentYear)
} else {
reportError("mostRecentYear is undefined")
}
Expand Down
22 changes: 0 additions & 22 deletions client/tests/unit/__mocks__/ResizeObserver.js

This file was deleted.

9 changes: 9 additions & 0 deletions client/tests/unit/__mocks__/ResizeObserver.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { vi } from 'vitest'

const ResizeObserverMock = vi.fn(class {
observe = vi.fn()
unobserve = vi.fn()
disconnect = vi.fn()
})

export default ResizeObserverMock
7 changes: 2 additions & 5 deletions client/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@
"dist"
],
"compilerOptions": {
"outDir": "dist_random", // satisfy vs code syntax check
"composite": true,
"module": "ESNext",
"target": "es2022",
"lib": ["ES2022", "DOM"],
"baseUrl": ".",
"lib": ["ES2022", "DOM", "DOM.Iterable"],
"paths": {
"@/*": ["./src/*"]
},
"allowJs": true // do we need it?
}
}
}
2 changes: 1 addition & 1 deletion client/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["@tsconfig/node24/tsconfig.json", "@vue/tsconfig/tsconfig.json"],
"extends": "@vue/tsconfig/tsconfig.json",
"include": ["vite.config.*", "vitest.config.*"],
"compilerOptions": {
"composite": true,
Expand Down
5 changes: 3 additions & 2 deletions client/tsconfig.vitest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"compilerOptions": {
"composite": true,
"types": ["node", "jsdom"],
"lib": ["es2022"],
"target": "es2022"
"lib": ["es2022", "DOM", "DOM.Iterable"],
"target": "es2022",
"allowJs": true
}
}
4 changes: 2 additions & 2 deletions client/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ export default defineConfig({
}
},
test: {
setupFiles: ['tests/vitest-setupfiles/setup-jest-dom.js', 'jsdom-worker'],
setupFiles: ['tests/vitest-setupfiles/setup-jest-dom.ts', 'jsdom-worker'],
environment: 'jsdom',
globals: true,
exclude: ['node_modules', 'dist', "dist_random"],
exclude: ['node_modules', 'dist'],
coverage: {
enabled: false,
include: ['src/**/*'],
Expand Down