Skip to content
Merged
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
7 changes: 7 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ All notable changes to this project will be documented in this file.

## unreleased

* Added
* SBOM result might have `component.scope=optional` populated for OptionalDependencies ([#645] via [#657])
* Fixed
* DevDependencies that are also required by OptionalDependencies correctly have the property [`cdx:npm:package:development`](https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/npm.md) populated in SBOM results ([#645] via [#657])
* DevDependencies that are also required by OptionalDependencies are correctly omitted from SBOM results, when the CLI switch for omitting "dev" and "optional" are set ([#645] via [#657])
* Docs
* Describe internal `npm` executable detection in README (via [#647])

[#645]: https://github.com/CycloneDX/cyclonedx-node-npm/issues/645
[#647]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/647
[#657]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/657

## 1.9.2 - 2023-03-30

Expand Down
4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.2.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.2.xml

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.3.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.3.xml

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.4.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/bare/bom.1.4.xml

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.2.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.2.xml

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.3.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.3.xml

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.4.json

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

4 changes: 2 additions & 2 deletions demo/bundled-dependencies/example-results/flat/bom.1.4.xml

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

39 changes: 36 additions & 3 deletions demo/dev-dependencies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ and see how they behave different from

## remarks

* The `optional` is `true` for optionalDependencies.
* The `optional` is absent for non-optionalDependencies.
* The `dev` is `true` for devDependencies.
* The `dev` is absent for non-devDependencies.
* The `devOptional` is `true` for devDependencies that are also transitive dependencies from optionalDependencies.
* npm6: `_development` instead of `dev`.
* npm6: `_optional` instead of `optional`.

## output

Expand All @@ -24,17 +28,46 @@ Output of `npm ls --json -a -l` look like this:
{
"name": "demo-dev-dependencies",
"description": "demo: demo-dev-dependencies -- showcase how workspaces look like",
"optionalDependencies": {
"uuidv4": "^6.2.13"
},
"devDependencies": {
"@types/node": ">=16"
"@types/node": ">=16",
"@types/uuid": "^8",
"uuid": "^8"
},
"path": "/home/flow/Documents/Coding/node/cyclonedx-node-npm/demo/dev-dependencies/project",
"path": ".../cyclonedx-node-npm/demo/dev-dependencies/project",
// other properties
"dependencies": {
"@types/node": {
"name": "@types/node",
"dev": true,
"path": "/home/flow/Documents/Coding/node/cyclonedx-node-npm/demo/dev-dependencies/project/node_modules/@types/node",
"path": ".../demo/dev-dependencies/project/node_modules/@types/node",
// other properties
},
"@types/uuid": {
// ...
},
"uuid": {
"name": "uuid",
"devOptional": true,
"path": ".../demo/dev-dependencies/project/node_modules/uuid",
// other properties
},
"uuidv4": {
"name": "uuidv4",
"optional": true,
"path": ".../demo/dev-dependencies/project/node_modules/uuidv4",
// other properties
"dependencies": {
"uuid": {
"name": "uuid",
"devOptional": true,
"path": ".../demo/dev-dependencies/project/node_modules/uuid",
// other properties
},
// ...
}
}
}
}
Expand Down
Loading