diff --git a/build/containerfiles/Containerfile b/build/containerfiles/Containerfile index 22b6321b21..142ebded77 100644 --- a/build/containerfiles/Containerfile +++ b/build/containerfiles/Containerfile @@ -323,6 +323,6 @@ COPY --chown=1001:1001 $EXTERNAL_SOURCE_NESTED/packages/backend/src/instrumentat RUN chmod a=r ./instrumentation.js ENV NODE_OPTIONS="--no-node-snapshot" -ENTRYPOINT ["node", "--require", "./instrumentation.js", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.example.yaml", "--config", "app-config.example.production.yaml"] +ENTRYPOINT ["node", "--require", "./instrumentation.js", "packages/backend"] # append Brew metadata here diff --git a/packages/backend/package.json b/packages/backend/package.json index b6157f00a9..5cc7ddac6c 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -21,7 +21,6 @@ "prettier:fix": "prettier --ignore-unknown --write ." }, "dependencies": { - "@backstage-community/plugin-rbac-backend": "7.12.5", "@backstage-community/plugin-rbac-node": "1.20.1", "@backstage-community/plugin-scaffolder-backend-module-annotator": "2.16.1", "@backstage/backend-app-api": "1.6.0", diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts index 7f0acf4ca6..c263f26e4a 100644 --- a/packages/backend/src/index.ts +++ b/packages/backend/src/index.ts @@ -144,10 +144,10 @@ backend.add(import('@backstage/plugin-search-backend-module-catalog')); backend.add(import('@backstage/plugin-events-backend')); backend.add(import('@backstage/plugin-permission-backend')); -backend.add(import('@backstage-community/plugin-rbac-backend')); backend.add( import('@backstage-community/plugin-scaffolder-backend-module-annotator'), ); + backend.add(pluginIDProviderService); backend.add(rbacDynamicPluginsProvider); diff --git a/packages/backend/src/modules/rbacDynamicPluginsModule.ts b/packages/backend/src/modules/rbacDynamicPluginsModule.ts index 23675db4af..4de6259000 100644 --- a/packages/backend/src/modules/rbacDynamicPluginsModule.ts +++ b/packages/backend/src/modules/rbacDynamicPluginsModule.ts @@ -8,8 +8,10 @@ import { createServiceRef, } from '@backstage/backend-plugin-api'; -import { PluginIdProvider } from '@backstage-community/plugin-rbac-backend'; -import { pluginIdProviderExtensionPoint } from '@backstage-community/plugin-rbac-node'; +import { + PluginIdProvider, + pluginIdProviderExtensionPoint, +} from '@backstage-community/plugin-rbac-node'; const pluginIDProviderServiceRef = createServiceRef({ id: 'pluginIDProvider', diff --git a/yarn.lock b/yarn.lock index 0de1c4209c..c7a47284b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1527,7 +1527,18 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.15, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.26.2, @babel/parser@npm:^7.28.6, @babel/parser@npm:^7.29.0": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.26.2, @babel/parser@npm:^7.28.6, @babel/parser@npm:^7.29.0": + version: 7.29.0 + resolution: "@babel/parser@npm:7.29.0" + dependencies: + "@babel/types": "npm:^7.29.0" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/333b2aa761264b91577a74bee86141ef733f9f9f6d4fc52548e4847dc35dfbf821f58c46832c637bfa761a6d9909d6a68f7d1ed59e17e4ffbb958dc510c17b62 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.20.15": version: 7.29.2 resolution: "@babel/parser@npm:7.29.2" dependencies: @@ -2668,35 +2679,6 @@ __metadata: languageName: node linkType: hard -"@backstage-community/plugin-rbac-backend@npm:7.12.5": - version: 7.12.5 - resolution: "@backstage-community/plugin-rbac-backend@npm:7.12.5" - dependencies: - "@backstage-community/plugin-rbac-common": "npm:^1.26.1" - "@backstage-community/plugin-rbac-node": "npm:^1.20.1" - "@backstage/backend-defaults": "npm:^0.16.0" - "@backstage/backend-plugin-api": "npm:^1.8.0" - "@backstage/catalog-client": "npm:^1.14.0" - "@backstage/catalog-model": "npm:^1.7.7" - "@backstage/config": "npm:^1.3.6" - "@backstage/errors": "npm:^1.2.7" - "@backstage/plugin-permission-common": "npm:^0.9.7" - "@backstage/plugin-permission-node": "npm:^0.10.11" - "@dagrejs/graphlib": "npm:^4.0.0" - casbin: "npm:^5.27.1" - chokidar: "npm:^3.6.0" - csv-parse: "npm:^6.0.0" - express: "npm:^4.18.2" - express-promise-router: "npm:^4.1.0" - js-yaml: "npm:^4.1.0" - knex: "npm:^3.0.0" - lodash: "npm:^4.17.21" - typeorm-adapter: "npm:^1.6.1" - zod: "npm:^4.3.6" - checksum: 10c0/ee2b60a75568241d808fbc8f79e0c823bc832bf57ac01b0364c8056a0107b8b62f69c9321abf88cb7e8a1d2ccf13065f392f205dbb662fb5ff151f6070e7710c - languageName: node - linkType: hard - "@backstage-community/plugin-rbac-common@npm:1.26.1, @backstage-community/plugin-rbac-common@npm:^1.26.1": version: 1.26.1 resolution: "@backstage-community/plugin-rbac-common@npm:1.26.1" @@ -2707,7 +2689,7 @@ __metadata: languageName: node linkType: hard -"@backstage-community/plugin-rbac-node@npm:1.20.1, @backstage-community/plugin-rbac-node@npm:^1.20.1": +"@backstage-community/plugin-rbac-node@npm:1.20.1": version: 1.20.1 resolution: "@backstage-community/plugin-rbac-node@npm:1.20.1" dependencies: @@ -5974,15 +5956,6 @@ __metadata: languageName: node linkType: hard -"@casbin/expression-eval@npm:^5.3.0": - version: 5.3.0 - resolution: "@casbin/expression-eval@npm:5.3.0" - dependencies: - jsep: "npm:^0.3.0" - checksum: 10c0/1fa2fd703036b065821fbeb8d0f0c274ba50331737d19b3a77b7c9cd571f5df2580145bda1d90f2dd46863a66aae9f5256974eb168b7ccbb9facbcb796f5cb7a - languageName: node - linkType: hard - "@changesets/types@npm:^4.0.1": version: 4.1.0 resolution: "@changesets/types@npm:4.1.0" @@ -6188,13 +6161,6 @@ __metadata: languageName: node linkType: hard -"@dagrejs/graphlib@npm:^4.0.0": - version: 4.0.1 - resolution: "@dagrejs/graphlib@npm:4.0.1" - checksum: 10c0/03ab574f2eb7d87173af0b9d8bbae87c10e225778b8144a800c663afe307ff71d851c13d96d32ec91db85e325d64914cdabbab1ce76fb043e0a5538e60bb51bd - languageName: node - linkType: hard - "@date-io/core@npm:1.x, @date-io/core@npm:^1.3.13": version: 1.3.13 resolution: "@date-io/core@npm:1.3.13" @@ -10041,6 +10007,17 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/core@npm:2.5.1": + version: 2.5.1 + resolution: "@opentelemetry/core@npm:2.5.1" + dependencies: + "@opentelemetry/semantic-conventions": "npm:^1.29.0" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.10.0" + checksum: 10c0/cbaf36953364d1295ef2ff4587c3f99eca121c7c2dbd2553699100ccbd91017f20fb1a710ac76fad832d9762dc98ae009ce0e96ab8fb00e5b539dc401d57f217 + languageName: node + linkType: hard + "@opentelemetry/core@npm:2.7.1, @opentelemetry/core@npm:^2.0.0": version: 2.7.1 resolution: "@opentelemetry/core@npm:2.7.1" @@ -10908,7 +10885,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/resources@npm:2.7.1, @opentelemetry/resources@npm:^2.0.0": +"@opentelemetry/resources@npm:2.7.1": version: 2.7.1 resolution: "@opentelemetry/resources@npm:2.7.1" dependencies: @@ -10920,6 +10897,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/resources@npm:^2.0.0": + version: 2.5.1 + resolution: "@opentelemetry/resources@npm:2.5.1" + dependencies: + "@opentelemetry/core": "npm:2.5.1" + "@opentelemetry/semantic-conventions": "npm:^1.29.0" + peerDependencies: + "@opentelemetry/api": ">=1.3.0 <1.10.0" + checksum: 10c0/c336d5066fa7457272bcffb5a9826f090e1e07c2a70c5976942cf2bb188be685842658982a0f323ddfc1d6fbc364f123b6b0e433e230b023aefd88ec60062ba4 + languageName: node + linkType: hard + "@opentelemetry/sdk-logs@npm:0.218.0": version: 0.218.0 resolution: "@opentelemetry/sdk-logs@npm:0.218.0" @@ -11007,13 +10996,20 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/semantic-conventions@npm:^1.24.0, @opentelemetry/semantic-conventions@npm:^1.27.0, @opentelemetry/semantic-conventions@npm:^1.29.0, @opentelemetry/semantic-conventions@npm:^1.30.0, @opentelemetry/semantic-conventions@npm:^1.33.0, @opentelemetry/semantic-conventions@npm:^1.33.1, @opentelemetry/semantic-conventions@npm:^1.34.0, @opentelemetry/semantic-conventions@npm:^1.36.0, @opentelemetry/semantic-conventions@npm:^1.37.0": +"@opentelemetry/semantic-conventions@npm:^1.24.0, @opentelemetry/semantic-conventions@npm:^1.33.0, @opentelemetry/semantic-conventions@npm:^1.33.1, @opentelemetry/semantic-conventions@npm:^1.34.0, @opentelemetry/semantic-conventions@npm:^1.36.0, @opentelemetry/semantic-conventions@npm:^1.37.0": version: 1.41.1 resolution: "@opentelemetry/semantic-conventions@npm:1.41.1" checksum: 10c0/c54b1edf845766e93026d30fd95e15da9dba8d7a5b58f8c320c5d36ab542c77b37868f3e8e3d78ec162da8ee2afd24781f0a65934c9bdbc1aea86b47b12f074c languageName: node linkType: hard +"@opentelemetry/semantic-conventions@npm:^1.27.0, @opentelemetry/semantic-conventions@npm:^1.29.0, @opentelemetry/semantic-conventions@npm:^1.30.0": + version: 1.40.0 + resolution: "@opentelemetry/semantic-conventions@npm:1.40.0" + checksum: 10c0/3259de0ea11b52eb70e44c12eba21448392baf9cb74c37b62071c4a5ed7fb89b61e194f3898d40ac6bfa7293617a0e132876cb6e355472b66de0cdb13c50b529 + languageName: node + linkType: hard + "@opentelemetry/sql-common@npm:^0.41.2": version: 0.41.2 resolution: "@opentelemetry/sql-common@npm:0.41.2" @@ -12007,7 +12003,7 @@ __metadata: languageName: node linkType: hard -"@react-aria/button@npm:^3.14.3, @react-aria/button@npm:^3.14.4": +"@react-aria/button@npm:^3.14.3": version: 3.14.5 resolution: "@react-aria/button@npm:3.14.5" dependencies: @@ -12025,6 +12021,24 @@ __metadata: languageName: node linkType: hard +"@react-aria/button@npm:^3.14.4": + version: 3.14.4 + resolution: "@react-aria/button@npm:3.14.4" + dependencies: + "@react-aria/interactions": "npm:^3.27.0" + "@react-aria/toolbar": "npm:3.0.0-beta.23" + "@react-aria/utils": "npm:^3.33.0" + "@react-stately/toggle": "npm:^3.9.4" + "@react-types/button": "npm:^3.15.0" + "@react-types/shared": "npm:^3.33.0" + "@swc/helpers": "npm:^0.5.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + checksum: 10c0/99b640d9d50478c36c57eb0be05ad6dc86f9ac0f80501c5d73c1ae316d958ed07bfb4ec8b61fd31093fb6b62491df5422e3bff229eb86be1e43dcda7cdd41350 + languageName: node + linkType: hard + "@react-aria/calendar@npm:^3.9.4": version: 3.9.4 resolution: "@react-aria/calendar@npm:3.9.4" @@ -12346,7 +12360,7 @@ __metadata: languageName: node linkType: hard -"@react-aria/landmark@npm:^3.0.10, @react-aria/landmark@npm:^3.0.9": +"@react-aria/landmark@npm:^3.0.10": version: 3.0.10 resolution: "@react-aria/landmark@npm:3.0.10" dependencies: @@ -12361,6 +12375,21 @@ __metadata: languageName: node linkType: hard +"@react-aria/landmark@npm:^3.0.9": + version: 3.0.9 + resolution: "@react-aria/landmark@npm:3.0.9" + dependencies: + "@react-aria/utils": "npm:^3.33.0" + "@react-types/shared": "npm:^3.33.0" + "@swc/helpers": "npm:^0.5.0" + use-sync-external-store: "npm:^1.6.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 + checksum: 10c0/e430a5cf7517d6a674ea6ac8a76d55cede471f4991385a1acae70771b136fb21636fb28cca2e5dfe4d362a557eb9abc9200421fb2749f3cf5ed51980a06ad744 + languageName: node + linkType: hard + "@react-aria/link@npm:^3.8.8": version: 3.8.8 resolution: "@react-aria/link@npm:3.8.8" @@ -15080,13 +15109,6 @@ __metadata: languageName: node linkType: hard -"@sqltools/formatter@npm:^1.2.5": - version: 1.2.5 - resolution: "@sqltools/formatter@npm:1.2.5" - checksum: 10c0/4b4fa62b8cd4880784b71cc5edd4a13da04fda0a915c14282765a8ec1a900a495e69b322704413e2052d221b5646d9fb0e20e87911f9a8f438f33180eecb11a4 - languageName: node - linkType: hard - "@standard-schema/spec@npm:^1.0.0, @standard-schema/spec@npm:^1.1.0": version: 1.1.0 resolution: "@standard-schema/spec@npm:1.1.0" @@ -18597,13 +18619,6 @@ __metadata: languageName: node linkType: hard -"ansis@npm:^4.2.0": - version: 4.2.0 - resolution: "ansis@npm:4.2.0" - checksum: 10c0/cd6a7a681ecd36e72e0d79c1e34f1f3bcb1b15bcbb6f0f8969b4228062d3bfebbef468e09771b00d93b2294370b34f707599d4a113542a876de26823b795b5d2 - languageName: node - linkType: hard - "any-promise@npm:^1.0.0": version: 1.3.0 resolution: "any-promise@npm:1.3.0" @@ -18689,13 +18704,6 @@ __metadata: languageName: unknown linkType: soft -"app-root-path@npm:^3.1.0": - version: 3.1.0 - resolution: "app-root-path@npm:3.1.0" - checksum: 10c0/4a0fd976de1bffcdb18a5e1f8050091f15d0780e0582bca99aaa9d52de71f0e08e5185355fcffc781180bfb898499e787a2f5ed79b9c448b942b31dc947acaa9 - languageName: node - linkType: hard - "app@workspace:*, app@workspace:packages/app": version: 0.0.0-use.local resolution: "app@workspace:packages/app" @@ -19159,13 +19167,6 @@ __metadata: languageName: node linkType: hard -"await-lock@npm:^2.0.1": - version: 2.2.2 - resolution: "await-lock@npm:2.2.2" - checksum: 10c0/bedf00dad44c6325a655bf3bd523ab9e1ce41023da6a8c379990c76ac1d942ac7e5301627ab84ba37917ab5247506ba429b7f6e4bf77074093f255571b9ad5ee - languageName: node - linkType: hard - "aws-ssl-profiles@npm:^1.1.2": version: 1.1.2 resolution: "aws-ssl-profiles@npm:1.1.2" @@ -19180,15 +19181,25 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.12.0, axios@npm:^1.12.2, axios@npm:^1.7.3, axios@npm:^1.7.4": - version: 1.16.1 - resolution: "axios@npm:1.16.1" +"axios@npm:^1.12.0, axios@npm:^1.12.2, axios@npm:^1.7.4": + version: 1.13.5 + resolution: "axios@npm:1.13.5" dependencies: - follow-redirects: "npm:^1.16.0" + follow-redirects: "npm:^1.15.11" form-data: "npm:^4.0.5" - https-proxy-agent: "npm:^5.0.1" - proxy-from-env: "npm:^2.1.0" - checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7 + proxy-from-env: "npm:^1.1.0" + checksum: 10c0/abf468c34f2d145f3dc7dbc0f1be67e520630624307bda69a41bbe8d386bd672d87b4405c4ee77f9ff54b235ab02f96a9968fb00e75b13ce64706e352a3068fd + languageName: node + linkType: hard + +"axios@npm:^1.7.3": + version: 1.13.6 + resolution: "axios@npm:1.13.6" + dependencies: + follow-redirects: "npm:^1.15.11" + form-data: "npm:^4.0.5" + proxy-from-env: "npm:^1.1.0" + checksum: 10c0/51fb5af055c3b85662fa97df17d986ae2c37d13bf86d50b6bb36b6b3a2dec6966a1d3a14ab3774b71707b155ae3597ed9b7babdf1a1a863d1a31840cb8e7ec71 languageName: node linkType: hard @@ -19338,7 +19349,6 @@ __metadata: version: 0.0.0-use.local resolution: "backend@workspace:packages/backend" dependencies: - "@backstage-community/plugin-rbac-backend": "npm:7.12.5" "@backstage-community/plugin-rbac-node": "npm:1.20.1" "@backstage-community/plugin-scaffolder-backend-module-annotator": "npm:2.16.1" "@backstage/backend-app-api": "npm:1.6.0" @@ -20204,19 +20214,6 @@ __metadata: languageName: node linkType: hard -"casbin@npm:^5.27.0, casbin@npm:^5.27.1": - version: 5.49.0 - resolution: "casbin@npm:5.49.0" - dependencies: - "@casbin/expression-eval": "npm:^5.3.0" - await-lock: "npm:^2.0.1" - buffer: "npm:^6.0.3" - csv-parse: "npm:^5.5.6" - minimatch: "npm:^10.2.1" - checksum: 10c0/100e9370e7672c57561ebfb444db7d557ebf09abb96e2262735a2543e60059d74f7e159fc88de0558cf03ac1c7ab9422d7d59e33feb8e0aeb68ebd63b907f8ea - languageName: node - linkType: hard - "catharsis@npm:^0.9.0": version: 0.9.0 resolution: "catharsis@npm:0.9.0" @@ -21624,20 +21621,6 @@ __metadata: languageName: node linkType: hard -"csv-parse@npm:^5.5.6": - version: 5.6.0 - resolution: "csv-parse@npm:5.6.0" - checksum: 10c0/52f5e6c45359902e0c8e57fc2eeed41366dc6b6d283b495b538dd50c8e8510413d6f924096ea056319cbbb8ed26e111c3a3485d7985c021bcf5abaa9e92425c7 - languageName: node - linkType: hard - -"csv-parse@npm:^6.0.0": - version: 6.2.1 - resolution: "csv-parse@npm:6.2.1" - checksum: 10c0/8b6f14b244ca62476d4217aac721131ba0ada3e4ed7614e43ebc99203807564dcb054144d1de4ef22ee8b0c63b431640f75d46a0e1e0f72853a954b279ba1c61 - languageName: node - linkType: hard - "ctrlc-windows@npm:^2.1.0": version: 2.2.0 resolution: "ctrlc-windows@npm:2.2.0" @@ -21840,13 +21823,6 @@ __metadata: languageName: node linkType: hard -"dayjs@npm:^1.11.19": - version: 1.11.19 - resolution: "dayjs@npm:1.11.19" - checksum: 10c0/7d8a6074a343f821f81ea284d700bd34ea6c7abbe8d93bce7aba818948957c1b7f56131702e5e890a5622cdfc05dcebe8aed0b8313bdc6838a594d7846b0b000 - languageName: node - linkType: hard - "debounce-promise@npm:^3.1.2": version: 3.1.2 resolution: "debounce-promise@npm:3.1.2" @@ -21928,7 +21904,7 @@ __metadata: languageName: node linkType: hard -"dedent@npm:^1.6.0, dedent@npm:^1.7.0": +"dedent@npm:^1.6.0": version: 1.7.1 resolution: "dedent@npm:1.7.1" peerDependencies: @@ -22460,13 +22436,6 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^16.6.1": - version: 16.6.1 - resolution: "dotenv@npm:16.6.1" - checksum: 10c0/15ce56608326ea0d1d9414a5c8ee6dcf0fffc79d2c16422b4ac2268e7e2d76ff5a572d37ffe747c377de12005f14b3cc22361e79fc7f1061cce81f77d2c973dc - languageName: node - linkType: hard - "drange@npm:^1.0.2": version: 1.1.1 resolution: "drange@npm:1.1.1" @@ -23935,7 +23904,7 @@ __metadata: languageName: node linkType: hard -"express@npm:4.22.1, express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.2, express@npm:^4.22.0, express@npm:^4.22.1": +"express@npm:4.22.1, express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.22.0, express@npm:^4.22.1": version: 4.22.1 resolution: "express@npm:4.22.1" dependencies: @@ -24132,6 +24101,13 @@ __metadata: languageName: node linkType: hard +"fast-xml-builder@npm:^1.0.0": + version: 1.0.0 + resolution: "fast-xml-builder@npm:1.0.0" + checksum: 10c0/2631fda265c81e8008884d08944eeed4e284430116faa5b8b7a43a3602af367223b7bf01c933215c9ad2358b8666e45041bc038d64877156a2f88821841b3014 + languageName: node + linkType: hard + "fast-xml-builder@npm:^1.1.5": version: 1.1.5 resolution: "fast-xml-builder@npm:1.1.5" @@ -24141,7 +24117,7 @@ __metadata: languageName: node linkType: hard -"fast-xml-parser@npm:5.7.1, fast-xml-parser@npm:^5.0.7, fast-xml-parser@npm:^5.3.4": +"fast-xml-parser@npm:5.7.1": version: 5.7.1 resolution: "fast-xml-parser@npm:5.7.1" dependencies: @@ -24155,6 +24131,18 @@ __metadata: languageName: node linkType: hard +"fast-xml-parser@npm:^5.0.7, fast-xml-parser@npm:^5.3.4": + version: 5.4.1 + resolution: "fast-xml-parser@npm:5.4.1" + dependencies: + fast-xml-builder: "npm:^1.0.0" + strnum: "npm:^2.1.2" + bin: + fxparser: src/cli/cli.js + checksum: 10c0/8c696438a0c64135faf93ea6a93879208d649b7c9a3293d30d6eb750dc7f766fd083c0df5a82786b60809c3ead64fad155f28dbed25efea91017aaf9f64c91e5 + languageName: node + linkType: hard + "fastest-stable-stringify@npm:^2.0.2": version: 2.0.2 resolution: "fastest-stable-stringify@npm:2.0.2" @@ -24450,7 +24438,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.16.0": +"follow-redirects@npm:^1.0.0": version: 1.16.0 resolution: "follow-redirects@npm:1.16.0" peerDependenciesMeta: @@ -24460,6 +24448,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.11": + version: 1.15.11 + resolution: "follow-redirects@npm:1.15.11" + peerDependenciesMeta: + debug: + optional: true + checksum: 10c0/d301f430542520a54058d4aeeb453233c564aaccac835d29d15e050beb33f339ad67d9bddbce01739c5dc46a6716dbe3d9d0d5134b1ca203effa11a7ef092343 + languageName: node + linkType: hard + "for-each@npm:^0.3.3, for-each@npm:^0.3.5": version: 0.3.5 resolution: "for-each@npm:0.3.5" @@ -28099,13 +28097,6 @@ __metadata: languageName: node linkType: hard -"jsep@npm:^0.3.0": - version: 0.3.5 - resolution: "jsep@npm:0.3.5" - checksum: 10c0/fb5def7a4ba1cee41d144ebdd0d477785dc84b6bc1fed6cf5169f106de980dbe363bf99cb36a450435d7fd952d22b1d76e1609aeb5c7e7cbbbdb6d15fad03614 - languageName: node - linkType: hard - "jsep@npm:^1.2.0, jsep@npm:^1.4.0": version: 1.4.0 resolution: "jsep@npm:1.4.0" @@ -33287,10 +33278,10 @@ __metadata: languageName: node linkType: hard -"proxy-from-env@npm:^2.1.0": - version: 2.1.0 - resolution: "proxy-from-env@npm:2.1.0" - checksum: 10c0/ed01729fd4d094eab619cd7e17ce3698b3413b31eb102c4904f9875e677cd207392795d5b4adee9cec359dfd31c44d5ad7595a3a3ad51c40250e141512281c58 +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b languageName: node linkType: hard @@ -34521,13 +34512,6 @@ __metadata: languageName: node linkType: hard -"reflect-metadata@npm:^0.1.13": - version: 0.1.14 - resolution: "reflect-metadata@npm:0.1.14" - checksum: 10c0/3a6190c7f6cb224f26a012d11f9e329360c01c1945e2cbefea23976a8bacf9db6b794aeb5bf18adcb673c448a234fbc06fc41853c00a6c206b30f0777ecf019e - languageName: node - linkType: hard - "reflect-metadata@npm:^0.2.2": version: 0.2.2 resolution: "reflect-metadata@npm:0.2.2" @@ -36221,13 +36205,6 @@ __metadata: languageName: node linkType: hard -"sql-highlight@npm:^6.1.0": - version: 6.1.0 - resolution: "sql-highlight@npm:6.1.0" - checksum: 10c0/9614f4608bfde8ea7bf9b2fe9233dcc99a619c91cbc3f5cd85a6fb5ad4b2177f4ac8ca4a0191f4243ff8aea3b6f2a1229efc88635298269e0049b2ac08bde263 - languageName: node - linkType: hard - "ssh-remote-port-forward@npm:^1.0.4": version: 1.0.4 resolution: "ssh-remote-port-forward@npm:1.0.4" @@ -36733,6 +36710,13 @@ __metadata: languageName: node linkType: hard +"strnum@npm:^2.1.2": + version: 2.1.2 + resolution: "strnum@npm:2.1.2" + checksum: 10c0/4e04753b793540d79cd13b2c3e59e298440477bae2b853ab78d548138385193b37d766d95b63b7046475d68d44fb1fca692f0a3f72b03f4168af076c7b246df9 + languageName: node + linkType: hard + "strnum@npm:^2.2.3": version: 2.2.3 resolution: "strnum@npm:2.2.3" @@ -38027,94 +38011,6 @@ __metadata: languageName: node linkType: hard -"typeorm-adapter@npm:^1.6.1": - version: 1.9.0 - resolution: "typeorm-adapter@npm:1.9.0" - dependencies: - casbin: "npm:^5.27.0" - reflect-metadata: "npm:^0.1.13" - typeorm: "npm:^0.3.17" - checksum: 10c0/13a8cfdad81b0b262c2b38ca83bece96e4ca6c703a40ce1594b186b08e2d8afa8614af864c24b809a4f8b14df04f213fa322303dfaa8ea11401215fa9bd33f85 - languageName: node - linkType: hard - -"typeorm@npm:^0.3.17": - version: 0.3.28 - resolution: "typeorm@npm:0.3.28" - dependencies: - "@sqltools/formatter": "npm:^1.2.5" - ansis: "npm:^4.2.0" - app-root-path: "npm:^3.1.0" - buffer: "npm:^6.0.3" - dayjs: "npm:^1.11.19" - debug: "npm:^4.4.3" - dedent: "npm:^1.7.0" - dotenv: "npm:^16.6.1" - glob: "npm:^10.5.0" - reflect-metadata: "npm:^0.2.2" - sha.js: "npm:^2.4.12" - sql-highlight: "npm:^6.1.0" - tslib: "npm:^2.8.1" - uuid: "npm:^11.1.0" - yargs: "npm:^17.7.2" - peerDependencies: - "@google-cloud/spanner": ^5.18.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - "@sap/hana-client": ^2.14.22 - better-sqlite3: ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 - ioredis: ^5.0.4 - mongodb: ^5.8.0 || ^6.0.0 - mssql: ^9.1.1 || ^10.0.0 || ^11.0.0 || ^12.0.0 - mysql2: ^2.2.5 || ^3.0.1 - oracledb: ^6.3.0 - pg: ^8.5.1 - pg-native: ^3.0.0 - pg-query-stream: ^4.0.0 - redis: ^3.1.1 || ^4.0.0 || ^5.0.14 - sql.js: ^1.4.0 - sqlite3: ^5.0.3 - ts-node: ^10.7.0 - typeorm-aurora-data-api-driver: ^2.0.0 || ^3.0.0 - peerDependenciesMeta: - "@google-cloud/spanner": - optional: true - "@sap/hana-client": - optional: true - better-sqlite3: - optional: true - ioredis: - optional: true - mongodb: - optional: true - mssql: - optional: true - mysql2: - optional: true - oracledb: - optional: true - pg: - optional: true - pg-native: - optional: true - pg-query-stream: - optional: true - redis: - optional: true - sql.js: - optional: true - sqlite3: - optional: true - ts-node: - optional: true - typeorm-aurora-data-api-driver: - optional: true - bin: - typeorm: cli.js - typeorm-ts-node-commonjs: cli-ts-node-commonjs.js - typeorm-ts-node-esm: cli-ts-node-esm.js - checksum: 10c0/b850b2f76ed576f9eae3deb39617466c527572328cb2727cb962d263822aabf289b52fe3f070d779e9cde5c164eed7486e73d77aef91e69a919b21e59a2e6122 - languageName: node - linkType: hard - "types-ramda@npm:^0.30.1": version: 0.30.1 resolution: "types-ramda@npm:0.30.1" @@ -38321,13 +38217,27 @@ __metadata: languageName: node linkType: hard -"undici@npm:7.25.0, undici@npm:^7.1.1, undici@npm:^7.16.0, undici@npm:^7.2.3, undici@npm:^7.21.0, undici@npm:^7.22.0": +"undici@npm:7.25.0, undici@npm:^7.1.1": version: 7.25.0 resolution: "undici@npm:7.25.0" checksum: 10c0/02a0b45dc14eb91bc488948750232450fe52f27a6b08086d6ac6736bb47908d600fe3a96d346f12eab24729c782e5c2f693bc8e8eca6696d4e4c09b1ed4cb4ec languageName: node linkType: hard +"undici@npm:^7.16.0": + version: 7.24.6 + resolution: "undici@npm:7.24.6" + checksum: 10c0/0f5413ccb20bafe27637a3a02cada731c53ee75f1df79029099db3af1eaaed410488489d9f430c09bd30bf0b925cb75fc30c39dff0689f656fd6fb7d75ded95f + languageName: node + linkType: hard + +"undici@npm:^7.2.3, undici@npm:^7.21.0, undici@npm:^7.22.0": + version: 7.22.0 + resolution: "undici@npm:7.22.0" + checksum: 10c0/09777c06f3f18f761f03e3a4c9c04fd9fcca8ad02ccea43602ee4adf73fcba082806f1afb637f6ea714ef6279c5323c25b16d435814c63db720f63bfc20d316b + languageName: node + linkType: hard + "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.1 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.1" @@ -38842,7 +38752,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^11.0.0, uuid@npm:^11.0.2, uuid@npm:^11.1.0": +"uuid@npm:^11.0.0, uuid@npm:^11.0.2": version: 11.1.0 resolution: "uuid@npm:11.1.0" bin: @@ -39972,7 +39882,7 @@ __metadata: languageName: node linkType: hard -"zod@npm:4.3.6, zod@npm:^4.1.13, zod@npm:^4.3.6": +"zod@npm:4.3.6, zod@npm:^4.1.13": version: 4.3.6 resolution: "zod@npm:4.3.6" checksum: 10c0/860d25a81ab41d33aa25f8d0d07b091a04acb426e605f396227a796e9e800c44723ed96d0f53a512b57be3d1520f45bf69c0cb3b378a232a00787a2609625307