From b6a2b085d9c2189a613749198b5d38494106ddbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 09:23:05 +0000 Subject: [PATCH] npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 1.22.4 to 1.22.5. - [Release notes](https://github.com/sveltejs/kit/releases) - [Changelog](https://github.com/sveltejs/kit/blob/master/packages/kit/CHANGELOG.md) - [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@1.22.5/packages/kit) --- updated-dependencies: - dependency-name: "@sveltejs/kit" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 19 +++++++++++++++++++ frontend/package.json | 4 ++++ frontend/pnpm-lock.yaml | 20 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index cf653b0b..78ad6ed1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -21,6 +21,7 @@ "devDependencies": { "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.22.5", +<<<<<<< HEAD ======= "@fortawesome/free-solid-svg-icons": "^6.4.0", ======= @@ -41,6 +42,8 @@ ======= "@sveltejs/kit": "^1.22.4", >>>>>>> 6fad133 (npm-dep: bump @sveltejs/kit from 1.22.3 to 1.22.4 in /frontend) +======= +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "eslint": "^8.45.0", @@ -731,6 +734,7 @@ }, "node_modules/@sveltejs/kit": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "version": "1.22.5", "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.5.tgz", @@ -745,6 +749,11 @@ "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.4.tgz", "integrity": "sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==", >>>>>>> 6fad133 (npm-dep: bump @sveltejs/kit from 1.22.3 to 1.22.4 in /frontend) +======= + "version": "1.22.5", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.22.5.tgz", + "integrity": "sha512-LHq+ECucoT6c6/tkrxIQtD8KVNhPFV4QQ+xOKTwBAs/Qdtff8P5gAzsIZiwEaaO6J6sYZoy5RP2VR6m8PSCgLA==", +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) "dev": true, "hasInstallScript": true, "dependencies": { @@ -759,11 +768,15 @@ "sade": "^1.8.1", "set-cookie-parser": "^2.6.0", "sirv": "^2.0.2", +<<<<<<< HEAD <<<<<<< HEAD "undici": "~5.23.0" ======= "undici": "~5.22.0" >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend) +======= + "undici": "~5.23.0" +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) }, "bin": { "svelte-kit": "svelte-kit.js" @@ -3926,6 +3939,7 @@ } }, "node_modules/undici": { +<<<<<<< HEAD <<<<<<< HEAD "version": "5.23.0", "resolved": "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz", @@ -3935,6 +3949,11 @@ "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) +======= + "version": "5.23.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz", + "integrity": "sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==", +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) "dev": true, "dependencies": { "busboy": "^1.6.0" diff --git a/frontend/package.json b/frontend/package.json index 9f883de5..126410e3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD "@sveltejs/adapter-static": "^2.0.3", +<<<<<<< HEAD <<<<<<< HEAD "@sveltejs/kit": "^1.22.5", ======= @@ -30,6 +31,9 @@ ======= "@sveltejs/kit": "^1.22.4", >>>>>>> 6fad133 (npm-dep: bump @sveltejs/kit from 1.22.3 to 1.22.4 in /frontend) +======= + "@sveltejs/kit": "^1.22.5", +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "eslint": "^8.45.0", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 19f11a25..993fbd2e 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -75,9 +75,10 @@ devDependencies: <<<<<<< HEAD <<<<<<< HEAD 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 +<<<<<<< HEAD <<<<<<< HEAD specifier: ^1.22.5 version: 1.22.5(svelte@4.1.2)(vite@4.4.9) @@ -127,6 +128,10 @@ devDependencies: ======= version: 1.22.4(svelte@4.1.2)(vite@4.4.9) >>>>>>> e7c5fdb (npm-dep: bump vite from 4.4.8 to 4.4.9 in /frontend) +======= + specifier: ^1.22.5 + version: 1.22.5(svelte@4.1.2)(vite@4.4.9) +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 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) @@ -813,6 +818,9 @@ packages: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.22.5): resolution: {integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==} ======= @@ -870,7 +878,7 @@ packages: peerDependencies: '@sveltejs/kit': ^1.5.0 dependencies: - '@sveltejs/kit': 1.22.4(svelte@4.1.2)(vite@4.4.9) + '@sveltejs/kit': 1.22.5(svelte@4.1.2)(vite@4.4.9) dev: true <<<<<<< HEAD @@ -878,6 +886,7 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD /@sveltejs/kit@1.22.4(svelte@4.1.2)(vite@4.4.7): <<<<<<< HEAD @@ -885,6 +894,10 @@ packages: /@sveltejs/kit@1.22.4(svelte@4.1.2)(vite@4.4.9): >>>>>>> e7c5fdb (npm-dep: bump vite from 4.4.8 to 4.4.9 in /frontend) resolution: {integrity: sha512-Opkqw1QXk4Cc25b/heJP2D7mX+OUBFAq4MXKfET58svTTxdeiHFKzmnuRsSF3nmxESqrLjqPAgHpib+knNGzRw==} +======= + /@sveltejs/kit@1.22.5(svelte@4.1.2)(vite@4.4.9): + resolution: {integrity: sha512-LHq+ECucoT6c6/tkrxIQtD8KVNhPFV4QQ+xOKTwBAs/Qdtff8P5gAzsIZiwEaaO6J6sYZoy5RP2VR6m8PSCgLA==} +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) engines: {node: ^16.14 || >=18} >>>>>>> e50b84b (npm-dep: update all) ======= @@ -4042,6 +4055,7 @@ packages: /undici@5.23.0: resolution: {integrity: sha512-1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg==} engines: {node: '>=14.0'} +<<<<<<< HEAD ======= /undici@5.22.1: <<<<<<< HEAD @@ -4064,6 +4078,8 @@ packages: >>>>>>> e50b84b (npm-dep: update all) ======= >>>>>>> 6878878 (reuse device form, simplify realtime updates) +======= +>>>>>>> 3332f19 (npm-dep: bump @sveltejs/kit from 1.22.4 to 1.22.5 in /frontend) dependencies: busboy: 1.6.0 dev: true