Skip to content

Commit

Permalink
Revert "Revert to Lodash v3 which never overwrites globals."
Browse files Browse the repository at this point in the history
This reverts commit ff3ebec.

Only Lodash v4's main export breaks when in browsers. Just need to avoid
that there.
  • Loading branch information
Macil committed Feb 29, 2016
1 parent 7eb5150 commit 844438e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions inc/index.js
Expand Up @@ -2,14 +2,14 @@

var has = require('../lib/has');
var StrSet = require('../lib/str-set');
var forEach = require('lodash/collection/forEach');
var some = require('lodash/collection/some');
var map = require('lodash/collection/map');
var filter = require('lodash/collection/filter');
var zipObject = require('lodash/array/zipObject');
var forOwn = require('lodash/object/forOwn');
var mapValues = require('lodash/object/mapValues');
var assign = require('lodash/object/assign');
var forEach = require('lodash/forEach');
var some = require('lodash/some');
var map = require('lodash/map');
var filter = require('lodash/filter');
var zipObject = require('lodash/zipObject');
var forOwn = require('lodash/forOwn');
var mapValues = require('lodash/mapValues');
var assign = require('lodash/assign');

function emitError(err) {
setTimeout(function() {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"convert-source-map": "^1.1.1",
"express": "^4.13.3",
"lodash": "^3.10.1",
"lodash": "^4.0.0",
"rsvp": "^3.0.21",
"socket.io": "^1.3.7",
"socket.io-client": "^1.3.7",
Expand Down

0 comments on commit 844438e

Please sign in to comment.