File tree Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -222,14 +222,7 @@ function merge(original = {}, mixin = {}) {
222
222
switch ( typeof originalValue ) {
223
223
case 'object' : {
224
224
//can't merge a non-object with an object
225
- if ( mixinValue === '// removed by extract-text-webpack-plugin' ) {
226
- // when the source style is empty / contain only :global rules,
227
- // extract-text-webpack-plugin put string instead of json, which break the merge.
228
- // this if prevent this specific case
229
- // https://github.com/javivelasco/react-css-themr/issues/66
230
- break ;
231
- }
232
- throw new Error ( `You are merging non-object ${ mixinValue } with an object ${ key } ` )
225
+ throw new Error ( `You are merging non-object ${ mixinValue } with an object ${ key } , (can occur when using empty or :global only base theme stylesheet)` )
233
226
}
234
227
235
228
case 'undefined' : {
You can’t perform that action at this time.
0 commit comments