Turbo configuration for Aggregator pkg (#1099)

* Turbo configuration for Aggregator pck

* .gitignore

* Changeset version files

* Yarn cache removed

* Setup node with cache

* Lerna config removed

* .turbo cached

* Cache dir at build

* Release workflow with cache

* Bug fix

* Clean command and bug fix with turbo outputs

* Tests with cache-dir

.changeset/shy-jobs-thank.md

@@ -0,0 +1,5 @@
+---
+'@xchainjs/xchain-aggregator': patch
+---
+
+Build production mode without sourcemaps and with minification. Build tool updated from Rollup to Tsup

.github/workflows/build-and-test.yaml

@@ -8,21 +8,25 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repo
+        uses: actions/checkout@v4
 
-      - name: Use Node.js
-        uses: actions/setup-node@v1
+      - name: Cache turbo build setup
+        uses: actions/cache@v4
         with:
-          node-version: "20.x"
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
 
-      - name: Cache Yarn packages
-        uses: actions/cache@v2
+      - name: Setup Node.js 20.x
+        uses: actions/setup-node@v4
         with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          node-version: 20.x
+          cache: yarn
 
       - name: Install dependencies
-        run: yarn && yarn yarn-audit-ci --high
+        run: yarn install --frozen-lockfile && yarn yarn-audit-ci --high
 
       - name: Build packages
         run: yarn build

.github/workflows/release.yaml

@@ -15,15 +15,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Cache turbo build setup
+        uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
 
       - name: Setup Node.js 20.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
+          cache: yarn
 
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Build packages
         run: yarn build

.gitignore

@@ -6,6 +6,7 @@ results
 *.tsbuildinfo
 .DS_Store
 .idea
+.turbo
 
 *.txt
 

package.json

@@ -7,14 +7,15 @@
     "examples/*"
   ],
   "scripts": {
-    "clean": "lerna run clean",
-    "build": "lerna run build",
+    "clean": "turbo run clean && rm -rf ./.turbo",
+    "clean:nodemodules": "rm -rf ./packages/*/node_modules && rm -rf ./node_modules",
+    "build": "turbo run build --cache-dir=.turbo",
     "build:examples": "tsc examples/**/*.ts --noEmit --skipLibCheck",
     "build:tools": "tsc tools/**/*.ts --noEmit --skipLibCheck",
-    "pub": "lerna publish",
-    "test": "lerna run test",
-    "e2e": "lerna run e2e",
-    "lint": "lerna run lint",
+    "test": "turbo run test --cache-dir=.turbo",
+    "pub": "turbo publish",
+    "e2e": "turbo run e2e",
+    "lint": "turbo run lint",
     "update-packages": "yarn changeset",
     "increase-packages": "yarn changeset version",
     "notification:prepare": "ts-node scripts/notification.ts"
@@ -46,7 +47,6 @@
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.0",
     "jest": "^29.3.1",
-    "lerna": "^6.6.1",
     "lint-staged": "^13.1.0",
     "prettier": "^2.2.0",
     "rimraf": "5.0.0",
@@ -56,8 +56,10 @@
     "ts-jest": "^29.0.3",
     "ts-node": "10.9.2",
     "tslib": "^2.5.0",
+    "tsup": "8.0.2",
+    "turbo": "1.13.0",
     "typescript": "^5.0.4",
-    "yarn-audit-ci": "^1.2.0",
-    "weighted": "^1.0.0"
+    "weighted": "^1.0.0",
+    "yarn-audit-ci": "^1.2.0"
   }
-}
+}

packages/xchain-aggregator/package.json

@@ -18,8 +18,10 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "build": "yarn clean && rollup -c",
-    "clean": "rimraf -rf ./lib",
+    "clean": "rm -rf .turbo && rm -rf lib",
+    "build": "yarn build:pro",
+    "build:dev": "tsup --env.ENV dev",
+    "build:pro": "tsup --env.ENV pro",
     "prepublishOnly": "yarn run build",
     "e2e": "jest --config jest.config.e2e.js",
     "test": "jest"
