diff --git a/_regroup_monorepo/apps/client/package.json b/_regroup_monorepo/apps/client/package.json index 6c1adaf4e..2e28aed11 100644 --- a/_regroup_monorepo/apps/client/package.json +++ b/_regroup_monorepo/apps/client/package.json @@ -36,7 +36,6 @@ "debounce": "2.2.0", "vitest": "3.1.1", "css-loader": "7.1.2", - "postcss-loader": "8.1.1", - "happy-dom": "17.4.4" + "postcss-loader": "8.1.1" } } diff --git a/_regroup_monorepo/apps/client/vitest.config.ts b/_regroup_monorepo/apps/client/vitest.config.ts index 38d87e41e..681910bf3 100644 --- a/_regroup_monorepo/apps/client/vitest.config.ts +++ b/_regroup_monorepo/apps/client/vitest.config.ts @@ -7,8 +7,7 @@ export default defineConfig({ ...configDefaults.exclude, "build/**", ], - setupFiles: ["./spec/setup.ts"], - environment: "happy-dom", + coverage: { reporter: [ "text", "html" ], } diff --git a/apps/client/package.json b/apps/client/package.json index abaf04eec..384b8c5f5 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "private": true, "dependencies": { + "@eslint/js": "9.25.0", "@excalidraw/excalidraw": "0.18.0", "@fullcalendar/core": "6.1.17", "@fullcalendar/daygrid": "6.1.17", @@ -12,44 +13,44 @@ "@fullcalendar/timegrid": "6.1.17", "@mermaid-js/layout-elk": "0.1.7", "@mind-elixir/node-menu": "1.0.5", - "i18next-http-backend": "3.0.2", - "jquery-hotkeys": "0.2.2", - "jquery.fancytree": "2.38.5", - "jquery": "3.7.1", - "jsplumb": "2.15.6", - "knockout": "3.5.1", - "leaflet-gpx": "2.1.2", - "leaflet": "1.9.4", - "mark.js": "8.11.1", - "i18next": "25.0.0", - "mermaid": "11.6.0", - "mind-elixir": "4.5.1", - "panzoom": "9.4.3", - "react-dom": "18.3.1", - "react": "18.3.1", - "split.js": "1.6.5", - "svg-pan-zoom": "3.6.2", - "vanilla-js-wheel-zoom": "9.0.4", - "draggabilly": "3.0.0", - "force-graph": "1.49.5", "@popperjs/core": "2.11.8", - "eslint-linter-browserify": "9.25.0", - "@eslint/js": "9.25.0", + "@triliumnext/commons": "workspace:*", "bootstrap": "5.3.5", "dayjs": "1.11.13", "dayjs-plugin-utc": "0.1.2", "debounce": "2.2.0", - "marked": "15.0.8", + "draggabilly": "3.0.0", + "eslint-linter-browserify": "9.25.0", + "force-graph": "1.49.5", "globals": "16.0.0", - "@triliumnext/commons": "workspace:*" + "i18next": "25.0.0", + "i18next-http-backend": "3.0.2", + "jquery": "3.7.1", + "jquery-hotkeys": "0.2.2", + "jquery.fancytree": "2.38.5", + "jsplumb": "2.15.6", + "knockout": "3.5.1", + "leaflet": "1.9.4", + "leaflet-gpx": "2.1.2", + "mark.js": "8.11.1", + "marked": "15.0.8", + "mermaid": "11.6.0", + "mind-elixir": "4.5.1", + "panzoom": "9.4.3", + "react": "18.3.1", + "react-dom": "18.3.1", + "split.js": "1.6.5", + "svg-pan-zoom": "3.6.2", + "vanilla-js-wheel-zoom": "9.0.4" }, "devDependencies": { - "script-loader": "0.7.2", - "@types/jquery": "3.5.32", - "@types/leaflet-gpx": "1.3.7", - "@types/leaflet": "1.9.17", "@types/bootstrap": "5.2.10", + "@types/jquery": "3.5.32", + "@types/leaflet": "1.9.17", + "@types/leaflet-gpx": "1.3.7", "@types/react": "18.3.20", - "@types/react-dom": "18.3.6" + "@types/react-dom": "18.3.6", + "happy-dom": "17.4.4", + "script-loader": "0.7.2" } } diff --git a/_regroup_monorepo/apps/client/spec/setup.ts b/apps/client/src/test/setup.ts similarity index 100% rename from _regroup_monorepo/apps/client/spec/setup.ts rename to apps/client/src/test/setup.ts diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index 26be2b87e..de26df7e9 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -2,22 +2,19 @@ import { defineConfig } from 'vite'; export default defineConfig(() => ({ - root: __dirname, - cacheDir: '../../node_modules/.vite/apps/client', - plugins: [], - // Uncomment this if you are using workers. - // worker: { - // plugins: [ nxViteTsPaths() ], - // }, - test: { - 'watch': false, - 'globals': true, - 'environment': "jsdom", - 'include': ["src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], - 'reporters': ["default"], - 'coverage': { - 'reportsDirectory': './test-output/vitest/coverage', - 'provider': 'v8' as const, -} - }, + root: __dirname, + cacheDir: '../../node_modules/.vite/apps/client', + plugins: [], + test: { + watch: false, + globals: true, + setupFiles: ["./src/test/setup.ts"], + environment: "happy-dom", + include: ["src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], + reporters: ["default"], + coverage: { + reportsDirectory: './test-output/vitest/coverage', + provider: 'v8' as const, + } + }, })); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd7a80b1e..5d77145f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,7 +134,7 @@ importers: version: 6.3.2(@types/node@18.16.9)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) vitest: specifier: ^3.0.0 - version: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) + version: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0) @@ -277,6 +277,9 @@ importers: '@types/react-dom': specifier: 18.3.6 version: 18.3.6(@types/react@18.3.20) + happy-dom: + specifier: 17.4.4 + version: 17.4.4 script-loader: specifier: 0.7.2 version: 0.7.2 @@ -345,7 +348,7 @@ importers: version: 1.0.2 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) + version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) electron: specifier: 35.1.5 version: 35.1.5 @@ -525,7 +528,7 @@ importers: version: 1.4.7 copy-webpack-plugin: specifier: 13.0.0 - version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) + version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) csrf-csrf: specifier: 3.1.0 version: 3.1.0 @@ -696,7 +699,7 @@ importers: version: 1.0.1 webpack: specifier: 5.99.6 - version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) + version: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) ws: specifier: 8.18.1 version: 8.18.1(bufferutil@4.0.9)(utf-8-validate@6.0.5) @@ -6128,6 +6131,10 @@ packages: handle-thing@2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} + happy-dom@17.4.4: + resolution: {integrity: sha512-/Pb0ctk3HTZ5xEL3BZ0hK1AqDSAUuRQitOmROPHhfUYEWpmTImwfD8vFDGADmMAX0JYgbcgxWoLFKtsWhcpuVA==} + engines: {node: '>=18.0.0'} + harmony-reflect@1.6.2: resolution: {integrity: sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==} @@ -12550,7 +12557,7 @@ snapshots: semver: 7.7.1 tsconfig-paths: 4.2.0 vite: 6.3.2(@types/node@18.16.9)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) - vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) + vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) transitivePeerDependencies: - '@babel/traverse' - '@swc-node/register' @@ -14162,7 +14169,7 @@ snapshots: std-env: 3.9.0 test-exclude: 7.0.1 tinyrainbow: 2.0.0 - vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) + vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) transitivePeerDependencies: - supports-color @@ -14209,7 +14216,7 @@ snapshots: sirv: 3.0.1 tinyglobby: 0.2.13 tinyrainbow: 2.0.0 - vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) + vitest: 3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1) '@vitest/utils@3.1.2': dependencies: @@ -15263,14 +15270,14 @@ snapshots: serialize-javascript: 6.0.2 webpack: 5.98.0(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) - copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): + copy-webpack-plugin@13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): dependencies: glob-parent: 6.0.2 normalize-path: 3.0.0 schema-utils: 4.3.2 serialize-javascript: 6.0.2 tinyglobby: 0.2.13 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) core-js-compat@3.41.0: dependencies: @@ -16955,6 +16962,11 @@ snapshots: handle-thing@2.0.1: {} + happy-dom@17.4.4: + dependencies: + webidl-conversions: 7.0.0 + whatwg-mimetype: 3.0.0 + harmony-reflect@1.6.2: {} has-flag@4.0.0: {} @@ -20518,14 +20530,14 @@ snapshots: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 - terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)): + terser-webpack-plugin@5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4) + webpack: 5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)) optionalDependencies: '@swc/core': 1.5.29(@swc/helpers@0.5.17) esbuild: 0.19.12 @@ -20979,7 +20991,7 @@ snapshots: terser: 5.39.0 yaml: 2.7.1 - vitest@3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1): + vitest@3.1.2(@types/debug@4.1.12)(@types/node@18.16.9)(@vitest/ui@3.1.2)(happy-dom@17.4.4)(jiti@2.4.2)(jsdom@22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5))(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1): dependencies: '@vitest/expect': 3.1.2 '@vitest/mocker': 3.1.2(vite@6.3.2(@types/node@18.16.9)(jiti@2.4.2)(less@4.1.3)(sass-embedded@1.87.0)(sass@1.87.0)(stylus@0.64.0)(terser@5.39.0)(yaml@2.7.1)) @@ -21006,6 +21018,7 @@ snapshots: '@types/debug': 4.1.12 '@types/node': 18.16.9 '@vitest/ui': 3.1.2(vitest@3.1.2) + happy-dom: 17.4.4 jsdom: 22.1.0(bufferutil@4.0.9)(utf-8-validate@6.0.5) transitivePeerDependencies: - jiti @@ -21191,7 +21204,7 @@ snapshots: - esbuild - uglify-js - webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4): + webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0)): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -21213,7 +21226,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4)) + terser-webpack-plugin: 5.3.14(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4(webpack-dev-server@5.2.1)(webpack@5.98.0))) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: