chore(table): replace lodash-es with lodash (#2641)

patternfly · Aug 5, 2019 · ad3ccc8 · ad3ccc8
1 parent 4cc786a
commit ad3ccc8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -33,9 +33,9 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/scripts/generators/',
     '<rootDir>/packages/patternfly-4/react-integration/',
-    '<rootDir>/node_modules/(?!lodash-es/.*)'
+    '<rootDir>/node_modules/(?!lodash/.*)'
   ],
-  transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|tippy.js|lodash-es)'],
+  transformIgnorePatterns: ['node_modules/(?!@patternfly|@novnc|tippy.js|lodash)'],
   // https://github.com/kulshekhar/ts-jest/blob/master/docs/user/config/index.md
   preset: 'ts-jest/presets/js-with-babel',
   globals: {

diff --git a/packages/patternfly-4/react-table/package.json b/packages/patternfly-4/react-table/package.json
@@ -34,7 +34,7 @@
     "@patternfly/react-tokens": "^2.6.13",
     "classnames": "^2.2.5",
     "exenv": "^1.2.2",
-    "lodash-es": "^4.2.1"
+    "lodash": "^4.2.1"
   },
   "peerDependencies": {
     "prop-types": "^15.6.1",

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/body-row.js b/packages/patternfly-4/react-table/src/components/Table/base/body-row.js
@@ -5,7 +5,7 @@
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
 
-import { isEqual, isFunction } from 'lodash-es';
+import { isEqual, isFunction } from 'lodash';
 import React from 'react';
 import columnsAreEqual from './columns-are-equal';
 import evaluateFormatters from './evaluate-formatters';

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/body.js b/packages/patternfly-4/react-table/src/components/Table/base/body.js
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
-import { isEqual, isFunction } from 'lodash-es';
+import { isEqual, isFunction } from 'lodash';
 import React from 'react';
 import { tableBodyTypes, tableBodyDefaults, tableBodyContextTypes } from './types';
 import BodyRow from './body-row';

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/columns-are-equal.js b/packages/patternfly-4/react-table/src/components/Table/base/columns-are-equal.js
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
-import { isFunction, isEqualWith } from 'lodash-es';
+import { isFunction, isEqualWith } from 'lodash';
 
 function columnsAreEqual(oldColumns, newColumns) {
   return isEqualWith(oldColumns, newColumns, (a, b) => {

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/evaluate-transforms.js b/packages/patternfly-4/react-table/src/components/Table/base/evaluate-transforms.js
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
-import { isFunction } from 'lodash-es';
+import { isFunction } from 'lodash';
 import mergeProps from './merge-props';
 
 function evaluateTransforms(transforms = [], value, extraParameters = {}) {

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/merge-props.js b/packages/patternfly-4/react-table/src/components/Table/base/merge-props.js
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
-import { mergeWith } from 'lodash-es';
+import { mergeWith } from 'lodash';
 import classNames from 'classnames';
 
 function mergePropPair(...props) {

diff --git a/packages/patternfly-4/react-table/src/components/Table/base/resolve-row-key.js b/packages/patternfly-4/react-table/src/components/Table/base/resolve-row-key.js
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  * */
-import { isArray } from 'lodash-es';
+import { isArray } from 'lodash';
 
 function resolveRowKey({ rowData, rowIndex, rowKey }) {
   if (typeof rowKey === 'function') {

diff --git a/packages/patternfly-4/react-virtualized-extension/package.json b/packages/patternfly-4/react-virtualized-extension/package.json
@@ -40,7 +40,6 @@
   },
   "peerDependencies": {
     "@patternfly/react-table": "^2.10.0",
-    "lodash-es": "4.x",
     "prop-types": "^15.6.1",
     "react": "^16.4.0",
     "react-dom": "^15.6.2 || ^16.4.0"