From 63479eae017e117b34e6780cabaab2dc8574408a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yago=20P=C3=A9rez=20V=C3=A1zquez?= Date: Wed, 12 Apr 2023 13:27:21 +0200 Subject: [PATCH] fix: Fix aliases after build (#389) --- package.json | 1 + packages/account-abstraction-kit/package.json | 2 +- packages/api-kit/package.json | 2 +- packages/auth-kit/package.json | 2 +- packages/onramp-kit/package.json | 2 +- packages/protocol-kit/package.json | 2 +- packages/relay-kit/package.json | 2 +- packages/safe-core-sdk-types/package.json | 2 +- packages/safe-ethers-adapters/package.json | 2 +- yarn.lock | 38 ++++++++++++++++++- 10 files changed, 45 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 0d8bccca2..9b0e83df1 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "rimraf": "^3.0.2", "ts-jest": "^29.0.5", "ts-node": "^10.9.1", + "tsc-alias": "^1.8.5", "typescript": "^4.9.4" }, "lint-staged": { diff --git a/packages/account-abstraction-kit/package.json b/packages/account-abstraction-kit/package.json index 11e554590..2154f5d3b 100644 --- a/packages/account-abstraction-kit/package.json +++ b/packages/account-abstraction-kit/package.json @@ -12,7 +12,7 @@ ], "scripts": { "unbuild": "rimraf dist", - "build": "yarn unbuild && tsc", + "build": "yarn unbuild && tsc && tsc-alias", "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "test": "echo \"Error: no test specified\"" diff --git a/packages/api-kit/package.json b/packages/api-kit/package.json index 4fce76bc3..d6ea355c8 100644 --- a/packages/api-kit/package.json +++ b/packages/api-kit/package.json @@ -20,7 +20,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rimraf dist .nyc_output cache", - "build": "yarn unbuild && tsc -p tsconfig.build.json" + "build": "yarn unbuild && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/auth-kit/package.json b/packages/auth-kit/package.json index 2e4347aff..a579c6015 100644 --- a/packages/auth-kit/package.json +++ b/packages/auth-kit/package.json @@ -9,7 +9,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rm -rf dist", - "build": "yarn unbuild && yarn tsc -p tsconfig.build.json" + "build": "yarn unbuild && yarn tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/onramp-kit/package.json b/packages/onramp-kit/package.json index 7616b4282..758f315a6 100644 --- a/packages/onramp-kit/package.json +++ b/packages/onramp-kit/package.json @@ -9,7 +9,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rm -rf dist", - "build": "yarn unbuild && yarn tsc -p tsconfig.build.json" + "build": "yarn unbuild && yarn tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/protocol-kit/package.json b/packages/protocol-kit/package.json index 356dd379f..24f3d046c 100644 --- a/packages/protocol-kit/package.json +++ b/packages/protocol-kit/package.json @@ -32,7 +32,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rimraf dist artifacts deployments cache .nyc_output typechain *.tsbuildinfo", - "build": "yarn unbuild && hardhat compile && yarn typechain && yarn safe-deployments && tsc -p tsconfig.build.json" + "build": "yarn unbuild && hardhat compile && yarn typechain && yarn safe-deployments && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/relay-kit/package.json b/packages/relay-kit/package.json index b69f8e820..64aa26ce6 100644 --- a/packages/relay-kit/package.json +++ b/packages/relay-kit/package.json @@ -16,7 +16,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rimraf dist .nyc_output cache", - "build": "yarn unbuild && tsc -p tsconfig.build.json" + "build": "yarn unbuild && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/safe-core-sdk-types/package.json b/packages/safe-core-sdk-types/package.json index e7258f484..a7fe4c899 100644 --- a/packages/safe-core-sdk-types/package.json +++ b/packages/safe-core-sdk-types/package.json @@ -13,7 +13,7 @@ "format:check": "prettier --check \"*/**/*.{js,json,md,ts}\"", "format": "prettier --write \"*/**/*.{js,json,md,ts}\"", "unbuild": "rimraf dist *.tsbuildinfo", - "build": "yarn unbuild && tsc -p tsconfig.build.json" + "build": "yarn unbuild && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json" }, "repository": { "type": "git", diff --git a/packages/safe-ethers-adapters/package.json b/packages/safe-ethers-adapters/package.json index 3093d9791..e5bcecfed 100644 --- a/packages/safe-ethers-adapters/package.json +++ b/packages/safe-ethers-adapters/package.json @@ -11,7 +11,7 @@ ], "scripts": { "unbuild": "rimraf dist *.tsbuildinfo", - "build": "tsc", + "build": "tsc && tsc-alias", "test": "nyc mocha -r ts-node/register tests/**/*.test.ts", "example:creation": "ts-node examples/creation.ts", "example:interaction": "ts-node examples/interaction.ts", diff --git a/yarn.lock b/yarn.lock index 5d424114a..18797e42f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5319,7 +5319,7 @@ checkpoint-store@^1.1.0: dependencies: functional-red-black-tree "^1.0.1" -chokidar@3.5.3, chokidar@^3.4.0, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.4.0, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -5621,6 +5621,11 @@ commander@^8.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.0.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + common-ancestor-path@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz" @@ -7910,7 +7915,7 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globby@11.1.0, globby@^11.0.1, globby@^11.1.0: +globby@11.1.0, globby@^11.0.1, globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -10804,6 +10809,11 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mylas@^2.1.9: + version "2.1.13" + resolved "https://registry.yarnpkg.com/mylas/-/mylas-2.1.13.tgz#1e23b37d58fdcc76e15d8a5ed23f9ae9fc0cbdf4" + integrity sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg== + nano-json-stream-parser@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz" @@ -11867,6 +11877,13 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" +plimit-lit@^1.2.6: + version "1.5.0" + resolved "https://registry.yarnpkg.com/plimit-lit/-/plimit-lit-1.5.0.tgz#f66df8a7041de1e965c4f1c0697ab486968a92a5" + integrity sha512-Eb/MqCb1Iv/ok4m1FqIXqvUKPISufcjZ605hl3KM/n8GaX8zfhtgdLwZU3vKjuHGh2O9Rjog/bHTq8ofIShdng== + dependencies: + queue-lit "^1.5.0" + pluralize@^8.0.0: version "8.0.0" resolved "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz" @@ -12300,6 +12317,11 @@ querystringify@^2.1.1: resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-lit@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/queue-lit/-/queue-lit-1.5.0.tgz#8197fdafda1edd615c8a0fc14c48353626e5160a" + integrity sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA== + queue-microtask@^1.2.2, queue-microtask@^1.2.3: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -13902,6 +13924,18 @@ ts-node@^10.9.1: v8-compile-cache-lib "^3.0.1" yn "3.1.1" +tsc-alias@^1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.8.5.tgz#6b74e938230573354c9118deb58fd341d06d6253" + integrity sha512-Y3ka0olwSRdbHPyX5kXhYY2aoBKuT53DFdeY+PpQUR4hg5M/b8eIRmC8dL4FBdd0wT366iWc6iDUUGe6QwI7mg== + dependencies: + chokidar "^3.5.3" + commander "^9.0.0" + globby "^11.0.4" + mylas "^2.1.9" + normalize-path "^3.0.0" + plimit-lit "^1.2.6" + tsconfig-paths@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz#4819f861eef82e6da52fb4af1e8c930a39ed979a"