fix: build script

Signed-off-by: Tomás Migone <[email protected]>
graphprotocol · Mar 14, 2024 · 7f325b7 · 7f325b7
1 parent 6b01dbf
commit 7f325b7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/packages/contracts/contracts/arbitrum/Arbitrum.md b/packages/contracts/contracts/arbitrum/Arbitrum.md
@@ -0,0 +1,5 @@
+# Arbitrum contracts
+
+These contracts have been copied from the [Arbitrum repo](https://github.com/OffchainLabs/arbitrum).
+
+They are also available as part of the npm packages [arb-bridge-eth](https://www.npmjs.com/package/arb-bridge-eth) and [arb-bridge-peripherals](https://www.npmjs.com/package/arb-bridge-peripherals). The reason for copying them rather than installing those packages is the contracts only support Solidity `^0.6.11`, so we had to change the version to `^0.7.6` for it to be compatible with our other contracts.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -75,7 +75,7 @@
     "solidity-coverage": "^0.7.16",
     "ts-node": "^10.9.1",
     "typechain": "^5.0.0",
-    "typescript": "^4.7.4",
+    "typescript": "^5.2.2",
     "winston": "^3.3.3",
     "yaml": "^1.10.2",
     "yargs": "^17.0.0"

diff --git a/packages/contracts/scripts/build b/packages/contracts/scripts/build
@@ -3,7 +3,6 @@
 TYPECHAIN_DIR=dist/types
 
 set -eo pipefail
-set +o noglob
 
 # Build contracts
 yarn clean
@@ -14,7 +13,4 @@ rm -rf dist && mkdir -p ${TYPECHAIN_DIR}
 cp -R build/abis/ dist/abis
 cp -R build/types/ ${TYPECHAIN_DIR}
 
-# Build and create TS declarations
-pushd ${TYPECHAIN_DIR}
-ls *.ts **/*.ts | xargs tsc --esModuleInterop
-popd
+tsc --esModuleInterop
diff --git a/yarn.lock b/yarn.lock
@@ -2681,7 +2681,7 @@ __metadata:
     solidity-coverage: "npm:^0.7.16"
     ts-node: "npm:^10.9.1"
     typechain: "npm:^5.0.0"
-    typescript: "npm:^4.7.4"
+    typescript: "npm:^5.2.2"
     winston: "npm:^3.3.3"
     yaml: "npm:^1.10.2"
     yargs: "npm:^17.0.0"
@@ -21601,7 +21601,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^4.0.2, typescript@npm:^4.7.4":
+"typescript@npm:^4.0.2":
   version: 4.9.5
   resolution: "typescript@npm:4.9.5"
   bin:
@@ -21621,7 +21621,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^4.0.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^4.7.4#optional!builtin<compat/typescript>":
+"typescript@npm:^5.2.2":
+  version: 5.4.2
+  resolution: "typescript@npm:5.4.2"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 583ff68cafb0c076695f72d61df6feee71689568179fb0d3a4834dac343df6b6ed7cf7b6f6c801fa52d43cd1d324e2f2d8ae4497b09f9e6cfe3d80a6d6c9ca52
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^4.0.2#optional!builtin<compat/typescript>":
   version: 4.9.5
   resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin<compat/typescript>::version=4.9.5&hash=289587"
   bin:
@@ -21641,6 +21651,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
+  version: 5.4.2
+  resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin<compat/typescript>::version=5.4.2&hash=e012d7"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 22e2f213c3ffe5960c5eaec6c95c04e01858fed57a94be250746f540b935b2c18c3c3fc80d3ab65d28c0aba1eb76284557ba3bf521d28caee811c44ba2b648f9
+  languageName: node
+  linkType: hard
+
 "typewise-core@npm:^1.2, typewise-core@npm:^1.2.0":
   version: 1.2.0
   resolution: "typewise-core@npm:1.2.0"