From 3b286e60343b5c64d1842f6f7e095bba22b8643a Mon Sep 17 00:00:00 2001 From: Jaco Date: Sat, 4 Mar 2023 13:57:24 +0200 Subject: [PATCH] Use tsc compiler (#486) --- CHANGELOG.md | 2 +- package.json | 4 +-- packages/wasm-bridge/package.json | 2 +- packages/wasm-crypto-asmjs/package.json | 2 +- packages/wasm-crypto-init/package.json | 2 +- packages/wasm-crypto-wasm/package.json | 2 +- packages/wasm-crypto/package.json | 2 +- packages/wasm-util/package.json | 2 +- scripts/build-js.sh | 2 +- yarn.lock | 35 +++++++++++++------------ 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5506e68d..b00d2170 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changes: -- Swap TS -> JS compiler to use swc +- Swap TS -> JS compiler to use tsc (from babel) - Adjust all tests to use `node:test` runner diff --git a/package.json b/package.json index 26da2f76..3a45dcb4 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,10 @@ }, "devDependencies": { "@babel/core": "^7.21.0", - "@polkadot/dev": "^0.69.25", + "@polkadot/dev": "^0.69.26", "@polkadot/util": "^10.4.2", "@polkadot/x-randomvalues": "^10.4.2", - "@types/node": "^18.14.5", + "@types/node": "^18.14.6", "fflate": "^0.7.4" }, "resolutions": { diff --git a/packages/wasm-bridge/package.json b/packages/wasm-bridge/package.json index 23d3e280..881243bd 100644 --- a/packages/wasm-bridge/package.json +++ b/packages/wasm-bridge/package.json @@ -23,7 +23,7 @@ "version": "6.4.2-35-x", "main": "index.js", "dependencies": { - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2", diff --git a/packages/wasm-crypto-asmjs/package.json b/packages/wasm-crypto-asmjs/package.json index 63926fbc..e64aaecf 100644 --- a/packages/wasm-crypto-asmjs/package.json +++ b/packages/wasm-crypto-asmjs/package.json @@ -20,7 +20,7 @@ "version": "6.4.2-35-x", "main": "index.js", "dependencies": { - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2" diff --git a/packages/wasm-crypto-init/package.json b/packages/wasm-crypto-init/package.json index 055f0f30..3f2ab6fa 100644 --- a/packages/wasm-crypto-init/package.json +++ b/packages/wasm-crypto-init/package.json @@ -28,7 +28,7 @@ "@polkadot/wasm-bridge": "6.4.2-35-x", "@polkadot/wasm-crypto-asmjs": "6.4.2-35-x", "@polkadot/wasm-crypto-wasm": "6.4.2-35-x", - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2", diff --git a/packages/wasm-crypto-wasm/package.json b/packages/wasm-crypto-wasm/package.json index 0c63d95d..ea0d9089 100644 --- a/packages/wasm-crypto-wasm/package.json +++ b/packages/wasm-crypto-wasm/package.json @@ -21,7 +21,7 @@ "main": "index.js", "dependencies": { "@polkadot/wasm-util": "6.4.2-35-x", - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2" diff --git a/packages/wasm-crypto/package.json b/packages/wasm-crypto/package.json index 26fca465..31167db1 100644 --- a/packages/wasm-crypto/package.json +++ b/packages/wasm-crypto/package.json @@ -36,7 +36,7 @@ "@polkadot/wasm-crypto-init": "6.4.2-35-x", "@polkadot/wasm-crypto-wasm": "6.4.2-35-x", "@polkadot/wasm-util": "6.4.2-35-x", - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2", diff --git a/packages/wasm-util/package.json b/packages/wasm-util/package.json index 9db09324..e4385e44 100644 --- a/packages/wasm-util/package.json +++ b/packages/wasm-util/package.json @@ -23,7 +23,7 @@ "version": "6.4.2-35-x", "main": "index.js", "dependencies": { - "@swc/helpers": "^0.4.14" + "tslib": "^2.5.0" }, "devDependencies": { "@polkadot/util": "^10.4.2" diff --git a/scripts/build-js.sh b/scripts/build-js.sh index 05a92911..18d682c1 100755 --- a/scripts/build-js.sh +++ b/scripts/build-js.sh @@ -6,4 +6,4 @@ set -e yarn polkadot-dev-clean-build -yarn polkadot-dev-build-ts --compiler swc +yarn polkadot-dev-build-ts diff --git a/yarn.lock b/yarn.lock index a0abffa3..32a7d2e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1754,9 +1754,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.69.25": - version: 0.69.25 - resolution: "@polkadot/dev@npm:0.69.25" +"@polkadot/dev@npm:^0.69.26": + version: 0.69.26 + resolution: "@polkadot/dev@npm:0.69.26" dependencies: "@babel/cli": ^7.21.0 "@babel/core": ^7.21.0 @@ -1813,6 +1813,7 @@ __metadata: rollup: ^3.18.0 rollup-plugin-cleanup: ^3.2.1 tap-parser: ^12.0.1 + tslib: ^2.5.0 typescript: ^4.9.5 webpack: ^5.75.0 webpack-cli: ^5.0.1 @@ -1844,7 +1845,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 80579467976cc5f124e0a5c04c4c142f541523485eb00d8838c82f9a48d0c14c8e5ce3fe139d02ed52af8013bdb2eb35cd06534962a4e80a46a1374bc46be8d1 + checksum: 785b1c30d30edf3b3e4efc650fcc34af2b775df482e06f4fcd6b4295027cb0b05e9169fcb50841740ec907f616212bf1ad392ccc672691328819c641c47aec0d languageName: node linkType: hard @@ -1869,7 +1870,7 @@ __metadata: dependencies: "@polkadot/util": ^10.4.2 "@polkadot/x-randomvalues": ^10.4.2 - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" "@polkadot/x-randomvalues": "*" @@ -1881,7 +1882,7 @@ __metadata: resolution: "@polkadot/wasm-crypto-asmjs@workspace:packages/wasm-crypto-asmjs" dependencies: "@polkadot/util": ^10.4.2 - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -1896,7 +1897,7 @@ __metadata: "@polkadot/wasm-crypto-asmjs": 6.4.2-35-x "@polkadot/wasm-crypto-wasm": 6.4.2-35-x "@polkadot/x-randomvalues": ^10.4.2 - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" "@polkadot/x-randomvalues": "*" @@ -1909,7 +1910,7 @@ __metadata: dependencies: "@polkadot/util": ^10.4.2 "@polkadot/wasm-util": 6.4.2-35-x - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -1926,7 +1927,7 @@ __metadata: "@polkadot/wasm-crypto-wasm": 6.4.2-35-x "@polkadot/wasm-util": 6.4.2-35-x "@polkadot/x-randomvalues": ^10.4.2 - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" "@polkadot/x-randomvalues": "*" @@ -1938,7 +1939,7 @@ __metadata: resolution: "@polkadot/wasm-util@workspace:packages/wasm-util" dependencies: "@polkadot/util": ^10.4.2 - "@swc/helpers": ^0.4.14 + tslib: ^2.5.0 peerDependencies: "@polkadot/util": "*" languageName: unknown @@ -2465,10 +2466,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^18.14.5": - version: 18.14.5 - resolution: "@types/node@npm:18.14.5" - checksum: 415fb0edc132baa9580f1b7a381a3f10b662f5d7a7d11641917fa0961788ccede3272badc414aadc47306e9fc35c5f6c59159ac470b46d3f3a15fb0446224c8c +"@types/node@npm:*, @types/node@npm:^18.14.6": + version: 18.14.6 + resolution: "@types/node@npm:18.14.6" + checksum: 2f88f482cabadc6dbddd627a1674239e68c3c9beab56eb4ae2309fb96fd17fc3a509d99b0309bafe13b58529574f49ecf3a583f2ebe2896dd32fe4be436dc96e languageName: node linkType: hard @@ -9309,10 +9310,10 @@ fsevents@~2.3.2: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.21.0 - "@polkadot/dev": ^0.69.25 + "@polkadot/dev": ^0.69.26 "@polkadot/util": ^10.4.2 "@polkadot/x-randomvalues": ^10.4.2 - "@types/node": ^18.14.5 + "@types/node": ^18.14.6 fflate: ^0.7.4 languageName: unknown linkType: soft @@ -10346,7 +10347,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"tslib@npm:^2.3.1, tslib@npm:^2.4.0": +"tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0": version: 2.5.0 resolution: "tslib@npm:2.5.0" checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1