fix(lodash): use lodash v4, reduce build size

vvo · vvo · commit 216d1e084c30 · 2016-08-24T17:54:12.000+02:00
helper now uses lodash v4, let's use lodash v4 in IS too
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "classnames": "^2.2.5",
     "events": "^1.1.0",
     "hogan.js": "^3.0.2",
-    "lodash": "^3.10.1",
+    "lodash": "^4.15.0",
     "react": "^15.3.1",
     "react-dom": "^15.3.1",
     "react-nouislider": "^1.13.0",
diff --git a/scripts/dev-functional-tests.js b/scripts/dev-functional-tests.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-console, no-magic-numbers */
 
-import debounce from 'lodash/function/debounce';
+import debounce from 'lodash/debounce';
 import watch from './dev-functional-tests-compile-watch.js';
 
 import {spawn} from 'child_process';
diff --git a/src/components/CurrentRefinedValues/CurrentRefinedValues.js b/src/components/CurrentRefinedValues/CurrentRefinedValues.js
@@ -3,9 +3,9 @@ import React from 'react';
 import Template from '../Template.js';
 
 import {isSpecialClick} from '../../lib/utils.js';
-import map from 'lodash/collection/map';
-import cloneDeep from 'lodash/lang/cloneDeep';
-import isEqual from 'lodash/lang/isEqual';
+import map from 'lodash/map';
+import cloneDeep from 'lodash/cloneDeep';
+import isEqual from 'lodash/isEqual';
 
 class CurrentRefinedValues extends React.Component {
   shouldComponentUpdate(nextProps) {
@@ -56,7 +56,7 @@ class CurrentRefinedValues extends React.Component {
       <div>
         {this._clearAllElement('before', this.props.clearAllPosition)}
         <div className={this.props.cssClasses.list}>
-          {map(this.props.refinements, this._refinementElement, this)}
+          {map(this.props.refinements, this._refinementElement.bind(this))}
         </div>
         {this._clearAllElement('after', this.props.clearAllPosition)}
       </div>
diff --git a/src/components/CurrentRefinedValues/__tests__/CurrentRefinedValues-test.js b/src/components/CurrentRefinedValues/__tests__/CurrentRefinedValues-test.js
@@ -5,8 +5,8 @@ import React from 'react';
 import expect from 'expect';
 import TestUtils from 'react-addons-test-utils';
 
-import forEach from 'lodash/collection/forEach';
-import map from 'lodash/collection/map';
+import forEach from 'lodash/forEach';
+import map from 'lodash/map';
 
 import CurrentRefinedValues from '../CurrentRefinedValues.js';
 import Template from '../../Template';
diff --git a/src/components/Hits.js b/src/components/Hits.js
@@ -1,7 +1,7 @@
 import React from 'react';
-import map from 'lodash/collection/map';
+import map from 'lodash/map';
 import Template from './Template.js';
-import hasKey from 'lodash/object/has';
+import hasKey from 'lodash/has';
 import cx from 'classnames';
 
 class Hits extends React.Component {
diff --git a/src/components/Pagination/Pagination.js b/src/components/Pagination/Pagination.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import forEach from 'lodash/collection/forEach';
-import defaultsDeep from 'lodash/object/defaultsDeep';
+import forEach from 'lodash/forEach';
+import defaultsDeep from 'lodash/defaultsDeep';
 import {isSpecialClick} from '../../lib/utils.js';
 
 import Paginator from './Paginator.js';
diff --git a/src/components/Pagination/PaginationLink.js b/src/components/Pagination/PaginationLink.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class PaginationLink extends React.Component {
   componentWillMount() {
diff --git a/src/components/Pagination/Paginator.js b/src/components/Pagination/Paginator.js
@@ -1,4 +1,4 @@
-import range from 'lodash/utility/range';
+import range from 'lodash/range';
 
 class Paginator {
   constructor(params) {
diff --git a/src/components/PriceRanges/PriceRanges.js b/src/components/PriceRanges/PriceRanges.js
@@ -3,7 +3,7 @@ import React from 'react';
 import Template from '../Template.js';
 import PriceRangesForm from './PriceRangesForm.js';
 import cx from 'classnames';
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class PriceRanges extends React.Component {
   componentWillMount() {
diff --git a/src/components/RefinementList/RefinementList.js b/src/components/RefinementList/RefinementList.js
@@ -4,7 +4,7 @@ import {isSpecialClick} from '../../lib/utils.js';
 
 import Template from '../Template.js';
 import RefinementListItem from './RefinementListItem.js';
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class RefinementList extends React.Component {
   constructor(props) {
diff --git a/src/components/RefinementList/RefinementListItem.js b/src/components/RefinementList/RefinementListItem.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import Template from '../Template.js';
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class RefinementListItem extends React.Component {
   componentWillMount() {
diff --git a/src/components/Slider/Slider.js b/src/components/Slider/Slider.js
@@ -1,11 +1,11 @@
 import React from 'react';
-import omit from 'lodash/object/omit';
+import omit from 'lodash/omit';
 
 import Nouislider from 'react-nouislider';
 
 let cssPrefix = 'ais-range-slider--';
 
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class Slider extends React.Component {
   componentWillMount() {
diff --git a/src/components/Template.js b/src/components/Template.js
@@ -1,12 +1,12 @@
 import React from 'react';
 
-import curry from 'lodash/function/curry';
-import cloneDeep from 'lodash/lang/cloneDeep';
-import mapValues from 'lodash/object/mapValues';
+import curry from 'lodash/curry';
+import cloneDeep from 'lodash/cloneDeep';
+import mapValues from 'lodash/mapValues';
 
 import hogan from 'hogan.js';
 
-import isEqual from 'lodash/lang/isEqual';
+import isEqual from 'lodash/isEqual';
 
 class Template extends React.Component {
   shouldComponentUpdate(nextProps) {
diff --git a/src/decorators/headerFooter.js b/src/decorators/headerFooter.js
@@ -4,7 +4,7 @@
 import React from 'react';
 
 import cx from 'classnames';
-import getKey from 'lodash/object/get';
+import getKey from 'lodash/get';
 
 import Template from '../components/Template.js';
 
diff --git a/src/lib/InstantSearch.js b/src/lib/InstantSearch.js
@@ -2,11 +2,11 @@
 // https://github.com/algolia/instantsearch.js/issues/1024#issuecomment-221618284
 import algoliasearch from 'algoliasearch/src/browser/builds/algoliasearchLite.js';
 import algoliasearchHelper from 'algoliasearch-helper';
-import forEach from 'lodash/collection/forEach';
-import merge from 'lodash/object/merge';
-import union from 'lodash/array/union';
-import clone from 'lodash/lang/clone';
-import isObject from 'lodash/lang/isObject';
+import forEach from 'lodash/forEach';
+import mergeWith from 'lodash/mergeWith';
+import union from 'lodash/union';
+import clone from 'lodash/clone';
+import isObject from 'lodash/isObject';
 import {EventEmitter} from 'events';
 import urlSyncWidget from './url-sync.js';
 import version from './version.js';
@@ -164,7 +164,7 @@ Usage: instantsearch({
   }
 
   _render(helper, results, state) {
-    forEach(this.widgets, function(widget) {
+    forEach(this.widgets, widget => {
       if (!widget.render) {
         return;
       }
@@ -175,23 +175,22 @@ Usage: instantsearch({
         helper,
         createURL: this._createAbsoluteURL
       });
-    }, this);
+    });
     this.emit('render');
   }
 
   _init(state, helper) {
-    const {_onHistoryChange, templatesConfig} = this;
-    forEach(this.widgets, function(widget) {
+    forEach(this.widgets, widget => {
       if (widget.init) {
         widget.init({
           state,
           helper,
-          templatesConfig,
+          templatesConfig: this.templatesConfig,
           createURL: this._createAbsoluteURL,
-          onHistoryChange: _onHistoryChange
+          onHistoryChange: this._onHistoryChange
         });
       }
-    }, this);
+    });
   }
 }
 
@@ -210,13 +209,13 @@ function enhanceConfiguration(searchParametersFromUrl) {
 
       // avoid mutating objects
       if (isObject(a)) {
-        return merge({}, a, b, customizer);
+        return mergeWith({}, a, b, customizer);
       }
 
       return undefined;
     };
 
-    return merge(
+    return mergeWith(
       {},
       configuration,
       partialConfiguration,
diff --git a/src/lib/__tests__/InstantSearch-test.js b/src/lib/__tests__/InstantSearch-test.js
@@ -2,7 +2,7 @@
 import EventEmitter from 'events';
 
 import expect from 'expect';
-import range from 'lodash/utility/range';
+import range from 'lodash/range';
 import sinon from 'sinon';
 
 
diff --git a/src/lib/__tests__/main-test.js b/src/lib/__tests__/main-test.js
@@ -3,7 +3,7 @@
 import expect from 'expect';
 
 import instantsearch from '../main.js';
-import forEach from 'lodash/collection/forEach';
+import forEach from 'lodash/forEach';
 
 describe('instantsearch()', () => {
    // to ensure the global.window is set
diff --git a/src/lib/__tests__/utils-test.js b/src/lib/__tests__/utils-test.js
@@ -4,7 +4,7 @@ import expect from 'expect';
 
 import algoliasearchHelper from 'algoliasearch-helper';
 import * as utils from '../utils';
-import isEmpty from 'lodash/lang/isEmpty';
+import isEmpty from 'lodash/isEmpty';
 
 describe('utils.getContainerNode', () => {
   it('should be able to get a node from a node', () => {
diff --git a/src/lib/url-sync.js b/src/lib/url-sync.js
@@ -1,8 +1,8 @@
 import algoliasearchHelper from 'algoliasearch-helper';
 import version from '../lib/version.js';
 import urlHelper from 'algoliasearch-helper/src/url';
-import isEqual from 'lodash/lang/isEqual';
-import merge from 'lodash/object/merge';/**/
+import isEqual from 'lodash/isEqual';
+import assign from 'lodash/assign';
 
 const AlgoliaSearchHelper = algoliasearchHelper.AlgoliaSearchHelper;
 const majorVersionNumber = version.split('.')[0];
@@ -123,7 +123,7 @@ class URLSync {
   onPopState(helper, fullState) {
     // compare with helper.state
     const partialHelperState = helper.getState(this.trackedParameters);
-    const fullHelperState = merge({}, this.originalConfig, partialHelperState);
+    const fullHelperState = assign({}, this.originalConfig, partialHelperState);
 
     if (isEqual(fullHelperState, fullState)) return;
 
@@ -175,7 +175,7 @@ class URLSync {
     this.urlUtils.onpopstate(() => {
       const qs = this.urlUtils.readUrl();
       const partialState = AlgoliaSearchHelper.getConfigurationFromQueryString(qs, {mapping: this.mapping});
-      const fullState = merge({}, this.originalConfig, partialState);
+      const fullState = assign({}, this.originalConfig, partialState);
       fn(fullState);
     });
   }
diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -1,11 +1,11 @@
-import reduce from 'lodash/collection/reduce';
-import forEach from 'lodash/collection/forEach';
-import find from 'lodash/collection/find';
-import get from 'lodash/object/get';
-import isEmpty from 'lodash/lang/isEmpty';
-import keys from 'lodash/object/keys';
-import uniq from 'lodash/array/uniq';
-import mapKeys from 'lodash/object/mapKeys';
+import reduce from 'lodash/reduce';
+import forEach from 'lodash/forEach';
+import find from 'lodash/find';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import keys from 'lodash/keys';
+import uniq from 'lodash/uniq';
+import mapKeys from 'lodash/mapKeys';
 
 export {
   getContainerNode,
diff --git a/src/widgets/current-refined-values/__tests__/current-refined-values-test.js b/src/widgets/current-refined-values/__tests__/current-refined-values-test.js
@@ -3,8 +3,8 @@
 import React from 'react';
 import expect from 'expect';
 import sinon from 'sinon';
-import map from 'lodash/collection/map';
-import filter from 'lodash/collection/filter';
+import map from 'lodash/map';
+import filter from 'lodash/filter';
 import algoliasearch from 'algoliasearch';
 import algoliasearchHelper from 'algoliasearch-helper';
 import {prepareTemplateProps} from '../../../lib/utils';
diff --git a/src/widgets/current-refined-values/current-refined-values.js b/src/widgets/current-refined-values/current-refined-values.js
@@ -10,16 +10,16 @@ import {
   clearRefinementsAndSearch
 } from '../../lib/utils.js';
 import cx from 'classnames';
-import isUndefined from 'lodash/lang/isUndefined';
-import isBoolean from 'lodash/lang/isBoolean';
-import isString from 'lodash/lang/isString';
-import isArray from 'lodash/lang/isArray';
-import isPlainObject from 'lodash/lang/isPlainObject';
-import isFunction from 'lodash/lang/isFunction';
-import isEmpty from 'lodash/lang/isEmpty';
-import map from 'lodash/collection/map';
-import reduce from 'lodash/collection/reduce';
-import filter from 'lodash/collection/filter';
+import isUndefined from 'lodash/isUndefined';
+import isBoolean from 'lodash/isBoolean';
+import isString from 'lodash/isString';
+import isArray from 'lodash/isArray';
+import isPlainObject from 'lodash/isPlainObject';
+import isFunction from 'lodash/isFunction';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import reduce from 'lodash/reduce';
+import filter from 'lodash/filter';
 import headerFooterHOC from '../../decorators/headerFooter.js';
 import autoHideContainerHOC from '../../decorators/autoHideContainer';
 import defaultTemplates from './defaultTemplates';
diff --git a/src/widgets/hits-per-page-selector/hits-per-page-selector.js b/src/widgets/hits-per-page-selector/hits-per-page-selector.js
@@ -4,7 +4,7 @@ import {
   bemHelper,
   getContainerNode
 } from '../../lib/utils.js';
-import any from 'lodash/collection/any';
+import some from 'lodash/some';
 import cx from 'classnames';
 import autoHideContainerHOC from '../../decorators/autoHideContainer.js';
 import SelectorComponent from '../../components/Selector.js';
@@ -57,7 +57,7 @@ function hitsPerPageSelector({
 
   return {
     init({helper, state}) {
-      const isCurrentInOptions = any(
+      const isCurrentInOptions = some(
         options,
         option => Number(state.hitsPerPage) === Number(option.value)
       );
diff --git a/src/widgets/numeric-refinement-list/__tests__/numeric-refinement-list-test.js b/src/widgets/numeric-refinement-list/__tests__/numeric-refinement-list-test.js
@@ -4,7 +4,7 @@ import React from 'react';
 import expect from 'expect';
 import sinon from 'sinon';
 
-import cloneDeep from 'lodash/lang/cloneDeep';
+import cloneDeep from 'lodash/cloneDeep';
 
 import expectJSX from 'expect-jsx';
 import numericRefinementList from '../numeric-refinement-list.js';
diff --git a/src/widgets/numeric-refinement-list/numeric-refinement-list.js b/src/widgets/numeric-refinement-list/numeric-refinement-list.js
@@ -6,8 +6,8 @@ import {
   getContainerNode
 } from '../../lib/utils.js';
 import cx from 'classnames';
-import find from 'lodash/collection/find';
-import includes from 'lodash/collection/includes';
+import find from 'lodash/find';
+import includes from 'lodash/includes';
 import autoHideContainerHOC from '../../decorators/autoHideContainer.js';
 import headerFooterHOC from '../../decorators/headerFooter.js';
 import defaultTemplates from './defaultTemplates.js';
diff --git a/src/widgets/numeric-selector/numeric-selector.js b/src/widgets/numeric-selector/numeric-selector.js
@@ -5,7 +5,7 @@ import {
   getContainerNode
 } from '../../lib/utils.js';
 import cx from 'classnames';
-import find from 'lodash/collection/find';
+import find from 'lodash/find';
 import autoHideContainerHOC from '../../decorators/autoHideContainer.js';
 import SelectorComponent from '../../components/Selector.js';
 
diff --git a/src/widgets/pagination/pagination.js b/src/widgets/pagination/pagination.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import defaults from 'lodash/object/defaults';
+import defaults from 'lodash/defaults';
 import cx from 'classnames';
 import {
   bemHelper,
diff --git a/src/widgets/range-slider/range-slider.js b/src/widgets/range-slider/range-slider.js
@@ -5,7 +5,7 @@ import {
   prepareTemplateProps,
   getContainerNode
 } from '../../lib/utils.js';
-import find from 'lodash/collection/find';
+import find from 'lodash/find';
 import autoHideContainerHOC from '../../decorators/autoHideContainer.js';
 import headerFooterHOC from '../../decorators/headerFooter.js';
 import cx from 'classnames';
diff --git a/src/widgets/refinement-list/refinement-list.js b/src/widgets/refinement-list/refinement-list.js
diff --git a/src/widgets/search-box/search-box.js b/src/widgets/search-box/search-box.js
diff --git a/src/widgets/sort-by-selector/sort-by-selector.js b/src/widgets/sort-by-selector/sort-by-selector.js
diff --git a/src/widgets/toggle/implementations/currentToggle.js b/src/widgets/toggle/implementations/currentToggle.js
diff --git a/src/widgets/toggle/implementations/legacyToggle.js b/src/widgets/toggle/implementations/legacyToggle.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import range from 'lodash/utility/range';`
	`1`	`+import range from 'lodash/range';`
`2`	`2`
`3`	`3`	`class Paginator {`
`4`	`4`	`constructor(params) {`