diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 13eb33f5..abf6498f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -42,6 +42,7 @@ "lint-staged": "^13.2.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", +<<<<<<< HEAD <<<<<<< HEAD "svelte": "^4.1.2", "svelte-preprocess": "^5.0.4", @@ -49,6 +50,9 @@ "vite": "^4.4.9" ======= "svelte": "^4.1.1", +======= + "svelte": "^4.1.2", +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) "svelte-preprocess": "^5.0.4", "typescript": "^5.1.6", <<<<<<< HEAD @@ -3598,6 +3602,7 @@ } }, "node_modules/svelte": { +<<<<<<< HEAD <<<<<<< HEAD "version": "4.1.2", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", @@ -3607,6 +3612,11 @@ "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.1.tgz", "integrity": "sha512-Enick5fPFISLoVy0MFK45cG+YlQt6upw8skEK9zzTpJnH1DqEv8xOZwizCGSo3Q6HZ7KrZTM0J18poF7aQg5zw==", >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) +======= + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", + "integrity": "sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g==", +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", diff --git a/frontend/package.json b/frontend/package.json index 844cd304..edfc99f6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,6 +35,7 @@ "lint-staged": "^13.2.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", +<<<<<<< HEAD <<<<<<< HEAD "svelte": "^4.1.2", "svelte-preprocess": "^5.0.4", @@ -51,6 +52,9 @@ "sass": "^1.64.2", ======= "svelte": "^4.1.1", +======= + "svelte": "^4.1.2", +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) "svelte-preprocess": "^5.0.4", "typescript": "^5.1.6", "vite": "^4.4.7" diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index c2ef9ec6..25f7a0b0 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -82,6 +82,7 @@ devDependencies: version: 2.0.2(@sveltejs/kit@1.22.3) '@sveltejs/kit': specifier: ^1.22.3 +<<<<<<< HEAD version: 1.22.3(svelte@4.1.1)(vite@4.4.7) >>>>>>> fae38a0 (cleanup) ======= @@ -100,6 +101,9 @@ devDependencies: specifier: ^1.22.3 version: 1.22.3(svelte@4.1.1)(vite@4.4.7) >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) +======= + version: 1.22.3(svelte@4.1.2)(vite@4.4.7) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) '@typescript-eslint/eslint-plugin': specifier: ^5.62.0 version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.46.0)(typescript@5.1.6) @@ -123,6 +127,7 @@ devDependencies: <<<<<<< HEAD specifier: ^2.32.4 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 2.32.4(eslint@8.45.0)(svelte@4.1.2) ======= @@ -138,6 +143,9 @@ devDependencies: ======= version: 2.32.4(eslint@8.46.0)(svelte@4.2.0) >>>>>>> c615d87 (npm-dep: update all) +======= + version: 2.32.4(eslint@8.45.0)(svelte@4.1.2) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) husky: specifier: ^8.0.3 version: 8.0.3 @@ -149,12 +157,13 @@ devDependencies: version: 2.8.8 prettier-plugin-svelte: specifier: ^2.10.1 - version: 2.10.1(prettier@2.8.8)(svelte@4.2.0) + version: 2.10.1(prettier@2.8.8)(svelte@4.1.2) svelte: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifier: ^4.1.2 version: 4.1.2 @@ -197,6 +206,13 @@ devDependencies: specifier: ^5.0.4 version: 5.0.4(postcss@8.4.27)(sass@1.64.1)(svelte@4.1.1)(typescript@5.1.6) >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) +======= + specifier: ^4.1.2 + version: 4.1.2 + svelte-preprocess: + specifier: ^5.0.4 + version: 5.0.4(postcss@8.4.27)(sass@1.64.1)(svelte@4.1.2)(typescript@5.1.6) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) typescript: specifier: ^5.1.6 version: 5.1.6 @@ -801,9 +817,10 @@ packages: peerDependencies: '@sveltejs/kit': ^1.5.0 dependencies: - '@sveltejs/kit': 1.22.3(svelte@4.1.1)(vite@4.4.7) + '@sveltejs/kit': 1.22.3(svelte@4.1.2)(vite@4.4.7) dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /@sveltejs/kit@1.22.4(svelte@4.1.2)(vite@4.4.7): @@ -823,6 +840,9 @@ packages: >>>>>>> 6878878 (reuse device form, simplify realtime updates) ======= /@sveltejs/kit@1.22.3(svelte@4.1.1)(vite@4.4.7): +======= + /@sveltejs/kit@1.22.3(svelte@4.1.2)(vite@4.4.7): +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) resolution: {integrity: sha512-IpHD5wvuoOIHYaHQUBJ1zERD2Iz+fB/rBXhXjl8InKw6X4VKE9BSus+ttHhE7Ke+Ie9ecfilzX8BnWE3FeQyng==} engines: {node: ^16.14 || >=18} >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) @@ -835,6 +855,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.9) ======= @@ -849,6 +870,9 @@ packages: ======= '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.1)(vite@4.4.7) >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) +======= + '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.7) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.3.2 @@ -862,6 +886,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD svelte: 4.1.2 undici: 5.23.0 @@ -885,6 +910,9 @@ packages: >>>>>>> c615d87 (npm-dep: update all) ======= svelte: 4.1.1 +======= + svelte: 4.1.2 +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) undici: 5.22.1 <<<<<<< HEAD vite: 4.4.6(sass@1.64.1) @@ -900,6 +928,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.2)(vite@4.4.9): resolution: {integrity: sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==} @@ -933,6 +962,9 @@ packages: >>>>>>> 6878878 (reuse device form, simplify realtime updates) ======= /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.1)(vite@4.4.7): +======= + /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.2)(vite@4.4.7): +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) resolution: {integrity: sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA==} engines: {node: ^14.18.0 || >= 16} >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) @@ -944,6 +976,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.9) ======= @@ -982,6 +1015,11 @@ packages: vite: 4.4.6(sass@1.64.1) >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) ======= +======= + '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.7) + debug: 4.3.4 + svelte: 4.1.2 +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) vite: 4.4.7(sass@1.64.1) >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) transitivePeerDependencies: @@ -992,6 +1030,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /@sveltejs/vite-plugin-svelte@2.4.2(svelte@4.1.2)(vite@4.4.9): resolution: {integrity: sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==} @@ -1025,6 +1064,9 @@ packages: >>>>>>> 6878878 (reuse device form, simplify realtime updates) ======= /@sveltejs/vite-plugin-svelte@2.4.2(svelte@4.1.1)(vite@4.4.7): +======= + /@sveltejs/vite-plugin-svelte@2.4.2(svelte@4.1.2)(vite@4.4.7): +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) resolution: {integrity: sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==} engines: {node: ^14.18.0 || >= 16} >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) @@ -1035,6 +1077,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.2)(vite@4.4.9) ======= @@ -1043,10 +1086,14 @@ packages: ======= '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.1)(vite@4.4.7) >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) +======= + '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.2)(svelte@4.1.2)(vite@4.4.7) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.1 +<<<<<<< HEAD <<<<<<< HEAD svelte: 4.1.2 svelte-hmr: 0.15.2(svelte@4.1.2) @@ -1092,6 +1139,10 @@ packages: vitefu: 0.2.4(vite@4.4.6) >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) ======= +======= + svelte: 4.1.2 + svelte-hmr: 0.15.2(svelte@4.1.2) +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) vite: 4.4.7(sass@1.64.1) vitefu: 0.2.4(vite@4.4.7) >>>>>>> 1f60714 (npm-dep: bump vite from 4.4.6 to 4.4.7 in /frontend) @@ -1853,6 +1904,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /eslint-plugin-svelte@2.32.4(eslint@8.45.0)(svelte@4.1.2): resolution: {integrity: sha512-VJ12i2Iogug1jvhwxSlognnfGj76P5gks/V4pUD4SCSVQOp14u47MNP0zAG8AQR3LT0Fi1iUvIFnY4l9z5Rwbg==} @@ -1881,6 +1933,11 @@ packages: } engines: { node: ^14.17.0 || >=16.0.0 } >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /eslint-plugin-svelte@2.32.4(eslint@8.45.0)(svelte@4.1.2): + resolution: {integrity: sha512-VJ12i2Iogug1jvhwxSlognnfGj76P5gks/V4pUD4SCSVQOp14u47MNP0zAG8AQR3LT0Fi1iUvIFnY4l9z5Rwbg==} + engines: {node: ^14.17.0 || >=16.0.0} +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) peerDependencies: eslint: ^7.0.0 || ^8.0.0-0 svelte: ^3.37.0 || ^4.0.0 @@ -1899,8 +1956,8 @@ packages: postcss-safe-parser: 6.0.0(postcss@8.4.27) postcss-selector-parser: 6.0.13 semver: 7.5.4 - svelte: 4.2.0 - svelte-eslint-parser: 0.32.2(svelte@4.2.0) + svelte: 4.1.2 + svelte-eslint-parser: 0.32.2(svelte@4.1.2) transitivePeerDependencies: - supports-color - ts-node @@ -2989,6 +3046,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.1.2): <<<<<<< HEAD @@ -3012,12 +3070,16 @@ packages: >>>>>>> e50b84b (npm-dep: update all) ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.1.2): + resolution: {integrity: sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ==} +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) peerDependencies: prettier: ^1.16.4 || ^2.0.0 svelte: ^3.2.0 || ^4.0.0-next.0 dependencies: prettier: 2.8.8 - svelte: 4.2.0 + svelte: 4.1.2 dev: true /prettier@2.8.8: @@ -3343,6 +3405,7 @@ packages: has-flag: 4.0.0 dev: true +<<<<<<< HEAD <<<<<<< HEAD /svelte-eslint-parser@0.32.2(svelte@4.1.2): ======= @@ -3414,6 +3477,11 @@ packages: } engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /svelte-eslint-parser@0.32.2(svelte@4.1.2): + resolution: {integrity: sha512-Ok9D3A4b23iLQsONrjqtXtYDu5ZZ/826Blaw2LeFZVTg1pwofKDG4mz3/GYTax8fQ0plRGHI6j+d9VQYy5Lo/A==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) peerDependencies: svelte: ^3.37.0 || ^4.0.0 peerDependenciesMeta: @@ -3425,7 +3493,7 @@ packages: espree: 9.6.1 postcss: 8.4.27 postcss-scss: 4.0.6(postcss@8.4.27) - svelte: 4.2.0 + svelte: 4.1.2 dev: true /svelte-fa@3.0.4: @@ -3439,6 +3507,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /svelte-french-toast@1.2.0(svelte@4.1.2): ======= @@ -3524,6 +3593,18 @@ packages: >>>>>>> 6878878 (reuse device form, simplify realtime updates) ======= /svelte-preprocess@5.0.4(postcss@8.4.27)(sass@1.64.1)(svelte@4.1.1)(typescript@5.1.6): +======= + /svelte-hmr@0.15.2(svelte@4.1.2): + resolution: {integrity: sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg==} + engines: {node: ^12.20 || ^14.13.1 || >= 16} + peerDependencies: + svelte: ^3.57.0 || ^4.0.0 + dependencies: + svelte: 4.1.2 + dev: true + + /svelte-preprocess@5.0.4(postcss@8.4.27)(sass@1.64.1)(svelte@4.1.2)(typescript@5.1.6): +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) resolution: {integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==} engines: {node: '>= 14.10.0'} >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) @@ -3576,7 +3657,7 @@ packages: >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 4.2.0 + svelte: 4.1.2 typescript: 5.1.6 dev: true @@ -3584,6 +3665,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /svelte-writable-derived@3.1.0(svelte@4.1.2): ======= @@ -3628,6 +3710,11 @@ packages: } engines: { node: '>=16' } >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /svelte@4.1.2: + resolution: {integrity: sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g==} + engines: {node: '>=16'} +>>>>>>> 4695c65 (npm-dep: bump svelte from 4.1.1 to 4.1.2 in /frontend) dependencies: '@ampproject/remapping': 2.2.1 '@jridgewell/sourcemap-codec': 1.4.15