chore: properly merge assets index files

witnet · Aug 28, 2023 · 2614f9c · 2614f9c
1 parent 267723e
commit 2614f9c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "truffle"
   ],
   "dependencies": {
-    "witnet-solidity-bridge": "https://github.com/witnet/witnet-solidity-bridge#0.7.x"
+    "witnet-solidity-bridge": "https://github.com/witnet/witnet-solidity-bridge#7bde6dfda48b9ce6998e9b74add6bfef8ca73397"
   },
   "devDependencies": {
     "@babel/cli": "^7.5.5",

diff --git a/src/bin/witnet.js b/src/bin/witnet.js
@@ -118,27 +118,36 @@ module.exports = {
         fs.writeFileSync("./assets/witnet/addresses.js", assets_witnet_addresses)
     }
     let assets_witnet_requests = 
-`module.exports = {
-    ...require("witnet-solidity/migrations/witnet/requests"),
-    ...require("../../migrations/witnet/requests"),
+`const { merge } = require("lodash")
+module.exports = {
+    ...merge(
+        require("witnet-solidity/migrations/witnet/requests"),
+        require("../../migrations/witnet/requests"),
+    ),
 };
 `
     if (!fs.existsSync("./assets/witnet/requests.js")) {
         fs.writeFileSync("./assets/witnet/requests.js", assets_witnet_requests)
     }
     let assets_witnet_retrievals = 
-`module.exports = {
-    ...require("witnet-solidity/migrations/witnet/retrievals"),
-    ...require("../../migrations/witnet/retrievals"),
+`const { merge } = require("lodash")
+module.exports = {
+    ...merge(
+        require("witnet-solidity/migrations/witnet/retrievals"),
+        require("../../migrations/witnet/retrievals"),
+    ),
 };
 `
     if (!fs.existsSync("./assets/witnet/retrievals.js")) {
         fs.writeFileSync("./assets/witnet/retrievals.js", assets_witnet_retrievals)
     }
     let assets_witnet_templates = 
-`module.exports = {
-    ...require("witnet-solidity/migrations/witnet/templates"),
-    ...require("../../migrations/witnet/templates"),
+`const { merge } = require("lodash")
+module.exports = {
+    ...merge(
+        require("witnet-solidity/migrations/witnet/templates"),
+        require("../../migrations/witnet/templates"),
+    ),
 };
 `
     if (!fs.existsSync("./assets/witnet/templates.js")) {