From 9e92537969e966b8164d61103fd60f4d1beb5212 Mon Sep 17 00:00:00 2001 From: Raine Revere Date: Wed, 21 Dec 2022 19:20:43 +0000 Subject: [PATCH] Remove erroneous --dep bundle option (#1256). --- CHANGELOG.md | 2 +- README.md | 4 ++-- src/cli-options.ts | 4 ++-- src/lib/doctor.ts | 1 - src/lib/getCurrentDependencies.ts | 4 ++-- src/lib/upgradePackageData.ts | 2 +- src/types/PackageFile.ts | 1 - src/types/RunOptions.ts | 2 +- test/getCurrentDependencies.test.ts | 15 ++++----------- 9 files changed, 13 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf7be4d7..09a878c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,7 +59,7 @@ If you have a use case where this change is not what is desired, please [report ### Breaking - node >= 12 is required. Time to upgrade that old-ass server you never touch. -- `peerDependencies` are now excluded by default. Peer dependencies should use the **lowest** possible version that works. The old behavior encouraged a bad practice of uprading peer dependencies. You can use `--dep prod,dev,bundle,optional,peer` for the old behavior ([#951](https://github.com/raineorshine/npm-check-updates/issues/951)). +- `peerDependencies` are now excluded by default. Peer dependencies should use the **lowest** possible version that works. The old behavior encouraged a bad practice of uprading peer dependencies. You can use `--dep prod,dev,optional,peer` for the old behavior ([#951](https://github.com/raineorshine/npm-check-updates/issues/951)). - Dependencies with `>` will be converted to `>=`. The old behavior was causing upgrades to `> [latest]` which was impossible ([#957](https://github.com/raineorshine/npm-check-updates/issues/957)). ## Other diff --git a/README.md b/README.md index a9cf951f..d649af73 100644 --- a/README.md +++ b/README.md @@ -150,9 +150,9 @@ ncu "/^(?!react-).*$/" # windows --deep Run recursively in current working directory. Alias of (--packageFile '**/package.json'). --dep Check one or more sections of dependencies only: - dev, optional, peer, prod, bundle, packageManager + dev, optional, peer, prod, or packageManager (comma-delimited). (default: - ["prod","dev","bundle","optional"]) + ["prod","dev","optional"]) --deprecated Include deprecated packages. -d, --doctor Iteratively installs upgrades and runs tests to identify breaking upgrades. Requires "-u" to diff --git a/src/cli-options.ts b/src/cli-options.ts index 56b6e83a..01caa53f 100755 --- a/src/cli-options.ts +++ b/src/cli-options.ts @@ -375,8 +375,8 @@ const cliOptions: CLIOption[] = [ long: 'dep', arg: 'value', description: - 'Check one or more sections of dependencies only: dev, optional, peer, prod, bundle, packageManager (comma-delimited).', - default: ['prod', 'dev', 'bundle', 'optional'], + 'Check one or more sections of dependencies only: dev, optional, peer, prod, or packageManager (comma-delimited).', + default: ['prod', 'dev', 'optional'], parse: value => (value && typeof value === 'string' ? value.split(',') : value), type: 'string | string[]', }, diff --git a/src/lib/doctor.ts b/src/lib/doctor.ts index b6162767..a72da4e3 100644 --- a/src/lib/doctor.ts +++ b/src/lib/doctor.ts @@ -88,7 +88,6 @@ const doctor = async (run: Run, options: Options): Promise => { ...pkg.dependencies, ...pkg.devDependencies, ...pkg.optionalDependencies, - ...pkg.bundleDependencies, } /** Install dependencies using "npm run install" or a custom script given by --doctorInstall. */ diff --git a/src/lib/getCurrentDependencies.ts b/src/lib/getCurrentDependencies.ts index 01d061bb..7107c097 100644 --- a/src/lib/getCurrentDependencies.ts +++ b/src/lib/getCurrentDependencies.ts @@ -24,7 +24,7 @@ const parsePackageManager = (pkgData: PackageFile) => { /** * Get the current dependencies from the package file. * - * @param [pkgData={}] Object with dependencies, devDependencies, peerDependencies, optionalDependencies, and/or bundleDependencies properties + * @param [pkgData={}] Object with dependencies, devDependencies, peerDependencies, and/or optionalDependencies properties. * @param [options={}] * @param options.dep * @param options.filter @@ -36,7 +36,7 @@ function getCurrentDependencies(pkgData: PackageFile = {}, options: Options = {} ? typeof options.dep === 'string' ? options.dep.split(',') : options.dep - : ['prod', 'dev', 'bundle', 'optional'] + : ['prod', 'dev', 'optional'] // map the dependency section option to a full dependency section name const depSections = depOptions.map( diff --git a/src/lib/upgradePackageData.ts b/src/lib/upgradePackageData.ts index 1ece7469..914090c0 100644 --- a/src/lib/upgradePackageData.ts +++ b/src/lib/upgradePackageData.ts @@ -29,7 +29,7 @@ async function upgradePackageData( ? typeof options.dep === 'string' ? options.dep.split(',') : options.dep - : ['prod', 'dev', 'bundle', 'optional'] + : ['prod', 'dev', 'optional'] // map the dependency section option to a full dependency section name const depSections = depOptions.map( diff --git a/src/types/PackageFile.ts b/src/types/PackageFile.ts index 9204e92d..0d1e6b29 100644 --- a/src/types/PackageFile.ts +++ b/src/types/PackageFile.ts @@ -4,7 +4,6 @@ import { VersionSpec } from './VersionSpec' /** The relevant bits of a parsed package.json file. */ export interface PackageFile { - bundleDependencies?: Index dependencies?: Index devDependencies?: Index engines?: Index diff --git a/src/types/RunOptions.ts b/src/types/RunOptions.ts index 9451692e..9dd03d4a 100644 --- a/src/types/RunOptions.ts +++ b/src/types/RunOptions.ts @@ -36,7 +36,7 @@ export interface RunOptions { /** Run recursively in current working directory. Alias of (--packageFile '**\/package.json'). */ deep?: boolean - /** Check one or more sections of dependencies only: dev, optional, peer, prod, bundle, packageManager (comma-delimited). (default: ["prod","dev","bundle","optional"]) */ + /** Check one or more sections of dependencies only: dev, optional, peer, prod, or packageManager (comma-delimited). (default: ["prod","dev","optional"]) */ dep?: string | string[] /** Include deprecated packages. */ diff --git a/test/getCurrentDependencies.test.ts b/test/getCurrentDependencies.test.ts index 0bc07a60..56f9abe6 100644 --- a/test/getCurrentDependencies.test.ts +++ b/test/getCurrentDependencies.test.ts @@ -10,6 +10,7 @@ describe('getCurrentDependencies', () => { beforeEach(() => { deps = { dependencies: { + bluebird: '^1.0.0', mocha: '1.2', }, devDependencies: { @@ -22,9 +23,6 @@ describe('getCurrentDependencies', () => { optionalDependencies: { chalk: '^1.1.0', }, - bundleDependencies: { - bluebird: '^1.0.0', - }, } }) @@ -34,12 +32,12 @@ describe('getCurrentDependencies', () => { getCurrentDependencies({}, {}).should.eql({}) }) - it('get dependencies, devDependencies, and bundleDependencies, and optionalDependencies by default', () => { + it('get dependencies, devDependencies, and optionalDependencies by default', () => { getCurrentDependencies(deps).should.eql({ + bluebird: '^1.0.0', mocha: '1.2', lodash: '^3.9.3', chalk: '^1.1.0', - bluebird: '^1.0.0', moment: '^1.0.0', }) }) @@ -47,6 +45,7 @@ describe('getCurrentDependencies', () => { describe('dep', () => { it('only get dependencies with --dep prod', () => { getCurrentDependencies(deps, { dep: 'prod' }).should.eql({ + bluebird: '^1.0.0', mocha: '1.2', }) }) @@ -70,12 +69,6 @@ describe('getCurrentDependencies', () => { }) }) - it('only get bundleDependencies with --dep bundle', () => { - getCurrentDependencies(deps, { dep: 'bundle' }).should.eql({ - bluebird: '^1.0.0', - }) - }) - it('only get devDependencies and peerDependencies with --dep dev,peer', () => { getCurrentDependencies(deps, { dep: 'dev,peer' }).should.eql({ lodash: '^3.9.3',