mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-26 03:25:09 +00:00
063ad60ddf
The latest version (2.1.2) of sort-keys-recursive adds TypeScript
typing, which includes export default function.
This change has caused the TS2349 type error.
This patch modifies the import form in assetTransfer.ts to fix the error.
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
(cherry picked from commit 8c1c36ae09)
# Conflicts:
# asset-transfer-basic/chaincode-javascript/package.json
# asset-transfer-basic/chaincode-typescript/package.json
# asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
68 lines
1.8 KiB
JSON
68 lines
1.8 KiB
JSON
{
|
|
"name": "asset-transfer-basic",
|
|
"version": "1.0.0",
|
|
"description": "Asset Transfer Basic contract implemented in TypeScript",
|
|
"main": "dist/index.js",
|
|
"typings": "dist/index.d.ts",
|
|
"engines": {
|
|
"node": ">=12",
|
|
"npm": ">=5"
|
|
},
|
|
"scripts": {
|
|
"lint": "tslint -c tslint.json 'src/**/*.ts'",
|
|
"pretest": "npm run lint",
|
|
"test": "nyc mocha -r ts-node/register src/**/*.spec.ts",
|
|
"start": "fabric-chaincode-node start",
|
|
"build": "tsc",
|
|
"build:watch": "tsc -w",
|
|
"prepublishOnly": "npm run build"
|
|
},
|
|
"engineStrict": true,
|
|
"author": "Hyperledger",
|
|
"license": "Apache-2.0",
|
|
"dependencies": {
|
|
"fabric-contract-api": "^2.0.0",
|
|
<<<<<<< HEAD
|
|
"fabric-shim": "^2.0.0"
|
|
=======
|
|
"fabric-shim": "^2.0.0",
|
|
"json-stringify-deterministic": "^1.0.0",
|
|
"sort-keys-recursive": "^2.1.2"
|
|
>>>>>>> 8c1c36a (Fix type error when using the latest sort-keys-recursive)
|
|
},
|
|
"devDependencies": {
|
|
"@types/chai": "^4.1.7",
|
|
"@types/mocha": "^5.2.5",
|
|
"@types/node": "^10.12.10",
|
|
"@types/sinon": "^5.0.7",
|
|
"@types/sinon-chai": "^3.2.1",
|
|
"chai": "^4.2.0",
|
|
"mocha": "^5.2.0",
|
|
"nyc": "^14.1.1",
|
|
"sinon": "^7.1.1",
|
|
"sinon-chai": "^3.3.0",
|
|
"ts-node": "^7.0.1",
|
|
"tslint": "^5.11.0",
|
|
"typescript": "^3.1.6"
|
|
},
|
|
"nyc": {
|
|
"extension": [
|
|
".ts",
|
|
".tsx"
|
|
],
|
|
"exclude": [
|
|
"coverage/**",
|
|
"dist/**"
|
|
],
|
|
"reporter": [
|
|
"text-summary",
|
|
"html"
|
|
],
|
|
"all": true,
|
|
"check-coverage": true,
|
|
"statements": 100,
|
|
"branches": 100,
|
|
"functions": 100,
|
|
"lines": 100
|
|
}
|
|
}
|