From cd6febaf2dfdf2d219b4112b2ef5d97e31eb7da4 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 5 Aug 2020 11:34:17 +0200 Subject: [PATCH] cli: update e2e-test to include dist versions of backend packages --- packages/cli/e2e-test/cli-e2e-test.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/cli/e2e-test/cli-e2e-test.js b/packages/cli/e2e-test/cli-e2e-test.js index e9635de6bb..c90433db1d 100644 --- a/packages/cli/e2e-test/cli-e2e-test.js +++ b/packages/cli/e2e-test/cli-e2e-test.js @@ -73,6 +73,8 @@ async function buildDistWorkspace(workspaceName, rootDir) { '@backstage/core', '@backstage/dev-utils', '@backstage/test-utils', + // We don't use the backend itself, but want all of its dependencies + 'example-backend', ]); print('Pinning yarn version in workspace'); @@ -180,13 +182,15 @@ async function overrideModuleResolutions(appDir, workspaceDir) { pkgJson.resolutions = pkgJson.resolutions || {}; pkgJson.dependencies = pkgJson.dependencies || {}; - const packageNames = await fs.readdir(resolvePath(workspaceDir, 'packages')); - for (const name of packageNames) { - const pkgPath = joinPath('..', 'workspace', 'packages', name); + for (const dir of ['packages', 'plugins']) { + const packageNames = await fs.readdir(resolvePath(workspaceDir, dir)); + for (const name of packageNames) { + const pkgPath = joinPath('..', 'workspace', dir, name); - pkgJson.dependencies[`@backstage/${name}`] = `file:${pkgPath}`; - pkgJson.resolutions[`@backstage/${name}`] = `file:${pkgPath}`; - delete pkgJson.devDependencies[`@backstage/${name}`]; + pkgJson.dependencies[`@backstage/${name}`] = `file:${pkgPath}`; + pkgJson.resolutions[`@backstage/${name}`] = `file:${pkgPath}`; + delete pkgJson.devDependencies[`@backstage/${name}`]; + } } fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 }); }