Skip to content

Commit

Permalink
update lodash to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
pentateu authored and billyjanitsch committed Feb 10, 2016
1 parent c044621 commit 2f97cda
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions docs/00 Quick Start/FAQ.md
Expand Up @@ -78,7 +78,7 @@ Because [`DragSource`](docs-drag-source.html) and [`DropTarget`](docs-drop-targe
```js
var DragSource = require('react-dnd').DragSource;
var DropTarget = require('react-dnd').DropTarget;
var flow = require('lodash/function/flow');
var flow = require('lodash/flow');

var YourComponent = React.createClass({
/* ... */
Expand All @@ -92,7 +92,7 @@ module.exports = flow(
-------------------
```js
import { DragSource } from 'react-dnd';
import flow from 'lodash/function/flow';
import flow from 'lodash/flow';

class YourComponent {
/* ... */
Expand Down
4 changes: 2 additions & 2 deletions docs/00 Quick Start/Overview.md
Expand Up @@ -174,7 +174,7 @@ Even if you don't plan to use ES7, the partial application can still be handy, b
```js
var DragSource = require('react-dnd').DragSource;
var DropTarget = require('react-dnd').DropTarget;
var flow = require('lodash/function/flow');
var flow = require('lodash/flow');

var YourComponent = React.createClass({
/* ... */
Expand All @@ -188,7 +188,7 @@ module.exports = flow(
-------------------
```js
import { DragSource } from 'react-dnd';
import flow from 'lodash/function/flow';
import flow from 'lodash/flow';

class YourComponent {
/* ... */
Expand Down
4 changes: 2 additions & 2 deletions examples/01 Dustbin/Stress Test/Container.js
Expand Up @@ -4,7 +4,7 @@ import HTML5Backend, { NativeTypes } from 'react-dnd-html5-backend';
import Dustbin from './Dustbin';
import Box from './Box';
import ItemTypes from './ItemTypes';
import shuffle from 'lodash/collection/shuffle';
import shuffle from 'lodash/shuffle';
import update from 'react/lib/update';

@DragDropContext(HTML5Backend)
Expand Down Expand Up @@ -88,4 +88,4 @@ export default class Container extends Component {
} : {}
}));
}
}
}
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -42,7 +42,7 @@
"disposables": "^1.0.1",
"dnd-core": "^1.2.2",
"invariant": "^2.1.0",
"lodash": "^3.10.1"
"lodash": "^4.0.1"
},
"peerDependencies": {
"react": "^0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildSiteIndexPages.sh
Expand Up @@ -9,7 +9,7 @@ var path = require('path');
var glob = require('glob');
var Constants = require('../site/Constants');
var renderPath = require('../__site_prerender__/renderPath');
var flatten = require('lodash/array/flatten');
var flatten = require('lodash/flatten');

var sitePath = path.join(__dirname, '../__site__');
if (!fs.existsSync(sitePath)) {
Expand Down
4 changes: 2 additions & 2 deletions src/DragLayer.js
@@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react';
import shallowEqual from './utils/shallowEqual';
import shallowEqualScalar from './utils/shallowEqualScalar';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';
import invariant from 'invariant';
import checkDecoratorArguments from './utils/checkDecoratorArguments';

Expand Down Expand Up @@ -96,4 +96,4 @@ export default function DragLayer(collect, options = {}) {
}
};
};
}
}
4 changes: 2 additions & 2 deletions src/DragSource.js
@@ -1,5 +1,5 @@
import invariant from 'invariant';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';
import checkDecoratorArguments from './utils/checkDecoratorArguments';
import decorateHandler from './decorateHandler';
import registerSource from './registerSource';
Expand Down Expand Up @@ -61,4 +61,4 @@ export default function DragSource(type, spec, collect, options = {}) {
options
});
};
}
}
4 changes: 2 additions & 2 deletions src/DropTarget.js
@@ -1,5 +1,5 @@
import invariant from 'invariant';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';
import checkDecoratorArguments from './utils/checkDecoratorArguments';
import decorateHandler from './decorateHandler';
import registerTarget from './registerTarget';
Expand Down Expand Up @@ -61,4 +61,4 @@ export default function DropTarget(type, spec, collect, options = {}) {
options
});
};
}
}
4 changes: 2 additions & 2 deletions src/createSourceFactory.js
@@ -1,5 +1,5 @@
import invariant from 'invariant';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';

const ALLOWED_SPEC_METHODS = ['canDrag', 'beginDrag', 'canDrag', 'isDragging', 'endDrag'];
const REQUIRED_SPEC_METHODS = ['beginDrag'];
Expand Down Expand Up @@ -94,4 +94,4 @@ export default function createSourceFactory(spec) {
return function createSource(monitor) {
return new Source(monitor);
};
}
}
4 changes: 2 additions & 2 deletions src/createTargetFactory.js
@@ -1,5 +1,5 @@
import invariant from 'invariant';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';

const ALLOWED_SPEC_METHODS = ['canDrop', 'hover', 'drop'];

Expand Down Expand Up @@ -83,4 +83,4 @@ export default function createTargetFactory(spec) {
return function createTarget(monitor) {
return new Target(monitor);
};
}
}
4 changes: 2 additions & 2 deletions src/decorateHandler.js
Expand Up @@ -2,7 +2,7 @@ import React, { Component, PropTypes } from 'react';
import { Disposable, CompositeDisposable, SerialDisposable } from 'disposables';
import shallowEqual from './utils/shallowEqual';
import shallowEqualScalar from './utils/shallowEqualScalar';
import isPlainObject from 'lodash/lang/isPlainObject';
import isPlainObject from 'lodash/isPlainObject';
import invariant from 'invariant';
import bindConnector from './bindConnector';

Expand Down Expand Up @@ -161,4 +161,4 @@ export default function decorateHandler({
);
}
};
}
}
4 changes: 2 additions & 2 deletions src/utils/isValidType.js
@@ -1,7 +1,7 @@
import isArray from 'lodash/lang/isArray';
import isArray from 'lodash/isArray';

export default function isValidType(type, allowArray) {
return typeof type === 'string' ||
typeof type === 'symbol' ||
allowArray && isArray(type) && type.every(t => isValidType(t, false));
}
}

0 comments on commit 2f97cda

Please sign in to comment.