From 859fc51f553da611a44db558df3b2a9ad90232f8 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 7 Jan 2022 13:21:04 +0100 Subject: [PATCH] backend-common: switch to using get-packages for listing monorepo packages Signed-off-by: Patrik Oldsberg --- packages/backend-common/package.json | 2 +- packages/backend-common/src/config.ts | 7 +++---- yarn.lock | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index adbb6fed18..03dd8e3e91 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -36,7 +36,7 @@ "@backstage/integration": "^0.7.0", "@backstage/types": "^0.1.1", "@google-cloud/storage": "^5.8.0", - "@lerna/project": "^4.0.0", + "@manypkg/get-packages": "^1.1.3", "@octokit/rest": "^18.5.3", "@types/cors": "^2.8.6", "@types/dockerode": "^3.3.0", diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts index 399898cfc4..12cc2e3a9d 100644 --- a/packages/backend-common/src/config.ts +++ b/packages/backend-common/src/config.ts @@ -27,6 +27,7 @@ import { } from '@backstage/config-loader'; import { AppConfig, Config, ConfigReader } from '@backstage/config'; import { JsonValue } from '@backstage/types'; +import { getPackages } from '@manypkg/get-packages'; import { isValidUrl } from './urls'; @@ -194,11 +195,9 @@ export async function loadBackendConfig(options: { // TODO(hhogg): This is fetching _all_ of the packages of the monorepo // in order to find the secrets for redactions, however we only care about // the backend ones, we need to find a way to exclude the frontend packages. - const { Project } = require('@lerna/project'); - const project = new Project(paths.targetDir); - const packages = await project.getPackages(); + const { packages } = await getPackages(paths.targetDir); const schema = await loadConfigSchema({ - dependencies: packages.map((p: any) => p.name), + dependencies: packages.map(p => p.packageJson.name), }); const config = new ObservableConfigProxy(options.logger); diff --git a/yarn.lock b/yarn.lock index 7f9e909637..dbfbfb81ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4300,7 +4300,7 @@ npmlog "^4.1.2" upath "^2.0.1" -"@lerna/project@4.0.0", "@lerna/project@^4.0.0": +"@lerna/project@4.0.0": version "4.0.0" resolved "https://registry.npmjs.org/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b" integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==