From 501c45b766ecc315651e340928e6358a399037a9 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Fri, 29 Apr 2022 14:18:42 +0100 Subject: [PATCH] Add support for Node 16 (#571) Signed-off-by: Mark S. Lewis --- azure-pipelines.yml | 2 ++ docs/index.md | 2 +- fabric-ca-client/package.json | 3 +-- fabric-common/package.json | 3 +-- fabric-network/package.json | 3 +-- fabric-protos/package.json | 3 +-- test/ts-scenario/tsconfig.json | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3738bd4281..cfb2c6ac28 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,6 +48,8 @@ stages: versionSpec: '12.x' Node14: versionSpec: '14.x' + Node16: + versionSpec: '16.x' steps: - task: NodeTool@0 inputs: diff --git a/docs/index.md b/docs/index.md index de33e47b1e..a54678ff9a 100755 --- a/docs/index.md +++ b/docs/index.md @@ -35,7 +35,7 @@ The following tables show versions of Fabric, Node and other dependencies that a | | Tested | Supported | | --- | ------ | --------- | | **Fabric** | 2.2 | 2.2 | -| **Node** | 10, 12, 14 | 10 LTS, 12 LTS, 14 LTS | +| **Node** | 10, 12, 14, 16 | 10 LTS, 12 LTS, 14 LTS, 16 LTS | | **Platform** | Ubuntu 20.04 | | diff --git a/fabric-ca-client/package.json b/fabric-ca-client/package.json index c355d278f6..b0d6ba5632 100644 --- a/fabric-ca-client/package.json +++ b/fabric-ca-client/package.json @@ -15,8 +15,7 @@ "url": "https://github.com/hyperledger/fabric-sdk-node" }, "engines": { - "node": "^10.15.3 || ^12.13.1 || ^14.13.1", - "npm": "^6.4.1" + "node": ">=10.13.0" }, "types": "./types/index.d.ts", "dependencies": { diff --git a/fabric-common/package.json b/fabric-common/package.json index ebbc6a334f..b4b0127c4e 100644 --- a/fabric-common/package.json +++ b/fabric-common/package.json @@ -20,8 +20,7 @@ "test": "nyc mocha --exclude 'test/data/**/*.js' --recursive -t 10000" }, "engines": { - "node": "^10.15.3 || ^12.13.1 || ^14.13.1", - "npm": "^6.4.1" + "node": ">=10.13.0" }, "types": "./types/index.d.ts", "dependencies": { diff --git a/fabric-network/package.json b/fabric-network/package.json index 3134fa1006..16aec89b1a 100644 --- a/fabric-network/package.json +++ b/fabric-network/package.json @@ -20,8 +20,7 @@ "test": "nyc mocha --recursive -t 10000" }, "engines": { - "node": "^10.15.3 || ^12.13.1 || ^14.13.1", - "npm": "^6.4.1" + "node": ">=10.13.0" }, "types": "./types/index.d.ts", "dependencies": { diff --git a/fabric-protos/package.json b/fabric-protos/package.json index 1df5a5c1a1..01e861458a 100644 --- a/fabric-protos/package.json +++ b/fabric-protos/package.json @@ -16,8 +16,7 @@ "url": "https://github.com/hyperledger/fabric-sdk-node" }, "engines": { - "node": "^10.15.3 || ^12.13.1 || ^14.13.1", - "npm": "^6.4.1" + "node": ">=10.13.0" }, "keywords": [ "hyperledger", diff --git a/test/ts-scenario/tsconfig.json b/test/ts-scenario/tsconfig.json index 05730fe831..d6da1b0377 100644 --- a/test/ts-scenario/tsconfig.json +++ b/test/ts-scenario/tsconfig.json @@ -1,7 +1,7 @@ { + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "@tsconfig/node10/tsconfig.json", "compilerOptions": { - "module": "commonjs", - "target": "es2017", "sourceMap": true, "strict": true, "experimentalDecorators": true