From 54dca563efb13ad88d478ac31668f6e13a1d99e7 Mon Sep 17 00:00:00 2001
From: Daniel Stockman <daniel.stockman@gmail.com>
Date: Wed, 2 Oct 2019 17:17:18 -0700
Subject: [PATCH] fix(bootstrap): Move all filter logging into
 get-filtered-packages method

---
 commands/bootstrap/index.js                   | 20 -------------------
 .../lib/get-filtered-packages.js              | 15 ++++++++++++++
 core/filter-options/package.json              |  3 ++-
 package-lock.json                             |  3 ++-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/commands/bootstrap/index.js b/commands/bootstrap/index.js
index f0601be169..cb578d9c2a 100644
--- a/commands/bootstrap/index.js
+++ b/commands/bootstrap/index.js
@@ -134,26 +134,6 @@ class BootstrapCommand extends Command {
     let chain = Promise.resolve();
 
     chain = chain.then(() => {
-      if (this.options.scope) {
-        this.logger.notice("filter", "including %j", this.options.scope);
-      }
-
-      if (this.options.ignore) {
-        this.logger.notice("filter", "excluding %j", this.options.ignore);
-      }
-
-      if (this.options.since) {
-        this.logger.notice("filter", "changed since %j", this.options.since);
-      }
-
-      if (this.options.includeFilteredDependents) {
-        this.logger.notice("filter", "including filtered dependents");
-      }
-
-      if (this.options.includeFilteredDependencies) {
-        this.logger.notice("filter", "including filtered dependencies");
-      }
-
       return getFilteredPackages(this.targetGraph, this.execOpts, this.options);
     });
 
diff --git a/core/filter-options/lib/get-filtered-packages.js b/core/filter-options/lib/get-filtered-packages.js
index 1e5e961943..7a8d5b1f84 100644
--- a/core/filter-options/lib/get-filtered-packages.js
+++ b/core/filter-options/lib/get-filtered-packages.js
@@ -1,11 +1,20 @@
 "use strict";
 
+const log = require("npmlog");
 const collectUpdates = require("@lerna/collect-updates");
 const filterPackages = require("@lerna/filter-packages");
 
 module.exports = getFilteredPackages;
 
 function getFilteredPackages(packageGraph, execOpts, options) {
+  if (options.scope) {
+    log.notice("filter", "including %j", options.scope);
+  }
+
+  if (options.ignore) {
+    log.notice("filter", "excluding %j", options.ignore);
+  }
+
   let chain = Promise.resolve();
 
   chain = chain.then(() =>
@@ -19,6 +28,8 @@ function getFilteredPackages(packageGraph, execOpts, options) {
   );
 
   if (options.since !== undefined) {
+    log.notice("filter", "changed since %j", options.since);
+
     chain = chain.then(filteredPackages =>
       Promise.resolve(collectUpdates(filteredPackages, packageGraph, execOpts, options)).then(updates => {
         const updated = new Set(updates.map(({ pkg }) => pkg.name));
@@ -29,10 +40,14 @@ function getFilteredPackages(packageGraph, execOpts, options) {
   }
 
   if (options.includeFilteredDependents) {
+    log.notice("filter", "including filtered dependents");
+
     chain = chain.then(filteredPackages => packageGraph.addDependents(filteredPackages));
   }
 
   if (options.includeFilteredDependencies) {
+    log.notice("filter", "including filtered dependencies");
+
     chain = chain.then(filteredPackages => packageGraph.addDependencies(filteredPackages));
   }
 
diff --git a/core/filter-options/package.json b/core/filter-options/package.json
index 4b19389f40..ad3b9b64eb 100644
--- a/core/filter-options/package.json
+++ b/core/filter-options/package.json
@@ -34,6 +34,7 @@
   "dependencies": {
     "@lerna/collect-updates": "file:../../utils/collect-updates",
     "@lerna/filter-packages": "file:../../utils/filter-packages",
-    "dedent": "^0.7.0"
+    "dedent": "^0.7.0",
+    "npmlog": "^4.1.2"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 3f07cddf61..6d5b0c5e9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -983,7 +983,8 @@
       "requires": {
         "@lerna/collect-updates": "file:utils/collect-updates",
         "@lerna/filter-packages": "file:utils/filter-packages",
-        "dedent": "^0.7.0"
+        "dedent": "^0.7.0",
+        "npmlog": "^4.1.2"
       }
     },
     "@lerna/filter-packages": {