feat(wip): ci fixes

hyperledger-cacti · Feb 16, 2024 · fae7518 · fae7518
1 parent c50d2f2
commit fae7518
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -407,11 +407,11 @@ jobs:
           tool: 'benchmarkjs'
           output-file-path: .tmp/benchmark-results/cmd-api-server/run-cmd-api-server-benchmark.ts.log
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          
+
           # Only push the benchmark results to gh-pages website if we are running on the main branch
           # We do not want to clutter the benchmark results with intermediate results from PRs that could be drafts
           auto-push: ${{ github.ref == 'refs/heads/main' }}
-          
+
           # Show alert with commit comment on detecting possible performance regression
           alert-threshold: '5%'
           comment-on-alert: true
@@ -1086,7 +1086,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-javascript-source.test.ts
 
   plugin-ledger-connector-fabric-2:
     continue-on-error: false
@@ -1119,7 +1119,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-typescript-source.test.ts
 
   plugin-ledger-connector-fabric-3:
     needs:
@@ -1152,7 +1152,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-lock-asset.test.ts
 
   plugin-ledger-connector-fabric-4:
     continue-on-error: false
@@ -1185,7 +1185,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation.test.ts
 
   plugin-ledger-connector-fabric-5:
     continue-on-error: false
@@ -1218,7 +1218,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/openapi/openapi-validation-go.test.ts
 
   plugin-ledger-connector-fabric-6:
     continue-on-error: false
@@ -1251,7 +1251,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/unit/identity-internal-crypto-utils.test.ts
 
   plugin-ledger-connector-fabric-7:
     continue-on-error: false
@@ -1284,7 +1284,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/identity-client.test.ts
 
   plugin-ledger-connector-fabric-8:
     continue-on-error: false
@@ -1317,7 +1317,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-identities.test.ts
 
   plugin-ledger-connector-fabric-9:
     continue-on-error: false
@@ -1350,7 +1350,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/obtain-profiles.test.ts
 
   plugin-ledger-connector-fabric-10:
     needs:
@@ -1383,7 +1383,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/deploy-cc-from-golang-source.test.ts
 
   plugin-ledger-connector-fabric-11:
     continue-on-error: false
@@ -1416,7 +1416,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/add-orgs.test.ts
 
   plugin-ledger-connector-fabric-12:
     continue-on-error: false
@@ -1449,7 +1449,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
       - run: npm run configure
-      - run: yarn ts-node ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
+      - run: yarn tsx ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
 
   cactus-plugin-ledger-connector-go-ethereum-socketio:
     continue-on-error: false

diff --git a/examples/cactus-example-carbon-accounting-frontend/package.json b/examples/cactus-example-carbon-accounting-frontend/package.json
@@ -8,7 +8,6 @@
     "Blockchain Integration",
     "Distributed Ledger Technology"
   ],
-  "type": "module",
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
     "url": "https://github.com/hyperledger/cacti/issues"
@@ -35,6 +34,7 @@
       "url": "https://accenture.com"
     }
   ],
+  "type": "module",
   "files": [
     "www/*"
   ],

diff --git a/examples/cactus-example-supply-chain-frontend/package.json b/examples/cactus-example-supply-chain-frontend/package.json
@@ -2,7 +2,6 @@
   "name": "@hyperledger/cactus-example-supply-chain-frontend",
   "version": "2.0.0-alpha.2",
   "description": "The frontend component of an example project demonstrating how Cacti can be used for cross-chain dapp development.",
-  "type": "module",
   "keywords": [
     "Hyperledger",
     "Cacti",
@@ -35,6 +34,7 @@
       "url": "https://accenture.com"
     }
   ],
+  "type": "module",
   "files": [
     "www/*"
   ],

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "webpack:dev:web": "lerna run webpack:dev:web",
     "webpack:dev:node": "lerna run webpack:dev:node",
     "test:jest:all": "NODE_OPTIONS=\"--max_old_space_size=3072 --experimental-vm-modules\" jest",
-    "test:tap:all": "NODE_OPTIONS=\"--experimental-vm-modules\" tap",
+    "test:tap:all": "tap build && NODE_OPTIONS=\"--experimental-vm-modules\" tap",
     "test:all": "NODE_OPTIONS=\"--experimental-vm-modules\" yarn test:jest:all && yarn test:tap:all",
     "prettier": "prettier --write --config .prettierrc.js \"./**/src/main/json/openapi.json\"",
     "lerna-publish-canary": "lerna publish --canary --force-publish --dist-tag $(git branch --show-current) --preid $(git branch --show-current) --loglevel=silly --ignore-scripts --ignore-prepublish",

diff --git a/weaver/core/identity-management/iin-agent/package-local.json b/weaver/core/identity-management/iin-agent/package-local.json
@@ -49,6 +49,7 @@
     "sinon": "6.3.5",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.1",
+    "tsx": "4.7.1",
     "typedoc": "0.25.6",
     "typescript": "5.3.3"
   },

diff --git a/weaver/core/identity-management/iin-agent/package.json b/weaver/core/identity-management/iin-agent/package.json
@@ -49,6 +49,7 @@
     "sinon": "6.3.5",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.1",
+    "tsx": "4.7.1",
     "typedoc": "0.25.6",
     "typescript": "5.3.3"
   },

diff --git a/weaver/samples/besu/besu-cli/bin/besu-cli b/weaver/samples/besu/besu-cli/bin/besu-cli
@@ -13,7 +13,7 @@ if (wantsCompiled || !devMode) {
 } else {
   // this runs from the typescript source (for dev only)
   // hook into ts-node so we can run typescript on the fly
-  require('ts-node').register({ project: `${__dirname}/../tsconfig.json` })
+  require('ts-node').register({ project: `${__dirname}/../tsconfig.json`, experimentalResolver: true })
   // run the CLI with the current process arguments
   require(`${__dirname}/../src/cli`).run(process.argv)
 }

diff --git a/weaver/samples/fabric/fabric-cli/bin/fabric-cli b/weaver/samples/fabric/fabric-cli/bin/fabric-cli
@@ -13,7 +13,7 @@ if (wantsCompiled || !devMode) {
 } else {
   // this runs from the typescript source (for dev only)
   // hook into ts-node so we can run typescript on the fly
-  require('ts-node').register({ project: `${__dirname}/../tsconfig.json` })
+  require('ts-node').register({ project: `${__dirname}/../tsconfig.json`, experimentalResolver: true })
   // run the CLI with the current process arguments
   require(`${__dirname}/../src/cli`).run(process.argv)
 }

diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json
@@ -72,6 +72,7 @@
     "sinon": "6.3.5",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.1",
+    "tsx": "4.7.1",
     "typedoc": "0.25.6",
     "typescript": "5.3.3"
   },

diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json
@@ -72,6 +72,7 @@
     "sinon": "6.3.5",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.1",
+    "tsx": "4.7.1",
     "typedoc": "0.25.6",
     "typescript": "5.3.3"
   },