Merge branch 'next' into 'main'

.eslintrc.yaml

@@ -61,11 +61,6 @@ overrides:
       max-classes-per-file: "off"
       node/no-extraneous-require: "off"
       node/no-unpublished-require: "off"
-      node/no-unsupported-features/es-syntax:
-        - error
-        - ignores:
-            - asyncFunctions
-            # jest transpiles fast-async
       no-console: "off"
   - files:
       - "test/fixtures/**"
@@ -74,6 +69,7 @@ overrides:
       global-require: "off"
       import/no-extraneous-dependencies: "off"
       import/no-unresolved: "off"
+      import/no-useless-path-segments: "off"
       node/no-extraneous-require: "off"
       node/no-missing-require:
         - error

.github/workflows/ci.yaml

@@ -22,6 +22,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
+      - run: npm -g i npm@next-7
       - run: npm ci
       - run: npm run ci:lint
 
@@ -31,7 +32,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node: [ 12, 10, 8 ]
+        node: [ 12, 10 ]
         script: [ 'ci:test:unit', 'ci:test:integration' ]
     steps:
       - uses: actions/checkout@v2
@@ -48,6 +49,7 @@ jobs:
         run: |
           git config --global user.email test@example.com
           git config --global user.name "Tester McPerson"
+      - run: npm -g i npm@next-7
       - run: npm ci
       - run: npm run ${{ matrix.script }}
 
@@ -80,6 +82,7 @@ jobs:
         run: |
           git config --global user.email test@example.com
           git config --global user.name "Tester McPerson"
+      - run: npm -g i npm@next-7
       - run: npm ci
       - env:
           LERNA_CI_TYPE: ${{ matrix.subset }}

.travis.yml

@@ -9,7 +9,6 @@ language: node_js
 node_js:
   - "12"
   - "10"
-  - "8"
 
 os:
   - linux

commands/__mocks__/@lerna/check-working-tree.js

@@ -4,6 +4,6 @@ const mockCheckWorkingTree = jest.fn(() => Promise.resolve());
 const mockThrowIfReleased = jest.fn(() => Promise.resolve());
 const mockThrowIfUncommitted = jest.fn(() => Promise.resolve());
 
-module.exports = mockCheckWorkingTree;
+module.exports.checkWorkingTree = mockCheckWorkingTree;
 module.exports.throwIfReleased = mockThrowIfReleased;
 module.exports.throwIfUncommitted = mockThrowIfUncommitted;

commands/__mocks__/@lerna/collect-updates.js

@@ -8,7 +8,7 @@ const updated = new Map();
 
 const mockCollectUpdates = jest.fn((filteredPackages, packageGraph, { cwd }) => {
   const targets = updated.get(cwd);
-  const updates = targets ? new Map(targets.map(name => [name, packageGraph.get(name)])) : packageGraph;
+  const updates = targets ? new Map(targets.map((name) => [name, packageGraph.get(name)])) : packageGraph;
 
   return Array.from(updates.values());
 });
@@ -20,7 +20,7 @@ afterEach(() => {
   updated.clear();
 });
 
-module.exports = mockCollectUpdates;
-module.exports.setUpdated = setUpdated;
+module.exports.collectUpdates = mockCollectUpdates;
+module.exports.collectUpdates.setUpdated = setUpdated;
 module.exports.collectPackages = collectPackages;
 module.exports.getPackagesForOption = getPackagesForOption;

commands/__mocks__/@lerna/conventional-commits.js

@@ -1,15 +1,15 @@
 "use strict";
 
-const fs = require.requireActual("fs-extra");
+const fs = jest.requireActual("fs-extra");
 const path = require("path");
 const semver = require("semver");
 
 const mockRecommendVersion = jest.fn().mockName("recommendVersion");
 const mockUpdateChangelog = jest.fn().mockName("updateChangelog");
 
-mockRecommendVersion.mockImplementation(node => semver.inc(node.version, "patch"));
+mockRecommendVersion.mockImplementation((node) => semver.inc(node.version, "patch"));
 
