Skip to content
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.

Sign up for GitHub

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

Drop Node.js 8.0 support #84

Merged
merged 9 commits into from
Jun 28, 2021
+1,045 −1,366
Merged

Drop Node.js 8.0 support #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d185f2
Drop Node.js 8.0 support
coderpatros Sep 4, 2020
18377d0
Merge branch 'master' into drop-node8
coderpatros Sep 4, 2020
bf2a781
Bump jest from 25.5.4 to 26.4.2
dependabot-preview[bot] Sep 4, 2020
1c3620b
Run npm ci in test helper script
coderpatros Sep 4, 2020
0caf3bd
Bump xmlbuilder from 13.0.2 to 15.1.1
dependabot-preview[bot] Sep 4, 2020
2771c17
Update test snapshots for slightly different behaviour in xmlbuilder
coderpatros Sep 4, 2020
7bfd61e
Bump uuid from 3.4.0 to 8.3.0
coderpatros Sep 4, 2020
2108b62
Update uuid reference
coderpatros Sep 4, 2020
82c4b17
Merge branch 'master' into drop-node8
stevespringett Jun 28, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [8.x, 10.x, 12.x, 14.x]
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2.3.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2.1.5
with:
node-version: 14.x
node-version: 10.x

- name: Configure Git
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The CycloneDX module for Node.js creates a valid CycloneDX Software Bill-of-Mate

Requirements
-------------------
Node.js v8.0.0 or higher
Node.js v10.0.0 or higher

Usage
-------------------
Expand Down
4 changes: 2 additions & 2 deletions model/Bom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Copyright (c) Steve Springett. All Rights Reserved.
*/
const builder = require('xmlbuilder');
const uuidv4 = require('uuid/v4');
const uuid = require('uuid');
const Component = require('./Component');
const CycloneDXObject = require('./CycloneDXObject');
const Metadata = require('./Metadata');
Expand All @@ -34,7 +34,7 @@ class Bom extends CycloneDXObject {
this._includeLicenseText = includeLicenseText;
this._version = 1;
if (includeSerialNumber) {
this._serialNumber = 'urn:uuid:' + uuidv4();
this._serialNumber = 'urn:uuid:' + uuid.v4();
}
if (pkg) {
this._metadata = this.createMetadata(pkg, componentType);
Expand Down
1,602 changes: 800 additions & 802 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"test": "jest"
},
"engines": {
"node": ">=8.0.0"
"node": ">=10.0.0"
},
"repository": {
"type": "git",
Expand All @@ -55,8 +55,8 @@
"prettify-xml": "^1.2.0",
"read-installed": "^4.0.3",
"ssri": "^8.0.0",
"uuid": "^3.3.2",
"xmlbuilder": "^13.0.2",
"uuid": "^8.3.0",
"xmlbuilder": "^15.1.1",
"xmldom": "^0.6.0"
},
"files": [
Expand All @@ -66,6 +66,6 @@
"spdx-licenses.json"
],
"devDependencies": {
"jest": "^25.5.4"
"jest": "^26.4.2"
}
}
1 change: 1 addition & 0 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
npm ci
cd tests/with-packages
npm ci
cd ..
Expand Down
Loading