Skip to content

Commit

Permalink
Add workaround for webpack & browserify usage, see TehShrike/deepmerg…
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Fitzner committed Feb 23, 2018
1 parent 217953f commit 1a1d069
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* Imports
*/
import merge from 'deepmerge';
import * as mergeHelper from 'deepmerge';
import mixinHelper, { mixinType } from '@veams/helpers/lib/function/mixin';
import makeIdHelper from '@veams/helpers/lib/utility/make-id';

Expand All @@ -21,6 +21,9 @@ export interface BaseConfig {
options?: any;
}

// Workaround for browserify and webpack bundling
const merge = mergeHelper.default || mergeHelper;

class Base {
options: any;
_namespace: string;
Expand Down

0 comments on commit 1a1d069

Please sign in to comment.