-mockUpdateChangelog.mockImplementation(pkg => {
+mockUpdateChangelog.mockImplementation((pkg) => {
   const filePath = path.join(pkg.location, "CHANGELOG.md");
 
   // grumble grumble re-implementing the implementation

commands/__mocks__/@lerna/github-client.js

@@ -6,7 +6,6 @@ const client = {
   },
 };
 
-module.exports.client = client;
 module.exports.createGitHubClient = () => client;
 module.exports.parseGitRepo = () => ({
   owner: "lerna",

commands/__mocks__/@lerna/gitlab-client.js

@@ -6,4 +6,4 @@ const client = {
   },
 };
 
-module.exports = () => client;
+module.exports.createGitLabClient = () => client;

commands/__mocks__/@lerna/has-npm-version.js

@@ -1,7 +1,5 @@
 "use strict";
 
 const mockHasNpmVersion = jest.fn(() => true);
-const mockMakePredicate = jest.fn(() => range => mockHasNpmVersion(range));
 
-module.exports = mockHasNpmVersion;
-module.exports.makePredicate = mockMakePredicate;
+module.exports.hasNpmVersion = mockHasNpmVersion;

commands/__mocks__/@lerna/npm-publish.js

@@ -19,6 +19,6 @@ afterEach(() => {
   registry.clear();
 });
 
-module.exports = mockNpmPublish;
-module.exports.order = order;
-module.exports.registry = registry;
+module.exports.npmPublish = mockNpmPublish;
+module.exports.npmPublish.order = order;
+module.exports.npmPublish.registry = registry;

commands/__mocks__/@lerna/output.js

@@ -1,17 +1,17 @@
 "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.enabled = false;
+chalk.level = 0;
 
 // @lerna/output is just a wrapper around console.log
 const mockOutput = jest.fn();
 
 function logged() {
-  return mockOutput.mock.calls.map(args => multiLineTrimRight(args[0])).join("\n");
+  return mockOutput.mock.calls.map((args) => multiLineTrimRight(args[0])).join("\n");
 }
 
-module.exports = mockOutput;
-module.exports.logged = logged;
+module.exports.output = mockOutput;
+module.exports.output.logged = logged;

commands/__mocks__/@lerna/pack-directory.js

@@ -2,7 +2,7 @@
 
 const registry = new Set();
 
-const mockPackDirectory = jest.fn(pkg => {
+const mockPackDirectory = jest.fn((pkg) => {
   registry.add(pkg.name);
 
   return Promise.resolve({
@@ -16,5 +16,5 @@ afterEach(() => {
   registry.clear();
 });
 
-module.exports = mockPackDirectory;
-module.exports.registry = registry;
+module.exports.packDirectory = mockPackDirectory;
+module.exports.packDirectory.registry = registry;

commands/__mocks__/@lerna/prompt.js

@@ -15,9 +15,9 @@ const mockSelect = jest.fn((_, { choices }) => {
 });
 const mockInput = jest.fn(() => Promise.resolve());
 
-exports.confirm = mockConfirm;
-exports.select = mockSelect;
-exports.input = mockInput;
+exports.promptConfirmation = mockConfirm;
+exports.promptSelectOne = mockSelect;
+exports.promptTextInput = mockInput;
 
 const semverIndex = new Map(
   [
@@ -32,6 +32,6 @@ const semverIndex = new Map(
   ].map((keyword, idx) => [keyword, idx])
 );
 
-exports.mockChoices = (...keywords) => {
-  choiceIndices = keywords.map(keyword => semverIndex.get(keyword));
+mockSelect.chooseBump = (keyword) => {
+  choiceIndices.push(semverIndex.get(keyword));
 };

commands/__mocks__/@lerna/run-lifecycle.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const mockRunLifecycle = jest.fn(pkg => Promise.resolve(pkg));
-const mockCreateRunner = jest.fn(opts => (pkg, stage) => {
+const mockRunLifecycle = jest.fn((pkg) => Promise.resolve(pkg));
+const mockCreateRunner = jest.fn((opts) => (pkg, stage) => {
   // no longer the actual API, but approximates inner logic of default export
   if (pkg.scripts[stage]) {
     return mockRunLifecycle(pkg, stage, opts);
@@ -14,6 +14,6 @@ function getOrderedCalls() {
   return mockRunLifecycle.mock.calls.map(([pkg, script]) => [pkg.name, script]);
 }
 
-module.exports = mockRunLifecycle;
+module.exports.runLifecycle = mockRunLifecycle;
 module.exports.createRunner = mockCreateRunner;
-module.exports.getOrderedCalls = getOrderedCalls;
+module.exports.runLifecycle.getOrderedCalls = getOrderedCalls;

commands/__mocks__/load-json-file.js

@@ -3,7 +3,7 @@
 const path = require("path");
 const normalizePath = require("normalize-path");
 
-const loadJsonFile = require.requireActual("load-json-file");
+const loadJsonFile = jest.requireActual("load-json-file");
 const asyncRegistry = new Map();
 const syncRegistry = new Map();
 
@@ -17,13 +17,13 @@ function incrementCalled(registry, manifestLocation) {
 }
 
 // by default, act like a spy that counts number of times each location was loaded
-const mockLoadJsonFile = jest.fn(manifestLocation => {
+const mockLoadJsonFile = jest.fn((manifestLocation) => {
   incrementCalled(asyncRegistry, manifestLocation);
 
   return loadJsonFile(manifestLocation);
 });
 
-const mockLoadJsonFileSync = jest.fn(manifestLocation => {
+const mockLoadJsonFileSync = jest.fn((manifestLocation) => {
   incrementCalled(syncRegistry, manifestLocation);
 
   return loadJsonFile.sync(manifestLocation);

commands/__mocks__/write-pkg.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const writePkg = require.requireActual("write-pkg");
+const writePkg = jest.requireActual("write-pkg");
 const registry = new Map();
 
 // by default, act like a spy that populates registry
@@ -10,7 +10,7 @@ const mockWritePkg = jest.fn((fp, data) => {
   return writePkg(fp, data);
 });
 
-const updatedManifest = name => registry.get(name);
+const updatedManifest = (name) => registry.get(name);
 
 // a convenient format for assertions
 function updatedVersions() {

commands/add/__tests__/add-command.test.js

@@ -1,11 +1,11 @@
 "use strict";
 
 jest.mock("@lerna/bootstrap");
-jest.mock("@evocateur/pacote/manifest");
+jest.mock("pacote");
 
 // mocked or stubbed modules
 const bootstrap = require("@lerna/bootstrap");
-const getManifest = require("@evocateur/pacote/manifest");
+const pacote = require("pacote");
 
 // helpers
 const initFixture = require("@lerna-test/init-fixture")(__dirname);
@@ -21,7 +21,7 @@ describe("AddCommand", () => {
   // we already have enough tests of BootstrapCommand
   bootstrap.mockResolvedValue();
   // we don't need network requests during unit tests
-  getManifest.mockResolvedValue({ version: "1.0.0" });
+  pacote.manifest.mockResolvedValue({ version: "1.0.0" });
 
   it("should throw without packages", async () => {
     const testDir = await initFixture("basic");
@@ -55,7 +55,7 @@ describe("AddCommand", () => {
     expect(pkg3).toDependOn("tiny-tarball");
     expect(pkg4).toDependOn("tiny-tarball");
 
-    expect(getManifest).toHaveBeenLastCalledWith(
+    expect(pacote.manifest).toHaveBeenLastCalledWith(
       expect.objectContaining({
         // an npm-package-arg Result
         name: "tiny-tarball",
@@ -235,7 +235,7 @@ describe("AddCommand", () => {
   it("accepts --registry option", async () => {
     const testDir = await initFixture("basic");
 
-    getManifest.mockImplementationOnce(() => {
+    pacote.manifest.mockImplementationOnce(() => {
       const err = new Error("ENOTFOUND");
       return Promise.reject(err);
     });
@@ -249,7 +249,7 @@ describe("AddCommand", () => {
     // obviously this registry doesn't exist, thus it will always error
     await expect(command).rejects.toThrow(/ENOTFOUND/);
 
-    expect(getManifest).toHaveBeenLastCalledWith(
+    expect(pacote.manifest).toHaveBeenLastCalledWith(
       expect.objectContaining({
         name: "@my-own/private-idaho",
       }),

commands/add/command.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const filterable = 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
@@ -9,7 +9,7 @@ exports.command = "add <pkg> [globs..]";
 
 exports.describe = "Add a single dependency to matched packages";
 
-exports.builder = yargs => {
+exports.builder = (yargs) => {
   yargs
     .positional("pkg", {
       describe: "Package name to add as a dependency",
@@ -66,7 +66,7 @@ exports.builder = yargs => {
     .example("$0 add module-1 --no-bootstrap", "Skip automatic `lerna bootstrap`")
     .example("$0 add babel-core", "Install babel-core in all modules");
 
-  return filterable(yargs);
+  return filterOptions(yargs);
 };
 
 exports.handler = function handler(argv) {