From 63499e33652bc78fe23751875d74017e2f16a689 Mon Sep 17 00:00:00 2001 From: Daniel Stockman <5605+evocateur@users.noreply.github.com> Date: Mon, 7 Dec 2020 16:35:25 -0800 Subject: [PATCH] feat: Consume named exports of sibling modules --- commands/__mocks__/@lerna/output.js | 2 +- commands/add/command.js | 2 +- commands/add/index.js | 4 +- .../__tests__/bootstrap-command.test.js | 56 +++++++++---------- commands/bootstrap/command.js | 2 +- commands/bootstrap/index.js | 24 ++++---- .../changed/__tests__/changed-command.test.js | 8 +-- commands/changed/index.js | 6 +- .../clean/__tests__/clean-command.test.js | 4 +- commands/clean/command.js | 2 +- commands/clean/index.js | 6 +- .../create/__tests__/create-command.test.js | 2 +- commands/create/index.js | 4 +- commands/diff/__tests__/diff-command.test.js | 8 +-- commands/diff/index.js | 4 +- commands/exec/__tests__/exec-command.test.js | 4 +- commands/exec/command.js | 2 +- commands/exec/index.js | 8 +-- .../import/__tests__/import-command.test.js | 6 +- commands/import/index.js | 6 +- commands/info/__tests__/info-command.test.js | 2 +- commands/info/index.js | 4 +- commands/init/index.js | 2 +- commands/link/__tests__/link-command.test.js | 4 +- commands/link/index.js | 6 +- commands/list/__tests__/list-command.test.js | 4 +- commands/list/command.js | 2 +- commands/list/index.js | 4 +- .../__tests__/create-temp-licenses.test.js | 2 +- .../__tests__/get-npm-username.test.js | 2 +- .../get-packages-without-license.test.js | 2 +- .../get-two-factor-auth-required.test.js | 2 +- .../get-unpublished-packages.test.js | 2 +- .../publish/__tests__/publish-canary.test.js | 14 ++--- .../publish/__tests__/publish-command.test.js | 18 +++--- .../__tests__/publish-from-git.test.js | 14 ++--- .../__tests__/publish-from-package.test.js | 10 ++-- .../__tests__/publish-licenses.test.js | 4 +- .../publish-lifecycle-scripts.test.js | 4 +- .../publish-relative-file-specifiers.test.js | 6 +- .../publish/__tests__/publish-tagging.test.js | 4 +- .../__tests__/remove-temp-licenses.test.js | 2 +- .../verify-npm-package-access.test.js | 2 +- commands/publish/index.js | 30 +++++----- commands/publish/lib/get-npm-username.js | 2 +- commands/publish/lib/get-profile-data.js | 2 +- .../lib/get-two-factor-auth-required.js | 2 +- commands/publish/lib/get-whoami.js | 2 +- .../publish/lib/verify-npm-package-access.js | 4 +- commands/run/__tests__/run-command.test.js | 12 ++-- commands/run/command.js | 2 +- commands/run/index.js | 16 +++--- .../version/__tests__/prompt-version.test.js | 2 +- .../__tests__/version-bump-prerelease.test.js | 12 ++-- .../version/__tests__/version-bump.test.js | 2 +- .../version/__tests__/version-command.test.js | 22 ++++---- .../version-conventional-commits.test.js | 4 +- .../__tests__/version-create-release.test.js | 4 +- .../__tests__/version-ignore-changes.test.js | 8 +-- .../version-include-merged-tags.test.js | 12 ++-- .../version-lifecycle-scripts.test.js | 2 +- .../version/__tests__/version-message.test.js | 2 +- commands/version/index.js | 18 +++--- commands/version/lib/create-release.js | 4 +- core/cli/__tests__/core-cli.test.js | 4 +- core/cli/index.js | 2 +- core/command/__tests__/command.test.js | 6 +- core/command/index.js | 8 +-- .../__tests__/conventional-commits.test.js | 6 +- .../lib/get-changelog-config.js | 2 +- .../__tests__/get-filtered-packages.test.js | 6 +- .../lib/get-filtered-packages.js | 4 +- core/lerna/__tests__/cli.test.js | 2 +- core/otplease/__tests__/otplease.test.js | 6 +- .../__tests__/package-graph.test.js | 4 +- core/package-graph/index.js | 2 +- core/package-graph/lib/package-graph-node.js | 2 +- core/package-graph/lib/report-cycles.js | 2 +- core/package/__tests__/core-package.test.js | 2 +- core/project/__tests__/project.test.js | 2 +- core/project/index.js | 4 +- core/project/lib/apply-extends.js | 2 +- core/project/lib/make-file-finder.js | 2 +- helpers/commit-change-to-package/index.js | 4 +- helpers/copy-fixture/index.js | 2 +- helpers/init-fixture/index.js | 8 +-- helpers/init-named-fixture/index.js | 8 +-- helpers/logging-output/index.js | 2 +- helpers/pkg-matchers/index.js | 2 +- helpers/update-lerna-config/index.js | 2 +- integration/lerna-add.test.js | 2 +- integration/lerna-bootstrap-ci.test.js | 2 +- integration/lerna-bootstrap-hoist.test.js | 2 +- integration/lerna-bootstrap-legacy.test.js | 2 +- integration/lerna-bootstrap-yarn.test.js | 2 +- integration/lerna-changed.test.js | 6 +- integration/lerna-clean.test.js | 2 +- integration/lerna-exec-since.test.js | 8 +-- integration/lerna-exec.test.js | 2 +- integration/lerna-import.test.js | 4 +- integration/lerna-init.test.js | 2 +- integration/lerna-link-sibling-bins.test.js | 2 +- integration/lerna-ls.test.js | 2 +- integration/lerna-publish-auth.test.js | 2 +- integration/lerna-publish-canary.test.js | 8 +-- ...lish-conventional-fixed-prerelease.test.js | 6 +- .../lerna-publish-conventional-fixed.test.js | 4 +- ...onventional-independent-prerelease.test.js | 6 +- ...a-publish-conventional-independent.test.js | 4 +- integration/lerna-publish-custom-tag.test.js | 4 +- integration/lerna-publish-error.test.js | 2 +- integration/lerna-publish-fixed.test.js | 4 +- integration/lerna-publish-independent.test.js | 4 +- .../lerna-publish-lifecycle-errors.test.js | 6 +- .../lerna-publish-lifecycle-silent.test.js | 2 +- integration/lerna-publish-lifecycle.test.js | 2 +- .../lerna-publish-relative-file-spec.test.js | 8 +-- integration/lerna-publish-skip-npm.test.js | 6 +- integration/lerna-publish-transitive.test.js | 8 +-- integration/lerna-publish-validation.test.js | 6 +- integration/lerna-run-since.test.js | 8 +-- integration/lerna-run.test.js | 2 +- .../__tests__/check-working-tree.test.js | 6 +- .../lib/check-working-tree.js | 6 +- .../__tests__/collect-uncommitted.test.js | 2 +- .../__helpers__/build-graph.js | 4 +- .../__tests__/collect-updates.test.js | 12 ++-- utils/collect-updates/collect-updates.js | 4 +- .../__tests__/create-symlink.test.js | 2 +- utils/filter-packages/filter-packages.js | 2 +- utils/get-npm-exec-opts/get-npm-exec-opts.js | 2 +- utils/get-packed/__tests__/get-packed.test.js | 2 +- .../__tests__/gitlab-client.test.js | 2 +- .../__tests__/has-npm-version.test.js | 6 +- .../__tests__/listable-format.test.js | 4 +- utils/listable/lib/listable-format.js | 2 +- utils/log-packed/__tests__/log-packed.test.js | 4 +- .../__tests__/npm-dist-tag.test.js | 4 +- utils/npm-dist-tag/npm-dist-tag.js | 2 +- .../npm-install/__tests__/npm-install.test.js | 30 +++++----- utils/npm-install/npm-install.js | 4 +- .../npm-publish/__tests__/npm-publish.test.js | 8 +-- utils/npm-publish/npm-publish.js | 4 +- .../__tests__/npm-run-script.test.js | 8 +-- utils/npm-run-script/npm-run-script.js | 4 +- .../__tests__/pack-directory.test.js | 2 +- utils/pack-directory/lib/pack-directory.js | 6 +- .../prerelease-id-from-version.test.js | 2 +- utils/query-graph/query-graph.js | 2 +- .../__tests__/resolve-symlink.test.js | 2 +- utils/rimraf-dir/__tests__/rimraf-dir.test.js | 2 +- .../__tests__/run-lifecycle.test.js | 4 +- utils/run-topologically/run-topologically.js | 2 +- .../__tests__/symlink-binary.test.js | 4 +- utils/symlink-binary/symlink-binary.js | 4 +- .../symlink-dependencies.js | 6 +- 156 files changed, 413 insertions(+), 413 deletions(-) diff --git a/commands/__mocks__/@lerna/output.js b/commands/__mocks__/@lerna/output.js index 210e1c8040..bf8b6eae1d 100644 --- a/commands/__mocks__/@lerna/output.js +++ b/commands/__mocks__/@lerna/output.js @@ -1,7 +1,7 @@ "use strict"; const chalk = require("chalk"); -const multiLineTrimRight = require("@lerna-test/multi-line-trim-right"); +const { multiLineTrimRight } = require("@lerna-test/multi-line-trim-right"); // keep snapshots stable cross-platform chalk.level = 0; diff --git a/commands/add/command.js b/commands/add/command.js index da09e3bb70..3c982c0806 100644 --- a/commands/add/command.js +++ b/commands/add/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); /** * @see https://github.com/yargs/yargs/blob/master/docs/advanced.md#providing-a-command-module diff --git a/commands/add/index.js b/commands/add/index.js index ed0ce2312c..6f19abaac7 100644 --- a/commands/add/index.js +++ b/commands/add/index.js @@ -7,10 +7,10 @@ const path = require("path"); const pacote = require("pacote"); const semver = require("semver"); -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const npmConf = require("@lerna/npm-conf"); const bootstrap = require("@lerna/bootstrap"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const { getFilteredPackages } = require("@lerna/filter-options"); const getRangeToReference = require("./lib/get-range-to-reference"); diff --git a/commands/bootstrap/__tests__/bootstrap-command.test.js b/commands/bootstrap/__tests__/bootstrap-command.test.js index f08394b5c9..5545e0f0d9 100644 --- a/commands/bootstrap/__tests__/bootstrap-command.test.js +++ b/commands/bootstrap/__tests__/bootstrap-command.test.js @@ -9,23 +9,23 @@ const fs = require("fs-extra"); const path = require("path"); // mocked or stubbed modules -const rimrafDir = require("@lerna/rimraf-dir"); -const npmInstall = require("@lerna/npm-install"); -const runLifecycle = require("@lerna/run-lifecycle"); -const createSymlink = require("@lerna/create-symlink"); -const hasNpmVersion = require("@lerna/has-npm-version"); +const { rimrafDir } = require("@lerna/rimraf-dir"); +const { npmInstall, npmInstallDependencies } = require("@lerna/npm-install"); +const { runLifecycle } = require("@lerna/run-lifecycle"); +const { createSymlink } = require("@lerna/create-symlink"); +const { hasNpmVersion } = require("@lerna/has-npm-version"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir"); -const updateLernaConfig = require("@lerna-test/update-lerna-config"); +const { normalizeRelativeDir } = require("@lerna-test/normalize-relative-dir"); +const { updateLernaConfig } = require("@lerna-test/update-lerna-config"); // file under test const lernaBootstrap = require("@lerna-test/command-runner")(require("../command")); // assertion helpers const installedPackagesInDirectories = (testDir) => - npmInstall.dependencies.mock.calls.reduce((obj, [pkg, dependencies]) => { + npmInstallDependencies.mock.calls.reduce((obj, [pkg, dependencies]) => { const relative = normalizeRelativeDir(testDir, pkg.location); obj[relative || "ROOT"] = dependencies; return obj; @@ -64,7 +64,7 @@ describe("BootstrapCommand", () => { // we stub npmInstall in most tests because // we already have enough tests of npmInstall npmInstall.mockResolvedValue(); - npmInstall.dependencies.mockResolvedValue(); + npmInstallDependencies.mockResolvedValue(); // stub runLifecycle because it is a huge source // of slowness when running tests for no good reason @@ -111,7 +111,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--ignore-scripts"); expect(runLifecycle).not.toHaveBeenCalled(); - expect(npmInstall.dependencies).toHaveBeenCalledWith( + expect(npmInstallDependencies).toHaveBeenCalledWith( expect.objectContaining({ name: "package-prepare", }), @@ -144,7 +144,7 @@ describe("BootstrapCommand", () => { expect(removedDirectories(testDir)).toMatchSnapshot(); // root includes explicit dependencies and hoisted from leaves - expect(npmInstall.dependencies).toHaveBeenCalledWith( + expect(npmInstallDependencies).toHaveBeenCalledWith( expect.objectContaining({ name: "basic", }), @@ -159,7 +159,7 @@ describe("BootstrapCommand", () => { ); // foo@0.1.2 differs from the more common foo@^1.0.0 - expect(npmInstall.dependencies).toHaveBeenLastCalledWith( + expect(npmInstallDependencies).toHaveBeenLastCalledWith( expect.objectContaining({ name: "package-3", }), @@ -219,7 +219,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--ci"); expect(hasNpmVersion).toHaveBeenLastCalledWith(">=5.7.0"); - expect(npmInstall.dependencies.mock.calls[0][2]).toEqual({ + expect(npmInstallDependencies.mock.calls[0][2]).toEqual({ subCommand: "ci", registry: undefined, npmClient: "npm", @@ -236,7 +236,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--ci"); - expect(npmInstall.dependencies.mock.calls[0][2]).toEqual({ + expect(npmInstallDependencies.mock.calls[0][2]).toEqual({ registry: undefined, npmClient: "npm", npmClientArgs: [], @@ -250,7 +250,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--hoist", "package-*", "--ci"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ subCommand: "install", // not "ci" npmClient: "npm", npmClientArgs: ["--no-save"], @@ -270,7 +270,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); expect(hasNpmVersion).not.toHaveBeenCalled(); - expect(npmInstall.dependencies.mock.calls[0][2]).toEqual({ + expect(npmInstallDependencies.mock.calls[0][2]).toEqual({ registry: undefined, npmClient: "npm", npmClientArgs: [], @@ -350,7 +350,7 @@ describe("BootstrapCommand", () => { expect(installedPackagesInDirectories(testDir)).toMatchSnapshot(); expect(symlinkedDirectories(testDir)).toMatchSnapshot(); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ subCommand: "install", // not "ci" npmClient: "npm", npmClientArgs: ["--no-save"], @@ -362,7 +362,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--scope", "@test/package-2", "--npm-client", "yarn", "--ci"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ npmClient: "yarn", npmClientArgs: ["--pure-lockfile"], }); @@ -373,7 +373,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); - expect(npmInstall.dependencies).toHaveBeenCalledWith( + expect(npmInstallDependencies).toHaveBeenCalledWith( expect.objectContaining({ name: "@test/package-2", }), @@ -450,7 +450,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--npm-client", "yarn"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ npmClient: "yarn", mutex: expect.stringMatching(/^network:\d+$/), }); @@ -461,7 +461,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--npm-client", "yarn", "--mutex", "file:/test/this/path"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ npmClient: "yarn", mutex: "file:/test/this/path", }); @@ -486,7 +486,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); - expect(npmInstall.dependencies).not.toHaveBeenCalled(); + expect(npmInstallDependencies).not.toHaveBeenCalled(); }); it("hoists appropriately", async () => { @@ -531,7 +531,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); - expect(npmInstall.dependencies).not.toHaveBeenCalled(); + expect(npmInstallDependencies).not.toHaveBeenCalled(); }); }); @@ -542,7 +542,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); expect(installedPackagesInDirectories(testDir)).toMatchSnapshot(); - expect(npmInstall.dependencies).toHaveBeenLastCalledWith( + expect(npmInstallDependencies).toHaveBeenLastCalledWith( expect.objectContaining({ name: "@test/package-1", }), @@ -563,7 +563,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--", "--no-optional", "--production"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ npmClientArgs: ["--no-optional", "--production"], }); }); @@ -575,7 +575,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)("--", "--no-optional"); - expect(npmInstall.dependencies.mock.calls[0][2]).toMatchObject({ + expect(npmInstallDependencies.mock.calls[0][2]).toMatchObject({ npmClientArgs: ["--production", "--no-optional"], }); }); @@ -588,7 +588,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); - expect(npmInstall.dependencies).not.toHaveBeenCalled(); + expect(npmInstallDependencies).not.toHaveBeenCalled(); expect(npmInstall).toHaveBeenLastCalledWith( expect.objectContaining({ name: "root" }), expect.objectContaining({ @@ -614,7 +614,7 @@ describe("BootstrapCommand", () => { await lernaBootstrap(testDir)(); - expect(npmInstall.dependencies).not.toHaveBeenCalled(); + expect(npmInstallDependencies).not.toHaveBeenCalled(); expect(npmInstall).toHaveBeenLastCalledWith( expect.objectContaining({ name: "relative-file-specs" }), expect.objectContaining({ diff --git a/commands/bootstrap/command.js b/commands/bootstrap/command.js index 6c25271b4b..3d25c65231 100644 --- a/commands/bootstrap/command.js +++ b/commands/bootstrap/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); /** * @see https://github.com/yargs/yargs/blob/master/docs/advanced.md#providing-a-command-module diff --git a/commands/bootstrap/index.js b/commands/bootstrap/index.js index 066f600fed..7e1a5a551c 100644 --- a/commands/bootstrap/index.js +++ b/commands/bootstrap/index.js @@ -8,18 +8,18 @@ const pMap = require("p-map"); const pMapSeries = require("p-map-series"); const pWaterfall = require("p-waterfall"); -const Command = require("@lerna/command"); -const rimrafDir = require("@lerna/rimraf-dir"); -const hasNpmVersion = require("@lerna/has-npm-version"); -const npmInstall = require("@lerna/npm-install"); +const { Command } = require("@lerna/command"); +const { rimrafDir } = require("@lerna/rimraf-dir"); +const { hasNpmVersion } = require("@lerna/has-npm-version"); +const { npmInstall, npmInstallDependencies } = require("@lerna/npm-install"); const { createRunner } = require("@lerna/run-lifecycle"); -const runTopologically = require("@lerna/run-topologically"); -const symlinkBinary = require("@lerna/symlink-binary"); -const symlinkDependencies = require("@lerna/symlink-dependencies"); -const ValidationError = require("@lerna/validation-error"); +const { runTopologically } = require("@lerna/run-topologically"); +const { symlinkBinary } = require("@lerna/symlink-binary"); +const { symlinkDependencies } = require("@lerna/symlink-dependencies"); +const { ValidationError } = require("@lerna/validation-error"); const { getFilteredPackages } = require("@lerna/filter-options"); -const PackageGraph = require("@lerna/package-graph"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { PackageGraph } = require("@lerna/package-graph"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); const hasDependencyInstalled = require("./lib/has-dependency-installed"); const isHoistedPackage = require("./lib/is-hoisted-package"); @@ -478,7 +478,7 @@ class BootstrapCommand extends Command { tracker.info("hoist", "Installing hoisted dependencies into root"); } - const promise = npmInstall.dependencies(rootPkg, depsToInstallInRoot, this.npmConfig); + const promise = npmInstallDependencies(rootPkg, depsToInstallInRoot, this.npmConfig); return pulseTillDone(promise) .then(() => @@ -557,7 +557,7 @@ class BootstrapCommand extends Command { if (deps.some(({ isSatisfied }) => !isSatisfied)) { actions.push(() => { const dependencies = deps.map(({ dependency }) => dependency); - const promise = npmInstall.dependencies(leafNode.pkg, dependencies, leafNpmConfig); + const promise = npmInstallDependencies(leafNode.pkg, dependencies, leafNpmConfig); return pulseTillDone(promise).then(() => { tracker.verbose("installed leaf", leafNode.name); diff --git a/commands/changed/__tests__/changed-command.test.js b/commands/changed/__tests__/changed-command.test.js index 7d6028f963..4b918d7aa6 100644 --- a/commands/changed/__tests__/changed-command.test.js +++ b/commands/changed/__tests__/changed-command.test.js @@ -1,13 +1,13 @@ "use strict"; // mocked modules -const collectUpdates = require("@lerna/collect-updates"); -const output = require("@lerna/output"); +const { collectUpdates } = require("@lerna/collect-updates"); +const { output } = require("@lerna/output"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loggingOutput = require("@lerna-test/logging-output"); -const updateLernaConfig = require("@lerna-test/update-lerna-config"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { updateLernaConfig } = require("@lerna-test/update-lerna-config"); // file under test const lernaChanged = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/changed/index.js b/commands/changed/index.js index 825caa9604..8c385843ef 100644 --- a/commands/changed/index.js +++ b/commands/changed/index.js @@ -1,9 +1,9 @@ "use strict"; -const Command = require("@lerna/command"); -const collectUpdates = require("@lerna/collect-updates"); +const { Command } = require("@lerna/command"); +const { collectUpdates } = require("@lerna/collect-updates"); const listable = require("@lerna/listable"); -const output = require("@lerna/output"); +const { output } = require("@lerna/output"); module.exports = factory; diff --git a/commands/clean/__tests__/clean-command.test.js b/commands/clean/__tests__/clean-command.test.js index ff59607a3e..d919758682 100644 --- a/commands/clean/__tests__/clean-command.test.js +++ b/commands/clean/__tests__/clean-command.test.js @@ -7,12 +7,12 @@ const fs = require("fs-extra"); const path = require("path"); // mocked or stubbed modules -const rimrafDir = require("@lerna/rimraf-dir"); +const { rimrafDir } = require("@lerna/rimraf-dir"); const PromptUtilities = require("@lerna/prompt"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir"); +const { normalizeRelativeDir } = require("@lerna-test/normalize-relative-dir"); // file under test const lernaClean = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/clean/command.js b/commands/clean/command.js index d513cc711d..bf10cf2c2b 100644 --- a/commands/clean/command.js +++ b/commands/clean/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); /** * @see https://github.com/yargs/yargs/blob/master/docs/advanced.md#providing-a-command-module diff --git a/commands/clean/index.js b/commands/clean/index.js index d38b0ea397..c4fb25de4b 100644 --- a/commands/clean/index.js +++ b/commands/clean/index.js @@ -3,11 +3,11 @@ const path = require("path"); const pMap = require("p-map"); -const Command = require("@lerna/command"); -const rimrafDir = require("@lerna/rimraf-dir"); +const { Command } = require("@lerna/command"); +const { rimrafDir } = require("@lerna/rimraf-dir"); const PromptUtilities = require("@lerna/prompt"); const { getFilteredPackages } = require("@lerna/filter-options"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); module.exports = factory; diff --git a/commands/create/__tests__/create-command.test.js b/commands/create/__tests__/create-command.test.js index 874ad16414..1ffef87a07 100644 --- a/commands/create/__tests__/create-command.test.js +++ b/commands/create/__tests__/create-command.test.js @@ -12,7 +12,7 @@ const pacote = require("pacote"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); +const { gitAdd } = require("@lerna-test/git-add"); // file under test const lernaCreate = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/create/index.js b/commands/create/index.js index 30ce4e83cb..1ab1381b41 100644 --- a/commands/create/index.js +++ b/commands/create/index.js @@ -12,10 +12,10 @@ const npa = require("npm-package-arg"); const pReduce = require("p-reduce"); const slash = require("slash"); -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const ChildProcessUtilities = require("@lerna/child-process"); const npmConf = require("@lerna/npm-conf"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const builtinNpmrc = require("./lib/builtin-npmrc"); const catFile = require("./lib/cat-file"); diff --git a/commands/diff/__tests__/diff-command.test.js b/commands/diff/__tests__/diff-command.test.js index 6ecdf1d0e4..b9f3bafc42 100644 --- a/commands/diff/__tests__/diff-command.test.js +++ b/commands/diff/__tests__/diff-command.test.js @@ -10,10 +10,10 @@ const ChildProcessUtilities = require("@lerna/child-process"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const gitInit = require("@lerna-test/git-init"); -const gitTag = require("@lerna-test/git-tag"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { gitInit } = require("@lerna-test/git-init"); +const { gitTag } = require("@lerna-test/git-tag"); // file under test const lernaDiff = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/diff/index.js b/commands/diff/index.js index 778b537b71..a71cf25915 100644 --- a/commands/diff/index.js +++ b/commands/diff/index.js @@ -1,8 +1,8 @@ "use strict"; const ChildProcessUtilities = require("@lerna/child-process"); -const Command = require("@lerna/command"); -const ValidationError = require("@lerna/validation-error"); +const { Command } = require("@lerna/command"); +const { ValidationError } = require("@lerna/validation-error"); const getLastCommit = require("./lib/get-last-commit"); const hasCommit = require("./lib/has-commit"); diff --git a/commands/exec/__tests__/exec-command.test.js b/commands/exec/__tests__/exec-command.test.js index 1ef7342968..18c15f4f98 100644 --- a/commands/exec/__tests__/exec-command.test.js +++ b/commands/exec/__tests__/exec-command.test.js @@ -9,8 +9,8 @@ const ChildProcessUtilities = require("@lerna/child-process"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loggingOutput = require("@lerna-test/logging-output"); -const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { normalizeRelativeDir } = require("@lerna-test/normalize-relative-dir"); // file under test const lernaExec = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/exec/command.js b/commands/exec/command.js index 05fb96c6bc..5e97dd2ca6 100644 --- a/commands/exec/command.js +++ b/commands/exec/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); /** * @see https://github.com/yargs/yargs/blob/master/docs/advanced.md#providing-a-command-module diff --git a/commands/exec/index.js b/commands/exec/index.js index 01dc56907a..720182611d 100644 --- a/commands/exec/index.js +++ b/commands/exec/index.js @@ -3,10 +3,10 @@ const pMap = require("p-map"); const ChildProcessUtilities = require("@lerna/child-process"); -const Command = require("@lerna/command"); -const Profiler = require("@lerna/profiler"); -const runTopologically = require("@lerna/run-topologically"); -const ValidationError = require("@lerna/validation-error"); +const { Command } = require("@lerna/command"); +const { Profiler } = require("@lerna/profiler"); +const { runTopologically } = require("@lerna/run-topologically"); +const { ValidationError } = require("@lerna/validation-error"); const { getFilteredPackages } = require("@lerna/filter-options"); module.exports = factory; diff --git a/commands/import/__tests__/import-command.test.js b/commands/import/__tests__/import-command.test.js index c9504e8b23..9810c9869b 100644 --- a/commands/import/__tests__/import-command.test.js +++ b/commands/import/__tests__/import-command.test.js @@ -13,9 +13,9 @@ const PromptUtilities = require("@lerna/prompt"); // helpers const initNamedFixture = require("@lerna-test/init-named-fixture")(__dirname); const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const updateLernaConfig = require("@lerna-test/update-lerna-config"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { updateLernaConfig } = require("@lerna-test/update-lerna-config"); // file under test const lernaImport = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/import/index.js b/commands/import/index.js index 0005f210fe..c1b8802e78 100644 --- a/commands/import/index.js +++ b/commands/import/index.js @@ -6,10 +6,10 @@ const path = require("path"); const pMapSeries = require("p-map-series"); const ChildProcessUtilities = require("@lerna/child-process"); -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const PromptUtilities = require("@lerna/prompt"); -const ValidationError = require("@lerna/validation-error"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { ValidationError } = require("@lerna/validation-error"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); module.exports = factory; diff --git a/commands/info/__tests__/info-command.test.js b/commands/info/__tests__/info-command.test.js index 7cdc1b04d2..06a473b11e 100644 --- a/commands/info/__tests__/info-command.test.js +++ b/commands/info/__tests__/info-command.test.js @@ -8,7 +8,7 @@ const envinfo = require("envinfo"); envinfo.run.mockResolvedValue("MOCK_ENVINFO"); // helper -const output = require("@lerna/output"); +const { output } = require("@lerna/output"); // file under test const lernaInfo = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/info/index.js b/commands/info/index.js index caa44121e4..443506fdab 100644 --- a/commands/info/index.js +++ b/commands/info/index.js @@ -1,7 +1,7 @@ "use strict"; -const Command = require("@lerna/command"); -const output = require("@lerna/output"); +const { Command } = require("@lerna/command"); +const { output } = require("@lerna/output"); const envinfo = require("envinfo"); module.exports = factory; diff --git a/commands/init/index.js b/commands/init/index.js index 8fb23dfbcb..6a50f9d16b 100644 --- a/commands/init/index.js +++ b/commands/init/index.js @@ -5,7 +5,7 @@ const path = require("path"); const pMap = require("p-map"); const writeJsonFile = require("write-json-file"); -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const childProcess = require("@lerna/child-process"); module.exports = factory; diff --git a/commands/link/__tests__/link-command.test.js b/commands/link/__tests__/link-command.test.js index 584d540ef1..99f1c7e94b 100644 --- a/commands/link/__tests__/link-command.test.js +++ b/commands/link/__tests__/link-command.test.js @@ -3,11 +3,11 @@ jest.mock("@lerna/create-symlink"); // mocked or stubbed modules -const createSymlink = require("@lerna/create-symlink"); +const { createSymlink } = require("@lerna/create-symlink"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir"); +const { normalizeRelativeDir } = require("@lerna-test/normalize-relative-dir"); // file under test const lernaLink = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/link/index.js b/commands/link/index.js index 564455ea57..bb0cc9fbd5 100644 --- a/commands/link/index.js +++ b/commands/link/index.js @@ -3,9 +3,9 @@ const path = require("path"); const pMap = require("p-map"); const slash = require("slash"); -const Command = require("@lerna/command"); -const PackageGraph = require("@lerna/package-graph"); -const symlinkDependencies = require("@lerna/symlink-dependencies"); +const { Command } = require("@lerna/command"); +const { PackageGraph } = require("@lerna/package-graph"); +const { symlinkDependencies } = require("@lerna/symlink-dependencies"); module.exports = factory; diff --git a/commands/list/__tests__/list-command.test.js b/commands/list/__tests__/list-command.test.js index 93974bbed9..0213216a6a 100644 --- a/commands/list/__tests__/list-command.test.js +++ b/commands/list/__tests__/list-command.test.js @@ -1,8 +1,8 @@ "use strict"; // mocked modules -const output = require("@lerna/output"); -const collectUpdates = require("@lerna/collect-updates"); +const { output } = require("@lerna/output"); +const { collectUpdates } = require("@lerna/collect-updates"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); diff --git a/commands/list/command.js b/commands/list/command.js index ce251c9d12..b672e3debb 100644 --- a/commands/list/command.js +++ b/commands/list/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); const listable = require("@lerna/listable"); /** diff --git a/commands/list/index.js b/commands/list/index.js index 9f228cf0ad..d6dc750c83 100644 --- a/commands/list/index.js +++ b/commands/list/index.js @@ -1,8 +1,8 @@ "use strict"; -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const listable = require("@lerna/listable"); -const output = require("@lerna/output"); +const { output } = require("@lerna/output"); const { getFilteredPackages } = require("@lerna/filter-options"); module.exports = factory; diff --git a/commands/publish/__tests__/create-temp-licenses.test.js b/commands/publish/__tests__/create-temp-licenses.test.js index 581b92da96..248ea0c603 100644 --- a/commands/publish/__tests__/create-temp-licenses.test.js +++ b/commands/publish/__tests__/create-temp-licenses.test.js @@ -2,7 +2,7 @@ const fs = require("fs-extra"); const path = require("path"); -const Project = require("@lerna/project"); +const { Project } = require("@lerna/project"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const { createTempLicenses } = require("../lib/create-temp-licenses"); diff --git a/commands/publish/__tests__/get-npm-username.test.js b/commands/publish/__tests__/get-npm-username.test.js index b8a827ae9d..43d5c2a87e 100644 --- a/commands/publish/__tests__/get-npm-username.test.js +++ b/commands/publish/__tests__/get-npm-username.test.js @@ -3,7 +3,7 @@ jest.mock("npm-registry-fetch"); const fetch = require("npm-registry-fetch"); -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); const { getNpmUsername } = require("../lib/get-npm-username"); fetch.json.mockImplementation(() => Promise.resolve({ username: "lerna-test" })); diff --git a/commands/publish/__tests__/get-packages-without-license.test.js b/commands/publish/__tests__/get-packages-without-license.test.js index 40303e51b5..0418a4b4ce 100644 --- a/commands/publish/__tests__/get-packages-without-license.test.js +++ b/commands/publish/__tests__/get-packages-without-license.test.js @@ -1,6 +1,6 @@ "use strict"; -const Project = require("@lerna/project"); +const { Project } = require("@lerna/project"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const { getPackagesWithoutLicense } = require("../lib/get-packages-without-license"); diff --git a/commands/publish/__tests__/get-two-factor-auth-required.test.js b/commands/publish/__tests__/get-two-factor-auth-required.test.js index e81bcdb4e3..90750fb471 100644 --- a/commands/publish/__tests__/get-two-factor-auth-required.test.js +++ b/commands/publish/__tests__/get-two-factor-auth-required.test.js @@ -2,7 +2,7 @@ jest.mock("../lib/get-profile-data"); -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); const { getProfileData } = require("../lib/get-profile-data"); const { getTwoFactorAuthRequired } = require("../lib/get-two-factor-auth-required"); diff --git a/commands/publish/__tests__/get-unpublished-packages.test.js b/commands/publish/__tests__/get-unpublished-packages.test.js index c9b2d19a45..67cc27375e 100644 --- a/commands/publish/__tests__/get-unpublished-packages.test.js +++ b/commands/publish/__tests__/get-unpublished-packages.test.js @@ -6,7 +6,7 @@ jest.mock("pacote"); const pacote = require("pacote"); // helpers -const PackageGraph = require("@lerna/package-graph"); +const { PackageGraph } = require("@lerna/package-graph"); const { getPackages } = require("@lerna/project"); const initFixture = require("@lerna-test/init-fixture")(__dirname); diff --git a/commands/publish/__tests__/publish-canary.test.js b/commands/publish/__tests__/publish-canary.test.js index 509d14ca39..c3b6a320ab 100644 --- a/commands/publish/__tests__/publish-canary.test.js +++ b/commands/publish/__tests__/publish-canary.test.js @@ -15,16 +15,16 @@ const childProcess = require("@lerna/child-process"); // mocked modules const writePkg = require("write-pkg"); -const npmPublish = require("@lerna/npm-publish"); +const { npmPublish } = require("@lerna/npm-publish"); const PromptUtilities = require("@lerna/prompt"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { throwIfUncommitted } = require("@lerna/check-working-tree"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitTag = require("@lerna-test/git-tag"); -const gitCommit = require("@lerna-test/git-commit"); -const loggingOutput = require("@lerna-test/logging-output"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { loggingOutput } = require("@lerna-test/logging-output"); // test command const lernaPublish = require("@lerna-test/command-runner")(require("../command")); @@ -353,7 +353,7 @@ Object { }); test("publish --canary with dirty tree throws error", async () => { - checkWorkingTree.throwIfUncommitted.mockImplementationOnce(() => { + throwIfUncommitted.mockImplementationOnce(() => { throw new Error("uncommitted"); }); diff --git a/commands/publish/__tests__/publish-command.test.js b/commands/publish/__tests__/publish-command.test.js index 66bafdfe00..4e319bd63d 100644 --- a/commands/publish/__tests__/publish-command.test.js +++ b/commands/publish/__tests__/publish-command.test.js @@ -16,20 +16,20 @@ jest.mock("../../version/lib/is-behind-upstream"); jest.mock("../../version/lib/remote-branch-exists"); // mocked or stubbed modules -const otplease = require("@lerna/otplease"); +const { getOneTimePassword } = require("@lerna/otplease"); const npmDistTag = require("@lerna/npm-dist-tag"); -const npmPublish = require("@lerna/npm-publish"); -const packDirectory = require("@lerna/pack-directory"); +const { npmPublish } = require("@lerna/npm-publish"); +const { packDirectory } = require("@lerna/pack-directory"); const PromptUtilities = require("@lerna/prompt"); -const collectUpdates = require("@lerna/collect-updates"); +const { collectUpdates } = require("@lerna/collect-updates"); const { getNpmUsername } = require("../lib/get-npm-username"); const { verifyNpmPackageAccess } = require("../lib/verify-npm-package-access"); const { getTwoFactorAuthRequired } = require("../lib/get-two-factor-auth-required"); const { gitCheckout } = require("../lib/git-checkout"); // helpers -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const loggingOutput = require("@lerna-test/logging-output"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { loggingOutput } = require("@lerna-test/logging-output"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const path = require("path"); const fs = require("fs-extra"); @@ -210,7 +210,7 @@ Map { }); describe("--otp", () => { - otplease.getOneTimePassword.mockImplementation(() => Promise.resolve("654321")); + getOneTimePassword.mockImplementation(() => Promise.resolve("654321")); it("passes one-time password to npm commands", async () => { const testDir = await initFixture("normal"); @@ -227,7 +227,7 @@ Map { expect.objectContaining({ otp }), expect.objectContaining({ otp }) ); - expect(otplease.getOneTimePassword).not.toHaveBeenCalled(); + expect(getOneTimePassword).not.toHaveBeenCalled(); }); it("prompts for OTP when option missing and account-level 2FA enabled", async () => { @@ -243,7 +243,7 @@ Map { expect.objectContaining({ otp: undefined }), expect.objectContaining({ otp: "654321" }) ); - expect(otplease.getOneTimePassword).toHaveBeenLastCalledWith("Enter OTP:"); + expect(getOneTimePassword).toHaveBeenLastCalledWith("Enter OTP:"); }); }); diff --git a/commands/publish/__tests__/publish-from-git.test.js b/commands/publish/__tests__/publish-from-git.test.js index 2e864e08f0..d83505e27d 100644 --- a/commands/publish/__tests__/publish-from-git.test.js +++ b/commands/publish/__tests__/publish-from-git.test.js @@ -16,14 +16,14 @@ jest.mock("../../version/lib/is-behind-upstream"); jest.mock("../../version/lib/remote-branch-exists"); // mocked or stubbed modules -const npmPublish = require("@lerna/npm-publish"); +const { npmPublish } = require("@lerna/npm-publish"); const PromptUtilities = require("@lerna/prompt"); -const output = require("@lerna/output"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { output } = require("@lerna/output"); +const { throwIfUncommitted } = require("@lerna/check-working-tree"); // helpers -const loggingOutput = require("@lerna-test/logging-output"); -const gitTag = require("@lerna-test/git-tag"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { gitTag } = require("@lerna-test/git-tag"); const initFixture = require("@lerna-test/init-fixture")(__dirname); // file under test @@ -37,7 +37,7 @@ describe("publish from-git", () => { await lernaPublish(cwd)("from-git"); // called from chained describeRef() - expect(checkWorkingTree.throwIfUncommitted).toHaveBeenCalled(); + expect(throwIfUncommitted).toHaveBeenCalled(); expect(PromptUtilities.confirm).toHaveBeenLastCalledWith( "Are you sure you want to publish these packages?" @@ -110,7 +110,7 @@ describe("publish from-git", () => { }); it("throws an error when uncommitted changes are present", async () => { - checkWorkingTree.throwIfUncommitted.mockImplementationOnce(() => { + throwIfUncommitted.mockImplementationOnce(() => { throw new Error("uncommitted"); }); diff --git a/commands/publish/__tests__/publish-from-package.test.js b/commands/publish/__tests__/publish-from-package.test.js index 4bec32c142..aa5b47bc9b 100644 --- a/commands/publish/__tests__/publish-from-package.test.js +++ b/commands/publish/__tests__/publish-from-package.test.js @@ -17,14 +17,14 @@ const path = require("path"); // mocked or stubbed modules const writePkg = require("write-pkg"); -const npmPublish = require("@lerna/npm-publish"); +const { npmPublish } = require("@lerna/npm-publish"); const PromptUtilities = require("@lerna/prompt"); -const output = require("@lerna/output"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { output } = require("@lerna/output"); +const { throwIfUncommitted } = require("@lerna/check-working-tree"); const { getUnpublishedPackages } = require("../lib/get-unpublished-packages"); // helpers -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); const initFixture = require("@lerna-test/init-fixture")(__dirname); // file under test @@ -76,7 +76,7 @@ describe("publish from-package", () => { }); it("throws an error when uncommitted changes are present", async () => { - checkWorkingTree.throwIfUncommitted.mockImplementationOnce(() => { + throwIfUncommitted.mockImplementationOnce(() => { throw new Error("uncommitted"); }); diff --git a/commands/publish/__tests__/publish-licenses.test.js b/commands/publish/__tests__/publish-licenses.test.js index d1868829e5..d59f033bdb 100644 --- a/commands/publish/__tests__/publish-licenses.test.js +++ b/commands/publish/__tests__/publish-licenses.test.js @@ -16,13 +16,13 @@ const fs = require("fs-extra"); const path = require("path"); // mocked modules -const packDirectory = require("@lerna/pack-directory"); +const { packDirectory } = require("@lerna/pack-directory"); const { createTempLicenses } = require("../lib/create-temp-licenses"); const { removeTempLicenses } = require("../lib/remove-temp-licenses"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); // test command const lernaPublish = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/publish/__tests__/publish-lifecycle-scripts.test.js b/commands/publish/__tests__/publish-lifecycle-scripts.test.js index 9fbbd47ab8..e7a9ac08a8 100644 --- a/commands/publish/__tests__/publish-lifecycle-scripts.test.js +++ b/commands/publish/__tests__/publish-lifecycle-scripts.test.js @@ -12,8 +12,8 @@ jest.mock("../../version/lib/is-behind-upstream"); jest.mock("../../version/lib/remote-branch-exists"); // mocked modules -const packDirectory = require("@lerna/pack-directory"); -const runLifecycle = require("@lerna/run-lifecycle"); +const { packDirectory } = require("@lerna/pack-directory"); +const { runLifecycle } = require("@lerna/run-lifecycle"); const loadJsonFile = require("load-json-file"); // helpers diff --git a/commands/publish/__tests__/publish-relative-file-specifiers.test.js b/commands/publish/__tests__/publish-relative-file-specifiers.test.js index 966faed3a2..8c61c66150 100644 --- a/commands/publish/__tests__/publish-relative-file-specifiers.test.js +++ b/commands/publish/__tests__/publish-relative-file-specifiers.test.js @@ -22,9 +22,9 @@ const writePkg = require("write-pkg"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitTag = require("@lerna-test/git-tag"); -const gitCommit = require("@lerna-test/git-commit"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCommit } = require("@lerna-test/git-commit"); // test command const lernaPublish = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/publish/__tests__/publish-tagging.test.js b/commands/publish/__tests__/publish-tagging.test.js index 4f62a233e8..d1fd564f8b 100644 --- a/commands/publish/__tests__/publish-tagging.test.js +++ b/commands/publish/__tests__/publish-tagging.test.js @@ -12,9 +12,9 @@ jest.mock("../../version/lib/is-behind-upstream"); jest.mock("../../version/lib/remote-branch-exists"); // mocked modules -const collectUpdates = require("@lerna/collect-updates"); +const { collectUpdates } = require("@lerna/collect-updates"); const npmDistTag = require("@lerna/npm-dist-tag"); -const npmPublish = require("@lerna/npm-publish"); +const { npmPublish } = require("@lerna/npm-publish"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); diff --git a/commands/publish/__tests__/remove-temp-licenses.test.js b/commands/publish/__tests__/remove-temp-licenses.test.js index ca4e1b0920..d9b7746f3e 100644 --- a/commands/publish/__tests__/remove-temp-licenses.test.js +++ b/commands/publish/__tests__/remove-temp-licenses.test.js @@ -2,7 +2,7 @@ const fs = require("fs-extra"); const path = require("path"); -const Project = require("@lerna/project"); +const { Project } = require("@lerna/project"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const { removeTempLicenses } = require("../lib/remove-temp-licenses"); diff --git a/commands/publish/__tests__/verify-npm-package-access.test.js b/commands/publish/__tests__/verify-npm-package-access.test.js index 954084e5d0..1def477cab 100644 --- a/commands/publish/__tests__/verify-npm-package-access.test.js +++ b/commands/publish/__tests__/verify-npm-package-access.test.js @@ -4,7 +4,7 @@ jest.mock("libnpmaccess"); const access = require("libnpmaccess"); const { getPackages } = require("@lerna/project"); -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const { verifyNpmPackageAccess } = require("../lib/verify-npm-package-access"); diff --git a/commands/publish/index.js b/commands/publish/index.js index c780cbc78a..cafc83c8cd 100644 --- a/commands/publish/index.js +++ b/commands/publish/index.js @@ -7,24 +7,24 @@ const pMap = require("p-map"); const pPipe = require("p-pipe"); const semver = require("semver"); -const Command = require("@lerna/command"); -const ValidationError = require("@lerna/validation-error"); -const describeRef = require("@lerna/describe-ref"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { Command } = require("@lerna/command"); +const { ValidationError } = require("@lerna/validation-error"); +const { describeRef } = require("@lerna/describe-ref"); +const { throwIfUncommitted } = require("@lerna/check-working-tree"); const PromptUtilities = require("@lerna/prompt"); -const output = require("@lerna/output"); -const collectUpdates = require("@lerna/collect-updates"); +const { output } = require("@lerna/output"); +const { collectUpdates } = require("@lerna/collect-updates"); const npmConf = require("@lerna/npm-conf"); const npmDistTag = require("@lerna/npm-dist-tag"); -const npmPublish = require("@lerna/npm-publish"); -const packDirectory = require("@lerna/pack-directory"); -const logPacked = require("@lerna/log-packed"); +const { npmPublish } = require("@lerna/npm-publish"); +const { packDirectory } = require("@lerna/pack-directory"); +const { logPacked } = require("@lerna/log-packed"); const { createRunner } = require("@lerna/run-lifecycle"); -const runTopologically = require("@lerna/run-topologically"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { runTopologically } = require("@lerna/run-topologically"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); const versionCommand = require("@lerna/version"); -const prereleaseIdFromVersion = require("@lerna/prerelease-id-from-version"); -const otplease = require("@lerna/otplease"); +const { prereleaseIdFromVersion } = require("@lerna/prerelease-id-from-version"); +const { getOneTimePassword } = require("@lerna/otplease"); const { createTempLicenses } = require("./lib/create-temp-licenses"); const { getCurrentSHA } = require("./lib/get-current-sha"); @@ -247,7 +247,7 @@ class PublishCommand extends Command { } verifyWorkingTreeClean() { - return describeRef(this.execOpts).then(checkWorkingTree.throwIfUncommitted); + return describeRef(this.execOpts).then(throwIfUncommitted); } detectFromGit() { @@ -611,7 +611,7 @@ class PublishCommand extends Command { } return Promise.resolve() - .then(() => otplease.getOneTimePassword("Enter OTP:")) + .then(() => getOneTimePassword("Enter OTP:")) .then((otp) => { this.otpCache.otp = otp; }); diff --git a/commands/publish/lib/get-npm-username.js b/commands/publish/lib/get-npm-username.js index bc8e0ad3c8..9ed75949e6 100644 --- a/commands/publish/lib/get-npm-username.js +++ b/commands/publish/lib/get-npm-username.js @@ -1,6 +1,6 @@ "use strict"; -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const { getFetchConfig } = require("./fetch-config"); const { getProfileData } = require("./get-profile-data"); const { getWhoAmI } = require("./get-whoami"); diff --git a/commands/publish/lib/get-profile-data.js b/commands/publish/lib/get-profile-data.js index 39fcd9f434..62e097346b 100644 --- a/commands/publish/lib/get-profile-data.js +++ b/commands/publish/lib/get-profile-data.js @@ -1,7 +1,7 @@ "use strict"; const fetch = require("npm-registry-fetch"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); module.exports.getProfileData = getProfileData; diff --git a/commands/publish/lib/get-two-factor-auth-required.js b/commands/publish/lib/get-two-factor-auth-required.js index 82159ce5a6..986dea8324 100644 --- a/commands/publish/lib/get-two-factor-auth-required.js +++ b/commands/publish/lib/get-two-factor-auth-required.js @@ -1,6 +1,6 @@ "use strict"; -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const { getFetchConfig } = require("./fetch-config"); const { getProfileData } = require("./get-profile-data"); diff --git a/commands/publish/lib/get-whoami.js b/commands/publish/lib/get-whoami.js index af600f9d4c..4c9d30e07e 100644 --- a/commands/publish/lib/get-whoami.js +++ b/commands/publish/lib/get-whoami.js @@ -1,7 +1,7 @@ "use strict"; const fetch = require("npm-registry-fetch"); -const pulseTillDone = require("@lerna/pulse-till-done"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); module.exports.getWhoAmI = getWhoAmI; diff --git a/commands/publish/lib/verify-npm-package-access.js b/commands/publish/lib/verify-npm-package-access.js index 4126620233..97e8a000ce 100644 --- a/commands/publish/lib/verify-npm-package-access.js +++ b/commands/publish/lib/verify-npm-package-access.js @@ -1,8 +1,8 @@ "use strict"; const access = require("libnpmaccess"); -const pulseTillDone = require("@lerna/pulse-till-done"); -const ValidationError = require("@lerna/validation-error"); +const { pulseTillDone } = require("@lerna/pulse-till-done"); +const { ValidationError } = require("@lerna/validation-error"); const { getFetchConfig } = require("./fetch-config"); module.exports.verifyNpmPackageAccess = verifyNpmPackageAccess; diff --git a/commands/run/__tests__/run-command.test.js b/commands/run/__tests__/run-command.test.js index 74e87ae413..f493e3c7a6 100644 --- a/commands/run/__tests__/run-command.test.js +++ b/commands/run/__tests__/run-command.test.js @@ -6,20 +6,20 @@ const fs = require("fs-extra"); const globby = require("globby"); // mocked modules -const npmRunScript = require("@lerna/npm-run-script"); -const output = require("@lerna/output"); +const { npmRunScript, npmRunScriptStreaming } = require("@lerna/npm-run-script"); +const { output } = require("@lerna/output"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loggingOutput = require("@lerna-test/logging-output"); -const normalizeRelativeDir = require("@lerna-test/normalize-relative-dir"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { normalizeRelativeDir } = require("@lerna-test/normalize-relative-dir"); // file under test const lernaRun = require("@lerna-test/command-runner")(require("../command")); // assertion helpers const ranInPackagesStreaming = (testDir) => - npmRunScript.stream.mock.calls.reduce((arr, [script, { args, npmClient, pkg, prefix }]) => { + npmRunScriptStreaming.mock.calls.reduce((arr, [script, { args, npmClient, pkg, prefix }]) => { const dir = normalizeRelativeDir(testDir, pkg.location); const record = [dir, npmClient, "run", script, `(prefixed: ${prefix})`].concat(args); arr.push(record.join(" ")); @@ -28,7 +28,7 @@ const ranInPackagesStreaming = (testDir) => describe("RunCommand", () => { npmRunScript.mockImplementation((script, { pkg }) => Promise.resolve({ exitCode: 0, stdout: pkg.name })); - npmRunScript.stream.mockImplementation(() => Promise.resolve({ exitCode: 0 })); + npmRunScriptStreaming.mockImplementation(() => Promise.resolve({ exitCode: 0 })); afterEach(() => { process.exitCode = undefined; diff --git a/commands/run/command.js b/commands/run/command.js index 74b5b097a5..92cab57258 100644 --- a/commands/run/command.js +++ b/commands/run/command.js @@ -1,6 +1,6 @@ "use strict"; -const filterOptions = require("@lerna/filter-options"); +const { filterOptions } = require("@lerna/filter-options"); /** * @see https://github.com/yargs/yargs/blob/master/docs/advanced.md#providing-a-command-module diff --git a/commands/run/index.js b/commands/run/index.js index 492a34d5a3..57f763fea0 100644 --- a/commands/run/index.js +++ b/commands/run/index.js @@ -2,13 +2,13 @@ const pMap = require("p-map"); -const Command = require("@lerna/command"); -const npmRunScript = require("@lerna/npm-run-script"); -const output = require("@lerna/output"); -const Profiler = require("@lerna/profiler"); -const timer = require("@lerna/timer"); -const runTopologically = require("@lerna/run-topologically"); -const ValidationError = require("@lerna/validation-error"); +const { Command } = require("@lerna/command"); +const { npmRunScript, npmRunScriptStreaming } = require("@lerna/npm-run-script"); +const { output } = require("@lerna/output"); +const { Profiler } = require("@lerna/profiler"); +const { timer } = require("@lerna/timer"); +const { runTopologically } = require("@lerna/run-topologically"); +const { ValidationError } = require("@lerna/validation-error"); const { getFilteredPackages } = require("@lerna/filter-options"); module.exports = factory; @@ -172,7 +172,7 @@ class RunCommand extends Command { } runScriptInPackageStreaming(pkg) { - return npmRunScript.stream(this.script, this.getOpts(pkg)); + return npmRunScriptStreaming(this.script, this.getOpts(pkg)); } runScriptInPackageCapturing(pkg) { diff --git a/commands/version/__tests__/prompt-version.test.js b/commands/version/__tests__/prompt-version.test.js index 101e794c62..3672b8b11c 100644 --- a/commands/version/__tests__/prompt-version.test.js +++ b/commands/version/__tests__/prompt-version.test.js @@ -4,7 +4,7 @@ jest.mock("@lerna/prompt"); const semver = require("semver"); const prompt = require("@lerna/prompt"); -const prereleaseIdFromVersion = require("@lerna/prerelease-id-from-version"); +const { prereleaseIdFromVersion } = require("@lerna/prerelease-id-from-version"); const makePromptVersion = require("../lib/prompt-version"); const resolvePrereleaseId = jest.fn(() => "alpha"); diff --git a/commands/version/__tests__/version-bump-prerelease.test.js b/commands/version/__tests__/version-bump-prerelease.test.js index 2049cc8498..5ee523dc4f 100644 --- a/commands/version/__tests__/version-bump-prerelease.test.js +++ b/commands/version/__tests__/version-bump-prerelease.test.js @@ -18,12 +18,12 @@ const prompt = require("@lerna/prompt"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const showCommit = require("@lerna-test/show-commit"); -const gitInit = require("@lerna-test/git-init"); -const gitAdd = require("@lerna-test/git-add"); -const gitTag = require("@lerna-test/git-tag"); -const gitCommit = require("@lerna-test/git-commit"); -const getCommitMessage = require("@lerna-test/get-commit-message"); +const { showCommit } = require("@lerna-test/show-commit"); +const { gitInit } = require("@lerna-test/git-init"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { getCommitMessage } = require("@lerna-test/get-commit-message"); const Tacks = require("tacks"); const tempy = require("tempy"); diff --git a/commands/version/__tests__/version-bump.test.js b/commands/version/__tests__/version-bump.test.js index 6dd17ecb46..dbe2d05945 100644 --- a/commands/version/__tests__/version-bump.test.js +++ b/commands/version/__tests__/version-bump.test.js @@ -13,7 +13,7 @@ const PromptUtilities = require("@lerna/prompt"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const getCommitMessage = require("@lerna-test/get-commit-message"); +const { getCommitMessage } = require("@lerna-test/get-commit-message"); // test command const lernaVersion = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/version/__tests__/version-command.test.js b/commands/version/__tests__/version-command.test.js index c7588cac04..5364f4a523 100644 --- a/commands/version/__tests__/version-command.test.js +++ b/commands/version/__tests__/version-command.test.js @@ -13,22 +13,22 @@ const execa = require("execa"); // mocked or stubbed modules const writePkg = require("write-pkg"); const PromptUtilities = require("@lerna/prompt"); -const collectUpdates = require("@lerna/collect-updates"); -const output = require("@lerna/output"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { collectUpdates } = require("@lerna/collect-updates"); +const { output } = require("@lerna/output"); +const { checkWorkingTree, throwIfUncommitted } = require("@lerna/check-working-tree"); const libPush = require("../lib/git-push"); const isAnythingCommitted = require("../lib/is-anything-committed"); const isBehindUpstream = require("../lib/is-behind-upstream"); const remoteBranchExists = require("../lib/remote-branch-exists"); // helpers -const loggingOutput = require("@lerna-test/logging-output"); -const gitAdd = require("@lerna-test/git-add"); -const gitTag = require("@lerna-test/git-tag"); -const gitCommit = require("@lerna-test/git-commit"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCommit } = require("@lerna-test/git-commit"); const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const showCommit = require("@lerna-test/show-commit"); -const getCommitMessage = require("@lerna-test/get-commit-message"); +const { showCommit } = require("@lerna-test/show-commit"); +const { getCommitMessage } = require("@lerna-test/get-commit-message"); // file under test const lernaVersion = require("@lerna-test/command-runner")(require("../command")); @@ -125,12 +125,12 @@ describe("VersionCommand", () => { // notably different than the actual message, but good enough here }); - it("calls `checkWorkingTree.throwIfUncommitted` when using --force-publish", async () => { + it("calls `throwIfUncommitted` when using --force-publish", async () => { const testDir = await initFixture("normal"); await lernaVersion(testDir)("--force-publish"); - expect(checkWorkingTree.throwIfUncommitted).toHaveBeenCalled(); + expect(throwIfUncommitted).toHaveBeenCalled(); }); it("only bumps changed packages when non-major version selected", async () => { diff --git a/commands/version/__tests__/version-conventional-commits.test.js b/commands/version/__tests__/version-conventional-commits.test.js index 4458021ff0..a6773812a0 100644 --- a/commands/version/__tests__/version-conventional-commits.test.js +++ b/commands/version/__tests__/version-conventional-commits.test.js @@ -11,12 +11,12 @@ const semver = require("semver"); // mocked modules const writePkg = require("write-pkg"); -const collectUpdates = require("@lerna/collect-updates"); +const { collectUpdates } = require("@lerna/collect-updates"); const ConventionalCommitUtilities = require("@lerna/conventional-commits"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const showCommit = require("@lerna-test/show-commit"); +const { showCommit } = require("@lerna-test/show-commit"); // test command const lernaVersion = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/version/__tests__/version-create-release.test.js b/commands/version/__tests__/version-create-release.test.js index 9241eae34e..f3b901669c 100644 --- a/commands/version/__tests__/version-create-release.test.js +++ b/commands/version/__tests__/version-create-release.test.js @@ -10,8 +10,8 @@ jest.mock("../lib/is-behind-upstream"); jest.mock("../lib/remote-branch-exists"); // mocked modules -const githubClient = require("@lerna/github-client").client; -const gitlabClient = require("@lerna/gitlab-client")(); +const githubClient = require("@lerna/github-client").createGitHubClient(); +const gitlabClient = require("@lerna/gitlab-client").createGitLabClient(); const { recommendVersion } = require("@lerna/conventional-commits"); // helpers diff --git a/commands/version/__tests__/version-ignore-changes.test.js b/commands/version/__tests__/version-ignore-changes.test.js index 2fe88b9df1..85b212bd34 100644 --- a/commands/version/__tests__/version-ignore-changes.test.js +++ b/commands/version/__tests__/version-ignore-changes.test.js @@ -14,10 +14,10 @@ const path = require("path"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const gitAdd = require("@lerna-test/git-add"); -const gitTag = require("@lerna-test/git-tag"); -const gitCommit = require("@lerna-test/git-commit"); -const showCommit = require("@lerna-test/show-commit"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { showCommit } = require("@lerna-test/show-commit"); // test command const lernaVersion = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/version/__tests__/version-include-merged-tags.test.js b/commands/version/__tests__/version-include-merged-tags.test.js index 7cb3c3da21..8fb0227965 100644 --- a/commands/version/__tests__/version-include-merged-tags.test.js +++ b/commands/version/__tests__/version-include-merged-tags.test.js @@ -7,15 +7,15 @@ const path = require("path"); const fs = require("fs"); // mocked modules -const output = require("@lerna/output"); +const { output } = require("@lerna/output"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const gitTag = require("@lerna-test/git-tag"); -const gitCheckout = require("@lerna-test/git-checkout"); -const gitMerge = require("@lerna-test/git-merge"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitCheckout } = require("@lerna-test/git-checkout"); +const { gitMerge } = require("@lerna-test/git-merge"); // file under test const lernaVersion = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/version/__tests__/version-lifecycle-scripts.test.js b/commands/version/__tests__/version-lifecycle-scripts.test.js index e11e1bc212..a8f4b14399 100644 --- a/commands/version/__tests__/version-lifecycle-scripts.test.js +++ b/commands/version/__tests__/version-lifecycle-scripts.test.js @@ -7,7 +7,7 @@ jest.mock("../lib/is-behind-upstream"); jest.mock("../lib/remote-branch-exists"); // mocked modules -const runLifecycle = require("@lerna/run-lifecycle"); +const { runLifecycle } = require("@lerna/run-lifecycle"); const loadJsonFile = require("load-json-file"); // helpers diff --git a/commands/version/__tests__/version-message.test.js b/commands/version/__tests__/version-message.test.js index 554718b753..6601114a70 100644 --- a/commands/version/__tests__/version-message.test.js +++ b/commands/version/__tests__/version-message.test.js @@ -10,7 +10,7 @@ const path = require("path"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../publish/__tests__")); -const getCommitMessage = require("@lerna-test/get-commit-message"); +const { getCommitMessage } = require("@lerna-test/get-commit-message"); // test command const lernaVersion = require("@lerna-test/command-runner")(require("../command")); diff --git a/commands/version/index.js b/commands/version/index.js index 15b7586ec3..400c3cacd0 100644 --- a/commands/version/index.js +++ b/commands/version/index.js @@ -10,16 +10,16 @@ const pReduce = require("p-reduce"); const pWaterfall = require("p-waterfall"); const semver = require("semver"); -const Command = require("@lerna/command"); +const { Command } = require("@lerna/command"); const ConventionalCommitUtilities = require("@lerna/conventional-commits"); -const checkWorkingTree = require("@lerna/check-working-tree"); +const { checkWorkingTree, throwIfUncommitted } = require("@lerna/check-working-tree"); const PromptUtilities = require("@lerna/prompt"); -const output = require("@lerna/output"); -const collectUpdates = require("@lerna/collect-updates"); +const { output } = require("@lerna/output"); +const { collectUpdates, collectPackages, getPackagesForOption } = require("@lerna/collect-updates"); const { createRunner } = require("@lerna/run-lifecycle"); -const runTopologically = require("@lerna/run-topologically"); -const ValidationError = require("@lerna/validation-error"); -const prereleaseIdFromVersion = require("@lerna/prerelease-id-from-version"); +const { runTopologically } = require("@lerna/run-topologically"); +const { ValidationError } = require("@lerna/validation-error"); +const { prereleaseIdFromVersion } = require("@lerna/prerelease-id-from-version"); const getCurrentBranch = require("./lib/get-current-branch"); const gitAdd = require("./lib/git-add"); @@ -34,8 +34,6 @@ const makePromptVersion = require("./lib/prompt-version"); const createRelease = require("./lib/create-release"); const { updateLockfileVersion } = require("./lib/update-lockfile-version"); -const { collectPackages, getPackagesForOption } = collectUpdates; - module.exports = factory; function factory(argv) { @@ -252,7 +250,7 @@ class VersionCommand extends Command { if (this.commitAndTag && this.gitOpts.amend !== true) { const { forcePublish, conventionalCommits, conventionalGraduate } = this.options; const checkUncommittedOnly = forcePublish || (conventionalCommits && conventionalGraduate); - const check = checkUncommittedOnly ? checkWorkingTree.throwIfUncommitted : checkWorkingTree; + const check = checkUncommittedOnly ? throwIfUncommitted : checkWorkingTree; tasks.unshift(() => check(this.execOpts)); } else { this.logger.warn("version", "Skipping working tree validation, proceed at your own risk"); diff --git a/commands/version/lib/create-release.js b/commands/version/lib/create-release.js index 7038722af1..52f9337311 100644 --- a/commands/version/lib/create-release.js +++ b/commands/version/lib/create-release.js @@ -2,9 +2,9 @@ const semver = require("semver"); -const createGitLabClient = require("@lerna/gitlab-client"); +const { createGitLabClient } = require("@lerna/gitlab-client"); const { createGitHubClient, parseGitRepo } = require("@lerna/github-client"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); module.exports = createRelease; diff --git a/core/cli/__tests__/core-cli.test.js b/core/cli/__tests__/core-cli.test.js index 7ff0688a2d..82d1338a36 100644 --- a/core/cli/__tests__/core-cli.test.js +++ b/core/cli/__tests__/core-cli.test.js @@ -1,7 +1,7 @@ "use strict"; -const ValidationError = require("@lerna/validation-error"); -const loggingOutput = require("@lerna-test/logging-output"); +const { ValidationError } = require("@lerna/validation-error"); +const { loggingOutput } = require("@lerna-test/logging-output"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const coreCLI = require(".."); diff --git a/core/cli/index.js b/core/cli/index.js index 8fab227c4c..edd15807bc 100644 --- a/core/cli/index.js +++ b/core/cli/index.js @@ -3,7 +3,7 @@ const dedent = require("dedent"); const log = require("npmlog"); const yargs = require("yargs/yargs"); -const globalOptions = require("@lerna/global-options"); +const { globalOptions } = require("@lerna/global-options"); module.exports = lernaCLI; diff --git a/core/command/__tests__/command.test.js b/core/command/__tests__/command.test.js index 01477d56f0..7bd6a720e4 100644 --- a/core/command/__tests__/command.test.js +++ b/core/command/__tests__/command.test.js @@ -16,11 +16,11 @@ jest.spyOn(os, "cpus").mockImplementation(() => new Array(42)); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loggingOutput = require("@lerna-test/logging-output"); -const updateLernaConfig = require("@lerna-test/update-lerna-config"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { updateLernaConfig } = require("@lerna-test/update-lerna-config"); // file under test -const Command = require(".."); +const { Command } = require(".."); describe("core-command", () => { let testDir; diff --git a/core/command/index.js b/core/command/index.js index fb4a334f0e..bb2e1ef73d 100644 --- a/core/command/index.js +++ b/core/command/index.js @@ -6,10 +6,10 @@ const execa = require("execa"); const log = require("npmlog"); const os = require("os"); -const PackageGraph = require("@lerna/package-graph"); -const Project = require("@lerna/project"); -const writeLogFile = require("@lerna/write-log-file"); -const ValidationError = require("@lerna/validation-error"); +const { PackageGraph } = require("@lerna/package-graph"); +const { Project } = require("@lerna/project"); +const { writeLogFile } = require("@lerna/write-log-file"); +const { ValidationError } = require("@lerna/validation-error"); const cleanStack = require("./lib/clean-stack"); const defaultOptions = require("./lib/default-options"); diff --git a/core/conventional-commits/__tests__/conventional-commits.test.js b/core/conventional-commits/__tests__/conventional-commits.test.js index f668d4ec85..e61d193d64 100644 --- a/core/conventional-commits/__tests__/conventional-commits.test.js +++ b/core/conventional-commits/__tests__/conventional-commits.test.js @@ -6,9 +6,9 @@ const { getPackages } = require("@lerna/project"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const gitTag = require("@lerna-test/git-tag"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { gitTag } = require("@lerna-test/git-tag"); // file under test const { recommendVersion, updateChangelog } = require(".."); diff --git a/core/conventional-commits/lib/get-changelog-config.js b/core/conventional-commits/lib/get-changelog-config.js index ebf03a2732..e95bf682ed 100644 --- a/core/conventional-commits/lib/get-changelog-config.js +++ b/core/conventional-commits/lib/get-changelog-config.js @@ -3,7 +3,7 @@ const log = require("npmlog"); const npa = require("npm-package-arg"); const pify = require("pify"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); module.exports = getChangelogConfig; diff --git a/core/filter-options/__tests__/get-filtered-packages.test.js b/core/filter-options/__tests__/get-filtered-packages.test.js index c4c1029479..4bd4d26dd0 100644 --- a/core/filter-options/__tests__/get-filtered-packages.test.js +++ b/core/filter-options/__tests__/get-filtered-packages.test.js @@ -4,15 +4,15 @@ const path = require("path"); const yargs = require("yargs/yargs"); // mocked modules -const collectUpdates = require("@lerna/collect-updates"); +const { collectUpdates } = require("@lerna/collect-updates"); // helpers const initFixture = require("@lerna-test/init-fixture")(path.resolve(__dirname, "../../command")); -const PackageGraph = require("@lerna/package-graph"); +const { PackageGraph } = require("@lerna/package-graph"); const { getPackages } = require("@lerna/project"); const { getFilteredPackages } = require("../lib/get-filtered-packages"); -const filterOptions = require(".."); +const { filterOptions } = require(".."); async function buildGraph(cwd) { const packages = await getPackages(cwd); diff --git a/core/filter-options/lib/get-filtered-packages.js b/core/filter-options/lib/get-filtered-packages.js index 255f4eee43..3b9317f65d 100644 --- a/core/filter-options/lib/get-filtered-packages.js +++ b/core/filter-options/lib/get-filtered-packages.js @@ -1,8 +1,8 @@ "use strict"; const log = require("npmlog"); -const collectUpdates = require("@lerna/collect-updates"); -const filterPackages = require("@lerna/filter-packages"); +const { collectUpdates } = require("@lerna/collect-updates"); +const { filterPackages } = require("@lerna/filter-packages"); module.exports.getFilteredPackages = getFilteredPackages; diff --git a/core/lerna/__tests__/cli.test.js b/core/lerna/__tests__/cli.test.js index d2ff4ce8ec..912b1f0c68 100644 --- a/core/lerna/__tests__/cli.test.js +++ b/core/lerna/__tests__/cli.test.js @@ -5,7 +5,7 @@ const path = require("path"); const tempy = require("tempy"); // git init is not necessary -const copyFixture = require("@lerna-test/copy-fixture"); +const { copyFixture } = require("@lerna-test/copy-fixture"); const CLI = path.join(__dirname, "../cli.js"); const bin = (cwd) => (...args) => execa(CLI, args, { cwd }); diff --git a/core/otplease/__tests__/otplease.test.js b/core/otplease/__tests__/otplease.test.js index a3a8d7e7ad..87bdfd70e7 100644 --- a/core/otplease/__tests__/otplease.test.js +++ b/core/otplease/__tests__/otplease.test.js @@ -6,7 +6,7 @@ jest.mock("@lerna/prompt"); const prompt = require("@lerna/prompt"); // file under test -const otplease = require(".."); +const { otplease, getOneTimePassword } = require(".."); // global mock setup prompt.input.mockResolvedValue("123456"); @@ -187,7 +187,7 @@ describe("@lerna/otplease", () => { describe("getOneTimePassword()", () => { it("defaults message argument", async () => { - await otplease.getOneTimePassword(); + await getOneTimePassword(); expect(prompt.input).toHaveBeenCalledWith( "This operation requires a one-time password:", @@ -196,7 +196,7 @@ describe("@lerna/otplease", () => { }); it("accepts custom message", async () => { - await otplease.getOneTimePassword("foo bar"); + await getOneTimePassword("foo bar"); expect(prompt.input).toHaveBeenCalledWith("foo bar", expect.any(Object)); }); diff --git a/core/package-graph/__tests__/package-graph.test.js b/core/package-graph/__tests__/package-graph.test.js index 3030ff9758..7d716d875f 100644 --- a/core/package-graph/__tests__/package-graph.test.js +++ b/core/package-graph/__tests__/package-graph.test.js @@ -1,9 +1,9 @@ "use strict"; -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); // file under test -const PackageGraph = require(".."); +const { PackageGraph } = require(".."); describe("PackageGraph", () => { describe("constructor", () => { diff --git a/core/package-graph/index.js b/core/package-graph/index.js index 197b2525c9..e5e2777415 100644 --- a/core/package-graph/index.js +++ b/core/package-graph/index.js @@ -1,7 +1,7 @@ "use strict"; const npa = require("npm-package-arg"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const { CyclicPackageGraphNode } = require("./lib/cyclic-package-graph-node"); const { PackageGraphNode } = require("./lib/package-graph-node"); const { reportCycles } = require("./lib/report-cycles"); diff --git a/core/package-graph/lib/package-graph-node.js b/core/package-graph/lib/package-graph-node.js index 65148e0d1e..b67ff0e591 100644 --- a/core/package-graph/lib/package-graph-node.js +++ b/core/package-graph/lib/package-graph-node.js @@ -1,7 +1,7 @@ "use strict"; const semver = require("semver"); -const prereleaseIdFromVersion = require("@lerna/prerelease-id-from-version"); +const { prereleaseIdFromVersion } = require("@lerna/prerelease-id-from-version"); /** * Represents a node in a PackageGraph. diff --git a/core/package-graph/lib/report-cycles.js b/core/package-graph/lib/report-cycles.js index 8097f94bc7..a79480b757 100644 --- a/core/package-graph/lib/report-cycles.js +++ b/core/package-graph/lib/report-cycles.js @@ -1,7 +1,7 @@ "use strict"; const log = require("npmlog"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); module.exports.reportCycles = reportCycles; diff --git a/core/package/__tests__/core-package.test.js b/core/package/__tests__/core-package.test.js index 5e29173362..f33f362a46 100644 --- a/core/package/__tests__/core-package.test.js +++ b/core/package/__tests__/core-package.test.js @@ -9,7 +9,7 @@ const loadJsonFile = require("load-json-file"); const writePkg = require("write-pkg"); // file under test -const Package = require(".."); +const { Package } = require(".."); describe("Package", () => { const factory = (json) => diff --git a/core/project/__tests__/project.test.js b/core/project/__tests__/project.test.js index 69619b73bf..d759ac0831 100644 --- a/core/project/__tests__/project.test.js +++ b/core/project/__tests__/project.test.js @@ -7,7 +7,7 @@ const path = require("path"); const initFixture = require("@lerna-test/init-fixture")(__dirname); // file under test -const Project = require(".."); +const { Project } = require(".."); describe("Project", () => { let testDir; diff --git a/core/project/index.js b/core/project/index.js index 9ec3db57d9..566f16c5b6 100644 --- a/core/project/index.js +++ b/core/project/index.js @@ -10,8 +10,8 @@ const pMap = require("p-map"); const path = require("path"); const writeJsonFile = require("write-json-file"); -const ValidationError = require("@lerna/validation-error"); -const Package = require("@lerna/package"); +const { ValidationError } = require("@lerna/validation-error"); +const { Package } = require("@lerna/package"); const applyExtends = require("./lib/apply-extends"); const deprecateConfig = require("./lib/deprecate-config"); const { makeFileFinder, makeSyncFileFinder } = require("./lib/make-file-finder"); diff --git a/core/project/lib/apply-extends.js b/core/project/lib/apply-extends.js index 237dd3e4a9..eda038da1b 100644 --- a/core/project/lib/apply-extends.js +++ b/core/project/lib/apply-extends.js @@ -2,7 +2,7 @@ const path = require("path"); const resolveFrom = require("resolve-from"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); const deprecateConfig = require("./deprecate-config"); const shallowExtend = require("./shallow-extend"); diff --git a/core/project/lib/make-file-finder.js b/core/project/lib/make-file-finder.js index a5945b3779..3d343136dc 100644 --- a/core/project/lib/make-file-finder.js +++ b/core/project/lib/make-file-finder.js @@ -3,7 +3,7 @@ const globby = require("globby"); const pMap = require("p-map"); const path = require("path"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); module.exports.makeFileFinder = makeFileFinder; module.exports.makeSyncFileFinder = makeSyncFileFinder; diff --git a/helpers/commit-change-to-package/index.js b/helpers/commit-change-to-package/index.js index aea0669a06..6eab5efcac 100644 --- a/helpers/commit-change-to-package/index.js +++ b/helpers/commit-change-to-package/index.js @@ -3,8 +3,8 @@ const path = require("path"); const loadJsonFile = require("load-json-file"); const writeJsonFile = require("write-json-file"); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); module.exports = commitChangeToPackage; module.exports.commitChangeToPackage = commitChangeToPackage; diff --git a/helpers/copy-fixture/index.js b/helpers/copy-fixture/index.js index 475363d1a9..b7eeb84ae8 100644 --- a/helpers/copy-fixture/index.js +++ b/helpers/copy-fixture/index.js @@ -1,6 +1,6 @@ "use strict"; -const findFixture = require("@lerna-test/find-fixture"); +const { findFixture } = require("@lerna-test/find-fixture"); const fs = require("fs-extra"); module.exports = copyFixture; diff --git a/helpers/init-fixture/index.js b/helpers/init-fixture/index.js index e44a88e058..a34b4546bf 100644 --- a/helpers/init-fixture/index.js +++ b/helpers/init-fixture/index.js @@ -1,10 +1,10 @@ "use strict"; const tempy = require("tempy"); -const copyFixture = require("@lerna-test/copy-fixture"); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const gitInit = require("@lerna-test/git-init"); +const { copyFixture } = require("@lerna-test/copy-fixture"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { gitInit } = require("@lerna-test/git-init"); module.exports = initFixture; diff --git a/helpers/init-named-fixture/index.js b/helpers/init-named-fixture/index.js index 6dc83c3d4b..2134285c1d 100644 --- a/helpers/init-named-fixture/index.js +++ b/helpers/init-named-fixture/index.js @@ -3,10 +3,10 @@ const path = require("path"); const fs = require("fs-extra"); const tempy = require("tempy"); -const copyFixture = require("@lerna-test/copy-fixture"); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); -const gitInit = require("@lerna-test/git-init"); +const { copyFixture } = require("@lerna-test/copy-fixture"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); +const { gitInit } = require("@lerna-test/git-init"); module.exports = initNamedFixture; diff --git a/helpers/logging-output/index.js b/helpers/logging-output/index.js index 6450f72e8d..f6a591cde5 100644 --- a/helpers/logging-output/index.js +++ b/helpers/logging-output/index.js @@ -1,7 +1,7 @@ "use strict"; const log = require("npmlog"); -const multiLineTrimRight = require("@lerna-test/multi-line-trim-right"); +const { multiLineTrimRight } = require("@lerna-test/multi-line-trim-right"); module.exports = loggingOutput; module.exports.loggingOutput = loggingOutput; diff --git a/helpers/pkg-matchers/index.js b/helpers/pkg-matchers/index.js index 7be182f6ed..33225f36b6 100644 --- a/helpers/pkg-matchers/index.js +++ b/helpers/pkg-matchers/index.js @@ -3,7 +3,7 @@ const fs = require("fs"); const path = require("path"); const semver = require("semver"); -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); exports.toDependOn = createDependencyMatcher("dependencies"); exports.toDevDependOn = createDependencyMatcher("devDependencies"); diff --git a/helpers/update-lerna-config/index.js b/helpers/update-lerna-config/index.js index c968ffb667..50fd17d626 100644 --- a/helpers/update-lerna-config/index.js +++ b/helpers/update-lerna-config/index.js @@ -1,7 +1,7 @@ "use strict"; // eslint-disable-next-line import/no-extraneous-dependencies, node/no-extraneous-require -const Project = require("@lerna/project"); +const { Project } = require("@lerna/project"); module.exports = updateLernaConfig; module.exports.updateLernaConfig = updateLernaConfig; diff --git a/integration/lerna-add.test.js b/integration/lerna-add.test.js index c0af04027c..30def1cc95 100644 --- a/integration/lerna-add.test.js +++ b/integration/lerna-add.test.js @@ -5,7 +5,7 @@ const globby = require("globby"); const loadJson = require("load-json-file"); const pMap = require("p-map"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const pkgMatchers = require("@lerna-test/pkg-matchers"); diff --git a/integration/lerna-bootstrap-ci.test.js b/integration/lerna-bootstrap-ci.test.js index 9d9a531a07..3349ba22f1 100644 --- a/integration/lerna-bootstrap-ci.test.js +++ b/integration/lerna-bootstrap-ci.test.js @@ -1,7 +1,7 @@ "use strict"; const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/bootstrap/__tests__") ); diff --git a/integration/lerna-bootstrap-hoist.test.js b/integration/lerna-bootstrap-hoist.test.js index 0ef139048b..0280026080 100644 --- a/integration/lerna-bootstrap-hoist.test.js +++ b/integration/lerna-bootstrap-hoist.test.js @@ -3,7 +3,7 @@ const fs = require("fs-extra"); const globby = require("globby"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); test("lerna bootstrap --hoist", async () => { diff --git a/integration/lerna-bootstrap-legacy.test.js b/integration/lerna-bootstrap-legacy.test.js index adf09941e7..131d5aa584 100644 --- a/integration/lerna-bootstrap-legacy.test.js +++ b/integration/lerna-bootstrap-legacy.test.js @@ -3,7 +3,7 @@ const fs = require("fs-extra"); const globby = require("globby"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); test("lerna bootstrap links all packages", async () => { diff --git a/integration/lerna-bootstrap-yarn.test.js b/integration/lerna-bootstrap-yarn.test.js index e95a411391..a9e4ef312b 100644 --- a/integration/lerna-bootstrap-yarn.test.js +++ b/integration/lerna-bootstrap-yarn.test.js @@ -3,7 +3,7 @@ const globby = require("globby"); const normalizePath = require("normalize-path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); test("lerna bootstrap --npm-client yarn", async () => { diff --git a/integration/lerna-changed.test.js b/integration/lerna-changed.test.js index 72af230d40..deab685949 100644 --- a/integration/lerna-changed.test.js +++ b/integration/lerna-changed.test.js @@ -1,8 +1,8 @@ "use strict"; -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); const initFixture = require("@lerna-test/init-fixture")(__dirname); test("includes dependents", async () => { diff --git a/integration/lerna-clean.test.js b/integration/lerna-clean.test.js index 06189679a5..0005455882 100644 --- a/integration/lerna-clean.test.js +++ b/integration/lerna-clean.test.js @@ -2,7 +2,7 @@ const globby = require("globby"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); describe("lerna clean", () => { diff --git a/integration/lerna-exec-since.test.js b/integration/lerna-exec-since.test.js index d6a19120a4..5289932fc3 100644 --- a/integration/lerna-exec-since.test.js +++ b/integration/lerna-exec-since.test.js @@ -3,10 +3,10 @@ const fs = require("fs-extra"); const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitCheckout = require("@lerna-test/git-checkout"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitCheckout } = require("@lerna-test/git-checkout"); +const { gitTag } = require("@lerna-test/git-tag"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const LERNA_PACKAGE_NAME = process.platform === "win32" ? "%LERNA_PACKAGE_NAME%" : "$LERNA_PACKAGE_NAME"; diff --git a/integration/lerna-exec.test.js b/integration/lerna-exec.test.js index b8dadf13b7..97e617fe10 100644 --- a/integration/lerna-exec.test.js +++ b/integration/lerna-exec.test.js @@ -3,7 +3,7 @@ const path = require("path"); const pathKey = require("path-key"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const EXEC_TEST_COMMAND = process.platform === "win32" ? "exec-test.cmd" : "exec-test"; diff --git a/integration/lerna-import.test.js b/integration/lerna-import.test.js index 295a7f91f2..3d3840c3bc 100644 --- a/integration/lerna-import.test.js +++ b/integration/lerna-import.test.js @@ -1,8 +1,8 @@ "use strict"; -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); -const loadManifests = require("@lerna-test/load-manifests"); +const { loadManifests } = require("@lerna-test/load-manifests"); describe("lerna import", () => { test("works with argument provided", async () => { diff --git a/integration/lerna-init.test.js b/integration/lerna-init.test.js index 96a25fc90b..d6a12819a2 100644 --- a/integration/lerna-init.test.js +++ b/integration/lerna-init.test.js @@ -4,7 +4,7 @@ const loadJsonFile = require("load-json-file"); const path = require("path"); const tempy = require("tempy"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); describe("lerna init", () => { diff --git a/integration/lerna-link-sibling-bins.test.js b/integration/lerna-link-sibling-bins.test.js index 740cbdc54a..5d1d986f3a 100644 --- a/integration/lerna-link-sibling-bins.test.js +++ b/integration/lerna-link-sibling-bins.test.js @@ -1,6 +1,6 @@ "use strict"; -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); if (process.platform !== "win32") { diff --git a/integration/lerna-ls.test.js b/integration/lerna-ls.test.js index 95708b3e1f..9962a6cf98 100644 --- a/integration/lerna-ls.test.js +++ b/integration/lerna-ls.test.js @@ -1,6 +1,6 @@ "use strict"; -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); // ls never makes changes to repo, so we only need one fixture + runner diff --git a/integration/lerna-publish-auth.test.js b/integration/lerna-publish-auth.test.js index 8a31e1bb7b..9c9f843fd8 100644 --- a/integration/lerna-publish-auth.test.js +++ b/integration/lerna-publish-auth.test.js @@ -2,7 +2,7 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-canary.test.js b/integration/lerna-publish-canary.test.js index 59d688ad8c..ee70529173 100644 --- a/integration/lerna-publish-canary.test.js +++ b/integration/lerna-publish-canary.test.js @@ -2,10 +2,10 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); -const gitStatus = require("@lerna-test/git-status"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); +const { gitStatus } = require("@lerna-test/git-status"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-conventional-fixed-prerelease.test.js b/integration/lerna-publish-conventional-fixed-prerelease.test.js index 4178b598ad..5077110f0e 100644 --- a/integration/lerna-publish-conventional-fixed-prerelease.test.js +++ b/integration/lerna-publish-conventional-fixed-prerelease.test.js @@ -5,9 +5,9 @@ const globby = require("globby"); const path = require("path"); const os = require("os"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-conventional-fixed.test.js b/integration/lerna-publish-conventional-fixed.test.js index a22f508161..60070b2891 100644 --- a/integration/lerna-publish-conventional-fixed.test.js +++ b/integration/lerna-publish-conventional-fixed.test.js @@ -5,8 +5,8 @@ const globby = require("globby"); const path = require("path"); const os = require("os"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-conventional-independent-prerelease.test.js b/integration/lerna-publish-conventional-independent-prerelease.test.js index c0427c7adb..fcbd919e43 100644 --- a/integration/lerna-publish-conventional-independent-prerelease.test.js +++ b/integration/lerna-publish-conventional-independent-prerelease.test.js @@ -5,9 +5,9 @@ const globby = require("globby"); const path = require("path"); const os = require("os"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-conventional-independent.test.js b/integration/lerna-publish-conventional-independent.test.js index 88f7f371e6..3d0553e6b4 100644 --- a/integration/lerna-publish-conventional-independent.test.js +++ b/integration/lerna-publish-conventional-independent.test.js @@ -5,8 +5,8 @@ const globby = require("globby"); const path = require("path"); const os = require("os"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-custom-tag.test.js b/integration/lerna-publish-custom-tag.test.js index 982f11d1a4..9821397257 100644 --- a/integration/lerna-publish-custom-tag.test.js +++ b/integration/lerna-publish-custom-tag.test.js @@ -2,8 +2,8 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { gitTag } = require("@lerna-test/git-tag"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-error.test.js b/integration/lerna-publish-error.test.js index aecdbc9897..1d60047e51 100644 --- a/integration/lerna-publish-error.test.js +++ b/integration/lerna-publish-error.test.js @@ -2,7 +2,7 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-fixed.test.js b/integration/lerna-publish-fixed.test.js index 3e5c21b862..6771ba5169 100644 --- a/integration/lerna-publish-fixed.test.js +++ b/integration/lerna-publish-fixed.test.js @@ -2,8 +2,8 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const showCommit = require("@lerna-test/show-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { showCommit } = require("@lerna-test/show-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-independent.test.js b/integration/lerna-publish-independent.test.js index cedcd55a82..f561b2b54d 100644 --- a/integration/lerna-publish-independent.test.js +++ b/integration/lerna-publish-independent.test.js @@ -2,8 +2,8 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const showCommit = require("@lerna-test/show-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { showCommit } = require("@lerna-test/show-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-lifecycle-errors.test.js b/integration/lerna-publish-lifecycle-errors.test.js index 3f62533839..a8038041f8 100644 --- a/integration/lerna-publish-lifecycle-errors.test.js +++ b/integration/lerna-publish-lifecycle-errors.test.js @@ -3,9 +3,9 @@ const fs = require("fs-extra"); const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-lifecycle-silent.test.js b/integration/lerna-publish-lifecycle-silent.test.js index 4ab8b7e607..a79753d7be 100644 --- a/integration/lerna-publish-lifecycle-silent.test.js +++ b/integration/lerna-publish-lifecycle-silent.test.js @@ -2,7 +2,7 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-lifecycle.test.js b/integration/lerna-publish-lifecycle.test.js index 762498da53..ab752a9cf9 100644 --- a/integration/lerna-publish-lifecycle.test.js +++ b/integration/lerna-publish-lifecycle.test.js @@ -2,7 +2,7 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-relative-file-spec.test.js b/integration/lerna-publish-relative-file-spec.test.js index 1049620973..d3234b46bd 100644 --- a/integration/lerna-publish-relative-file-spec.test.js +++ b/integration/lerna-publish-relative-file-spec.test.js @@ -2,10 +2,10 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); -const showCommit = require("@lerna-test/show-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); +const { showCommit } = require("@lerna-test/show-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-skip-npm.test.js b/integration/lerna-publish-skip-npm.test.js index 3c0ce8d449..0f36f02f80 100644 --- a/integration/lerna-publish-skip-npm.test.js +++ b/integration/lerna-publish-skip-npm.test.js @@ -2,9 +2,9 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-transitive.test.js b/integration/lerna-publish-transitive.test.js index f08f9c2611..dea0d14563 100644 --- a/integration/lerna-publish-transitive.test.js +++ b/integration/lerna-publish-transitive.test.js @@ -2,10 +2,10 @@ const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitTag = require("@lerna-test/git-tag"); -const showCommit = require("@lerna-test/show-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitTag } = require("@lerna-test/git-tag"); +const { showCommit } = require("@lerna-test/show-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-publish-validation.test.js b/integration/lerna-publish-validation.test.js index c7616df04b..b68b90e067 100644 --- a/integration/lerna-publish-validation.test.js +++ b/integration/lerna-publish-validation.test.js @@ -5,9 +5,9 @@ const fs = require("fs-extra"); const path = require("path"); const tempy = require("tempy"); -const cliRunner = require("@lerna-test/cli-runner"); -const gitAdd = require("@lerna-test/git-add"); -const gitCommit = require("@lerna-test/git-commit"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { gitAdd } = require("@lerna-test/git-add"); +const { gitCommit } = require("@lerna-test/git-commit"); const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); diff --git a/integration/lerna-run-since.test.js b/integration/lerna-run-since.test.js index ed2a755b1f..4fe2ddb61f 100644 --- a/integration/lerna-run-since.test.js +++ b/integration/lerna-run-since.test.js @@ -3,10 +3,10 @@ const fs = require("fs-extra"); const path = require("path"); -const cliRunner = require("@lerna-test/cli-runner"); -const commitChangeToPackage = require("@lerna-test/commit-change-to-package"); -const gitCheckout = require("@lerna-test/git-checkout"); -const gitTag = require("@lerna-test/git-tag"); +const { cliRunner } = require("@lerna-test/cli-runner"); +const { commitChangeToPackage } = require("@lerna-test/commit-change-to-package"); +const { gitCheckout } = require("@lerna-test/git-checkout"); +const { gitTag } = require("@lerna-test/git-tag"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const env = { diff --git a/integration/lerna-run.test.js b/integration/lerna-run.test.js index bd46cdec98..dc46a2d79f 100644 --- a/integration/lerna-run.test.js +++ b/integration/lerna-run.test.js @@ -1,6 +1,6 @@ "use strict"; -const cliRunner = require("@lerna-test/cli-runner"); +const { cliRunner } = require("@lerna-test/cli-runner"); const initFixture = require("@lerna-test/init-fixture")(__dirname); const env = { diff --git a/utils/check-working-tree/__tests__/check-working-tree.test.js b/utils/check-working-tree/__tests__/check-working-tree.test.js index 5f2ec4ab37..a90148e4f2 100644 --- a/utils/check-working-tree/__tests__/check-working-tree.test.js +++ b/utils/check-working-tree/__tests__/check-working-tree.test.js @@ -3,9 +3,9 @@ jest.mock("@lerna/describe-ref"); jest.mock("@lerna/collect-uncommitted"); -const describeRef = require("@lerna/describe-ref"); -const collectUncommitted = require("@lerna/collect-uncommitted"); -const checkWorkingTree = require("../lib/check-working-tree"); +const { describeRef } = require("@lerna/describe-ref"); +const { collectUncommitted } = require("@lerna/collect-uncommitted"); +const { checkWorkingTree } = require("../lib/check-working-tree"); describe("check-working-tree", () => { it("resolves on a clean tree with no release tags", async () => { diff --git a/utils/check-working-tree/lib/check-working-tree.js b/utils/check-working-tree/lib/check-working-tree.js index 14fe687067..66281aa489 100644 --- a/utils/check-working-tree/lib/check-working-tree.js +++ b/utils/check-working-tree/lib/check-working-tree.js @@ -1,8 +1,8 @@ "use strict"; -const describeRef = require("@lerna/describe-ref"); -const ValidationError = require("@lerna/validation-error"); -const collectUncommitted = require("@lerna/collect-uncommitted"); +const { describeRef } = require("@lerna/describe-ref"); +const { ValidationError } = require("@lerna/validation-error"); +const { collectUncommitted } = require("@lerna/collect-uncommitted"); module.exports = checkWorkingTree; module.exports.checkWorkingTree = checkWorkingTree; diff --git a/utils/collect-uncommitted/__tests__/collect-uncommitted.test.js b/utils/collect-uncommitted/__tests__/collect-uncommitted.test.js index 184c8ed252..71740fe0bc 100644 --- a/utils/collect-uncommitted/__tests__/collect-uncommitted.test.js +++ b/utils/collect-uncommitted/__tests__/collect-uncommitted.test.js @@ -6,7 +6,7 @@ const chalk = require("chalk"); // helpers const { getPackages } = require("@lerna/project"); -const gitAdd = require("@lerna-test/git-add"); +const { gitAdd } = require("@lerna-test/git-add"); const initFixture = require("@lerna-test/init-fixture")(__dirname); // file under test diff --git a/utils/collect-updates/__helpers__/build-graph.js b/utils/collect-updates/__helpers__/build-graph.js index 8ff865400e..ff21f4b267 100644 --- a/utils/collect-updates/__helpers__/build-graph.js +++ b/utils/collect-updates/__helpers__/build-graph.js @@ -1,8 +1,8 @@ "use strict"; // helpers -const Package = require("@lerna/package"); -const PackageGraph = require("@lerna/package-graph"); +const { Package } = require("@lerna/package"); +const { PackageGraph } = require("@lerna/package-graph"); module.exports = buildGraph; diff --git a/utils/collect-updates/__tests__/collect-updates.test.js b/utils/collect-updates/__tests__/collect-updates.test.js index 5e65b8b9a0..52c804d2e8 100644 --- a/utils/collect-updates/__tests__/collect-updates.test.js +++ b/utils/collect-updates/__tests__/collect-updates.test.js @@ -5,7 +5,7 @@ jest.mock("../lib/has-tags"); jest.mock("../lib/make-diff-predicate"); // mocked modules -const describeRef = require("@lerna/describe-ref"); +const { describeRefSync } = require("@lerna/describe-ref"); const hasTags = require("../lib/has-tags"); const makeDiffPredicate = require("../lib/make-diff-predicate"); @@ -13,10 +13,10 @@ const makeDiffPredicate = require("../lib/make-diff-predicate"); const buildGraph = require("../__helpers__/build-graph"); // file under test -const collectUpdates = require(".."); +const { collectUpdates } = require(".."); // default mock implementations -describeRef.sync.mockReturnValue({ +describeRefSync.mockReturnValue({ lastTagName: "v1.0.0", lastVersion: "1.0.0", refCount: "1", @@ -73,7 +73,7 @@ describe("collectUpdates()", () => { }), ]); expect(hasTags).toHaveBeenLastCalledWith(execOpts); - expect(describeRef.sync).toHaveBeenLastCalledWith(execOpts, undefined); + expect(describeRefSync).toHaveBeenLastCalledWith(execOpts, undefined); expect(makeDiffPredicate).toHaveBeenLastCalledWith("v1.0.0", execOpts, undefined); }); @@ -147,7 +147,7 @@ describe("collectUpdates()", () => { it("skips change detection when current revison is already released", () => { changedPackages.add("package-dag-1"); - describeRef.sync.mockReturnValueOnce({ + describeRefSync.mockReturnValueOnce({ refCount: "0", }); @@ -362,7 +362,7 @@ describe("collectUpdates()", () => { it("does not exit early on tagged release when --since is passed", () => { changedPackages.add("package-dag-1"); - describeRef.sync.mockReturnValueOnce({ + describeRefSync.mockReturnValueOnce({ refCount: "0", }); diff --git a/utils/collect-updates/collect-updates.js b/utils/collect-updates/collect-updates.js index f8c2e16eb7..60d301840a 100644 --- a/utils/collect-updates/collect-updates.js +++ b/utils/collect-updates/collect-updates.js @@ -1,7 +1,7 @@ "use strict"; const log = require("npmlog"); -const describeRef = require("@lerna/describe-ref"); +const { describeRefSync } = require("@lerna/describe-ref"); const hasTags = require("./lib/has-tags"); const collectPackages = require("./lib/collect-packages"); @@ -29,7 +29,7 @@ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions if (hasTags(execOpts)) { // describe the last annotated tag in the current branch - const { sha, refCount, lastTagName } = describeRef.sync(execOpts, commandOptions.includeMergedTags); + const { sha, refCount, lastTagName } = describeRefSync(execOpts, commandOptions.includeMergedTags); // TODO: warn about dirty tree? if (refCount === "0" && forced.size === 0 && !committish) { diff --git a/utils/create-symlink/__tests__/create-symlink.test.js b/utils/create-symlink/__tests__/create-symlink.test.js index 513a3b9ff2..a442a6cb42 100644 --- a/utils/create-symlink/__tests__/create-symlink.test.js +++ b/utils/create-symlink/__tests__/create-symlink.test.js @@ -6,7 +6,7 @@ jest.mock("fs-extra"); const cmdShim = require("cmd-shim"); const fs = require("fs-extra"); const path = require("path"); -const createSymlink = require(".."); +const { createSymlink } = require(".."); const linkRelative = (from, to) => path.relative(path.dirname(to), from); diff --git a/utils/filter-packages/filter-packages.js b/utils/filter-packages/filter-packages.js index 5861dc2dde..ac716d2c32 100644 --- a/utils/filter-packages/filter-packages.js +++ b/utils/filter-packages/filter-packages.js @@ -4,7 +4,7 @@ const util = require("util"); const multimatch = require("multimatch"); const log = require("npmlog"); -const ValidationError = require("@lerna/validation-error"); +const { ValidationError } = require("@lerna/validation-error"); module.exports = filterPackages; module.exports.filterPackages = filterPackages; diff --git a/utils/get-npm-exec-opts/get-npm-exec-opts.js b/utils/get-npm-exec-opts/get-npm-exec-opts.js index 357fc5bd3b..1c8601a36b 100644 --- a/utils/get-npm-exec-opts/get-npm-exec-opts.js +++ b/utils/get-npm-exec-opts/get-npm-exec-opts.js @@ -13,7 +13,7 @@ function getNpmExecOpts(pkg, registry) { env.npm_config_registry = registry; } - log.silly("getExecOpts", pkg.location, registry); + log.silly("getNpmExecOpts", pkg.location, registry); return { cwd: pkg.location, env, diff --git a/utils/get-packed/__tests__/get-packed.test.js b/utils/get-packed/__tests__/get-packed.test.js index fd65d43692..0227494f40 100644 --- a/utils/get-packed/__tests__/get-packed.test.js +++ b/utils/get-packed/__tests__/get-packed.test.js @@ -1,6 +1,6 @@ "use strict"; -const getPacked = require(".."); +const { getPacked } = require(".."); describe("@lerna/get-packed", () => { it("needs tests", () => { diff --git a/utils/gitlab-client/__tests__/gitlab-client.test.js b/utils/gitlab-client/__tests__/gitlab-client.test.js index 9e931855dc..e2aefa011d 100644 --- a/utils/gitlab-client/__tests__/gitlab-client.test.js +++ b/utils/gitlab-client/__tests__/gitlab-client.test.js @@ -3,7 +3,7 @@ jest.mock("../lib/GitLabClient"); const GitLabClient = require("../lib/GitLabClient"); -const createGitLabClient = require("../index"); +const { createGitLabClient } = require("../index"); describe("createGitLabClient", () => { const oldEnv = Object.assign({}, process.env); diff --git a/utils/has-npm-version/__tests__/has-npm-version.test.js b/utils/has-npm-version/__tests__/has-npm-version.test.js index 9bf84b148c..10f488ad0e 100644 --- a/utils/has-npm-version/__tests__/has-npm-version.test.js +++ b/utils/has-npm-version/__tests__/has-npm-version.test.js @@ -3,7 +3,7 @@ jest.mock("@lerna/child-process"); const childProcess = require("@lerna/child-process"); -const hasNpmVersion = require("../lib/has-npm-version"); +const { hasNpmVersion, makePredicate } = require("../lib/has-npm-version"); childProcess.execSync.mockReturnValue("5.6.0"); @@ -14,8 +14,8 @@ test("hasNpmVersion() returns boolean if range is satisfied by npm --version", ( expect(childProcess.execSync).toHaveBeenLastCalledWith("npm", ["--version"]); }); -test("hasNpmVersion.makePredicate() returns a predicate with cached version", () => { - const predicate = hasNpmVersion.makePredicate(); +test("makePredicate() returns a predicate with cached version", () => { + const predicate = makePredicate(); childProcess.execSync.mockReturnValue("3.10.10"); diff --git a/utils/listable/__tests__/listable-format.test.js b/utils/listable/__tests__/listable-format.test.js index fc988a1d7f..d84ce3bc98 100644 --- a/utils/listable/__tests__/listable-format.test.js +++ b/utils/listable/__tests__/listable-format.test.js @@ -4,8 +4,8 @@ const chalk = require("chalk"); const tempy = require("tempy"); const Tacks = require("tacks"); -const Project = require("@lerna/project"); -const loggingOutput = require("@lerna-test/logging-output"); +const { Project } = require("@lerna/project"); +const { loggingOutput } = require("@lerna-test/logging-output"); const listable = require(".."); const { File, Dir } = Tacks; diff --git a/utils/listable/lib/listable-format.js b/utils/listable/lib/listable-format.js index 2712805425..edc68a2705 100644 --- a/utils/listable/lib/listable-format.js +++ b/utils/listable/lib/listable-format.js @@ -3,7 +3,7 @@ const chalk = require("chalk"); const columnify = require("columnify"); const path = require("path"); -const QueryGraph = require("@lerna/query-graph"); +const { QueryGraph } = require("@lerna/query-graph"); module.exports = listableFormat; diff --git a/utils/log-packed/__tests__/log-packed.test.js b/utils/log-packed/__tests__/log-packed.test.js index aeef47176b..4979928356 100644 --- a/utils/log-packed/__tests__/log-packed.test.js +++ b/utils/log-packed/__tests__/log-packed.test.js @@ -3,8 +3,8 @@ // windows sucks jest.mock("has-unicode", () => () => false); -const loggingOutput = require("@lerna-test/logging-output"); -const logPacked = require("../lib/log-packed"); +const { loggingOutput } = require("@lerna-test/logging-output"); +const { logPacked } = require("../lib/log-packed"); // remove quotes around top-level strings expect.addSnapshotSerializer({ diff --git a/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js b/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js index 7b7bdb0be5..1f3576fec1 100644 --- a/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js +++ b/utils/npm-dist-tag/__tests__/npm-dist-tag.test.js @@ -1,7 +1,9 @@ "use strict"; jest.mock("npm-registry-fetch"); -jest.mock("@lerna/otplease", () => (cb, opts) => Promise.resolve(cb(opts))); +jest.mock("@lerna/otplease", () => ({ + otplease: (cb, opts) => Promise.resolve(cb(opts)), +})); // mocked modules const fetch = require("npm-registry-fetch"); diff --git a/utils/npm-dist-tag/npm-dist-tag.js b/utils/npm-dist-tag/npm-dist-tag.js index 578a45406e..9104047646 100644 --- a/utils/npm-dist-tag/npm-dist-tag.js +++ b/utils/npm-dist-tag/npm-dist-tag.js @@ -3,7 +3,7 @@ const log = require("npmlog"); const npa = require("npm-package-arg"); const fetch = require("npm-registry-fetch"); -const otplease = require("@lerna/otplease"); +const { otplease } = require("@lerna/otplease"); exports.add = add; exports.remove = remove; diff --git a/utils/npm-install/__tests__/npm-install.test.js b/utils/npm-install/__tests__/npm-install.test.js index b6d334bab1..9038f8a66e 100644 --- a/utils/npm-install/__tests__/npm-install.test.js +++ b/utils/npm-install/__tests__/npm-install.test.js @@ -12,10 +12,10 @@ const writePkg = require("write-pkg"); const ChildProcessUtilities = require("@lerna/child-process"); // helpers -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); // file under test -const npmInstall = require(".."); +const { npmInstall, npmInstallDependencies } = require(".."); describe("npm-install", () => { ChildProcessUtilities.exec.mockResolvedValue(); @@ -99,7 +99,7 @@ describe("npm-install", () => { }); }); - describe("npmInstall.dependencies()", () => { + describe("npmInstallDependencies()", () => { it("installs dependencies in targeted directory", async () => { const pkg = new Package( { @@ -139,7 +139,7 @@ describe("npm-install", () => { "others@1.0.0", ]; - await npmInstall.dependencies(pkg, dependencies, {}); + await npmInstallDependencies(pkg, dependencies, {}); expect(fs.rename).toHaveBeenLastCalledWith(pkg.manifestLocation, backupManifest); expect(fs.renameSync).toHaveBeenLastCalledWith(backupManifest, pkg.manifestLocation); @@ -194,7 +194,7 @@ describe("npm-install", () => { registry: "https://custom-registry/npm-install-deps", }; - await npmInstall.dependencies(pkg, dependencies, config); + await npmInstallDependencies(pkg, dependencies, config); expect(writePkg).toHaveBeenLastCalledWith(pkg.manifestLocation, { name: "npm-install-deps", @@ -233,7 +233,7 @@ describe("npm-install", () => { ); const dependencies = ["@scoped/foo@latest", "foo@latest", "caret@^1.0.0"]; - await npmInstall.dependencies(pkg, dependencies, { + await npmInstallDependencies(pkg, dependencies, { npmGlobalStyle: true, }); @@ -270,7 +270,7 @@ describe("npm-install", () => { ); const dependencies = ["@scoped/something@^2.0.0", "something@^1.0.0"]; - await npmInstall.dependencies(pkg, dependencies, { + await npmInstallDependencies(pkg, dependencies, { npmClient: "yarn", mutex: "network:12345", }); @@ -308,7 +308,7 @@ describe("npm-install", () => { ); const dependencies = ["@scoped/something@github:foo/bar", "something@github:foo/foo"]; - await npmInstall.dependencies(pkg, dependencies, { + await npmInstallDependencies(pkg, dependencies, { npmClientArgs: ["--production", "--no-optional"], }); @@ -352,7 +352,7 @@ describe("npm-install", () => { ); const dependencies = ["@scoped/something@github:foo/bar", "something@github:foo/foo"]; - await npmInstall.dependencies(pkg, dependencies, { + await npmInstallDependencies(pkg, dependencies, { npmClient: "yarn", npmGlobalStyle: true, mutex: "network:12345", @@ -394,7 +394,7 @@ describe("npm-install", () => { ); const dependencies = ["@scoped/something@github:foo/bar", "something@github:foo/foo"]; - await npmInstall.dependencies(pkg, dependencies, { + await npmInstallDependencies(pkg, dependencies, { subCommand: "ci", }); @@ -426,7 +426,7 @@ describe("npm-install", () => { ); const dependencies = []; - await npmInstall.dependencies(pkg, dependencies, {}); + await npmInstallDependencies(pkg, dependencies, {}); expect(ChildProcessUtilities.exec).not.toHaveBeenCalled(); }); @@ -450,7 +450,7 @@ describe("npm-install", () => { "@scoped/noversion", // sorted by write-pkg ]; - await npmInstall.dependencies(pkg, dependencies, {}); + await npmInstallDependencies(pkg, dependencies, {}); expect(writePkg).toHaveBeenLastCalledWith(pkg.manifestLocation, { name: "npm-install-deps", @@ -475,7 +475,7 @@ describe("npm-install", () => { fs.rename.mockRejectedValueOnce(new Error("Unable to rename file")); - await expect(npmInstall.dependencies(pkg, dependencies, {})).rejects.toThrow("Unable to rename file"); + await expect(npmInstallDependencies(pkg, dependencies, {})).rejects.toThrow("Unable to rename file"); }); it("cleans up synchronously after writeFile error", async () => { @@ -491,7 +491,7 @@ describe("npm-install", () => { writePkg.mockRejectedValueOnce(new Error("Unable to write file")); - await expect(npmInstall.dependencies(pkg, dependencies, {})).rejects.toThrow("Unable to write file"); + await expect(npmInstallDependencies(pkg, dependencies, {})).rejects.toThrow("Unable to write file"); expect(fs.renameSync).toHaveBeenLastCalledWith(backupManifest, pkg.manifestLocation); }); @@ -508,7 +508,7 @@ describe("npm-install", () => { ChildProcessUtilities.exec.mockRejectedValueOnce(new Error("Unable to install")); - await expect(npmInstall.dependencies(pkg, dependencies, {})).rejects.toThrow("Unable to install"); + await expect(npmInstallDependencies(pkg, dependencies, {})).rejects.toThrow("Unable to install"); expect(fs.renameSync).toHaveBeenLastCalledWith(backupManifest, pkg.manifestLocation); }); }); diff --git a/utils/npm-install/npm-install.js b/utils/npm-install/npm-install.js index d23f889d61..25d4c166b1 100644 --- a/utils/npm-install/npm-install.js +++ b/utils/npm-install/npm-install.js @@ -7,7 +7,7 @@ const onExit = require("signal-exit"); const writePkg = require("write-pkg"); const ChildProcessUtilities = require("@lerna/child-process"); -const getExecOpts = require("@lerna/get-npm-exec-opts"); +const { getNpmExecOpts } = require("@lerna/get-npm-exec-opts"); module.exports = npmInstall; module.exports.dependencies = npmInstallDependencies; @@ -19,7 +19,7 @@ function npmInstall( { registry, npmClient, npmClientArgs, npmGlobalStyle, mutex, stdio = "pipe", subCommand = "install" } ) { // build command, arguments, and options - const opts = getExecOpts(pkg, registry); + const opts = getNpmExecOpts(pkg, registry); const args = [subCommand]; let cmd = npmClient || "npm"; diff --git a/utils/npm-publish/__tests__/npm-publish.test.js b/utils/npm-publish/__tests__/npm-publish.test.js index 6cef1789f5..d43a16b93d 100644 --- a/utils/npm-publish/__tests__/npm-publish.test.js +++ b/utils/npm-publish/__tests__/npm-publish.test.js @@ -10,15 +10,15 @@ jest.mock("fs-extra"); const fs = require("fs-extra"); const { publish } = require("libnpmpublish"); const readJSON = require("read-package-json"); -const runLifecycle = require("@lerna/run-lifecycle"); -const otplease = require("@lerna/otplease"); +const { runLifecycle } = require("@lerna/run-lifecycle"); +const { otplease } = require("@lerna/otplease"); // helpers const path = require("path"); -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); // file under test -const npmPublish = require(".."); +const { npmPublish } = require(".."); describe("npm-publish", () => { const mockTarData = Buffer.from("MOCK"); diff --git a/utils/npm-publish/npm-publish.js b/utils/npm-publish/npm-publish.js index bff229fd6d..365010246d 100644 --- a/utils/npm-publish/npm-publish.js +++ b/utils/npm-publish/npm-publish.js @@ -6,9 +6,9 @@ const log = require("npmlog"); const { publish } = require("libnpmpublish"); const pify = require("pify"); const readJSON = require("read-package-json"); -const runLifecycle = require("@lerna/run-lifecycle"); +const { runLifecycle } = require("@lerna/run-lifecycle"); const npa = require("npm-package-arg"); -const otplease = require("@lerna/otplease"); +const { otplease } = require("@lerna/otplease"); module.exports = npmPublish; module.exports.npmPublish = npmPublish; diff --git a/utils/npm-run-script/__tests__/npm-run-script.test.js b/utils/npm-run-script/__tests__/npm-run-script.test.js index 54d62ecd7e..c1f1c322b4 100644 --- a/utils/npm-run-script/__tests__/npm-run-script.test.js +++ b/utils/npm-run-script/__tests__/npm-run-script.test.js @@ -6,7 +6,7 @@ jest.mock("@lerna/child-process"); const ChildProcessUtilities = require("@lerna/child-process"); // file under test -const npmRunScript = require(".."); +const { npmRunScript, npmRunScriptStreaming } = require(".."); describe("npm-run-script", () => { ChildProcessUtilities.exec.mockResolvedValue(); @@ -75,7 +75,7 @@ describe("npm-run-script", () => { }); }); - describe("npmRunScript.stream()", () => { + describe("npmRunScriptStreaming()", () => { it("runs an npm script in a package with streaming", async () => { const script = "foo"; const config = { @@ -88,7 +88,7 @@ describe("npm-run-script", () => { npmClient: "npm", }; - await npmRunScript.stream(script, config); + await npmRunScriptStreaming(script, config); expect(ChildProcessUtilities.spawnStreaming).toHaveBeenLastCalledWith( "npm", @@ -115,7 +115,7 @@ describe("npm-run-script", () => { reject: false, }; - await npmRunScript.stream(script, config); + await npmRunScriptStreaming(script, config); expect(ChildProcessUtilities.spawnStreaming).toHaveBeenLastCalledWith( "npm", diff --git a/utils/npm-run-script/npm-run-script.js b/utils/npm-run-script/npm-run-script.js index 21af5c7898..c81153c5d2 100644 --- a/utils/npm-run-script/npm-run-script.js +++ b/utils/npm-run-script/npm-run-script.js @@ -3,7 +3,7 @@ const log = require("npmlog"); const ChildProcessUtilities = require("@lerna/child-process"); -const getOpts = require("@lerna/get-npm-exec-opts"); +const { getNpmExecOpts } = require("@lerna/get-npm-exec-opts"); module.exports = npmRunScript; module.exports.stream = npmRunScriptStreaming; @@ -29,7 +29,7 @@ function npmRunScriptStreaming(script, { args, npmClient, pkg, prefix, reject = } function makeOpts(pkg, reject) { - return Object.assign(getOpts(pkg), { + return Object.assign(getNpmExecOpts(pkg), { reject, }); } diff --git a/utils/pack-directory/__tests__/pack-directory.test.js b/utils/pack-directory/__tests__/pack-directory.test.js index b9fb876813..73c58f0fbe 100644 --- a/utils/pack-directory/__tests__/pack-directory.test.js +++ b/utils/pack-directory/__tests__/pack-directory.test.js @@ -10,7 +10,7 @@ const npmConf = require("@lerna/npm-conf"); const { getPackages } = require("@lerna/project"); const initFixture = require("@lerna-test/init-fixture")(__dirname); -const packDirectory = require(".."); +const { packDirectory } = require(".."); // temp-write creates temp directories that are 36 characters long (uuid.v4()) const TAR_DIR_REGEXP = /([^\s"]*[\\/][-0-9a-f]{36})([^\s"]*)/g; diff --git a/utils/pack-directory/lib/pack-directory.js b/utils/pack-directory/lib/pack-directory.js index 1e8ff883d6..62c4741eac 100644 --- a/utils/pack-directory/lib/pack-directory.js +++ b/utils/pack-directory/lib/pack-directory.js @@ -5,9 +5,9 @@ const packlist = require("npm-packlist"); const log = require("npmlog"); const tar = require("tar"); const tempWrite = require("temp-write"); -const getPacked = require("@lerna/get-packed"); -const Package = require("@lerna/package"); -const runLifecycle = require("@lerna/run-lifecycle"); +const { getPacked } = require("@lerna/get-packed"); +const { Package } = require("@lerna/package"); +const { runLifecycle } = require("@lerna/run-lifecycle"); module.exports = packDirectory; module.exports.packDirectory = packDirectory; diff --git a/utils/prerelease-id-from-version/__tests__/prerelease-id-from-version.test.js b/utils/prerelease-id-from-version/__tests__/prerelease-id-from-version.test.js index 8386a96fde..27dcdd4f09 100644 --- a/utils/prerelease-id-from-version/__tests__/prerelease-id-from-version.test.js +++ b/utils/prerelease-id-from-version/__tests__/prerelease-id-from-version.test.js @@ -1,6 +1,6 @@ "use strict"; -const prereleaseIdFromVersion = require("../lib/prerelease-id-from-version"); +const { prereleaseIdFromVersion } = require("../lib/prerelease-id-from-version"); test("prereleaseIdFromVersion() returns prerelease identifier", () => { expect(prereleaseIdFromVersion("1.0.0-alpha.0")).toBe("alpha"); diff --git a/utils/query-graph/query-graph.js b/utils/query-graph/query-graph.js index de6e4d9e53..2499875be3 100644 --- a/utils/query-graph/query-graph.js +++ b/utils/query-graph/query-graph.js @@ -1,6 +1,6 @@ "use strict"; -const PackageGraph = require("@lerna/package-graph"); +const { PackageGraph } = require("@lerna/package-graph"); /** * @typedef {object} QueryGraphConfig diff --git a/utils/resolve-symlink/__tests__/resolve-symlink.test.js b/utils/resolve-symlink/__tests__/resolve-symlink.test.js index 7264372e24..5e33159522 100644 --- a/utils/resolve-symlink/__tests__/resolve-symlink.test.js +++ b/utils/resolve-symlink/__tests__/resolve-symlink.test.js @@ -6,7 +6,7 @@ jest.mock("fs-extra"); const readCmdShim = require("read-cmd-shim"); const fs = require("fs-extra"); const path = require("path"); -const resolveSymlink = require(".."); +const { resolveSymlink } = require(".."); const linkRelative = (from, to) => path.relative(path.dirname(to), from); diff --git a/utils/rimraf-dir/__tests__/rimraf-dir.test.js b/utils/rimraf-dir/__tests__/rimraf-dir.test.js index df0629fb8b..c9756fb6a3 100644 --- a/utils/rimraf-dir/__tests__/rimraf-dir.test.js +++ b/utils/rimraf-dir/__tests__/rimraf-dir.test.js @@ -10,7 +10,7 @@ const pathExists = require("path-exists"); const ChildProcessUtilities = require("@lerna/child-process"); // file under test -const rimrafDir = require(".."); +const { rimrafDir } = require(".."); describe("rimrafDir()", () => { it("calls rimraf CLI with arguments", async () => { diff --git a/utils/run-lifecycle/__tests__/run-lifecycle.test.js b/utils/run-lifecycle/__tests__/run-lifecycle.test.js index 6ef44665db..411e0e7c2a 100644 --- a/utils/run-lifecycle/__tests__/run-lifecycle.test.js +++ b/utils/run-lifecycle/__tests__/run-lifecycle.test.js @@ -3,10 +3,10 @@ jest.mock("npm-lifecycle", () => jest.fn(() => Promise.resolve())); const log = require("npmlog"); -const loggingOutput = require("@lerna-test/logging-output"); +const { loggingOutput } = require("@lerna-test/logging-output"); const runScript = require("npm-lifecycle"); const npmConf = require("@lerna/npm-conf"); -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); const { runLifecycle, createRunner } = require("../run-lifecycle"); describe("runLifecycle()", () => { diff --git a/utils/run-topologically/run-topologically.js b/utils/run-topologically/run-topologically.js index 8dcb44c52f..b1b743ae26 100644 --- a/utils/run-topologically/run-topologically.js +++ b/utils/run-topologically/run-topologically.js @@ -1,7 +1,7 @@ "use strict"; const PQueue = require("p-queue").default; -const QueryGraph = require("@lerna/query-graph"); +const { QueryGraph } = require("@lerna/query-graph"); module.exports = runTopologically; module.exports.runTopologically = runTopologically; diff --git a/utils/symlink-binary/__tests__/symlink-binary.test.js b/utils/symlink-binary/__tests__/symlink-binary.test.js index 252ee75e65..462337a968 100644 --- a/utils/symlink-binary/__tests__/symlink-binary.test.js +++ b/utils/symlink-binary/__tests__/symlink-binary.test.js @@ -1,13 +1,13 @@ "use strict"; const path = require("path"); -const Package = require("@lerna/package"); +const { Package } = require("@lerna/package"); // helpers const initFixture = require("@lerna-test/init-fixture")(__dirname); // file under test -const symlinkBinary = require(".."); +const { symlinkBinary } = require(".."); expect.extend(require("@lerna-test/pkg-matchers")); diff --git a/utils/symlink-binary/symlink-binary.js b/utils/symlink-binary/symlink-binary.js index 6bcac5794e..5f5576e74b 100644 --- a/utils/symlink-binary/symlink-binary.js +++ b/utils/symlink-binary/symlink-binary.js @@ -4,8 +4,8 @@ const fs = require("fs-extra"); const path = require("path"); const pMap = require("p-map"); -const Package = require("@lerna/package"); -const createSymlink = require("@lerna/create-symlink"); +const { Package } = require("@lerna/package"); +const { createSymlink } = require("@lerna/create-symlink"); module.exports = symlinkBinary; module.exports.symlinkBinary = symlinkBinary; diff --git a/utils/symlink-dependencies/symlink-dependencies.js b/utils/symlink-dependencies/symlink-dependencies.js index 515516bbc2..dbc7fe8d22 100644 --- a/utils/symlink-dependencies/symlink-dependencies.js +++ b/utils/symlink-dependencies/symlink-dependencies.js @@ -5,9 +5,9 @@ const pMap = require("p-map"); const pMapSeries = require("p-map-series"); const path = require("path"); -const createSymlink = require("@lerna/create-symlink"); -const resolveSymlink = require("@lerna/resolve-symlink"); -const symlinkBinary = require("@lerna/symlink-binary"); +const { createSymlink } = require("@lerna/create-symlink"); +const { resolveSymlink } = require("@lerna/resolve-symlink"); +const { symlinkBinary } = require("@lerna/symlink-binary"); module.exports = symlinkDependencies; module.exports.symlinkDependencies = symlinkDependencies;