Merge branch 'master' into fix-mobx-action-aot

adamkleingit · web-flow · commit 99e08e4c587b · 2017-04-29T15:41:45.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+<a name="3.4.1"></a>
+# 3.4.1 (2017-29-04)
+* Fixed SystemJS errors
+
 <a name="3.4.0"></a>
 # 3.4.0 (2017-28-04)
 * Add animations
diff --git a/lib/components/tree.component.ts b/lib/components/tree.component.ts
@@ -10,8 +10,8 @@ import { TreeViewportComponent } from './tree-viewport.component';
 
 import { deprecatedSelector } from '../deprecated-selector';
 
-const includes = require('lodash/includes');
-const pick = require('lodash/pick');
+import * as _ from 'lodash';
+const { includes, pick }  = _;
 
 @Component({
   selector: 'Tree, tree-root',
diff --git a/lib/models/tree-node.model.ts b/lib/models/tree-node.model.ts
@@ -4,8 +4,8 @@ import { TreeOptions } from './tree-options.model';
 import { ITreeNode } from '../defs/api';
 import { TREE_EVENTS } from '../constants/events';
 
-const first  = require('lodash/first');
-const last  = require('lodash/last');
+import * as _ from 'lodash';
+const { first, last } = _;
 
 export class TreeNode implements ITreeNode {
   @computed get isHidden() { return this.treeModel.isHidden(this); };
diff --git a/lib/models/tree-options.model.ts b/lib/models/tree-options.model.ts
@@ -3,7 +3,7 @@ import { TreeModel } from './tree.model';
 import { KEYS } from '../constants/keys';
 import { ITreeOptions } from '../defs/api';
 
-const defaultsDeep = require('lodash/defaultsDeep');
+import * as _ from 'lodash';
 
 export interface IActionHandler {
   (tree: TreeModel, node: TreeNode, $event: any, ...rest);
@@ -78,7 +78,7 @@ export class TreeOptions {
   actionMapping: IActionMapping;
 
   constructor(private options: ITreeOptions = {}) {
-    this.actionMapping = defaultsDeep({}, this.options.actionMapping, defaultActionMapping);
+    this.actionMapping = _.defaultsDeep({}, this.options.actionMapping, defaultActionMapping);
   }
 
   allowDrop(element, to): boolean {
diff --git a/lib/models/tree.model.ts b/lib/models/tree.model.ts
@@ -6,16 +6,10 @@ import { TreeVirtualScroll } from './tree-virtual-scroll.model';
 import { ITreeModel } from '../defs/api';
 import { TREE_EVENTS } from '../constants/events';
 
-const first = require('lodash/first');
-const last = require('lodash/last');
-const compact = require('lodash/compact');
-const find = require('lodash/find');
-const includes = require('lodash/includes');
-const remove = require('lodash/remove');
-const indexOf = require('lodash/indexOf');
-const pullAt = require('lodash/pullAt');
-const isString = require('lodash/isString');
-const isFunction = require('lodash/isFunction');
+import * as _ from 'lodash';
+
+const { first, last, compact, find, includes,
+  remove, indexOf, pullAt, isString, isFunction } = _;
 
 @Injectable()
 export class TreeModel implements ITreeModel {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-tree-component",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "A simple yet powerful tree component for Angular2",
   "author": "Adam Klein <adam@500tech.com>",
   "homepage": "https://github.com/500tech/angular-tree-component",
@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "lodash": "4.17.4",
+    "lodash-es": "4.17.4",
     "mobx": "^3.1.0",
     "mobx-angular": "^1.5.0"
   },
@@ -76,7 +77,7 @@
     "@angular/platform-browser-dynamic": "^4.0.0",
     "@angular/platform-server": "^4.0.0",
     "@types/jasmine": "2.5.38",
-    "@types/lodash": "4.14.62",
+    "@types/lodash": "^4.14.62",
     "@types/node": "^6.0.38",
     "@types/rx": "2.5.34",
     "@types/webpack": "^1.12.29",
