diff --git a/client/env.d.ts b/client/env.d.ts new file mode 100644 index 00000000..151aa685 --- /dev/null +++ b/client/env.d.ts @@ -0,0 +1 @@ +/// \ No newline at end of file diff --git a/client/src/views/TrackMapPage.vue b/client/src/views/TrackMapPage.vue index 5253cfa6..0bbb6c92 100644 --- a/client/src/views/TrackMapPage.vue +++ b/client/src/views/TrackMapPage.vue @@ -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") } diff --git a/client/tests/unit/__mocks__/ResizeObserver.js b/client/tests/unit/__mocks__/ResizeObserver.js deleted file mode 100644 index 85d97c36..00000000 --- a/client/tests/unit/__mocks__/ResizeObserver.js +++ /dev/null @@ -1,22 +0,0 @@ -import { vi } from 'vitest' - -const ResizeObserverMock = vi.fn(class { - observe = vi.fn() - unobserve = vi.fn() - disconnect = vi.fn() -}) - -// class ResizeObserverMock { -// observe () {} - -// unobserve () { -// // do nothing -// } - -// disconnect () { -// // do nothing -// } -// } - -// window.ResizeObserver = ResizeObserver -export default ResizeObserverMock diff --git a/client/tests/unit/__mocks__/ResizeObserver.ts b/client/tests/unit/__mocks__/ResizeObserver.ts new file mode 100644 index 00000000..3ad95fba --- /dev/null +++ b/client/tests/unit/__mocks__/ResizeObserver.ts @@ -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 diff --git a/client/tests/vitest-setupfiles/setup-jest-dom.js b/client/tests/vitest-setupfiles/setup-jest-dom.ts similarity index 100% rename from client/tests/vitest-setupfiles/setup-jest-dom.js rename to client/tests/vitest-setupfiles/setup-jest-dom.ts diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json index 5d121421..f2eac468 100644 --- a/client/tsconfig.app.json +++ b/client/tsconfig.app.json @@ -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? + } } } diff --git a/client/tsconfig.node.json b/client/tsconfig.node.json index 878fa42d..e6bbc38c 100644 --- a/client/tsconfig.node.json +++ b/client/tsconfig.node.json @@ -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, diff --git a/client/tsconfig.vitest.json b/client/tsconfig.vitest.json index 7d281106..095224a7 100644 --- a/client/tsconfig.vitest.json +++ b/client/tsconfig.vitest.json @@ -4,7 +4,8 @@ "compilerOptions": { "composite": true, "types": ["node", "jsdom"], - "lib": ["es2022"], - "target": "es2022" + "lib": ["es2022", "DOM", "DOM.Iterable"], + "target": "es2022", + "allowJs": true } } diff --git a/client/vite.config.ts b/client/vite.config.ts index 2ed7f0a0..1b4186d1 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -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/**/*'],