New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: use Arborist for dedupe and prune #1395
Closed
+44
−20
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,24 @@ | ||
// dedupe duplicated packages, or find them in the tree | ||
const util = require('util') | ||
const npm = require('./npm.js') | ||
const Arborist = require('@npmcli/arborist') | ||
const rimraf = util.promisify(require('rimraf')) | ||
const reifyOutput = require('./utils/reify-output.js') | ||
const usageUtil = require('./utils/usage.js') | ||
const reifyOutput = require('./utils/reify-output.js') | ||
|
||
const usage = usageUtil('dedupe', 'npm dedupe') | ||
|
||
const completion = (cb) => cb(null, []) | ||
|
||
const cmd = (args, cb) => dedupe(args).then(() => cb()).catch(cb) | ||
|
||
const dedupe = async args => { | ||
require('npmlog').warn('coming soon!') | ||
throw new Error('not yet implemented') | ||
const dedupe = async (args) => { | ||
const dryRun = args.dryRun || npm.flatOptions.dryRun | ||
const where = npm.prefix | ||
const arb = new Arborist({ | ||
...npm.flatOptions, | ||
path: where, | ||
dryRun | ||
}) | ||
await arb.dedupe() | ||
claudiahdz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
reifyOutput(arb) | ||
} | ||
|
||
module.exports = Object.assign(cmd, { usage, completion }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// dedupe duplicated packages, or find them in the tree | ||
const dedupe = require('./dedupe.js') | ||
const usageUtil = require('./utils/usage.js') | ||
|
||
const usage = usageUtil('find-dupes', 'npm find-dupes') | ||
const completion = (cb) => cb(null, []) | ||
const cmd = (args, cb) => dedupe({ dryRun: true } , cb) | ||
|
||
module.exports = Object.assign(cmd, { usage, completion }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,25 @@ | ||
// prune extraneous packages. | ||
const util = require('util') | ||
// prune extraneous packages | ||
const npm = require('./npm.js') | ||
const Arborist = require('@npmcli/arborist') | ||
const rimraf = util.promisify(require('rimraf')) | ||
const reifyOutput = require('./utils/reify-output.js') | ||
const usageUtil = require('./utils/usage.js') | ||
|
||
const usage = usageUtil('prune', | ||
'npm prune [[<@scope>/]<pkg>...] [--production]') | ||
const reifyOutput = require('./utils/reify-output.js') | ||
|
||
const completion = require('./utils/completion/installed-deep.js') | ||
const usage = usageUtil('prune', | ||
'npm prune [[<@scope>/]<pkg>...] [--production]' | ||
) | ||
const completion = (cb) => cb(null, []) | ||
|
||
const cmd = (args, cb) => prune(args).then(() => cb()).catch(cb) | ||
const cmd = (args, cb) => prune().then(() => cb()).catch(cb) | ||
|
||
const prune = async args => { | ||
require('npmlog').warn('coming soon!') | ||
throw new Error('not yet implemented') | ||
const prune = async () => { | ||
const where = npm.prefix | ||
const arb = new Arborist({ | ||
...npm.flatOptions, | ||
path: where | ||
}) | ||
await arb.prune() | ||
claudiahdz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
reifyOutput(arb) | ||
} | ||
|
||
module.exports = Object.assign(cmd, { usage, completion }) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh if
npm find-dupes
is now a top-level command it'd be nice to also add docs for it and a link below in the See Also section of this file 👇There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure about creating a new docs file for this command since it is essentially the same as
dedupe
only on dryRun mode. What do you think about just pointing thefind-dupes
docs to thededupe
docs?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right! sounds good 👍