From 6b5a016c5935e92c676a3c944b4e1454246d4671 Mon Sep 17 00:00:00 2001 From: Ryan Graham Date: Tue, 2 Dec 2014 19:09:48 -0800 Subject: [PATCH 1/2] Use full lodash instead of lodash components This change trims 134 modules from the dependency tree, many of which were duplicate depdencies between the 4 lodash.function modules used and their sub-dependencies. Before: $ npm ls | wc -l 494 $ du -sch node_modules/lodash* 432K node_modules/lodash.assign 660K node_modules/lodash.clonedeep 96K node_modules/lodash.defaults 980K node_modules/lodash.pick 2.1M total After: $ npm ls | wc -l 360 $ du -sch node_modules/lodash* 964K node_modules/lodash 964K total --- index.js | 2 +- lib/model-helper.js | 4 ++-- lib/route-helper.js | 4 ++-- lib/swagger.js | 2 +- lib/translate-data-type-keys.js | 2 +- package.json | 5 +---- test/class-helper.test.js | 2 +- test/model-helper.test.js | 2 +- test/route-helper.test.js | 2 +- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/index.js b/index.js index e34a778..08962c3 100644 --- a/index.js +++ b/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; diff --git a/lib/model-helper.js b/lib/model-helper.js index faee5b4..07699c9 100644 --- a/lib/model-helper.js +++ b/lib/model-helper.js @@ -3,8 +3,8 @@ /** * Module dependencies. */ -var _cloneDeep = require('lodash.clonedeep'); -var _pick = require('lodash.pick'); +var _cloneDeep = require('lodash').cloneDeep; +var _pick = require('lodash').pick; var translateDataTypeKeys = require('./translate-data-type-keys'); var typeConverter = require('./type-converter'); diff --git a/lib/route-helper.js b/lib/route-helper.js index a5ba8d5..4d5545f 100644 --- a/lib/route-helper.js +++ b/lib/route-helper.js @@ -5,8 +5,8 @@ */ var debug = require('debug')('loopback:explorer:routeHelpers'); -var _cloneDeep = require('lodash.clonedeep'); -var _assign = require('lodash.assign'); +var _cloneDeep = require('lodash').cloneDeep; +var _assign = require('lodash').assign; var modelHelper = require('./model-helper'); var typeConverter = require('./type-converter'); diff --git a/lib/swagger.js b/lib/swagger.js index 5da84ae..f6ee454 100644 --- a/lib/swagger.js +++ b/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'); diff --git a/lib/translate-data-type-keys.js b/lib/translate-data-type-keys.js index d1e84a7..d2ca63a 100644 --- a/lib/translate-data-type-keys.js +++ b/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 = { diff --git a/package.json b/package.json index 1fc09ed..112f387 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,7 @@ "cors": "^2.4.2", "debug": "~1.0.3", "express": "3.x", - "lodash.assign": "^2.4.1", - "lodash.clonedeep": "^2.4.1", - "lodash.defaults": "^2.4.1", - "lodash.pick": "^2.4.1", + "lodash": "^2.4.1", "swagger-ui": "~2.0.18" } } diff --git a/test/class-helper.test.js b/test/class-helper.test.js index beb6d8f..de3bc15 100644 --- a/test/class-helper.test.js +++ b/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() { diff --git a/test/model-helper.test.js b/test/model-helper.test.js index abe8586..06bd259 100644 --- a/test/model-helper.test.js +++ b/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; diff --git a/test/route-helper.test.js b/test/route-helper.test.js index faca3a5..6654f78 100644 --- a/test/route-helper.test.js +++ b/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() { From f3480f857cee2f3909d71ebbd8ff34f11b032391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 8 Dec 2014 08:10:06 +0100 Subject: [PATCH 2/2] v1.6.1 --- CHANGES.md | 10 ++++++++-- package.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 61c2a8d..4e8b4cb 100644 --- a/CHANGES.md +++ b/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š) diff --git a/package.json b/package.json index 112f387..fce503e 100644 --- a/package.json +++ b/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": {