refactor(CLI): Ensure empty line prior final status with progress

serverless · Oct 7, 2021 · c9f2227 · c9f2227
1 parent 8184c01
commit c9f2227
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/commands/plugin-install.js b/commands/plugin-install.js
@@ -38,6 +38,7 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await addPluginToServerlessFile(context);
 
   legacy.log(`Successfully installed "${pluginName}@${pluginVersion}"`);
+  log.notice();
   log.notice.success(
     `Plugin "${pluginName}${
       pluginVersion === 'latest' ? '' : `@${pluginVersion}`
@@ -138,6 +139,7 @@ const requestManualUpdate = (configurationFilePath) => {
   Can't automatically add plugin into "${path.basename(configurationFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically add plugin into "${path.basename(
       configurationFilePath

diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
@@ -33,6 +33,7 @@ module.exports = async ({ configuration, serviceDir, configurationFilename, opti
   await removePluginFromServerlessFile(context);
 
   legacy.log(`Successfully uninstalled "${pluginName}"`);
+  log.notice();
   log.notice.success(
     `Plugin "${pluginName}" uninstalled ${style.aside(
       `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
@@ -118,6 +119,7 @@ const requestManualUpdate = (configurationFilePath) => {
   Can't automatically remove plugin from "${path.basename(configurationFilePath)}" file.
   Please do it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically remove plugin from "${path.basename(
       configurationFilePath

diff --git a/lib/plugins/install.js b/lib/plugins/install.js
@@ -37,6 +37,7 @@ class Install {
     ].join('');
 
     legacy.log(message);
+    log.notice();
     log.notice.success(
       `${message} ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
     );

diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
@@ -26,6 +26,7 @@ const requestManualUpdate = (serverlessFilePath) => {
   Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically add plugin into "${path.basename(
       serverlessFilePath
@@ -77,6 +78,7 @@ class PluginInstall {
               ` "${this.options.pluginName}@${this.options.pluginVersion}"`,
             ].join('');
             legacy.log(message);
+            log.notice();
             log.notice.success(
               `Plugin "${this.options.pluginName}${
                 this.options.pluginVersion === 'latest' ? '' : `@${this.options.pluginVersion}`

diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
@@ -23,6 +23,7 @@ const requestManualUpdate = (serverlessFilePath) => {
   Can't automatically remove plugin from "${path.basename(serverlessFilePath)}" file.
   Please make it manually.
 `);
+  log.notice();
   log.notice.skip(
     `Can't automatically remove plugin from "${path.basename(
       serverlessFilePath
@@ -70,6 +71,7 @@ class PluginUninstall {
           .then(this.removePluginFromServerlessFile)
           .then(() => {
             legacy.log(`Successfully uninstalled "${this.options.pluginName}"`);
+            log.notice();
             log.notice.success(
               `Plugin "${this.options.pluginName}" uninstalled ${style.aside(
                 `(${Math.floor(

diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
@@ -47,6 +47,7 @@ module.exports = class Standalone {
     const latestVersion = tagName.slice(1);
     if (latestVersion === currentVersion) {
       legacy.log('Already at latest version');
+      log.notice();
       log.notice.skip(
         `Already at latest version ${style.aside(
           `(${Math.floor(
@@ -88,6 +89,7 @@ module.exports = class Standalone {
     await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
     await fsp.chmod(BINARY_PATH, 0o755);
     legacy.log(`Successfully upgraded to ${tagName}`);
+    log.notice();
     log.notice.success(
       `Successfully upgraded to ${tagName} ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
@@ -99,6 +101,7 @@ module.exports = class Standalone {
     mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
     legacy.log('Uninstalled');
+    log.notice();
     log.notice.success(
       `Standalone binary uninstalled ${style.aside(
         `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`