Skip to content

Commit

Permalink
build: migrate to Yarn v3
Browse files Browse the repository at this point in the history
Fixes hyperledger-cacti#1142

Signed-off-by: zondervancalvez <zondervan.v.calvez@accenture.com>
  • Loading branch information
zondervancalvez committed Jul 10, 2023
1 parent 6d012c7 commit 917ce70
Show file tree
Hide file tree
Showing 20 changed files with 46,244 additions and 621,944 deletions.
147,155 changes: 0 additions & 147,155 deletions .yarn/releases/yarn-1.18.0.cjs

This file was deleted.

147,191 changes: 0 additions & 147,191 deletions .yarn/releases/yarn-1.19.0.cjs

This file was deleted.

147,191 changes: 0 additions & 147,191 deletions .yarn/releases/yarn-1.19.0.js

This file was deleted.

147,520 changes: 0 additions & 147,520 deletions .yarn/releases/yarn-1.22.17.js

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.5.1.cjs

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions .yarnrc

This file was deleted.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.5.1.cjs

npmScopes:
"iroha2":
npmRegistryServer: "https://nexus.iroha.tech/repository/npm-group/"
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@
"publishConfig": {
"access": "public"
}
}
}
2 changes: 1 addition & 1 deletion examples/cactus-example-supply-chain-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@
"publishConfig": {
"access": "public"
}
}
}
3 changes: 1 addition & 2 deletions examples/cactus-example-tcs-huawei/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"main": "dist/www.js",
"module": "dist/www.js",
"types": "dist/www.d.ts",
"private": false,
"scripts": {
"start": "docker-compose build && docker-compose up",
"build": "npm run build-ts && npm run build:dev:backend:postbuild",
Expand Down Expand Up @@ -35,9 +34,9 @@
"xmlhttprequest": "1.8.0"
},
"devDependencies": {
"@types/escape-html": "1.0.1",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@types/escape-html": "1.0.1",
"eslint": "7.32.0",
"eslint-config-prettier": "8.4.0",
"eslint-plugin-prettier": "4.0.0",
Expand Down
6 changes: 3 additions & 3 deletions extensions/cactus-plugin-htlc-coordinator-besu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"dist/*"
],
"scripts": {
"codegen": "run-p 'codegen:*'",
"codegen:openapi": "run-p generate-sdk",
"generate-sdk": "run-p generate-sdk:*",
"codegen": "yarn run codegen:openapi",
"codegen:openapi": "npm run generate-sdk",
"generate-sdk": "yarn run generate-sdk:typescript-axios",
"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/",
"watch": "npm-watch",
"webpack": "npm-run-all webpack:dev webpack:prod",
Expand Down
18 changes: 10 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
"weaver/samples/besu/simpleasset",
"weaver/samples/besu/simplestate"
],
"nohoist": [
"installConfig.hoistingLimits": [
"**/iroha-helpers"
]
},
"packageManager": "yarn@1.22.17",
"packageManager": "yarn@3.5.1",
"scripts": {
"run-ci": "./tools/ci.sh",
"reset:node-modules": "del-cli '**/node_modules'",
"reset:git": "git clean -f -X",
"reset:yarn-lock": "yarn run init-registries && yarn install --update-checksums --force",
"reset:yarn-lock": "yarn install --check-cache && yarn run init-registries",
"reset": "run-s reset:git reset:node-modules reset:yarn-lock configure",
"configure": "yarn run init-registries && yarn install --frozen-lockfile --non-interactive && yarn run build:dev:backend",
"install-yarn": "npm install --global yarn@1.22.17",
"enable-corepack": "npm i -g corepack && corepack enable && corepack prepare yarn@1.22.17 --activate",
"configure": "yarn install --immutable && yarn run init-registries && yarn run build:dev:backend",
"install-yarn": "npm install --global yarn@1.22.17 && yarn set version 3.5.1",
"enable-corepack": "npm i -g corepack && corepack enable && corepack prepare yarn@3.5.1 --activate",
"custom-checks": "TS_NODE_PROJECT=./tools/tsconfig.json node --trace-deprecation --experimental-modules --abort-on-uncaught-exception --loader ts-node/esm --experimental-specifier-resolution=node ./tools/custom-checks/run-custom-checks.ts",
"tools:validate-bundle-names": "TS_NODE_PROJECT=./tools/tsconfig.json node --trace-deprecation --experimental-modules --abort-on-uncaught-exception --loader ts-node/esm --experimental-specifier-resolution=node ./tools/validate-bundle-names.js",
"generate-api-server-config": "node ./tools/generate-api-server-config.js",
Expand Down Expand Up @@ -89,11 +89,11 @@
"devDependencies": {
"@commitlint/cli": "13.1.0",
"@commitlint/config-conventional": "13.1.0",
"@openapitools/openapi-generator-cli": "2.4.14",
"@lerna-lite/cli": "1.17.0",
"@lerna-lite/exec": "1.17.0",
"@lerna-lite/list": "1.17.0",
"@lerna-lite/run": "1.17.0",
"@openapitools/openapi-generator-cli": "2.4.14",
"@types/fs-extra": "9.0.12",
"@types/jasminewd2": "2.0.10",
"@types/jest": "27.5.0",
Expand All @@ -104,6 +104,8 @@
"@types/uuid": "8.3.1",
"@typescript-eslint/eslint-plugin": "5.27.0",
"@typescript-eslint/parser": "5.27.0",
"ajv": "6.0.0",
"ajv-openapi": "2.0.0",
"buffer": "6.0.3",
"codecov": "3.8.3",
"cpy-cli": "4.1.0",
Expand All @@ -125,8 +127,8 @@
"git-cz": "4.7.6",
"globby": "12.0.0",
"google-protobuf": "3.21.2",
"grpc_tools_node_protoc_ts": "5.3.1",
"grpc-tools": "1.11.2",
"grpc_tools_node_protoc_ts": "5.3.1",
"husky": "7.0.1",
"inquirer": "8.1.2",
"jest": "28.1.0",
Expand Down
7 changes: 5 additions & 2 deletions packages/cactus-cmd-api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"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",
"proto:openapi": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g protobuf-schema --model-name-suffix=PB --additional-properties=packageName=org.hyperledger.cactus.cmd_api_server -o ./src/main/proto/generated/openapi/ -t=./src/main/openapi-generator/templates/protobuf-schema/",
"proto:protoc-gen-ts": "yarn run grpc_tools_node_protoc --plugin=protoc-gen-ts=../../node_modules/.bin/protoc-gen-ts --ts_out=grpc_js:./src/main/typescript/generated/proto/protoc-gen-ts/ --proto_path ./src/main/proto/generated/openapi/ ./src/main/proto/generated/openapi/services/*.proto",
"proto:protoc-gen-ts": "yarn run grpc_tools_node_protoc --plugin=protoc-gen-ts=../../node_modules/protoc-gen-ts/bin/protoc-gen-ts --ts_out=grpc_js:./src/main/typescript/generated/proto/protoc-gen-ts/ --proto_path ./src/main/proto/generated/openapi/ ./src/main/proto/generated/openapi/services/*.proto",
"watch": "npm-watch",
"webpack": "npm-run-all webpack:dev",
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
Expand Down Expand Up @@ -94,6 +94,7 @@
"devDependencies": {
"@hyperledger/cactus-plugin-keychain-vault": "2.0.0-alpha.1",
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.1",
"@openapitools/openapi-generator-cli": "2.6.0",
"@types/compression": "1.7.1",
"@types/convict": "6.1.1",
"@types/cors": "2.8.12",
Expand All @@ -111,7 +112,9 @@
"@types/uuid": "8.3.1",
"@types/xml2js": "0.4.9",
"artillery": "1.7.2",
"http-status-codes": "2.1.4"
"grpc-tools": "1.11.2",
"http-status-codes": "2.1.4",
"protoc-gen-ts": "0.6.0"
},
"engines": {
"node": ">=10",
Expand Down
6 changes: 5 additions & 1 deletion packages/cactus-core-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
"codegen:openapi": "npm run generate-sdk",
"codegen:proto": "run-s proto:protoc-gen-ts",
"generate-sdk": "run-p generate-sdk:*",
"codegen:preproto": "yarn preproto:protoc-gen-ts",
"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",
"preproto:protoc-gen-ts": "make-dir ./src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/",
"proto:protoc-gen-ts": "yarn run grpc_tools_node_protoc --plugin=protoc-gen-ts=../../node_modules/.bin/protoc-gen-ts --ts_out=grpc_js:./src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/ --proto_path ./src/main/proto/weaver/common/protos/ ./src/main/proto/weaver/common/protos/common/*.proto ./src/main/proto/weaver/common/protos/corda/*.proto ./src/main/proto/weaver/common/protos/driver/*.proto ./src/main/proto/weaver/common/protos/networks/*.proto ./src/main/proto/weaver/common/protos/relay/*.proto",
"proto:protoc-gen-ts": "yarn run grpc_tools_node_protoc --plugin=protoc-gen-ts=../../node_modules/protoc-gen-ts/bin/protoc-gen-ts --ts_out=grpc_js:./src/main/typescript/generated/proto/protoc-gen-ts/weaver/common/protos/ --proto_path ./src/main/proto/weaver/common/protos/ ./src/main/proto/weaver/common/protos/common/*.proto ./src/main/proto/weaver/common/protos/corda/*.proto ./src/main/proto/weaver/common/protos/driver/*.proto ./src/main/proto/weaver/common/protos/networks/*.proto ./src/main/proto/weaver/common/protos/relay/*.proto",
"watch": "npm-watch",
"webpack": "npm-run-all webpack:dev",
"webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",
Expand Down Expand Up @@ -80,8 +81,11 @@
"devDependencies": {
"@grpc/grpc-js": "1.3.6",
"@grpc/proto-loader": "0.6.4",
"@openapitools/openapi-generator-cli": "2.4.14",
"@types/express": "4.17.13",
"grpc-tools": "1.11.2",
"make-dir-cli": "3.0.0",
"protoc-gen-ts": "0.6.0",
"rxjs": "7.8.1",
"socket.io": "4.4.1",
"typescript-optional": "2.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/cactus-plugin-htlc-eth-besu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
"@hyperledger/cactus-plugin-keychain-memory": "2.0.0-alpha.1",
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.1",
"@types/express": "4.17.13",
"forge-std": "https://github.com/foundry-rs/forge-std.git#66bf4e2c92cf507531599845e8d5a08cc2e3b5bb",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0"
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#66bf4e2c92cf507531599845e8d5a08cc2e3b5bb"
},
"engines": {
"node": ">=10",
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-plugin-ledger-connector-corda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"scripts": {
"codegen": "run-p 'codegen:*'",
"codegen:openapi": "run-p generate-sdk generate-server",
"generate-sdk": "run-p 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/",
"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",
"generate-server": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin-spring -o ./src/main-server/kotlin/gen/kotlin-spring/ -c ./src/main-server/openapi-generator-config.yaml",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@
"runOnChangeOnly": true
}
}
}
}
4 changes: 2 additions & 2 deletions packages/cactus-plugin-persistence-fabric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
"copy-yarn-lock": "cp -af ../../yarn.lock ./dist/yarn.lock"
},
"dependencies": {
"@hyperledger/cactus-plugin-ledger-connector-fabric": "2.0.0-alpha.1",
"@hyperledger/cactus-plugin-keychain-memory": "2.0.0-alpha.1",
"@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-keychain-memory": "2.0.0-alpha.1",
"@hyperledger/cactus-plugin-ledger-connector-fabric": "2.0.0-alpha.1",
"axios": "0.21.4",
"fabric-protos": "2.2.18",
"js-sha256": "0.9.0",
Expand Down
1 change: 1 addition & 0 deletions tools/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ function mainTask()
if [ "${DEV_BUILD_DISABLED:-false}" = "true" ]; then
echo "$(date +%FT%T%z) [CI] Dev build disabled. Skipping..."
else
yarn
yarn configure
fi

Expand Down
Loading

0 comments on commit 917ce70

Please sign in to comment.