include-all
Advanced tools
Comparing version 2.0.0 to 3.0.0
@@ -6,3 +6,4 @@ /** | ||
var path = require('path'); | ||
var _ = require('lodash'); | ||
var _ = require('@sailshq/lodash'); | ||
var mergeDictionaries = require('merge-dictionaries'); | ||
var helpIncludeAllSync = require('./help-include-all-sync'); | ||
@@ -63,4 +64,5 @@ | ||
// Merge module into dictionary | ||
_.merge(dictionary, module); | ||
// Merge module into dictionary, using our custom merge strategy for the merge-dictionaries module | ||
// to prevent issues with empty dictionaries and arrays (see highlvl "edge case" tests) | ||
mergeDictionaries(dictionary, module); | ||
@@ -67,0 +69,0 @@ return; |
@@ -7,3 +7,3 @@ /** | ||
var fs = require('fs'); | ||
var _ = require('lodash'); | ||
var _ = require('@sailshq/lodash'); | ||
@@ -10,0 +10,0 @@ |
{ | ||
"name": "include-all", | ||
"version": "2.0.0", | ||
"version": "3.0.0", | ||
"description": "An easy way to include all node.js modules within a directory.", | ||
@@ -26,3 +26,4 @@ "main": "index.js", | ||
"dependencies": { | ||
"lodash": "3.10.1" | ||
"merge-dictionaries": "0.0.1", | ||
"@sailshq/lodash": "^3.10.2" | ||
}, | ||
@@ -29,0 +30,0 @@ "devDependencies": { |
@@ -338,3 +338,3 @@ # include-all | ||
Please observe the guidelines and conventions laid out in the [Sails project contribution guide](http://sailsjs.com/contribute) when opening issues or submitting pull requests. | ||
Please observe the guidelines and conventions laid out in the [Sails project contribution guide](http://sailsjs.com/documentation/contributing) when opening issues or submitting pull requests. | ||
@@ -341,0 +341,0 @@ [![NPM](https://nodei.co/npm/include-all.png?downloads=true)](http://npmjs.com/package/include-all) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
35175
499
2
+ Added@sailshq/lodash@^3.10.2
+ Addedmerge-dictionaries@0.0.1
+ Added@sailshq/lodash@3.10.6(transitive)
+ Addedmerge-dictionaries@0.0.1(transitive)
- Removedlodash@3.10.1
- Removedlodash@3.10.1(transitive)