diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e432e40e..0dcfb468 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,6 +8,7 @@ "name": "frontend", "version": "0.0.1", "dependencies": { +<<<<<<< HEAD "@fortawesome/free-solid-svg-icons": "^6.4.2", "@popperjs/core": "^2.11.8", "bootstrap": "5.3.1", @@ -19,6 +20,19 @@ "devDependencies": { "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.22.5", +======= + "@fortawesome/free-solid-svg-icons": "^6.4.0", + "@popperjs/core": "^2.11.8", + "bootstrap": "5.3.0", + "date-fns": "^2.30.0", + "pocketbase": "^0.15.3", + "sass": "^1.64.1", + "svelte-fa": "^3.0.4" + }, + "devDependencies": { + "@sveltejs/adapter-static": "^2.0.2", + "@sveltejs/kit": "^1.22.3", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "eslint": "^8.45.0", @@ -28,10 +42,17 @@ "lint-staged": "^13.2.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", +<<<<<<< HEAD "svelte": "^4.1.2", "svelte-preprocess": "^5.0.4", "typescript": "^5.1.6", "vite": "^4.4.9" +======= + "svelte": "^4.1.1", + "svelte-preprocess": "^5.0.4", + "typescript": "^5.1.6", + "vite": "^4.4.6" +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -476,21 +497,36 @@ } }, "node_modules/@fortawesome/fontawesome-common-types": { +<<<<<<< HEAD "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", +======= + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", + "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "hasInstallScript": true, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-solid-svg-icons": { +<<<<<<< HEAD "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", "hasInstallScript": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" +======= + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", + "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.0" +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) }, "engines": { "node": ">=6" @@ -634,18 +670,30 @@ } }, "node_modules/@sveltejs/adapter-static": { +<<<<<<< HEAD "version": "2.0.3", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz", "integrity": "sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==", +======= + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.2.tgz", + "integrity": "sha512-9wYtf6s6ew7DHUHMrt55YpD1FgV7oWql2IGsW5BXquLxqcY9vjrqCFo0TzzDpo+ZPZkW/v77k0eOP6tsAb8HmQ==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "dev": true, "peerDependencies": { "@sveltejs/kit": "^1.5.0" } }, "node_modules/@sveltejs/kit": { +<<<<<<< HEAD "version": "1.22.5", "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.5.tgz", "integrity": "sha512-LHq+ECucoT6c6/tkrxIQtD8KVNhPFV4QQ+xOKTwBAs/Qdtff8P5gAzsIZiwEaaO6J6sYZoy5RP2VR6m8PSCgLA==", +======= + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.3.tgz", + "integrity": "sha512-IpHD5wvuoOIHYaHQUBJ1zERD2Iz+fB/rBXhXjl8InKw6X4VKE9BSus+ttHhE7Ke+Ie9ecfilzX8BnWE3FeQyng==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "dev": true, "hasInstallScript": true, "dependencies": { @@ -660,7 +708,11 @@ "sade": "^1.8.1", "set-cookie-parser": "^2.6.0", "sirv": "^2.0.2", +<<<<<<< HEAD "undici": "~5.23.0" +======= + "undici": "~5.22.0" +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) }, "bin": { "svelte-kit": "svelte-kit.js" @@ -1100,9 +1152,15 @@ } }, "node_modules/bootstrap": { +<<<<<<< HEAD "version": "5.3.1", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz", "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==", +======= + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz", + "integrity": "sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "funding": [ { "type": "github", @@ -1114,7 +1172,11 @@ } ], "peerDependencies": { +<<<<<<< HEAD "@popperjs/core": "^2.11.8" +======= + "@popperjs/core": "^2.11.7" +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) } }, "node_modules/brace-expansion": { @@ -3160,9 +3222,15 @@ } }, "node_modules/rollup": { +<<<<<<< HEAD "version": "3.27.2", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.27.2.tgz", "integrity": "sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==", +======= + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.26.0.tgz", + "integrity": "sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -3244,9 +3312,15 @@ } }, "node_modules/sass": { +<<<<<<< HEAD "version": "1.64.2", "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.2.tgz", "integrity": "sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==", +======= + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.64.1.tgz", + "integrity": "sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -3504,9 +3578,15 @@ } }, "node_modules/svelte": { +<<<<<<< HEAD "version": "4.1.2", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", "integrity": "sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g==", +======= + "version": "4.1.1", + "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) "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", @@ -3767,9 +3847,15 @@ } }, "node_modules/undici": { +<<<<<<< HEAD "version": "5.23.0", "resolved": "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz", "integrity": "sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==", +======= + "version": "5.22.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz", + "integrity": "sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "dev": true, "dependencies": { "busboy": "^1.6.0" @@ -3794,6 +3880,7 @@ "dev": true }, "node_modules/vite": { +<<<<<<< HEAD "version": "4.4.9", "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", @@ -3802,6 +3889,16 @@ "esbuild": "^0.18.10", "postcss": "^8.4.27", "rollup": "^3.27.1" +======= + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.6.tgz", + "integrity": "sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==", + "dev": true, + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.26", + "rollup": "^3.25.2" +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) }, "bin": { "vite": "bin/vite.js" diff --git a/frontend/package.json b/frontend/package.json index f42f13e1..439b1bf4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,8 @@ { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "name": "frontend", "version": "0.0.1", "private": true, @@ -12,8 +15,13 @@ "format": "prettier --ignore-path ../.gitignore --write --plugin-search-dir=. ." }, "devDependencies": { +<<<<<<< HEAD "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.22.5", +======= + "@sveltejs/adapter-static": "^2.0.2", + "@sveltejs/kit": "^1.22.3", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "eslint": "^8.45.0", @@ -23,6 +31,7 @@ "lint-staged": "^13.2.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", +<<<<<<< HEAD "svelte": "^4.1.2", "svelte-preprocess": "^5.0.4", "typescript": "^5.1.6", @@ -36,12 +45,28 @@ "date-fns": "^2.30.0", "pocketbase": "^0.15.3", "sass": "^1.64.2", +======= + "svelte": "^4.1.1", + "svelte-preprocess": "^5.0.4", + "typescript": "^5.1.6", + "vite": "^4.4.6" + }, + "type": "module", + "dependencies": { + "@fortawesome/free-solid-svg-icons": "^6.4.0", + "@popperjs/core": "^2.11.8", + "bootstrap": "5.3.0", + "date-fns": "^2.30.0", + "pocketbase": "^0.15.3", + "sass": "^1.64.1", +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) "svelte-fa": "^3.0.4" }, "lint-staged": { "*.{js,svelte}": "eslint --fix --ignore-path ../.gitignore .", "*.{js,css,md,svelte,scss}": "prettier --write --ignore-path ../.gitignore --plugin-search-dir=. ." } +<<<<<<< HEAD ======= "name": "upsnap-frontend", "version": "0.0.1", @@ -91,4 +116,6 @@ "theme-change": "^2.5.0" } >>>>>>> 5340d83 (first commit for tailwind rewrite) +======= +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) } diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 1248d53c..d6ee0216 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -23,6 +23,7 @@ dependencies: specifier: ^0.15.3 version: 0.15.3 sass: +<<<<<<< HEAD specifier: ^1.64.2 version: 1.64.2 ======= @@ -39,6 +40,10 @@ dependencies: specifier: ^0.15.3 version: 0.15.3 >>>>>>> 5340d83 (first commit for tailwind rewrite) +======= + specifier: ^1.64.1 + version: 1.64.1 +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) svelte-fa: specifier: ^3.0.4 version: 3.0.4 @@ -139,6 +144,7 @@ devDependencies: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifier: ^4.1.2 version: 4.1.2 @@ -174,12 +180,20 @@ devDependencies: specifier: ^2.6.1 version: 2.6.1 >>>>>>> fae38a0 (cleanup) +======= + specifier: ^4.1.1 + version: 4.1.1 + svelte-preprocess: + 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) typescript: specifier: ^5.1.6 version: 5.1.6 vite: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifier: ^4.4.9 version: 4.4.9(sass@1.64.2) @@ -195,6 +209,10 @@ devDependencies: specifier: ^4.4.9 version: 4.4.9 >>>>>>> c615d87 (npm-dep: update all) +======= + specifier: ^4.4.6 + version: 4.4.6(sass@1.64.1) +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) packages: /@aashutoshrathi/word-wrap@1.2.6: @@ -810,6 +828,7 @@ packages: sirv: 2.0.3 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD svelte: 4.1.2 undici: 5.23.0 @@ -831,6 +850,11 @@ packages: undici: 5.23.0 vite: 4.4.9 >>>>>>> c615d87 (npm-dep: update all) +======= + svelte: 4.1.1 + undici: 5.22.1 + vite: 4.4.6(sass@1.64.1) +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) transitivePeerDependencies: - supports-color dev: true @@ -901,9 +925,14 @@ packages: ======= '@sveltejs/vite-plugin-svelte': 2.4.5(svelte@4.2.0)(vite@4.4.9) debug: 4.3.4 +<<<<<<< HEAD svelte: 4.2.0 vite: 4.4.9 >>>>>>> c615d87 (npm-dep: update all) +======= + svelte: 4.1.1 + vite: 4.4.6(sass@1.64.1) +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) transitivePeerDependencies: - supports-color dev: true @@ -978,6 +1007,7 @@ packages: debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 +<<<<<<< HEAD magic-string: 0.30.2 <<<<<<< HEAD svelte: 4.1.2 @@ -992,6 +1022,13 @@ packages: vite: 4.4.9 vitefu: 0.2.4(vite@4.4.9) >>>>>>> c615d87 (npm-dep: update all) +======= + magic-string: 0.30.1 + svelte: 4.1.1 + svelte-hmr: 0.15.2(svelte@4.1.1) + vite: 4.4.6(sass@1.64.1) + vitefu: 0.2.4(vite@4.4.6) +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) transitivePeerDependencies: - supports-color dev: true @@ -3073,9 +3110,14 @@ packages: rimraf: 2.7.1 dev: true +<<<<<<< HEAD <<<<<<< HEAD /sass@1.64.2: resolution: {integrity: sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==} +======= + /sass@1.64.1: + resolution: {integrity: sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==} +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -3083,8 +3125,11 @@ packages: immutable: 4.3.1 source-map-js: 1.0.2 +<<<<<<< HEAD ======= >>>>>>> 5340d83 (first commit for tailwind rewrite) +======= +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) /semver@7.5.4: resolution: { @@ -3371,6 +3416,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /svelte-preprocess@5.0.4(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2)(typescript@5.1.6): ======= @@ -3402,6 +3448,11 @@ packages: } engines: { node: '>= 14.10.0' } >>>>>>> 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): + 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) requiresBuild: true peerDependencies: '@babel/core': ^7.10.2 @@ -3441,10 +3492,14 @@ packages: detect-indent: 6.1.0 magic-string: 0.27.0 postcss: 8.4.27 +<<<<<<< HEAD <<<<<<< HEAD sass: 1.64.2 ======= >>>>>>> 5340d83 (first commit for tailwind rewrite) +======= + sass: 1.64.1 +>>>>>>> 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 @@ -3723,6 +3778,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /vite@4.4.9(sass@1.64.2): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} @@ -3756,6 +3812,11 @@ packages: >>>>>>> e50b84b (npm-dep: update all) ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /vite@4.4.6(sass@1.64.1): + resolution: {integrity: sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==} + engines: {node: ^14.18.0 || >=16.0.0} +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) hasBin: true peerDependencies: '@types/node': '>= 14' @@ -3785,6 +3846,7 @@ packages: postcss: 8.4.27 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rollup: 3.27.2 sass: 1.64.2 @@ -3797,6 +3859,10 @@ packages: ======= rollup: 3.28.0 >>>>>>> c615d87 (npm-dep: update all) +======= + rollup: 3.26.3 + sass: 1.64.1 +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) optionalDependencies: fsevents: 2.3.2 dev: true @@ -3838,6 +3904,7 @@ packages: dependencies: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 4.4.9(sass@1.64.2) ======= @@ -3849,6 +3916,9 @@ packages: ======= vite: 4.4.9 >>>>>>> c615d87 (npm-dep: update all) +======= + vite: 4.4.6(sass@1.64.1) +>>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) dev: true /which@2.0.2: