Merge pull request #16 from markusguenther/update_themr

markusguenther · web-flow · commit 659b5460d2df · 2018-08-06T10:34:27.000+02:00
Update themr.js to prevent breaking the merge when using ExtractTextPlugin
diff --git a/src/components/themr.js b/src/components/themr.js
@@ -225,8 +225,7 @@ function merge(original = {}, mixin = {}) {
         switch (typeof originalValue) {
           case 'object': {
             //can't merge a non-object with an object
-            throw new Error(`You are merging non-object ${mixinValue} with an object ${key}`)
-            break
+            throw new Error(`You are merging non-object ${mixinValue} with an object ${key}, (can occur when using empty or :global only base theme stylesheet)`)
           }
 
           case 'undefined': {

Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,7 @@ function merge(original = {}, mixin = {}) {`
`225`	`225`	`switch (typeof originalValue) {`
`226`	`226`	`case 'object': {`
`227`	`227`	`//can't merge a non-object with an object`
`228`		- throw new Error(`You are merging non-object ${mixinValue} with an object ${key}`)
`229`		`- break`
	`228`	+ throw new Error(`You are merging non-object ${mixinValue} with an object ${key}, (can occur when using empty or :global only base theme stylesheet)`)
`230`	`229`	`}`
`231`	`230`
`232`	`231`	`case 'undefined': {`