diff --git a/frontend/package.json b/frontend/package.json index 8cd289f9..f42f13e1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -58,24 +58,24 @@ }, "devDependencies": { "@sveltejs/adapter-static": "^2.0.3", - "@sveltejs/kit": "^1.22.4", + "@sveltejs/kit": "^1.22.5", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "autoprefixer": "^10.4.14", - "daisyui": "^3.5.0", + "daisyui": "^3.5.1", "eslint": "^8.46.0", - "eslint-config-prettier": "^8.9.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-svelte": "^2.32.4", "husky": "^8.0.3", "postcss": "^8.4.27", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.1", - "svelte": "^4.1.2", - "svelte-check": "^3.4.6", + "svelte": "^4.2.0", + "svelte-check": "^3.5.0", "tailwindcss": "^3.3.3", "tslib": "^2.6.1", "typescript": "^5.1.6", - "vite": "^4.4.7" + "vite": "^4.4.9" }, "type": "module", "lint-staged": { @@ -83,7 +83,7 @@ "*.{js,css,md,svelte,scss}": "prettier --write --cache --cache-strategy content --ignore-path ../.gitignore --plugin-search-dir=. ." }, "dependencies": { - "@fortawesome/free-solid-svg-icons": "^6.4.0", + "@fortawesome/free-solid-svg-icons": "^6.4.2", "date-fns": "^2.30.0", "pocketbase": "^0.15.3", "svelte-fa": "^3.0.4", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index ee597eb8..1248d53c 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -6,6 +6,7 @@ settings: dependencies: '@fortawesome/free-solid-svg-icons': +<<<<<<< HEAD <<<<<<< HEAD specifier: ^6.4.2 version: 6.4.2 @@ -27,6 +28,10 @@ dependencies: ======= specifier: ^6.4.0 version: 6.4.0 +======= + specifier: ^6.4.2 + version: 6.4.2 +>>>>>>> c615d87 (npm-dep: update all) date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -39,7 +44,7 @@ dependencies: version: 3.0.4 svelte-french-toast: specifier: ^1.2.0 - version: 1.2.0(svelte@4.1.2) + version: 1.2.0(svelte@4.2.0) theme-change: specifier: ^2.5.0 version: 2.5.0 @@ -70,11 +75,16 @@ devDependencies: >>>>>>> fae38a0 (cleanup) ======= specifier: ^2.0.3 - version: 2.0.3(@sveltejs/kit@1.22.4) + version: 2.0.3(@sveltejs/kit@1.22.5) '@sveltejs/kit': +<<<<<<< HEAD specifier: ^1.22.4 version: 1.22.4(svelte@4.1.2)(vite@4.4.7) >>>>>>> e50b84b (npm-dep: update all) +======= + specifier: ^1.22.5 + version: 1.22.5(svelte@4.2.0)(vite@4.4.9) +>>>>>>> c615d87 (npm-dep: update all) '@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) @@ -85,18 +95,19 @@ devDependencies: specifier: ^10.4.14 version: 10.4.14(postcss@8.4.27) daisyui: - specifier: ^3.5.0 - version: 3.5.0 + specifier: ^3.5.1 + version: 3.5.1 eslint: specifier: ^8.46.0 version: 8.46.0 eslint-config-prettier: - specifier: ^8.9.0 - version: 8.9.0(eslint@8.46.0) + specifier: ^8.10.0 + version: 8.10.0(eslint@8.46.0) eslint-plugin-svelte: <<<<<<< HEAD <<<<<<< HEAD specifier: ^2.32.4 +<<<<<<< HEAD <<<<<<< HEAD version: 2.32.4(eslint@8.45.0)(svelte@4.1.2) ======= @@ -109,6 +120,9 @@ devDependencies: ======= version: 2.32.4(eslint@8.46.0)(svelte@4.1.2) >>>>>>> e50b84b (npm-dep: update all) +======= + version: 2.32.4(eslint@8.46.0)(svelte@4.2.0) +>>>>>>> c615d87 (npm-dep: update all) husky: specifier: ^8.0.3 version: 8.0.3 @@ -120,10 +134,11 @@ devDependencies: version: 2.8.8 prettier-plugin-svelte: specifier: ^2.10.1 - version: 2.10.1(prettier@2.8.8)(svelte@4.1.2) + version: 2.10.1(prettier@2.8.8)(svelte@4.2.0) svelte: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifier: ^4.1.2 version: 4.1.2 @@ -140,9 +155,13 @@ devDependencies: specifier: ^4.1.2 version: 4.1.2 >>>>>>> e50b84b (npm-dep: update all) +======= + specifier: ^4.2.0 + version: 4.2.0 +>>>>>>> c615d87 (npm-dep: update all) svelte-check: - specifier: ^3.4.6 - version: 3.4.6(postcss@8.4.27)(svelte@4.1.2) + specifier: ^3.5.0 + version: 3.5.0(postcss@8.4.27)(svelte@4.2.0) tailwindcss: specifier: ^3.3.3 version: 3.3.3 @@ -160,6 +179,7 @@ devDependencies: version: 5.1.6 vite: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD specifier: ^4.4.9 version: 4.4.9(sass@1.64.2) @@ -171,6 +191,10 @@ devDependencies: specifier: ^4.4.7 version: 4.4.7 >>>>>>> fae38a0 (cleanup) +======= + specifier: ^4.4.9 + version: 4.4.9 +>>>>>>> c615d87 (npm-dep: update all) packages: /@aashutoshrathi/word-wrap@1.2.6: @@ -197,22 +221,22 @@ packages: engines: { node: '>=6.0.0' } dependencies: '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 - /@babel/runtime@7.22.6: + /@babel/runtime@7.22.10: resolution: { - integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ== + integrity: sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ== } engines: { node: '>=6.9.0' } dependencies: - regenerator-runtime: 0.13.11 + regenerator-runtime: 0.14.0 dev: false - /@esbuild/android-arm64@0.18.17: + /@esbuild/android-arm64@0.18.20: resolution: { - integrity: sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg== + integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== } engines: { node: '>=12' } cpu: [arm64] @@ -221,10 +245,10 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.18.17: + /@esbuild/android-arm@0.18.20: resolution: { - integrity: sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg== + integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== } engines: { node: '>=12' } cpu: [arm] @@ -233,10 +257,10 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.18.17: + /@esbuild/android-x64@0.18.20: resolution: { - integrity: sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw== + integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== } engines: { node: '>=12' } cpu: [x64] @@ -245,10 +269,10 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.18.17: + /@esbuild/darwin-arm64@0.18.20: resolution: { - integrity: sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g== + integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== } engines: { node: '>=12' } cpu: [arm64] @@ -257,10 +281,10 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.18.17: + /@esbuild/darwin-x64@0.18.20: resolution: { - integrity: sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g== + integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== } engines: { node: '>=12' } cpu: [x64] @@ -269,10 +293,10 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.18.17: + /@esbuild/freebsd-arm64@0.18.20: resolution: { - integrity: sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ== + integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== } engines: { node: '>=12' } cpu: [arm64] @@ -281,10 +305,10 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.18.17: + /@esbuild/freebsd-x64@0.18.20: resolution: { - integrity: sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA== + integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== } engines: { node: '>=12' } cpu: [x64] @@ -293,10 +317,10 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.18.17: + /@esbuild/linux-arm64@0.18.20: resolution: { - integrity: sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ== + integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== } engines: { node: '>=12' } cpu: [arm64] @@ -305,10 +329,10 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.18.17: + /@esbuild/linux-arm@0.18.20: resolution: { - integrity: sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg== + integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== } engines: { node: '>=12' } cpu: [arm] @@ -317,10 +341,10 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.18.17: + /@esbuild/linux-ia32@0.18.20: resolution: { - integrity: sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg== + integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== } engines: { node: '>=12' } cpu: [ia32] @@ -329,10 +353,10 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.18.17: + /@esbuild/linux-loong64@0.18.20: resolution: { - integrity: sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg== + integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== } engines: { node: '>=12' } cpu: [loong64] @@ -341,10 +365,10 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.18.17: + /@esbuild/linux-mips64el@0.18.20: resolution: { - integrity: sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ== + integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== } engines: { node: '>=12' } cpu: [mips64el] @@ -353,10 +377,10 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.18.17: + /@esbuild/linux-ppc64@0.18.20: resolution: { - integrity: sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ== + integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== } engines: { node: '>=12' } cpu: [ppc64] @@ -365,10 +389,10 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.18.17: + /@esbuild/linux-riscv64@0.18.20: resolution: { - integrity: sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g== + integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== } engines: { node: '>=12' } cpu: [riscv64] @@ -377,10 +401,10 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.18.17: + /@esbuild/linux-s390x@0.18.20: resolution: { - integrity: sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg== + integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== } engines: { node: '>=12' } cpu: [s390x] @@ -389,10 +413,10 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.18.17: + /@esbuild/linux-x64@0.18.20: resolution: { - integrity: sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ== + integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== } engines: { node: '>=12' } cpu: [x64] @@ -401,10 +425,10 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.18.17: + /@esbuild/netbsd-x64@0.18.20: resolution: { - integrity: sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ== + integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== } engines: { node: '>=12' } cpu: [x64] @@ -413,10 +437,10 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.18.17: + /@esbuild/openbsd-x64@0.18.20: resolution: { - integrity: sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA== + integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== } engines: { node: '>=12' } cpu: [x64] @@ -425,10 +449,10 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.18.17: + /@esbuild/sunos-x64@0.18.20: resolution: { - integrity: sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g== + integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== } engines: { node: '>=12' } cpu: [x64] @@ -437,10 +461,10 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.18.17: + /@esbuild/win32-arm64@0.18.20: resolution: { - integrity: sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw== + integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== } engines: { node: '>=12' } cpu: [arm64] @@ -449,10 +473,10 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.18.17: + /@esbuild/win32-ia32@0.18.20: resolution: { - integrity: sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg== + integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== } engines: { node: '>=12' } cpu: [ia32] @@ -461,10 +485,10 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.18.17: + /@esbuild/win32-x64@0.18.20: resolution: { - integrity: sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA== + integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== } engines: { node: '>=12' } cpu: [x64] @@ -504,7 +528,7 @@ packages: ajv: 6.12.6 debug: 4.3.4 espree: 9.6.1 - globals: 13.20.0 + globals: 13.21.0 ignore: 5.2.4 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -522,6 +546,7 @@ packages: engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 } dev: true +<<<<<<< HEAD <<<<<<< HEAD /@fortawesome/fontawesome-common-types@6.4.2: resolution: {integrity: sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==} @@ -534,22 +559,29 @@ packages: engines: {node: '>=6'} ======= /@fortawesome/fontawesome-common-types@6.4.0: +======= + /@fortawesome/fontawesome-common-types@6.4.2: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ== + integrity: sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA== } engines: { node: '>=6' } requiresBuild: true dev: false +<<<<<<< HEAD /@fortawesome/free-solid-svg-icons@6.4.0: <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /@fortawesome/free-solid-svg-icons@6.4.2: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ== + integrity: sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA== } engines: { node: '>=6' } <<<<<<< HEAD @@ -603,12 +635,12 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 - /@jridgewell/resolve-uri@3.1.0: + /@jridgewell/resolve-uri@3.1.1: resolution: { - integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== } engines: { node: '>=6.0.0' } @@ -619,26 +651,20 @@ packages: } engines: { node: '>=6.0.0' } - /@jridgewell/sourcemap-codec@1.4.14: - resolution: - { - integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - } - /@jridgewell/sourcemap-codec@1.4.15: resolution: { integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== } - /@jridgewell/trace-mapping@0.3.18: + /@jridgewell/trace-mapping@0.3.19: resolution: { - integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== + integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== } dependencies: - '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.14 + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 /@nodelib/fs.scandir@2.1.5: resolution: @@ -677,6 +703,7 @@ packages: } dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /@popperjs/core@2.11.8: @@ -723,6 +750,9 @@ packages: >>>>>>> ea070a3 (more changes to device settings) ======= /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.22.4): +======= + /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.22.5): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ== @@ -730,18 +760,22 @@ packages: peerDependencies: '@sveltejs/kit': ^1.5.0 dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.7) + '@sveltejs/kit': 1.22.5(svelte@4.2.0)(vite@4.4.9) dev: true +<<<<<<< HEAD /@sveltejs/kit@1.22.4(svelte@4.1.2)(vite@4.4.7): <<<<<<< HEAD resolution: {integrity: sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==} engines: {node: ^16.14 || >=18} >>>>>>> e50b84b (npm-dep: update all) ======= +======= + /@sveltejs/kit@1.22.5(svelte@4.2.0)(vite@4.4.9): +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw== + integrity: sha512-LHq+ECucoT6c6/tkrxIQtD8KVNhPFV4QQ+xOKTwBAs/Qdtff8P5gAzsIZiwEaaO6J6sYZoy5RP2VR6m8PSCgLA== } engines: { node: ^16.14 || >=18 } >>>>>>> 6878878 (reuse device form, simplify realtime updates) @@ -752,6 +786,7 @@ packages: vite: ^4.0.0 dependencies: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.9) ======= @@ -760,6 +795,9 @@ packages: ======= '@sveltejs/vite-plugin-svelte': 2.4.3(svelte@4.1.2)(vite@4.4.7) >>>>>>> e50b84b (npm-dep: update all) +======= + '@sveltejs/vite-plugin-svelte': 2.4.5(svelte@4.2.0)(vite@4.4.9) +>>>>>>> c615d87 (npm-dep: update all) '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.3.2 @@ -771,6 +809,7 @@ packages: set-cookie-parser: 2.6.0 sirv: 2.0.3 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD svelte: 4.1.2 undici: 5.23.0 @@ -787,12 +826,18 @@ packages: ======= vite: 4.4.7 >>>>>>> fae38a0 (cleanup) +======= + svelte: 4.2.0 + undici: 5.23.0 + vite: 4.4.9 +>>>>>>> c615d87 (npm-dep: update all) transitivePeerDependencies: - supports-color dev: true <<<<<<< 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==} @@ -802,6 +847,9 @@ packages: ======= /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.3)(svelte@4.1.1)(vite@4.4.7): >>>>>>> fae38a0 (cleanup) +======= + /@sveltejs/vite-plugin-svelte-inspector@1.0.3(@sveltejs/vite-plugin-svelte@2.4.5)(svelte@4.2.0)(vite@4.4.9): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-Khdl5jmmPN6SUsVuqSXatKpQTMIifoQPDanaxC84m9JxIibWvSABJyHpyys0Z+1yYrxY5TTEQm+6elh0XCMaOA== @@ -827,6 +875,7 @@ packages: vite: ^4.0.0 dependencies: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@sveltejs/vite-plugin-svelte': 2.4.2(svelte@4.1.2)(vite@4.4.9) ======= @@ -849,12 +898,19 @@ packages: >>>>>>> e50b84b (npm-dep: update all) vite: 4.4.7 >>>>>>> fae38a0 (cleanup) +======= + '@sveltejs/vite-plugin-svelte': 2.4.5(svelte@4.2.0)(vite@4.4.9) + debug: 4.3.4 + svelte: 4.2.0 + vite: 4.4.9 +>>>>>>> c615d87 (npm-dep: update all) transitivePeerDependencies: - supports-color dev: true <<<<<<< 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==} @@ -864,9 +920,12 @@ packages: ======= /@sveltejs/vite-plugin-svelte@2.4.3(svelte@4.1.1)(vite@4.4.7): >>>>>>> fae38a0 (cleanup) +======= + /@sveltejs/vite-plugin-svelte@2.4.5(svelte@4.2.0)(vite@4.4.9): +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-NY2h+B54KHZO3kDURTdARqthn6D4YSIebtfW75NvZ/fwyk4G+AJw3V/i0OBjyN4406Ht9yZcnNWMuRUFnDNNiA== + integrity: sha512-UJKsFNwhzCVuiZd06jM/psscyNJNDwjQC+qIeb7GBJK9iWeQCcIyfcPWDvbCudfcJggY9jtxJeeaZH7uny93FQ== } engines: { node: ^14.18.0 || >= 16 } >>>>>>> ea070a3 (more changes to device settings) @@ -888,6 +947,7 @@ packages: vite: ^4.0.0 dependencies: <<<<<<< 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) ======= @@ -912,16 +972,26 @@ packages: ======= ======= '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.3)(svelte@4.1.2)(vite@4.4.7) +======= + '@sveltejs/vite-plugin-svelte-inspector': 1.0.3(@sveltejs/vite-plugin-svelte@2.4.5)(svelte@4.2.0)(vite@4.4.9) +>>>>>>> c615d87 (npm-dep: update all) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.2 +<<<<<<< HEAD svelte: 4.1.2 svelte-hmr: 0.15.2(svelte@4.1.2) >>>>>>> e50b84b (npm-dep: update all) vite: 4.4.7 vitefu: 0.2.4(vite@4.4.7) >>>>>>> fae38a0 (cleanup) +======= + svelte: 4.2.0 + svelte-hmr: 0.15.3(svelte@4.2.0) + vite: 4.4.9 + vitefu: 0.2.4(vite@4.4.9) +>>>>>>> c615d87 (npm-dep: update all) transitivePeerDependencies: - supports-color dev: true @@ -1222,7 +1292,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001518 + caniuse-lite: 1.0.30001519 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -1308,8 +1378,8 @@ packages: engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 } hasBin: true dependencies: - caniuse-lite: 1.0.30001518 - electron-to-chromium: 1.4.477 + caniuse-lite: 1.0.30001519 + electron-to-chromium: 1.4.490 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) dev: true @@ -1347,10 +1417,10 @@ packages: engines: { node: '>= 6' } dev: true - /caniuse-lite@1.0.30001518: + /caniuse-lite@1.0.30001519: resolution: { - integrity: sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA== + integrity: sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg== } dev: true @@ -1483,10 +1553,10 @@ packages: hasBin: true dev: true - /daisyui@3.5.0: + /daisyui@3.5.1: resolution: { - integrity: sha512-wSaeXwaYdMv4yURv9wj7kKQQN9Jyumfh/skIpZfCNkCb2jLf/so+iNKSM8l4rDN0TRvB5OccMlAvsf2UAtk2gg== + integrity: sha512-7GG+9QXnr2qQMCqnyFU8TxpaOYJigXiEtmzoivmiiZZHvxqIwYdaMAkgivqTVxEgy3Hot3m1suzZjmt1zUrvmA== } engines: { node: '>=16.9.0' } dependencies: @@ -1506,7 +1576,7 @@ packages: } engines: { node: '>=0.11' } dependencies: - '@babel/runtime': 7.22.6 + '@babel/runtime': 7.22.10 dev: false /debug@4.3.4: @@ -1595,10 +1665,10 @@ packages: esutils: 2.0.3 dev: true - /electron-to-chromium@1.4.477: + /electron-to-chromium@1.4.490: resolution: { - integrity: sha512-shUVy6Eawp33dFBFIoYbIwLHrX0IZ857AlH9ug2o4rvbWmpaCUdBpQ5Zw39HRrfzAFm4APJE9V+E2A/WB0YqJw== + integrity: sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A== } dev: true @@ -1609,37 +1679,37 @@ packages: } dev: true - /esbuild@0.18.17: + /esbuild@0.18.20: resolution: { - integrity: sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg== + integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== } engines: { node: '>=12' } hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.18.17 - '@esbuild/android-arm64': 0.18.17 - '@esbuild/android-x64': 0.18.17 - '@esbuild/darwin-arm64': 0.18.17 - '@esbuild/darwin-x64': 0.18.17 - '@esbuild/freebsd-arm64': 0.18.17 - '@esbuild/freebsd-x64': 0.18.17 - '@esbuild/linux-arm': 0.18.17 - '@esbuild/linux-arm64': 0.18.17 - '@esbuild/linux-ia32': 0.18.17 - '@esbuild/linux-loong64': 0.18.17 - '@esbuild/linux-mips64el': 0.18.17 - '@esbuild/linux-ppc64': 0.18.17 - '@esbuild/linux-riscv64': 0.18.17 - '@esbuild/linux-s390x': 0.18.17 - '@esbuild/linux-x64': 0.18.17 - '@esbuild/netbsd-x64': 0.18.17 - '@esbuild/openbsd-x64': 0.18.17 - '@esbuild/sunos-x64': 0.18.17 - '@esbuild/win32-arm64': 0.18.17 - '@esbuild/win32-ia32': 0.18.17 - '@esbuild/win32-x64': 0.18.17 + '@esbuild/android-arm': 0.18.20 + '@esbuild/android-arm64': 0.18.20 + '@esbuild/android-x64': 0.18.20 + '@esbuild/darwin-arm64': 0.18.20 + '@esbuild/darwin-x64': 0.18.20 + '@esbuild/freebsd-arm64': 0.18.20 + '@esbuild/freebsd-x64': 0.18.20 + '@esbuild/linux-arm': 0.18.20 + '@esbuild/linux-arm64': 0.18.20 + '@esbuild/linux-ia32': 0.18.20 + '@esbuild/linux-loong64': 0.18.20 + '@esbuild/linux-mips64el': 0.18.20 + '@esbuild/linux-ppc64': 0.18.20 + '@esbuild/linux-riscv64': 0.18.20 + '@esbuild/linux-s390x': 0.18.20 + '@esbuild/linux-x64': 0.18.20 + '@esbuild/netbsd-x64': 0.18.20 + '@esbuild/openbsd-x64': 0.18.20 + '@esbuild/sunos-x64': 0.18.20 + '@esbuild/win32-arm64': 0.18.20 + '@esbuild/win32-ia32': 0.18.20 + '@esbuild/win32-x64': 0.18.20 dev: true /escalade@3.1.1: @@ -1658,10 +1728,10 @@ packages: engines: { node: '>=10' } dev: true - /eslint-config-prettier@8.9.0(eslint@8.46.0): + /eslint-config-prettier@8.10.0(eslint@8.46.0): resolution: { - integrity: sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA== + integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== } hasBin: true peerDependencies: @@ -1670,6 +1740,7 @@ packages: eslint: 8.46.0 dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /eslint-plugin-svelte@2.32.4(eslint@8.45.0)(svelte@4.1.2): @@ -1677,6 +1748,9 @@ packages: engines: {node: ^14.17.0 || >=16.0.0} ======= /eslint-plugin-svelte@2.32.4(eslint@8.45.0)(svelte@4.1.1): +======= + /eslint-plugin-svelte@2.32.4(eslint@8.46.0)(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-VJ12i2Iogug1jvhwxSlognnfGj76P5gks/V4pUD4SCSVQOp14u47MNP0zAG8AQR3LT0Fi1iUvIFnY4l9z5Rwbg== @@ -1714,8 +1788,8 @@ packages: postcss-safe-parser: 6.0.0(postcss@8.4.27) postcss-selector-parser: 6.0.13 semver: 7.5.4 - svelte: 4.1.2 - svelte-eslint-parser: 0.32.2(svelte@4.1.2) + svelte: 4.2.0 + svelte-eslint-parser: 0.32.2(svelte@4.2.0) transitivePeerDependencies: - supports-color - ts-node @@ -1781,7 +1855,7 @@ packages: file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.20.0 + globals: 13.21.0 graphemer: 1.4.0 ignore: 5.2.4 imurmurhash: 0.1.4 @@ -2051,10 +2125,10 @@ packages: path-is-absolute: 1.0.1 dev: true - /globals@13.20.0: + /globals@13.21.0: resolution: { - integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== + integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== } engines: { node: '>=8' } dependencies: @@ -2171,10 +2245,10 @@ packages: binary-extensions: 2.2.0 dev: true - /is-core-module@2.12.1: + /is-core-module@2.13.0: resolution: { - integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== + integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== } dependencies: has: 1.0.3 @@ -2671,7 +2745,7 @@ packages: postcss: 8.4.27 postcss-value-parser: 4.2.0 read-cache: 1.0.0 - resolve: 1.22.2 + resolve: 1.22.4 dev: true /postcss-js@4.0.1(postcss@8.4.27): @@ -2802,6 +2876,7 @@ packages: engines: { node: '>= 0.8.0' } dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.1.2): @@ -2811,6 +2886,9 @@ packages: /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.1.1): ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /prettier-plugin-svelte@2.10.1(prettier@2.8.8)(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-Wlq7Z5v2ueCubWo0TZzKc9XHcm7TDxqcuzRuGd0gcENfzfT4JZ9yDlCbEgxWgiPmLHkBjfOtpAWkcT28MCDpUQ== @@ -2828,7 +2906,7 @@ packages: svelte: ^3.2.0 || ^4.0.0-next.0 dependencies: prettier: 2.8.8 - svelte: 4.1.2 + svelte: 4.2.0 dev: true /prettier@2.8.8: @@ -2874,10 +2952,10 @@ packages: picomatch: 2.3.1 dev: true - /regenerator-runtime@0.13.11: + /regenerator-runtime@0.14.0: resolution: { - integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== } dev: false @@ -2889,14 +2967,14 @@ packages: engines: { node: '>=4' } dev: true - /resolve@1.22.2: + /resolve@1.22.4: resolution: { - integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== } hasBin: true dependencies: - is-core-module: 2.12.1 + is-core-module: 2.13.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 dev: true @@ -2929,6 +3007,7 @@ packages: glob: 7.2.3 dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /rollup@3.27.2: @@ -2949,9 +3028,12 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} >>>>>>> e50b84b (npm-dep: update all) ======= +======= + /rollup@3.28.0: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-aOltLCrYZ0FhJDm7fCqwTjIUEVjWjcydKBV/Zeid6Mn8BWgDCUBBWT5beM5ieForYNo/1ZHuGJdka26kvQ3Gzg== + integrity: sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw== } engines: { node: '>=14.18.0', npm: '>=8.0.0' } >>>>>>> 6878878 (reuse device form, simplify realtime updates) @@ -3153,23 +3235,23 @@ packages: engines: { node: '>= 0.4' } dev: true - /svelte-check@3.4.6(postcss@8.4.27)(svelte@4.1.2): + /svelte-check@3.5.0(postcss@8.4.27)(svelte@4.2.0): resolution: { - integrity: sha512-OBlY8866Zh1zHQTkBMPS6psPi7o2umTUyj6JWm4SacnIHXpWFm658pG32m3dKvKFL49V4ntAkfFHKo4ztH07og== + integrity: sha512-KHujbn4k17xKYLmtCwv0sKKM7uiHTYcQvXnvrCcNU6a7hcszh99zFTIoiu/Sp/ewAw5aJmillJ1Cs8gKLmcX4A== } hasBin: true peerDependencies: svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 dependencies: - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 chokidar: 3.5.3 fast-glob: 3.3.1 import-fresh: 3.3.0 picocolors: 1.0.0 sade: 1.8.1 - svelte: 4.1.2 - svelte-preprocess: 5.0.4(postcss@8.4.27)(svelte@4.1.2)(typescript@5.1.6) + svelte: 4.2.0 + svelte-preprocess: 5.0.4(postcss@8.4.27)(svelte@4.2.0)(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - '@babel/core' @@ -3183,6 +3265,7 @@ packages: - sugarss dev: true +<<<<<<< HEAD <<<<<<< HEAD /svelte-eslint-parser@0.32.2(svelte@4.1.1): <<<<<<< HEAD @@ -3190,6 +3273,9 @@ packages: resolution: {integrity: sha512-Ok9D3A4b23iLQsONrjqtXtYDu5ZZ/826Blaw2LeFZVTg1pwofKDG4mz3/GYTax8fQ0plRGHI6j+d9VQYy5Lo/A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} ======= +======= + /svelte-eslint-parser@0.32.2(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-Ok9D3A4b23iLQsONrjqtXtYDu5ZZ/826Blaw2LeFZVTg1pwofKDG4mz3/GYTax8fQ0plRGHI6j+d9VQYy5Lo/A== @@ -3220,7 +3306,7 @@ packages: espree: 9.6.1 postcss: 8.4.27 postcss-scss: 4.0.6(postcss@8.4.27) - svelte: 4.1.2 + svelte: 4.2.0 dev: true /svelte-fa@3.0.4: @@ -3233,8 +3319,12 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /svelte-french-toast@1.2.0(svelte@4.1.2): +======= + /svelte-french-toast@1.2.0(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-5PW+6RFX3xQPbR44CngYAP1Sd9oCq9P2FOox4FZffzJuZI2mHOB7q5gJBVnOiLF5y3moVGZ7u2bYt7+yPAgcEQ== @@ -3242,10 +3332,11 @@ packages: peerDependencies: svelte: ^3.57.0 || ^4.0.0 dependencies: - svelte: 4.1.2 - svelte-writable-derived: 3.1.0(svelte@4.1.2) + svelte: 4.2.0 + svelte-writable-derived: 3.1.0(svelte@4.2.0) dev: false +<<<<<<< HEAD >>>>>>> 03a03e4 (added toast notifications) /svelte-hmr@0.15.2(svelte@4.1.2): <<<<<<< HEAD @@ -3255,9 +3346,12 @@ packages: /svelte-hmr@0.15.2(svelte@4.1.1): ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /svelte-hmr@0.15.3(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg== + integrity: sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ== } engines: { node: ^12.20 || ^14.13.1 || >= 16 } <<<<<<< HEAD @@ -3270,11 +3364,12 @@ packages: ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) peerDependencies: - svelte: ^3.19.0 || ^4.0.0-next.0 + svelte: ^3.19.0 || ^4.0.0 dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /svelte-preprocess@5.0.4(postcss@8.4.27)(sass@1.64.2)(svelte@4.1.2)(typescript@5.1.6): @@ -3285,6 +3380,9 @@ packages: resolution: {integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==} engines: {node: '>= 14.10.0'} ======= +======= + /svelte-preprocess@5.0.4(postcss@8.4.27)(svelte@4.2.0)(typescript@5.1.6): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw== @@ -3349,15 +3447,19 @@ packages: >>>>>>> 5340d83 (first commit for tailwind rewrite) sorcery: 0.11.0 strip-indent: 3.0.0 - svelte: 4.1.2 + svelte: 4.2.0 typescript: 5.1.6 dev: true <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= /svelte-writable-derived@3.1.0(svelte@4.1.2): +======= + /svelte-writable-derived@3.1.0(svelte@4.2.0): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-cTvaVFNIJ036vSDIyPxJYivKC7ZLtcFOPm1Iq6qWBDo1fOHzfk6ZSbwaKrxhjgy52Rbl5IHzRcWgos6Zqn9/rg== @@ -3365,9 +3467,10 @@ packages: peerDependencies: svelte: ^3.2.1 || ^4.0.0-next.1 dependencies: - svelte: 4.1.2 + svelte: 4.2.0 dev: false +<<<<<<< HEAD >>>>>>> 03a03e4 (added toast notifications) /svelte@4.1.2: <<<<<<< HEAD @@ -3387,16 +3490,19 @@ packages: engines: {node: '>=16'} >>>>>>> e50b84b (npm-dep: update all) ======= +======= + /svelte@4.2.0: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g== + integrity: sha512-kVsdPjDbLrv74SmLSUzAsBGquMs4MPgWGkGLpH+PjOYnFOziAvENVzgJmyOCV2gntxE32aNm8/sqNKD6LbIpeQ== } engines: { node: '>=16' } >>>>>>> 6878878 (reuse device form, simplify realtime updates) dependencies: '@ampproject/remapping': 2.2.1 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 acorn: 8.10.0 aria-query: 5.3.0 axobject-query: 3.2.1 @@ -3436,7 +3542,7 @@ packages: postcss-load-config: 4.0.1(postcss@8.4.27) postcss-nested: 6.0.1(postcss@8.4.27) postcss-selector-parser: 6.0.13 - resolve: 1.22.2 + resolve: 1.22.4 sucrase: 3.34.0 transitivePeerDependencies: - ts-node @@ -3554,6 +3660,7 @@ packages: hasBin: true dev: true +<<<<<<< HEAD <<<<<<< HEAD /undici@5.23.0: resolution: {integrity: sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==} @@ -3564,9 +3671,12 @@ packages: <<<<<<< HEAD ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /undici@5.23.0: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw== + integrity: sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg== } engines: { node: '>=14.0' } <<<<<<< HEAD @@ -3611,6 +3721,7 @@ packages: } dev: true +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD /vite@4.4.9(sass@1.64.2): @@ -3629,9 +3740,12 @@ packages: >>>>>>> fae38a0 (cleanup) ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /vite@4.4.9: +>>>>>>> c615d87 (npm-dep: update all) resolution: { - integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw== + integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA== } engines: { node: ^14.18.0 || >=16.0.0 } <<<<<<< HEAD @@ -3667,9 +3781,10 @@ packages: terser: optional: true dependencies: - esbuild: 0.18.17 + esbuild: 0.18.20 postcss: 8.4.27 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD rollup: 3.27.2 sass: 1.64.2 @@ -3679,12 +3794,16 @@ packages: ======= rollup: 3.27.0 >>>>>>> e50b84b (npm-dep: update all) +======= + rollup: 3.28.0 +>>>>>>> c615d87 (npm-dep: update all) optionalDependencies: fsevents: 2.3.2 dev: true <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /vitefu@0.2.4(vite@4.4.9): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} @@ -3697,6 +3816,9 @@ packages: ======= /vitefu@0.2.4(vite@4.4.7): >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= + /vitefu@0.2.4(vite@4.4.9): +>>>>>>> c615d87 (npm-dep: update all) resolution: { integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g== @@ -3715,6 +3837,7 @@ packages: optional: true dependencies: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 4.4.9(sass@1.64.2) ======= @@ -3723,6 +3846,9 @@ packages: ======= vite: 4.4.7 >>>>>>> fae38a0 (cleanup) +======= + vite: 4.4.9 +>>>>>>> c615d87 (npm-dep: update all) dev: true /which@2.0.2: