Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const { Readable } = require('stream');
const {
dedupeList,
findNodeModules,
findUsedModules,
toRelativeModulePath,
Expand All @@ -13,8 +14,9 @@ const {
const params = parseArgs(process.argv);

const handler = params.entry ? handleEntry : handlePackJSON;
const result = (await handler(params))
const rawResult = (await handler(params))
.map(toRelativeModulePath);
const result = dedupeList(rawResult);
if (params.zip) zip(result, params);

const output = formatOutput(result, params);
Expand Down
21 changes: 21 additions & 0 deletions lib/dedupe-list.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const path = require('path');

module.exports = dedupeList;

function dedupeList (list) {
const sorted = [...list].sort();
const seen = {};
return sorted.filter((item) => {
const parts = item.split(path.sep);
let dupe = seen[item];
while (!dupe && parts.length > 1) {
if (seen[parts.join(path.sep)]) {
dupe = true;
} else {
parts.pop();
}
}
seen[item] = true;
return !dupe;
});
}
30 changes: 30 additions & 0 deletions lib/dedupe-list.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const dedupeList = require('./dedupe-list');

describe('dedupeList', () => {
it('should sort and dedupe paths (and subpaths)', () => {
expect(dedupeList([
'../../node_modules/aws-serverless-express',
'../../node_modules/send/node_modules/ms',
'../../node_modules/express',
'../../node_modules/send/node_modules/http-errors',
'../../node_modules/morgan',
'../../node_modules/cookie-signature',
'../../node_modules/send',
'../../node_modules/morgan',
'../../node_modules/cookie/node_modules/something',
'../../node_modules/cors',
'../../node_modules/morgan',
'../../node_modules/send/node_modules/ms',
'../../node_modules/morgan',
'../../node_modules/cookie'
])).toEqual([
'../../node_modules/aws-serverless-express',
'../../node_modules/cookie',
'../../node_modules/cookie-signature',
'../../node_modules/cors',
'../../node_modules/express',
'../../node_modules/morgan',
'../../node_modules/send'
]);
});
});
1 change: 1 addition & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports.dedupeList = require('./dedupe-list');
module.exports.findNodeModules = require('./find-node-modules');
module.exports.findUsedModules = require('./find-used-modules');
module.exports.toRelativeModulePath = require('./to-relative-module-path');
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

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