Skip to content

Commit

Permalink
fix: use common conventions: tsconfig.json, package.json
Browse files Browse the repository at this point in the history
- 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 <peter.somogyvari@accenture.com>

Signed-off-by: Tomasz Awramski <tomasz.awramski@fujitsu.com>
Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
  • Loading branch information
rwat17 authored and petermetz committed Aug 18, 2023
1 parent 77fb559 commit 50f5c02
Show file tree
Hide file tree
Showing 57 changed files with 452 additions and 281 deletions.
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/cactus-example-supply-chain-backend/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/cactus-workshop-examples-2022-11-14/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/supply-chain-app/package.json
Expand Up @@ -27,7 +27,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion extensions/cactus-plugin-object-store-ipfs/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-api-client/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-cmd-api-server/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
37 changes: 34 additions & 3 deletions packages/cactus-cmd-socketio-server/package.json
@@ -1,10 +1,41 @@
{
"name": "@hyperledger/cactus-cmd-socketio-server",
"version": "2.0.0-alpha.1",
"description": "Allows Cactus nodes to interact with HTLC ETH contracts",
"keywords": [
"Hyperledger",
"Cactus",
"Integration",
"Blockchain",
"Distributed Ledger Technology"
],
"homepage": "https://github.com/hyperledger/cacti#readme",
"bugs": {
"url": "https://github.com/hyperledger/cacti/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/hyperledger/cacti.git"
},
"license": "Apache-2.0",
"main": "dist/src/main/typescript/index.js",
"module": "dist/src/main/typescript/index.js",
"types": "dist/src/main/typescript/index.d.ts",
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
"name": "Please add yourself to the list of contributors",
"email": "your.name@example.com",
"url": "https://example.com"
}
],
"main": "dist/lib/main/typescript/index.js",
"module": "dist/lib/main/typescript/index.js",
"types": "dist/lib/main/typescript/index.d.ts",
"files": [
"dist/*"
],
"scripts": {
"build": "npm run build-ts && npm run build:dev:backend:postbuild",
"build-ts": "tsc",
Expand Down
9 changes: 4 additions & 5 deletions packages/cactus-cmd-socketio-server/tsconfig.json
Expand Up @@ -2,8 +2,9 @@
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"composite": true,
"outDir": "./dist/",
"tsBuildInfoFile": "../../.build-cache/cactus-cmd-socketio-server.tsbuildinfo",
"outDir": "./dist/lib",
"rootDir": "./src",
"tsBuildInfoFile": "../../.build-cache/cactus-cmd-socketio-server.tsbuildinfo"
},
"include": [
"./src/main/typescript/business-logic-plugin/*.ts",
Expand All @@ -13,9 +14,7 @@
"./src/main/typescript/util/*.ts",
"./src/main/typescript/routing-interface/**/*.ts"
],
"exclude": [
"copyStaticAssets.ts"
],
"exclude": ["copyStaticAssets.ts"],
"references": [
{
"path": "../cactus-common/tsconfig.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-common/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-core-api/package.json
Expand Up @@ -60,7 +60,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-core/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-plugin-consortium-manual/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
174 changes: 87 additions & 87 deletions packages/cactus-plugin-htlc-eth-besu-erc20/package.json
@@ -1,92 +1,92 @@
{
"name": "@hyperledger/cactus-plugin-htlc-eth-besu-erc20",
"version": "2.0.0-alpha.1",
"description": "Allows Cactus nodes to interact with HTLC contracts with ERC-20 Tokens",
"keywords": [
"Hyperledger",
"Cactus",
"Integration",
"Blockchain",
"Distributed Ledger Technology"
],
"homepage": "https://github.com/hyperledger/cacti#readme",
"bugs": {
"url": "https://github.com/hyperledger/cacti/issues"
"name": "@hyperledger/cactus-plugin-htlc-eth-besu-erc20",
"version": "2.0.0-alpha.1",
"description": "Allows Cactus nodes to interact with HTLC contracts with ERC-20 Tokens",
"keywords": [
"Hyperledger",
"Cactus",
"Integration",
"Blockchain",
"Distributed Ledger Technology"
],
"homepage": "https://github.com/hyperledger/cacti#readme",
"bugs": {
"url": "https://github.com/hyperledger/cacti/issues"
},
"repository": {
"type": "git",
"url": "git+https://github.com/hyperledger/cacti.git"
},
"license": "Apache-2.0",
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
"name": "Please add yourself to the list of contributors",
"email": "your.name@example.com",
"url": "https://example.com"
},
"repository": {
"type": "git",
"url": "git+https://github.com/hyperledger/cacti.git"
{
"name": "Peter Somogyvari",
"email": "peter.somogyvari@accenture.com",
"url": "https://accenture.com"
},
"license": "Apache-2.0",
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
},
"contributors": [
{
"name": "Please add yourself to the list of contributors",
"email": "your.name@example.com",
"url": "https://example.com"
},
{
"name": "Peter Somogyvari",
"email": "peter.somogyvari@accenture.com",
"url": "https://accenture.com"
},
{
"name": "Jordi Giron",
"email": "jordi.giron.amezcua@accenture.com",
"url": "https://accenture.com"
}
],
"main": "dist/lib/main/typescript/index.js",
"module": "dist/lib/main/typescript/index.js",
"browser": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.js",
"types": "dist/lib/main/typescript/index.d.ts",
"files": [
"dist/*"
],
"scripts": {
"codegen": "run-p 'codegen:*'",
"codegen:openapi": "npm run generate-sdk",
"generate-sdk": "run-p 'generate-sdk:*'",
"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",
"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",
"watch": "npm-watch",
"webpack": "npm-run-all webpack:dev",
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
"webpack:dev:node": "webpack --env=dev --target=node --config ../../webpack.config.js",
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
},
"dependencies": {
"@hyperledger/cactus-common": "2.0.0-alpha.1",
"@hyperledger/cactus-core": "2.0.0-alpha.1",
"@hyperledger/cactus-core-api": "2.0.0-alpha.1",
"@hyperledger/cactus-plugin-ledger-connector-besu": "2.0.0-alpha.1",
"axios": "0.21.4",
"express": "4.17.1",
"joi": "17.9.1",
"openapi-types": "9.1.0",
"typescript-optional": "2.0.1"
},
"devDependencies": {
"@types/express": "4.17.13"
},
"engines": {
"node": ">=10",
"npm": ">=6"
},
"publishConfig": {
"access": "public"
},
"browserMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.min.js",
"mainMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.node.umd.min.js",
"watch": {
"codegen:openapi": {
"patterns": [
"./src/main/json/openapi.json"
]
}
{
"name": "Jordi Giron",
"email": "jordi.giron.amezcua@accenture.com",
"url": "https://accenture.com"
}
],
"main": "dist/lib/main/typescript/index.js",
"module": "dist/lib/main/typescript/index.js",
"browser": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.js",
"types": "dist/lib/main/typescript/index.d.ts",
"files": [
"dist/*"
],
"scripts": {
"codegen": "run-p 'codegen:*'",
"codegen:openapi": "npm run generate-sdk",
"generate-sdk": "run-p 'generate-sdk:*'",
"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",
"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",
"watch": "npm-watch",
"webpack": "npm-run-all webpack:dev",
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
"webpack:dev:node": "webpack --env=dev --target=node --config ../../webpack.config.js",
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
},
"dependencies": {
"@hyperledger/cactus-common": "2.0.0-alpha.1",
"@hyperledger/cactus-core": "2.0.0-alpha.1",
"@hyperledger/cactus-core-api": "2.0.0-alpha.1",
"@hyperledger/cactus-plugin-ledger-connector-besu": "2.0.0-alpha.1",
"axios": "0.21.4",
"express": "4.17.1",
"joi": "17.9.1",
"openapi-types": "9.1.0",
"typescript-optional": "2.0.1"
},
"devDependencies": {
"@types/express": "4.17.13"
},
"engines": {
"node": ">=10",
"npm": ">=6"
},
"publishConfig": {
"access": "public"
},
"browserMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.min.js",
"mainMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.node.umd.min.js",
"watch": {
"codegen:openapi": {
"patterns": [
"./src/main/json/openapi.json"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/cactus-plugin-htlc-eth-besu/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-plugin-keychain-aws-sm/package.json
Expand Up @@ -21,7 +21,7 @@
"author": {
"name": "Hyperledger Cactus Contributors",
"email": "cactus@lists.hyperledger.org",
"url": "https://www.hyperledger.org/use/cactus"
"url": "https://www.hyperledger.org/use/cacti"
},
"contributors": [
{
Expand Down

0 comments on commit 50f5c02

Please sign in to comment.