diff --git a/package-lock.json b/package-lock.json index ad1268327..479d6a664 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "immer": "^9.0.6", "leaflet": "^1.9.4", "leaflet-draw": "^1.0.4", - "leaflet-geosearch": "^3.8.0", + "leaflet-geosearch": "^4.2.0", "leaflet-gesture-handling": "^1.2.2", "microscope-sass": "^2.0.0", "moment": "^2.29.1", @@ -36,7 +36,7 @@ "react-formio": "^4.3.0", "react-intl": "^6.4.4", "react-leaflet": "4.2.1", - "react-leaflet-draw": "^0.20.4", + "react-leaflet-draw": "^0.20.6", "react-modal": "3.16.1", "react-number-format": "5.2.2", "react-router": "^7.1.3", @@ -66,21 +66,24 @@ "@storybook/preview-api": "^8.6.3", "@storybook/react": "^8.6.3", "@storybook/react-vite": "^8.6.3", - "@storybook/test-runner": "^0.20.0", + "@storybook/test-runner": "^0.22.0", "@storybook/types": "^8.6.3", "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", "@testing-library/user-event": "^14.6.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "@types/google.maps": "^3.58.1", "@types/leaflet": "^1.9.16", + "@types/node": "^20.17.22", + "@types/react-dom": "^18.3.5", "@typescript-eslint/parser": "^8.19.0", "@utrecht/component-library-css": "1.0.0-alpha.604", "@utrecht/component-library-react": "1.0.0-alpha.353", "@utrecht/components": "1.0.0-alpha.565", "@utrecht/design-tokens": "1.0.0-alpha.597", "@vitejs/plugin-react": "^4.3.4", - "@vitest/coverage-istanbul": "^3.0.3", + "@vitest/coverage-istanbul": "^3.0.7", "babel-plugin-formatjs": "^10.3.8", "babel-plugin-module-resolver": "^4.1.0", "browserslist": "^4.18.1", @@ -5106,9 +5109,9 @@ } }, "node_modules/@storybook/test-runner": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@storybook/test-runner/-/test-runner-0.20.1.tgz", - "integrity": "sha512-3WU/th/uncIR6vpQDK9hKjiZjmczsluoLbgkRV7ufxY9IgHCGcbIjvT5EPS+XZIaOrNGjaPsyB5cE1okKn9iSA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@storybook/test-runner/-/test-runner-0.22.0.tgz", + "integrity": "sha512-fKY6MTE/bcvMaulKXy+z0fPmRXJx1REkYMOMcGn8zn6uffyBigGgaVf/sZ+AZfibwvjzg/StWhJ9HvAM8pc14g==", "dev": true, "dependencies": { "@babel/core": "^7.22.5", @@ -5138,7 +5141,7 @@ "node": "^16.10.0 || ^18.0.0 || >=20.0.0" }, "peerDependencies": { - "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0" + "storybook": "^0.0.0-0 || ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 || ^9.0.0-0" } }, "node_modules/@storybook/test/node_modules/@testing-library/jest-dom": { @@ -5849,6 +5852,12 @@ "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", "dev": true }, + "node_modules/@types/google.maps": { + "version": "3.58.1", + "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.58.1.tgz", + "integrity": "sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==", + "dev": true + }, "node_modules/@types/graceful-fs": { "version": "4.1.9", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", @@ -5939,10 +5948,13 @@ } }, "node_modules/@types/node": { - "version": "14.18.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", - "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", - "dev": true + "version": "20.17.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.22.tgz", + "integrity": "sha512-9RV2zST+0s3EhfrMZIhrz2bhuhBwxgkbHEwP2gtGWPjBzVQjifMzJ9exw7aDZhR1wbpj8zBrfp3bo8oJcGiUUw==", + "dev": true, + "dependencies": { + "undici-types": "~6.19.2" + } }, "node_modules/@types/parse-json": { "version": "4.0.2", @@ -5964,6 +5976,15 @@ "csstype": "^3.0.2" } }, + "node_modules/@types/react-dom": { + "version": "18.3.5", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz", + "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==", + "dev": true, + "peerDependencies": { + "@types/react": "^18.0.0" + } + }, "node_modules/@types/react-transition-group": { "version": "4.4.10", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", @@ -6316,9 +6337,9 @@ } }, "node_modules/@vitest/coverage-istanbul": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-3.0.3.tgz", - "integrity": "sha512-W3+GsuJ3/HvTdOyqiCHa1pxmmYk/Qn/JMDmX7WKjr1rUGq8e3ySnP5mfjc8ui4Mi8SGROtX7qPVdlg9nZppbKQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-3.0.7.tgz", + "integrity": "sha512-hkd7rlfnqQJFlg6IPv9aFNaxJNkWLasdfaMJR3MBsBkxddSYy5ax9sW6Vv1/3tmmyT9m/b0lHDNknybKJ33cXw==", "dev": true, "dependencies": { "@istanbuljs/schema": "^0.1.3", @@ -6336,7 +6357,7 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "3.0.3" + "vitest": "3.0.7" } }, "node_modules/@vitest/coverage-istanbul/node_modules/brace-expansion": { @@ -7286,6 +7307,12 @@ } } }, + "node_modules/babel-plugin-formatjs/node_modules/@types/node": { + "version": "17.0.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", + "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==", + "dev": true + }, "node_modules/babel-plugin-formatjs/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -14119,9 +14146,9 @@ "license": "MIT" }, "node_modules/leaflet-geosearch": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/leaflet-geosearch/-/leaflet-geosearch-3.11.1.tgz", - "integrity": "sha512-cILLFLmn8C3MtGhaafGqY7CuhUG2+bGyUgfPHgNgW6fs4EvYyiIO88nO2ZqR7Hy6Ba089haLkhODpZR+/fRrPQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/leaflet-geosearch/-/leaflet-geosearch-4.2.0.tgz", + "integrity": "sha512-UWNhFSaUcLlAP5UQY75ziWCl3cp0UCcmcFczPHLHjuAVPOHoPTe0nSgHJuI3pSTJBQm46NYoZOlgonrWceUznQ==", "optionalDependencies": { "@googlemaps/js-api-loader": "^1.16.6", "leaflet": "^1.6.0" @@ -16038,10 +16065,9 @@ } }, "node_modules/react-leaflet-draw": { - "version": "0.20.4", - "resolved": "https://registry.npmjs.org/react-leaflet-draw/-/react-leaflet-draw-0.20.4.tgz", - "integrity": "sha512-u5JHdow2Z9G2AveyUEOTWHXhdhzXdEVQifkNfSaVbEn0gvD+2xW03TQN444zVqovDBvIrBcVWo1VajL4zgl6yg==", - "license": "ISC", + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/react-leaflet-draw/-/react-leaflet-draw-0.20.6.tgz", + "integrity": "sha512-mGypDjJNrrnVpfKfGYovNBuJZXSk39ClOdUJe/5dB5Cj3f2BGQlY9txyV4UmUxZCbc96aq+FMwrGZeM4BokhHQ==", "dependencies": { "fast-deep-equal": "^3.1.3", "lodash-es": "^4.17.15" diff --git a/package.json b/package.json index b318f9e28..9694bc6de 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "immer": "^9.0.6", "leaflet": "^1.9.4", "leaflet-draw": "^1.0.4", - "leaflet-geosearch": "^3.8.0", + "leaflet-geosearch": "^4.2.0", "leaflet-gesture-handling": "^1.2.2", "microscope-sass": "^2.0.0", "moment": "^2.29.1", @@ -51,7 +51,7 @@ "react-formio": "^4.3.0", "react-intl": "^6.4.4", "react-leaflet": "4.2.1", - "react-leaflet-draw": "^0.20.4", + "react-leaflet-draw": "^0.20.6", "react-modal": "3.16.1", "react-number-format": "5.2.2", "react-router": "^7.1.3", @@ -115,21 +115,24 @@ "@storybook/preview-api": "^8.6.3", "@storybook/react": "^8.6.3", "@storybook/react-vite": "^8.6.3", - "@storybook/test-runner": "^0.20.0", + "@storybook/test-runner": "^0.22.0", "@storybook/types": "^8.6.3", "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", "@testing-library/user-event": "^14.6.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "@types/google.maps": "^3.58.1", "@types/leaflet": "^1.9.16", + "@types/node": "^20.17.22", + "@types/react-dom": "^18.3.5", "@typescript-eslint/parser": "^8.19.0", "@utrecht/component-library-css": "1.0.0-alpha.604", "@utrecht/component-library-react": "1.0.0-alpha.353", "@utrecht/components": "1.0.0-alpha.565", "@utrecht/design-tokens": "1.0.0-alpha.597", "@vitejs/plugin-react": "^4.3.4", - "@vitest/coverage-istanbul": "^3.0.3", + "@vitest/coverage-istanbul": "^3.0.7", "babel-plugin-formatjs": "^10.3.8", "babel-plugin-module-resolver": "^4.1.0", "browserslist": "^4.18.1", diff --git a/src/vitest.setup.mjs b/src/vitest.setup.mts similarity index 100% rename from src/vitest.setup.mjs rename to src/vitest.setup.mts diff --git a/tsconfig.json b/tsconfig.json index 0bf1456ea..b77d4a754 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ "target": "ES2021", "jsx": "react-jsx", "declaration": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "noUnusedLocals": true, "noUnusedParameters": true, "esModuleInterop": true, @@ -21,7 +21,10 @@ "paths": { "@/*": ["./*"], "@/sb-decorators": ["../.storybook/decorators.tsx"] - } + }, + "types": [ + "vitest/globals" + ] }, "include": ["src"], "exclude": ["node_modules", "dist"] diff --git a/vite.config.mts b/vite.config.mts index 3d68c79eb..dd6aa8d99 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -233,7 +233,7 @@ export default defineConfig(({mode}) => { fakeTimers: { toFake: ['setTimeout', 'clearTimeout', 'Date'], }, - setupFiles: ['./src/vitest.setup.mjs'], + setupFiles: ['./src/vitest.setup.mts'], coverage: { provider: 'istanbul', include: ['src/**/*.{js,jsx,ts,tsx}'],