Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
prabhu committed May 3, 2024
1 parent 2895b92 commit 26a892a
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 61 deletions.
6 changes: 3 additions & 3 deletions deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "10.5.0",
"version": "10.5.1",
"exports": "./index.js",
"compilerOptions": {
"allowJs": true,
Expand Down Expand Up @@ -46,8 +46,8 @@
"@appthreat/cdx-proto": "npm:@appthreat/[email protected]",
"@babel/parser": "npm:@babel/parser@^7.24.5",
"@babel/traverse": "npm:@babel/traverse@^7.24.5",
"@npmcli/arborist": "npm:@npmcli/[email protected].0",
"ajv": "npm:ajv@^8.12.0",
"@npmcli/arborist": "npm:@npmcli/[email protected].1",
"ajv": "npm:ajv@^8.13.0",
"ajv-formats": "npm:ajv-formats@^3.0.1",
"cheerio": "npm:cheerio@^1.0.0-rc.12",
"edn-data": "npm:[email protected]",
Expand Down
4 changes: 4 additions & 0 deletions docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ export const getConnection = async (options, forRegistry) => {
"Ensure Docker for Desktop is running as an administrator with 'Exposing daemon on TCP without TLS' setting turned on.",
opts,
);
} else if (_platform() === "darwin") {
console.warn(
"Ensure Podman Desktop (open-source) or Docker for Desktop (May require subscription) is running.",
);
} else {
console.warn(
"Ensure docker/podman service or Docker for Desktop is running.",
Expand Down
2 changes: 1 addition & 1 deletion jsr.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "10.5.0",
"version": "10.5.1",
"exports": "./index.js",
"include": ["*.js", "bin/**", "data/**", "types/**"],
"exclude": ["test/", "docs/", "contrib/", "ci/", "tools_config/"]
Expand Down
128 changes: 77 additions & 51 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "10.5.0",
"version": "10.5.1",
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
"homepage": "http://github.com/cyclonedx/cdxgen",
"author": "Prabhu Subramanian <[email protected]>",
Expand Down Expand Up @@ -59,8 +59,8 @@
"dependencies": {
"@babel/parser": "^7.24.5",
"@babel/traverse": "^7.24.5",
"@npmcli/arborist": "7.5.0",
"ajv": "^8.12.0",
"@npmcli/arborist": "7.5.1",
"ajv": "^8.13.0",
"ajv-formats": "^3.0.1",
"cheerio": "^1.0.0-rc.12",
"edn-data": "1.1.1",
Expand Down Expand Up @@ -102,7 +102,7 @@
},
"files": ["*.js", "bin/", "data/", "types/"],
"devDependencies": {
"@biomejs/biome": "1.7.1",
"@biomejs/biome": "1.7.2",
"jest": "^29.7.0",
"typescript": "^5.4.5"
}
Expand Down
7 changes: 7 additions & 0 deletions utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,18 @@ if (process.env.SWIFT_CMD) {
SWIFT_CMD = process.env.SWIFT_CMD;
}

// HTTP cache
const gotHttpCache = new Map();

// Custom user-agent for cdxgen
export const cdxgenAgent = got.extend({
headers: {
"user-agent": `@CycloneDX/cdxgen ${_version}`,
},
cache: gotHttpCache,
retry: {
limit: 0,
},
});

/**
Expand Down
4 changes: 2 additions & 2 deletions utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2220,8 +2220,8 @@ test("parsePkgLock v3", async () => {
projectName: "cdxgen",
});
deps = parsedList.pkgList;
expect(deps.length).toEqual(840);
expect(parsedList.dependenciesList.length).toEqual(840);
expect(deps.length).toEqual(842);
expect(parsedList.dependenciesList.length).toEqual(842);
});

test("parseBowerJson", async () => {
Expand Down

0 comments on commit 26a892a

Please sign in to comment.