Merge pull request #532 from serverless-operations/revert-529-master

Revert "fix: Make it work with serverless-import-config-plugin"

Author: lopburny

lib/yamlParser.js

@@ -4,13 +4,18 @@ const _ = require('lodash');
 
 module.exports = {
   yamlParse() {
+    const parsedObject = this.serverless.configurationInput;
+
     this.serverless.service.stepFunctions = {
-      validate: false,
-      noOutput: false,
-      stateMachines: {},
-      activities: [],
-      ...this.serverless.service.stepFunctions,
+      validate: parsedObject.stepFunctions ? parsedObject.stepFunctions.validate : false,
+      noOutput: parsedObject.stepFunctions ? parsedObject.stepFunctions.noOutput : false,
     };
+    this.serverless.service.stepFunctions.stateMachines = parsedObject.stepFunctions
+      && parsedObject.stepFunctions.stateMachines
+      ? parsedObject.stepFunctions.stateMachines : {};
+    this.serverless.service.stepFunctions.activities = parsedObject.stepFunctions
+      && parsedObject.stepFunctions.activities
+      ? parsedObject.stepFunctions.activities : [];
 
     if (!this.serverless.pluginManager.cliOptions.stage) {
       this.serverless.pluginManager.cliOptions.stage = this.options.stage