Merge branch 'release/1.6.1' into production

CHANGES.md

@@ -1,3 +1,9 @@
+2014-12-08, Version 1.6.1
+=========================
+
+ * Use full lodash instead of lodash components (Ryan Graham)
+
+
 2014-12-02, Version 1.6.0
 =========================
 
@@ -10,12 +16,12 @@
  * model-helper: ignore unknown property types (Miroslav Bajtoš)
 
 
-2014-10-24, Version 1.5.0
+2014-10-24, Version 1.5.1
 =========================
 
 
 
-2014-10-24, Version 1.5.1
+2014-10-24, Version 1.5.0
 =========================
 
  * Add an option `uiDirs` (Miroslav Bajtoš)

index.js

@@ -5,7 +5,7 @@
 var url = require('url');
 var path = require('path');
 var urlJoin = require('./lib/url-join');
-var _defaults = require('lodash.defaults');
+var _defaults = require('lodash').defaults;
 var express = require('express');
 var swagger = require('./lib/swagger');
 var SWAGGER_UI_ROOT = require('swagger-ui').dist;

lib/model-helper.js

@@ -3,8 +3,8 @@
 /**
  * Module dependencies.
  */
-var _cloneDeep = require('lodash.clonedeep');
+var _cloneDeep = require('lodash').cloneDeep;
-var _pick = require('lodash.pick');
+var _pick = require('lodash').pick;
 var translateDataTypeKeys = require('./translate-data-type-keys');
 var typeConverter = require('./type-converter');
 

lib/route-helper.js

@@ -5,8 +5,8 @@
  */
 
 var debug = require('debug')('loopback:explorer:routeHelpers');
-var _cloneDeep = require('lodash.clonedeep');
+var _cloneDeep = require('lodash').cloneDeep;
-var _assign = require('lodash.assign');
+var _assign = require('lodash').assign;
 var modelHelper = require('./model-helper');
 var typeConverter = require('./type-converter');
 

lib/swagger.js

@@ -9,7 +9,7 @@ module.exports = Swagger;
  */
 var path = require('path');
 var urlJoin = require('./url-join');
-var _defaults = require('lodash.defaults');
+var _defaults = require('lodash').defaults;
 var classHelper = require('./class-helper');
 var routeHelper = require('./route-helper');
 var modelHelper = require('./model-helper');

lib/translate-data-type-keys.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-var _cloneDeep = require('lodash.clonedeep');
+var _cloneDeep = require('lodash').cloneDeep;
 
 // Keys that are different between LDL and Swagger
 var KEY_TRANSLATIONS = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-explorer",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Browse and test your LoopBack app's APIs",
   "main": "index.js",
   "scripts": {
@@ -34,10 +34,7 @@
     "cors": "^2.4.2",
     "debug": "~1.0.3",
     "express": "3.x",
-    "lodash.assign": "^2.4.1",
+    "lodash": "^2.4.1",
-    "lodash.clonedeep": "^2.4.1",
-    "lodash.defaults": "^2.4.1",
-    "lodash.pick": "^2.4.1",
     "swagger-ui": "~2.0.18"
   }
 }

test/class-helper.test.js

@@ -2,7 +2,7 @@
 
 var classHelper = require('../lib/class-helper');
 var expect = require('chai').expect;
-var _defaults = require('lodash.defaults');
+var _defaults = require('lodash').defaults;
 
 describe('class-helper', function() {
   it('joins array descriptions', function() {

test/model-helper.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var modelHelper = require('../lib/model-helper');
-var _defaults = require('lodash.defaults');
+var _defaults = require('lodash').defaults;
 var loopback = require('loopback');
 var expect = require('chai').expect;
 

test/route-helper.test.js

@@ -2,7 +2,7 @@
 
 var routeHelper = require('../lib/route-helper');
 var expect = require('chai').expect;
-var _defaults = require('lodash.defaults');
+var _defaults = require('lodash').defaults;
 
 describe('route-helper', function() {
   it('returns "object" when a route has multiple return values', function() {