From 1d2bceafd5916c94bfee03d1eca1f088f72e81cd Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 12 Feb 2021 10:14:53 +0100 Subject: [PATCH] bug: Upgrade to Lerna 4 --- packages/cli/src/lib/bundler/config.ts | 2 +- packages/cli/src/lib/config.ts | 2 +- packages/cli/src/lib/packager/index.ts | 2 +- packages/cli/src/lib/versioning/packages.test.ts | 2 +- packages/cli/src/lib/versioning/packages.ts | 2 +- scripts/check-type-dependencies.js | 2 +- scripts/isolated-release.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts index 6fbcc65c9a..b168b75eb4 100644 --- a/packages/cli/src/lib/bundler/config.ts +++ b/packages/cli/src/lib/bundler/config.ts @@ -72,7 +72,7 @@ async function readBuildInfo() { } async function loadLernaPackages(): Promise { - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const project = new LernaProject(cliPaths.targetDir); return project.getPackages(); } diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts index 30469421d3..b3e5f7844d 100644 --- a/packages/cli/src/lib/config.ts +++ b/packages/cli/src/lib/config.ts @@ -28,7 +28,7 @@ export async function loadCliConfig(options: Options) { const configPaths = options.args.map(arg => paths.resolveTarget(arg)); // Consider all packages in the monorepo when loading in config - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const project = new LernaProject(paths.targetDir); const packages = await project.getPackages(); diff --git a/packages/cli/src/lib/packager/index.ts b/packages/cli/src/lib/packager/index.ts index 3976998998..b9e5ab013d 100644 --- a/packages/cli/src/lib/packager/index.ts +++ b/packages/cli/src/lib/packager/index.ts @@ -219,7 +219,7 @@ async function moveToDistWorkspace( } async function findTargetPackages(pkgNames: string[]): Promise { - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const PackageGraph = require('@lerna/package-graph'); const project = new LernaProject(paths.targetDir); diff --git a/packages/cli/src/lib/versioning/packages.test.ts b/packages/cli/src/lib/versioning/packages.test.ts index 5af040809a..bd30015f06 100644 --- a/packages/cli/src/lib/versioning/packages.test.ts +++ b/packages/cli/src/lib/versioning/packages.test.ts @@ -59,7 +59,7 @@ describe('mapDependencies', () => { it('should read dependencies', async () => { // Make sure all modules involved in package discovery are in the module cache before we mock fs - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const project = new LernaProject(paths.targetDir); await project.getPackages(); diff --git a/packages/cli/src/lib/versioning/packages.ts b/packages/cli/src/lib/versioning/packages.ts index 991a4d23ef..207700f52a 100644 --- a/packages/cli/src/lib/versioning/packages.ts +++ b/packages/cli/src/lib/versioning/packages.ts @@ -67,7 +67,7 @@ export async function fetchPackageInfo( export async function mapDependencies( targetDir: string, ): Promise> { - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const project = new LernaProject(targetDir); const packages = await project.getPackages(); diff --git a/scripts/check-type-dependencies.js b/scripts/check-type-dependencies.js index 6ee4626a21..e0978d5951 100755 --- a/scripts/check-type-dependencies.js +++ b/scripts/check-type-dependencies.js @@ -24,7 +24,7 @@ const chalk = require('chalk'); async function main() { // This is from lerna, and cba polluting root package.json // eslint-disable-next-line import/no-extraneous-dependencies - const LernaProject = require('@lerna/project'); + const { LernaProject } = require('@lerna/project'); const project = new LernaProject(resolvePath('.')); const packages = await project.getPackages(); diff --git a/scripts/isolated-release.js b/scripts/isolated-release.js index 03c4e632c7..ea4ef32dc6 100755 --- a/scripts/isolated-release.js +++ b/scripts/isolated-release.js @@ -18,7 +18,7 @@ const path = require('path'); const childProcess = require('child_process'); // eslint-disable-next-line import/no-extraneous-dependencies -const LernaProject = require('@lerna/project'); +const { LernaProject } = require('@lerna/project'); // Prepare a release of the provided packages, e.g. @backstage/core async function main(args) {