From 6d7441473a473bd703bece126b3f141bf2197f5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 09:34:04 +0000 Subject: [PATCH] npm-dep: bump @sveltejs/adapter-static from 2.0.2 to 2.0.3 in /frontend Bumps [@sveltejs/adapter-static](https://github.com/sveltejs/kit/tree/HEAD/packages/adapter-static) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/sveltejs/kit/releases) - [Changelog](https://github.com/sveltejs/kit/blob/master/packages/adapter-static/CHANGELOG.md) - [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/adapter-static@2.0.3/packages/adapter-static) --- updated-dependencies: - dependency-name: "@sveltejs/adapter-static" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 8 +++++++- frontend/package.json | 4 ++++ frontend/pnpm-lock.yaml | 10 +++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index afefd8a9..13eb33f5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -30,7 +30,7 @@ "svelte-fa": "^3.0.4" }, "devDependencies": { - "@sveltejs/adapter-static": "^2.0.2", + "@sveltejs/adapter-static": "^2.0.3", "@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", @@ -674,6 +674,7 @@ } }, "node_modules/@sveltejs/adapter-static": { +<<<<<<< HEAD <<<<<<< HEAD "version": "2.0.3", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz", @@ -683,6 +684,11 @@ "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) +======= + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz", + "integrity": "sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==", +>>>>>>> dceee3f (npm-dep: bump @sveltejs/adapter-static from 2.0.2 to 2.0.3 in /frontend) "dev": true, "peerDependencies": { "@sveltejs/kit": "^1.5.0" diff --git a/frontend/package.json b/frontend/package.json index 4b3afbd2..844cd304 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,11 +15,15 @@ "format": "prettier --ignore-path ../.gitignore --write --plugin-search-dir=. ." }, "devDependencies": { +<<<<<<< HEAD <<<<<<< HEAD "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.22.5", ======= "@sveltejs/adapter-static": "^2.0.2", +======= + "@sveltejs/adapter-static": "^2.0.3", +>>>>>>> dceee3f (npm-dep: bump @sveltejs/adapter-static from 2.0.2 to 2.0.3 in /frontend) "@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", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index b864900c..c2ef9ec6 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -65,7 +65,7 @@ devDependencies: <<<<<<< HEAD <<<<<<< HEAD specifier: ^2.0.3 - version: 2.0.3(@sveltejs/kit@1.22.5) + version: 2.0.3(@sveltejs/kit@1.22.3) '@sveltejs/kit': <<<<<<< HEAD specifier: ^1.22.5 @@ -739,10 +739,14 @@ packages: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> dceee3f (npm-dep: bump @sveltejs/adapter-static from 2.0.2 to 2.0.3 in /frontend) /@popperjs/core@2.11.8: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false +<<<<<<< HEAD /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.22.5): resolution: {integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==} ======= @@ -790,6 +794,10 @@ packages: { integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ== } +======= + /@sveltejs/adapter-static@2.0.3(@sveltejs/kit@1.22.3): + resolution: {integrity: sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==} +>>>>>>> dceee3f (npm-dep: bump @sveltejs/adapter-static from 2.0.2 to 2.0.3 in /frontend) peerDependencies: '@sveltejs/kit': ^1.5.0 dependencies: