Skip to content

Commit 50f5c02

Browse files
rwat17petermetz
rwat17
authored and
petermetz
committed
fix: use common conventions: tsconfig.json, package.json
- change package.json and tsconfig.json files to follow common convention Peter's additions to fix the broken build: - Included shelljs typings as a dev dependency for the package called cactus-plugin-ledger-connector-go-ethereum-socketio - Also included "socket.io-client" as another missing dev dependency for the package above. Closes: #2216 Co-authored-by: Peter Somogyvari <[email protected]> Signed-off-by: Tomasz Awramski <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]>
1 parent 77fb559 commit 50f5c02

File tree

57 files changed

+452
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+452
-281
lines changed

‎examples/cactus-example-carbon-accounting-backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎examples/cactus-example-carbon-accounting-business-logic-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎examples/cactus-example-supply-chain-backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎examples/cactus-example-supply-chain-business-logic-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎examples/cactus-workshop-examples-2022-11-14/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎examples/supply-chain-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"author": {
2828
"name": "Hyperledger Cactus Contributors",
2929
"email": "[email protected]",
30-
"url": "https://www.hyperledger.org/use/cactus"
30+
"url": "https://www.hyperledger.org/use/cacti"
3131
},
3232
"contributors": [
3333
{

‎extensions/cactus-plugin-htlc-coordinator-besu/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎extensions/cactus-plugin-object-store-ipfs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-api-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-cmd-api-server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-cmd-socketio-server/package.json

+34-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,41 @@
11
{
22
"name": "@hyperledger/cactus-cmd-socketio-server",
33
"version": "2.0.0-alpha.1",
4+
"description": "Allows Cactus nodes to interact with HTLC ETH contracts",
5+
"keywords": [
6+
"Hyperledger",
7+
"Cactus",
8+
"Integration",
9+
"Blockchain",
10+
"Distributed Ledger Technology"
11+
],
12+
"homepage": "https://github.com/hyperledger/cacti#readme",
13+
"bugs": {
14+
"url": "https://github.com/hyperledger/cacti/issues"
15+
},
16+
"repository": {
17+
"type": "git",
18+
"url": "git+https://github.com/hyperledger/cacti.git"
19+
},
420
"license": "Apache-2.0",
5-
"main": "dist/src/main/typescript/index.js",
6-
"module": "dist/src/main/typescript/index.js",
7-
"types": "dist/src/main/typescript/index.d.ts",
21+
"author": {
22+
"name": "Hyperledger Cactus Contributors",
23+
"email": "[email protected]",
24+
"url": "https://www.hyperledger.org/use/cacti"
25+
},
26+
"contributors": [
27+
{
28+
"name": "Please add yourself to the list of contributors",
29+
"email": "[email protected]",
30+
"url": "https://example.com"
31+
}
32+
],
33+
"main": "dist/lib/main/typescript/index.js",
34+
"module": "dist/lib/main/typescript/index.js",
35+
"types": "dist/lib/main/typescript/index.d.ts",
36+
"files": [
37+
"dist/*"
38+
],
839
"scripts": {
940
"build": "npm run build-ts && npm run build:dev:backend:postbuild",
1041
"build-ts": "tsc",

‎packages/cactus-cmd-socketio-server/tsconfig.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"composite": true,
5-
"outDir": "./dist/",
6-
"tsBuildInfoFile": "../../.build-cache/cactus-cmd-socketio-server.tsbuildinfo",
5+
"outDir": "./dist/lib",
6+
"rootDir": "./src",
7+
"tsBuildInfoFile": "../../.build-cache/cactus-cmd-socketio-server.tsbuildinfo"
78
},
89
"include": [
910
"./src/main/typescript/business-logic-plugin/*.ts",
@@ -13,9 +14,7 @@
1314
"./src/main/typescript/util/*.ts",
1415
"./src/main/typescript/routing-interface/**/*.ts"
1516
],
16-
"exclude": [
17-
"copyStaticAssets.ts"
18-
],
17+
"exclude": ["copyStaticAssets.ts"],
1918
"references": [
2019
{
2120
"path": "../cactus-common/tsconfig.json"

‎packages/cactus-common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-core-api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"author": {
6161
"name": "Hyperledger Cactus Contributors",
6262
"email": "[email protected]",
63-
"url": "https://www.hyperledger.org/use/cactus"
63+
"url": "https://www.hyperledger.org/use/cacti"
6464
},
6565
"contributors": [
6666
{

‎packages/cactus-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-plugin-consortium-manual/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-plugin-htlc-eth-besu-erc20/package.json

+87-87
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
11
{
2-
"name": "@hyperledger/cactus-plugin-htlc-eth-besu-erc20",
3-
"version": "2.0.0-alpha.1",
4-
"description": "Allows Cactus nodes to interact with HTLC contracts with ERC-20 Tokens",
5-
"keywords": [
6-
"Hyperledger",
7-
"Cactus",
8-
"Integration",
9-
"Blockchain",
10-
"Distributed Ledger Technology"
11-
],
12-
"homepage": "https://github.com/hyperledger/cacti#readme",
13-
"bugs": {
14-
"url": "https://github.com/hyperledger/cacti/issues"
2+
"name": "@hyperledger/cactus-plugin-htlc-eth-besu-erc20",
3+
"version": "2.0.0-alpha.1",
4+
"description": "Allows Cactus nodes to interact with HTLC contracts with ERC-20 Tokens",
5+
"keywords": [
6+
"Hyperledger",
7+
"Cactus",
8+
"Integration",
9+
"Blockchain",
10+
"Distributed Ledger Technology"
11+
],
12+
"homepage": "https://github.com/hyperledger/cacti#readme",
13+
"bugs": {
14+
"url": "https://github.com/hyperledger/cacti/issues"
15+
},
16+
"repository": {
17+
"type": "git",
18+
"url": "git+https://github.com/hyperledger/cacti.git"
19+
},
20+
"license": "Apache-2.0",
21+
"author": {
22+
"name": "Hyperledger Cactus Contributors",
23+
"email": "[email protected]",
24+
"url": "https://www.hyperledger.org/use/cacti"
25+
},
26+
"contributors": [
27+
{
28+
"name": "Please add yourself to the list of contributors",
29+
"email": "[email protected]",
30+
"url": "https://example.com"
1531
},
16-
"repository": {
17-
"type": "git",
18-
"url": "git+https://github.com/hyperledger/cacti.git"
32+
{
33+
"name": "Peter Somogyvari",
34+
"email": "[email protected]",
35+
"url": "https://accenture.com"
1936
},
20-
"license": "Apache-2.0",
21-
"author": {
22-
"name": "Hyperledger Cactus Contributors",
23-
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
25-
},
26-
"contributors": [
27-
{
28-
"name": "Please add yourself to the list of contributors",
29-
"email": "[email protected]",
30-
"url": "https://example.com"
31-
},
32-
{
33-
"name": "Peter Somogyvari",
34-
"email": "[email protected]",
35-
"url": "https://accenture.com"
36-
},
37-
{
38-
"name": "Jordi Giron",
39-
"email": "[email protected]",
40-
"url": "https://accenture.com"
41-
}
42-
],
43-
"main": "dist/lib/main/typescript/index.js",
44-
"module": "dist/lib/main/typescript/index.js",
45-
"browser": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.js",
46-
"types": "dist/lib/main/typescript/index.d.ts",
47-
"files": [
48-
"dist/*"
49-
],
50-
"scripts": {
51-
"codegen": "run-p 'codegen:*'",
52-
"codegen:openapi": "npm run generate-sdk",
53-
"generate-sdk": "run-p 'generate-sdk:*'",
54-
"generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
55-
"generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected",
56-
"watch": "npm-watch",
57-
"webpack": "npm-run-all webpack:dev",
58-
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
59-
"webpack:dev:node": "webpack --env=dev --target=node --config ../../webpack.config.js",
60-
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
61-
},
62-
"dependencies": {
63-
"@hyperledger/cactus-common": "2.0.0-alpha.1",
64-
"@hyperledger/cactus-core": "2.0.0-alpha.1",
65-
"@hyperledger/cactus-core-api": "2.0.0-alpha.1",
66-
"@hyperledger/cactus-plugin-ledger-connector-besu": "2.0.0-alpha.1",
67-
"axios": "0.21.4",
68-
"express": "4.17.1",
69-
"joi": "17.9.1",
70-
"openapi-types": "9.1.0",
71-
"typescript-optional": "2.0.1"
72-
},
73-
"devDependencies": {
74-
"@types/express": "4.17.13"
75-
},
76-
"engines": {
77-
"node": ">=10",
78-
"npm": ">=6"
79-
},
80-
"publishConfig": {
81-
"access": "public"
82-
},
83-
"browserMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.min.js",
84-
"mainMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.node.umd.min.js",
85-
"watch": {
86-
"codegen:openapi": {
87-
"patterns": [
88-
"./src/main/json/openapi.json"
89-
]
90-
}
37+
{
38+
"name": "Jordi Giron",
39+
"email": "[email protected]",
40+
"url": "https://accenture.com"
41+
}
42+
],
43+
"main": "dist/lib/main/typescript/index.js",
44+
"module": "dist/lib/main/typescript/index.js",
45+
"browser": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.js",
46+
"types": "dist/lib/main/typescript/index.d.ts",
47+
"files": [
48+
"dist/*"
49+
],
50+
"scripts": {
51+
"codegen": "run-p 'codegen:*'",
52+
"codegen:openapi": "npm run generate-sdk",
53+
"generate-sdk": "run-p 'generate-sdk:*'",
54+
"generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
55+
"generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected",
56+
"watch": "npm-watch",
57+
"webpack": "npm-run-all webpack:dev",
58+
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
59+
"webpack:dev:node": "webpack --env=dev --target=node --config ../../webpack.config.js",
60+
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
61+
},
62+
"dependencies": {
63+
"@hyperledger/cactus-common": "2.0.0-alpha.1",
64+
"@hyperledger/cactus-core": "2.0.0-alpha.1",
65+
"@hyperledger/cactus-core-api": "2.0.0-alpha.1",
66+
"@hyperledger/cactus-plugin-ledger-connector-besu": "2.0.0-alpha.1",
67+
"axios": "0.21.4",
68+
"express": "4.17.1",
69+
"joi": "17.9.1",
70+
"openapi-types": "9.1.0",
71+
"typescript-optional": "2.0.1"
72+
},
73+
"devDependencies": {
74+
"@types/express": "4.17.13"
75+
},
76+
"engines": {
77+
"node": ">=10",
78+
"npm": ">=6"
79+
},
80+
"publishConfig": {
81+
"access": "public"
82+
},
83+
"browserMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.min.js",
84+
"mainMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.node.umd.min.js",
85+
"watch": {
86+
"codegen:openapi": {
87+
"patterns": [
88+
"./src/main/json/openapi.json"
89+
]
9190
}
91+
}
9292
}

‎packages/cactus-plugin-htlc-eth-besu/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

‎packages/cactus-plugin-keychain-aws-sm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": {
2222
"name": "Hyperledger Cactus Contributors",
2323
"email": "[email protected]",
24-
"url": "https://www.hyperledger.org/use/cactus"
24+
"url": "https://www.hyperledger.org/use/cacti"
2525
},
2626
"contributors": [
2727
{

0 commit comments

Comments
 (0)