From 4bcfde5de306567a64a23e376037e849d57e80f1 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 9 Dec 2016 13:35:46 +0000
Subject: [PATCH] chore(deps): fix lodash import

See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/12995#issuecomment-265784722 for context.
---
 package.json                           | 2 +-
 packages/angular-cli/commands/serve.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ac1a72a429a8..d539d1f2e9a3 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "@types/fs-extra": "^0.0.31",
     "@types/glob": "^5.0.29",
     "@types/jasmine": "^2.2.32",
-    "@types/lodash": "4.14.42",
+    "@types/lodash": "^4.14.43",
     "@types/mock-fs": "3.6.28",
     "@types/node": "^6.0.36",
     "@types/request": "0.0.30",
diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts
index b9fa384b188e..e22c91c71030 100644
--- a/packages/angular-cli/commands/serve.ts
+++ b/packages/angular-cli/commands/serve.ts
@@ -1,8 +1,8 @@
-import * as assign from 'lodash/assign';
 import * as denodeify from 'denodeify';
-const Command = require('../ember-cli/lib/models/command');
+const assign = require('lodash/assign');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
+const Command = require('../ember-cli/lib/models/command');
 import ServeWebpackTask from '../tasks/serve-webpack';
 
 PortFinder.basePort = 49152;