From 4a1860ed12561a5e4e169f42794b6291a746669c Mon Sep 17 00:00:00 2001 From: fraVlaca <86831094+fraVlaca@users.noreply.github.com> Date: Fri, 11 Feb 2022 08:19:48 +0000 Subject: [PATCH] enable support for node 14 - node engine >=14.19.0 (#1219) Signed-off-by: fraVlaca --- azure-pipelines.yml | 8 ++++---- package.json | 4 ++-- packages/caliper-cli/lib/lib/config.yaml | 4 ++-- packages/caliper-cli/package.json | 4 ++-- packages/caliper-core/package.json | 4 ++-- packages/caliper-ethereum/package.json | 4 ++-- packages/caliper-fabric/package.json | 12 ++++++------ packages/caliper-fisco-bcos/package.json | 4 ++-- packages/caliper-gui-dashboard/package.json | 4 ++-- packages/caliper-gui-server/package.json | 4 ++-- packages/caliper-publish/package.json | 4 ++-- packages/caliper-tests-integration/package.json | 4 ++++ packages/generator-caliper/package.json | 4 ++-- 13 files changed, 34 insertions(+), 30 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index deb0d4a08..fa0b53938 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,7 +23,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: "10.x" + versionSpec: "14.x" displayName: "Install Node.js" - script: | ./scripts/check-package-names.sh @@ -50,7 +50,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: "10.x" + versionSpec: "14.x" displayName: "Install Node.js" - script: | .build/benchmark-integration-test-direct.sh @@ -61,7 +61,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: "10.x" + versionSpec: "14.x" displayName: "Install Node.js" - script: | .build/benchmark-integration-test-direct.sh @@ -109,7 +109,7 @@ stages: steps: - task: NodeTool@0 inputs: - versionSpec: "10.x" + versionSpec: "14.x" displayName: "Install Node.js" - script: .build/publish-caliper.sh displayName: Publish Caliper diff --git a/package.json b/package.json index 772651ce4..ad733ea24 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "force-clean": "./scripts/force-clean.sh" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": {}, "devDependencies": { diff --git a/packages/caliper-cli/lib/lib/config.yaml b/packages/caliper-cli/lib/lib/config.yaml index 903ec23a2..beee5cb57 100644 --- a/packages/caliper-cli/lib/lib/config.yaml +++ b/packages/caliper-cli/lib/lib/config.yaml @@ -43,9 +43,9 @@ sut: settings: - *new-node-old-grpc 1.4.11: - packages: ['fabric-client@1.4.11', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.11','fs-extra@8.1.0'] + packages: ['fabric-client@1.4.11', 'fabric-protos@2.1.0', 'fabric-network@1.4.11','fs-extra@8.1.0'] 1.4.14: &fabric-v1-lts - packages: ['fabric-client@1.4.14', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.14','fs-extra@8.1.0'] + packages: ['fabric-client@1.4.14', 'fabric-protos@2.1.0', 'fabric-network@1.4.14','fs-extra@8.1.0'] 1.4: *fabric-v1-lts 2.1.0: &fabric-v2-2.1 packages: ['fabric-common@2.1.0', 'fabric-protos@2.1.0', 'fabric-network@2.1.0', 'fabric-ca-client@2.1.0'] diff --git a/packages/caliper-cli/package.json b/packages/caliper-cli/package.json index fc6f54659..8fa7fe7dc 100644 --- a/packages/caliper-cli/package.json +++ b/packages/caliper-cli/package.json @@ -22,8 +22,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@hyperledger/caliper-core": "0.4.3-unstable", diff --git a/packages/caliper-core/package.json b/packages/caliper-core/package.json index 6879b364c..ab5cec97f 100644 --- a/packages/caliper-core/package.json +++ b/packages/caliper-core/package.json @@ -18,8 +18,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "color-scheme": "^1.0.1", diff --git a/packages/caliper-ethereum/package.json b/packages/caliper-ethereum/package.json index 4f4a6b921..722980a6f 100644 --- a/packages/caliper-ethereum/package.json +++ b/packages/caliper-ethereum/package.json @@ -18,8 +18,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@hyperledger/caliper-core": "0.4.3-unstable", diff --git a/packages/caliper-fabric/package.json b/packages/caliper-fabric/package.json index 9f5266701..53372a1b0 100644 --- a/packages/caliper-fabric/package.json +++ b/packages/caliper-fabric/package.json @@ -18,8 +18,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@hapi/joi": "^15.1.1", @@ -27,10 +27,10 @@ "semver": "7.1.1" }, "devDependencies": { - "fabric-ca-client": "^1.4.7", - "fabric-client": "^1.4.7", - "fabric-network": "^1.4.7", - "fabric-protos": "2.0.0-snapshot.1", + "fabric-ca-client": "^1.4.19", + "fabric-client": "^1.4.19", + "fabric-network": "^1.4.19", + "fabric-protos": "2.1.0", "chai": "^3.5.0", "chai-as-promised": "^7.1.1", "eslint": "^5.16.0", diff --git a/packages/caliper-fisco-bcos/package.json b/packages/caliper-fisco-bcos/package.json index 4339fa9d3..b685fa868 100644 --- a/packages/caliper-fisco-bcos/package.json +++ b/packages/caliper-fisco-bcos/package.json @@ -18,8 +18,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@hyperledger/caliper-core": "0.4.3-unstable", diff --git a/packages/caliper-gui-dashboard/package.json b/packages/caliper-gui-dashboard/package.json index 2453e6e6d..93bb533b1 100755 --- a/packages/caliper-gui-dashboard/package.json +++ b/packages/caliper-gui-dashboard/package.json @@ -23,8 +23,8 @@ "map-sass": "node-sass src/assets/scss/paper-dashboard.scss src/assets/css/paper-dashboard.css --source-map true" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.27", diff --git a/packages/caliper-gui-server/package.json b/packages/caliper-gui-server/package.json index b6fd569a8..34bf15609 100644 --- a/packages/caliper-gui-server/package.json +++ b/packages/caliper-gui-server/package.json @@ -18,8 +18,8 @@ "start": "node app.js" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "@hyperledger/caliper-core": "0.4.3-unstable", diff --git a/packages/caliper-publish/package.json b/packages/caliper-publish/package.json index 464c116f2..7e34d0ae0 100644 --- a/packages/caliper-publish/package.json +++ b/packages/caliper-publish/package.json @@ -17,8 +17,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "dependencies": { "yargs": "15.3.1" diff --git a/packages/caliper-tests-integration/package.json b/packages/caliper-tests-integration/package.json index ad29025d4..de1f211f7 100644 --- a/packages/caliper-tests-integration/package.json +++ b/packages/caliper-tests-integration/package.json @@ -3,6 +3,10 @@ "version": "0.4.3-unstable", "private": true, "description": "Integration tests for Hyperledger Caliper", + "engines": { + "node": ">=14.19.0", + "npm": ">=6.14.16" + }, "scripts": { "cleanup": "./scripts/cleanup.sh", "start_verdaccio": "npm run cleanup && ./scripts/start-verdaccio.sh", diff --git a/packages/generator-caliper/package.json b/packages/generator-caliper/package.json index bae5f69f0..972b5edd4 100644 --- a/packages/generator-caliper/package.json +++ b/packages/generator-caliper/package.json @@ -22,8 +22,8 @@ "nyc": "nyc mocha --recursive -t 10000" }, "engines": { - "node": ">=10.22.0", - "npm": ">=6.14.0" + "node": ">=14.19.0", + "npm": ">=6.14.16" }, "files": [ "generators"