refactor(CLI): Cleanup components resolution logic

bin/serverless.js

@@ -12,20 +12,30 @@ if (require('../lib/utils/isStandaloneExecutable')) {
 
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
 
-// only check for components if user is running Node 8
+// CLI Triage
+// Serverless Components work only in Node.js v8+
 if (nodeVersion >= 8) {
-  const componentsV1 = require('../lib/components-v1');
-  const componentsV2 = require('../lib/components-v2');
+  try {
+    const componentsV1 = require('@serverless/cli');
+    const componentsV2 = require('@serverless/components');
 
-  if (componentsV1 && componentsV1.runningComponents()) {
-    componentsV1.runComponents();
-    return;
-  }
+    if (componentsV1.runningComponents()) {
+      // Serverless Components v1 CLI (deprecated)
+      componentsV1.runComponents();
+      return;
+    }
 
-  if (componentsV2 && componentsV2.runningComponents()) {
-    componentsV2.runComponents();
-    return;
+    if (componentsV2.runningComponents()) {
+      // Serverless Components CLI
+      componentsV2.runComponents();
+      return;
+    }
+  } catch (error) {
+    if (process.env.SLS_DEBUG) {
+      require('../lib/classes/Error').logWarning(`CLI triage crashed with: ${error.stack}`);
+    }
   }
 }
 
+// Serverless Framework CLI
 require('../scripts/serverless');

lib/classes/CLI.js

@@ -365,8 +365,14 @@ functionalities related to given service or current environment.`
     const userNodeVersion = Number(process.version.split('.')[0].slice(1));
     // only show components version if user is running Node 8+
     if (userNodeVersion >= 8) {
-      const components = require('../components-v2');
-      this.consoleLog(`Components: ${components ? components.componentsVersion : 'Unavailable'}`);
+      const componentsVersion = (() => {
+        try {
+          return require('@serverless/components/package').version;
+        } catch (error) {
+          return 'Unavailable';
+        }
+      })();
+      this.consoleLog(`Components: ${componentsVersion}`);
     }
   }
 

lib/classes/Error.js

@@ -114,14 +114,14 @@ module.exports.logError = (exception, { forceExit = false } = {}) => {
   // only show components version if user is running Node 8+
   const userNodeVersion = Number(process.version.split('.')[0].slice(1));
   if (userNodeVersion >= 8) {
-    const components = require('../components-v2');
-    consoleLog(
-      chalk.yellow(
-        `     Components Version:        ${
-          components ? components.componentsVersion : 'Unavailable'
-        }`
-      )
-    );
+    const componentsVersion = (() => {
+      try {
+        return require('@serverless/components/package').version;
+      } catch (error) {
+        return 'Unavailable';
+      }
+    })();
+    consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
   }
   consoleLog(' ');