diff --git a/src/commands/PublishCommand.js b/src/commands/PublishCommand.js index 0d274431af..95a0385aa6 100644 --- a/src/commands/PublishCommand.js +++ b/src/commands/PublishCommand.js @@ -6,6 +6,7 @@ import NpmUtilities from "../NpmUtilities"; import Command from "../Command"; import semver from "semver"; import async from "async"; +import chalk from "chalk"; import path from "path"; import { EOL } from "os"; @@ -232,7 +233,8 @@ export default class PublishCommand extends Command { this.logger.newLine(); this.logger.info("Changes:"); this.logger.info(this.updates.map((update) => { - return `- ${update.package.name}: ${update.package.version} => ${this.updatesVersions[update.package.name]}`; + const pkg = update.package; + return `- ${pkg.name}: ${pkg.version} => ${this.updatesVersions[pkg.name]}${pkg.isPrivate() ? ` (${chalk.red("private")})` : ""}`; }).join(EOL)); this.logger.newLine(); diff --git a/src/commands/UpdatedCommand.js b/src/commands/UpdatedCommand.js index cb6cb27269..8f37564b99 100644 --- a/src/commands/UpdatedCommand.js +++ b/src/commands/UpdatedCommand.js @@ -1,5 +1,6 @@ import UpdatedPackagesCollector from "../UpdatedPackagesCollector"; import Command from "../Command"; +import chalk from "chalk"; export default class UpdatedCommand extends Command { initialize(callback) { @@ -16,7 +17,7 @@ export default class UpdatedCommand extends Command { execute(callback) { const formattedUpdates = this.updates - .map((update) => `- ${update.package.name}${update.package.isPrivate() ? " (private)" : ""}`) + .map((update) => `- ${update.package.name}${update.package.isPrivate() ? ` (${chalk.red("private")})` : ""}`) .join("\n"); this.logger.newLine(); diff --git a/test/UpdatedCommand.js b/test/UpdatedCommand.js index 2ce6e69abe..2e8120d3b0 100644 --- a/test/UpdatedCommand.js +++ b/test/UpdatedCommand.js @@ -3,6 +3,7 @@ import child from "child_process"; import path from "path"; import fs from "fs"; import syncExec from "sync-exec"; +import chalk from "chalk"; import UpdatedCommand from "../src/commands/UpdatedCommand"; import exitWithCode from "./_exitWithCode"; @@ -63,7 +64,7 @@ describe("UpdatedCommand", () => { let calls = 0; stub(logger, "info", (message) => { if (calls === 0) assert.equal(message, "Checking for updated packages..."); - if (calls === 2) assert.equal(message, "- package-1\n- package-2\n- package-3\n- package-4"); + if (calls === 2) assert.equal(message, `- package-1\n- package-2\n- package-3\n- package-4\n- package-5 (${chalk.red("private")}`); calls++; }); @@ -194,7 +195,7 @@ describe("UpdatedCommand", () => { let calls = 0; stub(logger, "info", (message) => { if (calls === 0) assert.equal(message, "Checking for updated packages..."); - if (calls === 2) assert.equal(message, "- package-1\n- package-2\n- package-3\n- package-4"); + if (calls === 2) assert.equal(message, `- package-1\n- package-2\n- package-3\n- package-4\n- package-5 (${chalk.red("private")}`); calls++; }); diff --git a/test/fixtures/UpdatedCommand/basic/packages/package-5/package.json b/test/fixtures/UpdatedCommand/basic/packages/package-5/package.json new file mode 100644 index 0000000000..393e8e50ac --- /dev/null +++ b/test/fixtures/UpdatedCommand/basic/packages/package-5/package.json @@ -0,0 +1,8 @@ +{ + "name": "package-5", + "version": "1.0.0", + "private": "true", + "dependencies": { + "package-1": "^1.0.0" + } +} diff --git a/test/fixtures/UpdatedCommand/circular/packages/package-5/package.json b/test/fixtures/UpdatedCommand/circular/packages/package-5/package.json new file mode 100644 index 0000000000..393e8e50ac --- /dev/null +++ b/test/fixtures/UpdatedCommand/circular/packages/package-5/package.json @@ -0,0 +1,8 @@ +{ + "name": "package-5", + "version": "1.0.0", + "private": "true", + "dependencies": { + "package-1": "^1.0.0" + } +}