@@ -28,24 +30,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@xchainjs/xchain-client": "0.16.2",
-    "@xchainjs/xchain-mayachain": "1.0.1",
-    "@xchainjs/xchain-mayachain-query": "0.1.9",
-    "@xchainjs/xchain-thorchain": "1.0.4",
-    "@xchainjs/xchain-thorchain-query": "0.7.7",
-    "@xchainjs/xchain-util": "0.13.3"
+    "@xchainjs/xchain-client": "*",
+    "@xchainjs/xchain-mayachain": "*",
+    "@xchainjs/xchain-mayachain-amm": "*",
+    "@xchainjs/xchain-mayachain-query": "*",
+    "@xchainjs/xchain-thorchain": "*",
+    "@xchainjs/xchain-thorchain-amm": "*",
+    "@xchainjs/xchain-thorchain-query": "*",
+    "@xchainjs/xchain-util": "*",
+    "@xchainjs/xchain-wallet": "*"
   },
   "devDependencies": {
-    "@xchainjs/xchain-avax": "0.4.6",
-    "@xchainjs/xchain-bitcoin": "0.23.13",
-    "@xchainjs/xchain-binance": "5.7.11",
-    "@xchainjs/xchain-ethereum": "0.31.6",
-    "@xchainjs/xchain-kujira": "0.1.12",
+    "@xchainjs/xchain-avax": "*",
+    "@xchainjs/xchain-bitcoin": "*",
+    "@xchainjs/xchain-binance": "*",
+    "@xchainjs/xchain-ethereum": "*",
+    "@xchainjs/xchain-kujira": "*",
+    "axios": "1.3.6",
     "axios-mock-adapter": "1.20.0"
-  },
-  "peerDependencies": {
-    "@xchainjs/xchain-mayachain-amm": "1.0.14",
-    "@xchainjs/xchain-thorchain-amm": "1.0.5",
-    "@xchainjs/xchain-wallet": "0.1.8"
   }
 }

packages/xchain-aggregator/tsup.config.ts

@@ -0,0 +1,20 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig((options) => {
+  return {
+    entry: ['src/index.ts'],
+    outDir: 'lib',
+    format: ['cjs', 'esm'],
+    bundle: true,
+    skipNodeModulesBundle: true,
+    outExtension: ({ format }) => {
+      if (format === 'cjs') return { js: '.js' }
+      if (format === 'esm') return { js: '.esm.js' }
+      return { js: `.${format}.js` }
+    },
+    minify: options.env?.ENV === 'pro',
+    dts: true,
+    sourcemap: options.env?.ENV === 'dev',
+    clean: true,
+  }
+})

packages/xchain-arbitrum/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest --passWithNoTests",
     "e2e": "jest --config jest.config.e2e.js",
@@ -52,4 +52,4 @@
     "axios": "^1.3.6",
     "ethers": "^5.7.2"
   }
-}
+}

packages/xchain-avax/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest --passWithNoTests",
     "e2e": "jest --config jest.config.e2e.js",
@@ -52,4 +52,4 @@
     "axios": "^1.3.6",
     "ethers": "^5.7.2"
   }
-}
+}

packages/xchain-binance/package.json

@@ -25,7 +25,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest",
     "compile": "tsc -p tsconfig.build.json",
@@ -49,4 +49,4 @@
     "@xchainjs/xchain-crypto": "^0.3.1",
     "@xchainjs/xchain-util": "^0.13.3"
   }
-}
+}

packages/xchain-bitcoin/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest",
     "e2e": "jest --config jest.config.e2e.js",
@@ -63,4 +63,4 @@
   "dependencies": {
     "@ledgerhq/hw-app-btc": "^10.1.0"
   }
-}
+}

packages/xchain-bitcoincash/package.json

@@ -25,7 +25,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest",
     "e2e": "jest --config jest.config.e2e.js",
@@ -64,4 +64,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

packages/xchain-bsc/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest --passWithNoTests",
     "e2e": "jest --config jest.config.e2e.js",
@@ -52,4 +52,4 @@
     "axios": "^1.3.6",
     "ethers": "^5.7.2"
   }
-}
+}

packages/xchain-client/package.json

@@ -12,7 +12,7 @@
     "lib"
   ],
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "compile": "tsc -p tsconfig.build.json",
     "prepublishOnly": "yarn run build",
@@ -28,4 +28,4 @@
     "@xchainjs/xchain-crypto": "^0.3.1",
     "axios": "^1.3.6"
   }
-}
+}

packages/xchain-cosmos-sdk/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest --passWithNoTests",
     "e2e": "jest --config jest.config.e2e.js",
@@ -55,4 +55,4 @@
     "bip32": "^2.0.6",
     "secp256k1": "^5.0.0"
   }
-}
+}

packages/xchain-cosmos/package.json

@@ -24,7 +24,7 @@
     "url": "[email protected]:xchainjs/xchainjs-lib.git"
   },
   "scripts": {
-    "clean": "rimraf --glob ./lib/**",
+    "clean": "rm -rf .turbo && rm -rf lib",
     "build": "yarn clean && rollup -c",
     "test": "jest",
     "e2e": "jest --config jest.config.e2e.js",
@@ -47,4 +47,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}