Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschuler merged 1 commit into from
Aug 5, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/body-row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/columns-are-equal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/evaluate-transforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}) {
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/merge-props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/base/resolve-row-key.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
1 change: 0 additions & 1 deletion packages/patternfly-4/react-virtualized-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
},
"peerDependencies": {
"@patternfly/react-table": "^2.10.0",
"lodash-es": "4.x",
Copy link
Member

@priley86 priley86 Aug 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should lodash be added as a peerDependency now?

Copy link
Contributor Author

@redallen redallen Aug 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

react-virtualized-extension doesn't use lodash-es anywhere.

"prop-types": "^15.6.1",
"react": "^16.4.0",
"react-dom": "^15.6.2 || ^16.4.0"
Expand Down