Merge pull request #388 from suresh-gangumalla/dev

DeepMerge failed to merge instantiated objects

Author: michielvandergeest

package-lock.json

@@ -29,6 +29,7 @@
     "@metrological/sdk": "^1.0.0",
     "@michieljs/execute-as-promise": "^1.0.0",
     "deepmerge": "^4.2.2",
+    "is-plain-object": "^5.0.0",
     "localcookies": "^2.0.0",
     "shelljs": "^0.8.5",
     "url-polyfill": "^1.1.10",

package.json

@@ -19,6 +19,7 @@
 
 import Accessibility from '../Accessibility'
 import Deepmerge from 'deepmerge'
+import { isPlainObject } from 'is-plain-object'
 import Lightning from '../Lightning'
 import Locale from '../Locale'
 import Metrics from '../Metrics'
@@ -99,11 +100,10 @@ export default function(App, appData, platformSettings) {
 
   return class Application extends Lightning.Application {
     constructor(options) {
-      const config = Deepmerge(defaultOptions, options)
-      // Deepmerge breaks HTMLCanvasElement, so restore the passed in canvas.
-      if (options.stage.canvas) {
-        config.stage.canvas = options.stage.canvas
-      }
+      const config = Deepmerge(defaultOptions, options, {
+        isMergeableObject: isPlainObject
+      })
+
       super(config)
       this.config = config
     }