Skip to content
This repository has been archived by the owner on Jan 13, 2018. It is now read-only.

Commit

Permalink
fixes #94 migrating from underscore to lodash. backport
Browse files Browse the repository at this point in the history
Conflicts:
	lib/util.js
	test/bem-make.js
  • Loading branch information
Alexej Yaroshevich committed Nov 7, 2013
1 parent 389404b commit 564aa05
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/nodes/build.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('underscore'),
var _ = require('lodash/dist/lodash.underscore'),
Q = require('q'),
QFS = require('q-io/fs'),
FS = require('fs'),
Expand Down
2 changes: 1 addition & 1 deletion lib/nodes/level.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Q = require('q'),
_ = require('underscore'),
_ = require('lodash/dist/lodash.underscore'),
PATH = require('../path'),
U = require('../util'),
createLevel = require('../level').createLevel,
Expand Down
2 changes: 1 addition & 1 deletion lib/tech/v2.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var Q = require('q'),
FS = require('fs'),
QFS = require('q-io/fs'),
bemUtil = require('./../util'),
_ = require('underscore'),
_ = require('lodash/dist/lodash.underscore'),
PATH = require('./../path'),
INHERIT = require('inherit'),
LOGGER = require('./../logger'),
Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var ASSERT = require('assert'),
UTIL = require('util'),
ENV = require('./env'),
MKDIRP = require('mkdirp'),
_ = require('underscore');
_ = require('lodash/dist/lodash.underscore');

exports.nodeVer = process.version.substr(1)
.split('.')
Expand Down
6 changes: 3 additions & 3 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"qq": "~0.3.4",
"q-io": "~1.10.3",
"mime": "~1.2.5",
"underscore": "~1.3.1",
"lodash": "~2.2.1",
"inherit": "~1.0.0",
"borschik": "~0.3.5",
"apw": "~0.3.9",
Expand Down
2 changes: 1 addition & 1 deletion test/bem-make.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var assert = require('chai').assert,
UTIL = require('util'),
PATH = require('path'),
Q = require('q'),
_ = require('underscore'),
_ = require('lodash/dist/lodash.underscore'),
QFS = require('q-io/fs'),

BEM = require('..'),
Expand Down

0 comments on commit 564aa05

Please sign in to comment.