Skip to content

Commit e7c59a9

Browse files
authored
Merge pull request #7 from bholloway/remove-lodash-dependency
remove lodash dependency
2 parents 179d8be + d1180e9 commit e7c59a9

File tree

6 files changed

+106
-175
lines changed

6 files changed

+106
-175
lines changed

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6

index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
*/
55
'use strict';
66

7-
var assign = require('lodash.assign');
8-
9-
module.exports = assign(require('./lib/loader'), {
7+
module.exports = Object.assign(require('./lib/loader'), {
108
moduleFilenameTemplate: require('./lib/module-filename-template'),
119
codec : require('./codec')
1210
});

lib/loader.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
var path = require('path');
44

55
var loaderUtils = require('loader-utils'),
6-
camelcase = require('camelcase'),
7-
defaults = require('lodash.defaults');
6+
camelcase = require('camelcase');
87

98
var PACKAGE_NAME = require('../package.json').name;
109

@@ -27,10 +26,11 @@ function loader(content, sourceMap) {
2726
// webpack 2: prefer loader options
2827
// webpack 3: deprecate loader.options object
2928
// webpack 4: loader.options no longer defined
30-
var options = defaults(
31-
{sep: path.sep},
29+
var options = Object.assign(
30+
{},
31+
this.options && this.options[camelcase(PACKAGE_NAME)],
3232
loaderUtils.getOptions(this),
33-
this.options && this.options[camelcase(PACKAGE_NAME)]
33+
{sep: path.sep}
3434
);
3535

3636
// process the source-map

lib/process/index.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
22

3-
var assign = require('lodash.assign'),
4-
defaults = require('lodash.defaults'),
5-
camelcase = require('camelcase');
3+
var camelcase = require('camelcase');
64

75
var debugMessage = require('./debug-message'),
86
toRegExp = require('./to-reg-exp'),
@@ -17,21 +15,21 @@ var CODECS = require('../../codec');
1715
/**
1816
* Process the given source-map per the given options.
1917
* @param {{resourcePath:string, context:string, output:{path:string}}} context A loader or compilation
20-
* @param {{debug:boolean, fail:boolean, format:string|boolean, root:string, codecs:object}} options Options hash
18+
* @param {{debug:boolean, fail:boolean, format:string|boolean, root:string, codecs:object}} opt Options hash
2119
* @param {object|string} sourceMapOrSource An incoming source-map or single source path
2220
* @returns {undefined|object|string} An amended source-map or source path else undefined
2321
*/
24-
function process(context, options, sourceMapOrSource) {
22+
function process(context, opt, sourceMapOrSource) {
2523

2624
// default options
27-
defaults(options, {
25+
var options = Object.assign({
2826
sep : '/',
2927
debug : false,
3028
fail : false,
3129
format: false,
3230
root : false,
3331
codecs: CODECS
34-
});
32+
}, opt);
3533

3634
// validate codecs
3735
var codecs = options.codecs
@@ -58,7 +56,7 @@ function process(context, options, sourceMapOrSource) {
5856
throwErrors(context.resourcePath, absoluteSources);
5957

6058
// output map is a copy unless absent or we are removing
61-
outputMap = (!inputMap || (options.format === 'remove')) ? undefined : assign({}, inputMap);
59+
outputMap = (!inputMap || (options.format === 'remove')) ? undefined : Object.assign({}, inputMap);
6260

6361
// some change in format
6462
if (options.format) {

0 commit comments

Comments
 (0)