From d49a218e9815e8891e6babb5334319344ce8d3fa Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Sat, 29 Jun 2024 15:26:00 +0530 Subject: [PATCH 01/13] [INJIMOB-1554] change version to 0.2.0 for release (#41) Signed-off-by: Abhishek Paul --- js/package-lock.json | 2 +- js/package.json | 2 +- kotlin/PixelPass/publish-artifact.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index b761138..64822ff 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -1,6 +1,6 @@ { "name": "@mosip/pixelpass", - "version": "0.1.6", + "version": "0.2.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/js/package.json b/js/package.json index 6f80ac4..808002a 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "@mosip/pixelpass", - "version": "0.1.6", + "version": "0.2.0", "repository": "https://github.com/mosip/pixelpass", "author": "MOSIP", "license": "MIT", diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index e0cdb89..9be3793 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -79,7 +79,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "1.2-SNAPSHOT" + version = "0.2.0-SNAPSHOT" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { From 6c3871ba687ac195f96db25d6138421ba583883f Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Sat, 29 Jun 2024 20:18:41 +0530 Subject: [PATCH 02/13] [INJIMOB-1554] change yaml file name for release (#42) Signed-off-by: Abhishek Paul --- .../{android-artifact-build.yml => kotlin-artifacts-build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{android-artifact-build.yml => kotlin-artifacts-build.yml} (100%) diff --git a/.github/workflows/android-artifact-build.yml b/.github/workflows/kotlin-artifacts-build.yml similarity index 100% rename from .github/workflows/android-artifact-build.yml rename to .github/workflows/kotlin-artifacts-build.yml From 5c0306aada07cb2cde0319804621a847db310669 Mon Sep 17 00:00:00 2001 From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:21:23 +0530 Subject: [PATCH 03/13] [DSD-5825] inji-mob 0.13.0 release changes (#44) * [DSD-5825] inji-mob 0.13.0 release changes Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> * Update kotlin-artifacts-build.yml Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --------- Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --- .github/workflows/kotlin-artifacts-build.yml | 2 +- kotlin/PixelPass/publish-artifact.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kotlin-artifacts-build.yml b/.github/workflows/kotlin-artifacts-build.yml index b7fb17b..66bf797 100644 --- a/.github/workflows/kotlin-artifacts-build.yml +++ b/.github/workflows/kotlin-artifacts-build.yml @@ -19,7 +19,7 @@ jobs: JAVA_VERSION: 21 secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_URL: ${{secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_URL: ${{secrets.RELEASE_URL }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index 9be3793..e6fce56 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -79,7 +79,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "0.2.0-SNAPSHOT" + version = "0.2.0" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { @@ -90,4 +90,4 @@ publishing { artifact("build/outputs/aar/${artifactId}-${version}-release.aar") } } -} \ No newline at end of file +} From d32a31bc2e7f7bb80326bd7880707c51c3222f7a Mon Sep 17 00:00:00 2001 From: Swati Goel Date: Mon, 29 Jul 2024 13:11:28 +0530 Subject: [PATCH 04/13] [DSD-5825] - add mandatory nodes for pom (#45) Signed-off-by: Swati Goel --- kotlin/PixelPass/publish-artifact.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index e6fce56..8a0eafc 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -13,6 +13,10 @@ publishing { aar(MavenPublication) { pom { withXml { + asNode().appendNode('name', "Pixelpass") + asNode().appendNode('url', "https://github.com/mosip/pixelpass") + asNode().appendNode('description', "Kotlin library to generate QR code from VC and decode the data") + def dependenciesNode = asNode().appendNode('dependencies') project.configurations.implementation.allDependencies.each { def dependencyNode = dependenciesNode.appendNode('dependency') @@ -26,6 +30,13 @@ publishing { appendNode('url', 'https://www.mit.edu/~amini/LICENSE.md') } + asNode().appendNode('scm').with { + appendNode('connection', 'scm:git:git://github.com/mosip/pixelpass.git') + appendNode('developerConnection', 'scm:git:ssh://github.com:mosip/pixelpass.git') + appendNode('url', "https://github.com/mosip/pixelpass") + appendNode('tag', "HEAD") + } + asNode().appendNode('developers').appendNode('developer').with { appendNode('id', 'Your developer ID') appendNode('name', 'Mosip') From 750e6b07a5609050a85f4b7a185558e876c50786 Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Wed, 31 Jul 2024 22:09:13 +0530 Subject: [PATCH 05/13] [DSD-5825] - Add missing pom parameters and support for gpg sign (#46) Signed-off-by: Abhishek Paul --- kotlin/PixelPass/build.gradle.kts | 1 + kotlin/PixelPass/publish-artifact.gradle | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kotlin/PixelPass/build.gradle.kts b/kotlin/PixelPass/build.gradle.kts index 9bb41e4..9e0a011 100644 --- a/kotlin/PixelPass/build.gradle.kts +++ b/kotlin/PixelPass/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.androidLibrary) alias(libs.plugins.jetbrainsKotlinAndroid) `maven-publish` + `signing` } android { namespace = "io.mosip.pixelpass" diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index 8a0eafc..fcc81c7 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -17,14 +17,6 @@ publishing { asNode().appendNode('url', "https://github.com/mosip/pixelpass") asNode().appendNode('description', "Kotlin library to generate QR code from VC and decode the data") - def dependenciesNode = asNode().appendNode('dependencies') - project.configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - asNode().appendNode('licenses').appendNode('license').with { appendNode('name', 'MIT') appendNode('url', 'https://www.mit.edu/~amini/LICENSE.md') @@ -102,3 +94,7 @@ publishing { } } } +signing { + useGpgCmd() + sign publishing.publications.aar +} \ No newline at end of file From fcd677e002a57cd167036b9004ac179bb6c65cfb Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:16:20 +0530 Subject: [PATCH 06/13] [INJIMOB-1970] add dependency node in publish-artifact (#51) Signed-off-by: Abhishek Paul --- kotlin/PixelPass/publish-artifact.gradle | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index fcc81c7..cb20a1e 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -37,6 +37,14 @@ publishing { appendNode("organizationUrl", "https://github.com/mosip/pixelpass") } + def dependenciesNode = asNode().appendNode('dependencies') + project.configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + def pluginsNode = asNode().appendNode('build').appendNode('plugins') def pluginNode = pluginsNode.appendNode('plugin') @@ -82,7 +90,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "0.2.0" + version = "0.2.1-beta.1-SNAPSHOT" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { From bdb783f7ef73b07430950547148134e79abfab9d Mon Sep 17 00:00:00 2001 From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:40:49 +0530 Subject: [PATCH 07/13] [DSD-6157] 0.2.1-beta.1 release for pixelpass Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --- kotlin/PixelPass/publish-artifact.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index cb20a1e..1f65b72 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -90,7 +90,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "0.2.1-beta.1-SNAPSHOT" + version = "0.2.1-beta.1" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { @@ -105,4 +105,4 @@ publishing { signing { useGpgCmd() sign publishing.publications.aar -} \ No newline at end of file +} From 7c8f360f81b3762142aa9708f1d54a47b06342f5 Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:41:53 +0530 Subject: [PATCH 08/13] [INJIMOB-1970] update publish version (#53) Signed-off-by: Abhishek Paul --- kotlin/PixelPass/publish-artifact.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index 1f65b72..a93c041 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -90,7 +90,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "0.2.1-beta.1" + version = "0.2.1-SNAPSHOT" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { From 7bf360bc1169b6858af7fe6599bddc466ef0a375 Mon Sep 17 00:00:00 2001 From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:59:06 +0530 Subject: [PATCH 09/13] [DSD-6167] Update kotlin-artifacts-build.yml (#54) Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com> --- .github/workflows/kotlin-artifacts-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kotlin-artifacts-build.yml b/.github/workflows/kotlin-artifacts-build.yml index 66bf797..b7fb17b 100644 --- a/.github/workflows/kotlin-artifacts-build.yml +++ b/.github/workflows/kotlin-artifacts-build.yml @@ -19,7 +19,7 @@ jobs: JAVA_VERSION: 21 secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_URL: ${{secrets.RELEASE_URL }} + OSSRH_URL: ${{secrets.OSSRH_SNAPSHOT_URL }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} From d7b199f959ac727a2a671dd132dea54fab4b850b Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 6 Sep 2024 12:31:28 +0530 Subject: [PATCH 10/13] [DSD-6169] inji-wallet 0.13.1 release Signed-off-by: techno-467 --- .github/workflows/kotlin-artifacts-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kotlin-artifacts-build.yml b/.github/workflows/kotlin-artifacts-build.yml index b7fb17b..66bf797 100644 --- a/.github/workflows/kotlin-artifacts-build.yml +++ b/.github/workflows/kotlin-artifacts-build.yml @@ -19,7 +19,7 @@ jobs: JAVA_VERSION: 21 secrets: OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_URL: ${{secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_URL: ${{secrets.RELEASE_URL }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} From 4ac56e48ed993005dea95d89e22e1b87a12dc1a9 Mon Sep 17 00:00:00 2001 From: techno-467 Date: Fri, 6 Sep 2024 12:32:54 +0530 Subject: [PATCH 11/13] [DSD-6169] inji-wallet 0.13.1 release Signed-off-by: techno-467 --- kotlin/PixelPass/publish-artifact.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin/PixelPass/publish-artifact.gradle b/kotlin/PixelPass/publish-artifact.gradle index a93c041..c9c0db7 100644 --- a/kotlin/PixelPass/publish-artifact.gradle +++ b/kotlin/PixelPass/publish-artifact.gradle @@ -90,7 +90,7 @@ publishing { } groupId = "io.mosip" artifactId = "pixelpass" - version = "0.2.1-SNAPSHOT" + version = "0.2.1" if (project.gradle.startParameter.taskNames.any { it.contains('assembleRelease') }) { artifacts { aar { From 61d8fb1b4d3d77751f92fa4a38fcb9e07e5e37ac Mon Sep 17 00:00:00 2001 From: ckm007 Date: Tue, 10 Sep 2024 11:59:32 +0000 Subject: [PATCH 12/13] [DSD-6169] inji-wallet 0.13.1 release changes to master --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 403fc4a..342491b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # pixelpass This repository will be used to host the source code, documentation, and other related files for the PixelPass project which is used to generate and decode VC data to and from QR. - From 5a286ab601265d3f31294a969be07704da00d8b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 07:45:51 +0000 Subject: [PATCH 13/13] Bump send and express in /js/example Bumps [send](https://github.com/pillarjs/send) to 0.19.0 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `send` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/pillarjs/send/releases) - [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md) - [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: send dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- js/example/package-lock.json | 191 +++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 86 deletions(-) diff --git a/js/example/package-lock.json b/js/example/package-lock.json index 12052aa..b498a1c 100644 --- a/js/example/package-lock.json +++ b/js/example/package-lock.json @@ -55,9 +55,9 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -67,7 +67,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -247,9 +247,9 @@ "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -287,36 +287,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -328,12 +328,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -553,9 +553,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -609,9 +612,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -693,9 +699,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/pngjs": { "version": "5.0.0", @@ -735,11 +741,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -808,9 +814,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -830,20 +836,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -1054,9 +1068,9 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -1066,7 +1080,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1199,9 +1213,9 @@ "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "es-define-property": { "version": "1.0.0", @@ -1227,36 +1241,36 @@ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1265,12 +1279,12 @@ } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -1415,9 +1429,9 @@ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "methods": { "version": "1.1.2", @@ -1453,9 +1467,9 @@ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "on-finished": { "version": "2.4.1", @@ -1507,9 +1521,9 @@ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "pngjs": { "version": "5.0.0", @@ -1537,11 +1551,11 @@ } }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "range-parser": { @@ -1581,9 +1595,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -1600,6 +1614,11 @@ "statuses": "2.0.1" }, "dependencies": { + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -1608,14 +1627,14 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-blocking": {