From 6ed926414a1eee9badf3e2356d02134ac0578863 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:46:46 +0000 Subject: [PATCH 1/2] chore(deps): bump path-to-regexp from 6.2.2 to 8.0.0 Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) from 6.2.2 to 8.0.0. - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v6.2.2...v8.0.0) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .changeset/dependabot-b42f054.md | 7 +++++++ packages/backend-app-api/package.json | 2 +- packages/backend-common/package.json | 2 +- packages/backend-defaults/package.json | 2 +- yarn.lock | 15 +++++++++++---- 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 .changeset/dependabot-b42f054.md diff --git a/.changeset/dependabot-b42f054.md b/.changeset/dependabot-b42f054.md new file mode 100644 index 0000000000..b7f203ed9e --- /dev/null +++ b/.changeset/dependabot-b42f054.md @@ -0,0 +1,7 @@ +--- +'@backstage/backend-app-api': patch +'@backstage/backend-common': patch +'@backstage/backend-defaults': patch +--- + +chore(deps): bump `path-to-regexp` from 6.2.2 to 8.0.0 diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json index 5c7ec141f7..6108d2efcb 100644 --- a/packages/backend-app-api/package.json +++ b/packages/backend-app-api/package.json @@ -76,7 +76,7 @@ "morgan": "^1.10.0", "node-fetch": "^2.7.0", "node-forge": "^1.3.1", - "path-to-regexp": "^6.2.1", + "path-to-regexp": "^8.0.0", "selfsigned": "^2.0.0", "stoppable": "^1.1.0", "triple-beam": "^1.4.1", diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index 760abf9b51..da2099e121 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -105,7 +105,7 @@ "node-fetch": "^2.7.0", "node-forge": "^1.3.1", "p-limit": "^3.1.0", - "path-to-regexp": "^6.2.1", + "path-to-regexp": "^8.0.0", "pg": "^8.11.3", "pg-format": "^1.0.4", "raw-body": "^2.4.1", diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json index 5b848164a9..db95a98aab 100644 --- a/packages/backend-defaults/package.json +++ b/packages/backend-defaults/package.json @@ -169,7 +169,7 @@ "node-fetch": "^2.7.0", "node-forge": "^1.3.1", "p-limit": "^3.1.0", - "path-to-regexp": "^6.2.1", + "path-to-regexp": "^8.0.0", "pg": "^8.11.3", "pg-connection-string": "^2.3.0", "pg-format": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index 7aa2ab78af..d40ef47152 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3476,7 +3476,7 @@ __metadata: msw: ^1.0.0 node-fetch: ^2.7.0 node-forge: ^1.3.1 - path-to-regexp: ^6.2.1 + path-to-regexp: ^8.0.0 selfsigned: ^2.0.0 stoppable: ^1.1.0 supertest: ^7.0.0 @@ -3562,7 +3562,7 @@ __metadata: node-fetch: ^2.7.0 node-forge: ^1.3.1 p-limit: ^3.1.0 - path-to-regexp: ^6.2.1 + path-to-regexp: ^8.0.0 pg: ^8.11.3 pg-format: ^1.0.4 raw-body: ^2.4.1 @@ -3654,7 +3654,7 @@ __metadata: node-fetch: ^2.7.0 node-forge: ^1.3.1 p-limit: ^3.1.0 - path-to-regexp: ^6.2.1 + path-to-regexp: ^8.0.0 pg: ^8.11.3 pg-connection-string: ^2.3.0 pg-format: ^1.0.4 @@ -35948,13 +35948,20 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.2.1, path-to-regexp@npm:^6.2.2": +"path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.2.2": version: 6.2.2 resolution: "path-to-regexp@npm:6.2.2" checksum: b7b0005c36f5099f9ed1fb20a820d2e4ed1297ffe683ea1d678f5e976eb9544f01debb281369dabdc26da82e6453901bf71acf2c7ed14b9243536c2a45286c33 languageName: node linkType: hard +"path-to-regexp@npm:^8.0.0": + version: 8.0.0 + resolution: "path-to-regexp@npm:8.0.0" + checksum: f87373e65a11b648f0427df72b0a5686cf2d0fa4716da36612755085df2b9deda35d308c49514460f3a657a9be2b47f9aa0ee0e71766aff86f28a422bf5ba135 + languageName: node + linkType: hard + "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" From 677435f27fe0bec8aaa57c731898528e571cd58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 10 Sep 2024 10:23:03 +0200 Subject: [PATCH 2/2] fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .../src/entrypoints/httpRouter/createCredentialsBarrier.ts | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts b/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts index a69fa5a804..dd6c95ca82 100644 --- a/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts +++ b/packages/backend-defaults/src/entrypoints/httpRouter/createCredentialsBarrier.ts @@ -27,7 +27,7 @@ export function createPathPolicyPredicate(policyPath: string) { return () => true; } - const pathRegex = pathToRegexp(policyPath, undefined, { + const { regexp: pathRegex } = pathToRegexp(policyPath, { end: false, }); diff --git a/yarn.lock b/yarn.lock index d40ef47152..951dc90935 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35956,9 +35956,9 @@ __metadata: linkType: hard "path-to-regexp@npm:^8.0.0": - version: 8.0.0 - resolution: "path-to-regexp@npm:8.0.0" - checksum: f87373e65a11b648f0427df72b0a5686cf2d0fa4716da36612755085df2b9deda35d308c49514460f3a657a9be2b47f9aa0ee0e71766aff86f28a422bf5ba135 + version: 8.1.0 + resolution: "path-to-regexp@npm:8.1.0" + checksum: 982b784f8dff704c04c79dc3e26d51d2dba340e6bd513a8bdc48559a8543d730547d9d2355122166171eb509236e7524802ed643f8a77d527e12c69ffc74f97f languageName: node linkType: hard