merge conflict

Dockerfile

@@ -9,7 +9,7 @@ RUN yarn install && \
 
 # ---------------------------------
 
-FROM docker.io/library/node:16.15.1-alpine
+FROM docker.io/library/node:18.12.1-alpine
 
 # metadata
 ARG VERSION=""

package.json

@@ -74,7 +74,7 @@
     "@types/morgan": "1.9.3",
     "@types/triple-beam": "^1.3.2",
     "ts-node-dev": "^2.0.0",
-    "wasm-pack": "^0.10.3"
+    "wasm-pack": "^0.12.1"
   },
   "keywords": [
     "substrate",

yarn.lock

@@ -1404,7 +1404,7 @@ __metadata:
     prom-client: "npm:^14.2.0"
     rxjs: "npm:^7.5.6"
     ts-node-dev: "npm:^2.0.0"
-    wasm-pack: "npm:^0.10.3"
+    wasm-pack: "npm:^0.12.1"
     winston: "npm:^3.8.1"
   bin:
     substrate-api-sidecar: ./build/src/main.js
@@ -2133,12 +2133,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.1":
-  version: 0.21.4
-  resolution: "axios@npm:0.21.4"
+"axios@npm:^0.26.1":
+  version: 0.26.1
+  resolution: "axios@npm:0.26.1"
   dependencies:
-    follow-redirects: "npm:^1.14.0"
-  checksum: da644592cb6f8f9f8c64fdabd7e1396d6769d7a4c1ea5f8ae8beb5c2eb90a823e3a574352b0b934ac62edc762c0f52647753dc54f7d07279127a7e5c4cd20272
+    follow-redirects: "npm:^1.14.8"
+  checksum: 02863f4a4fd4e43ad6e0c8bc9d1359a0863c43cc57bda42ea21dfce34681e3211df193b2bf2e8ee10b2c3870ab8d6bed38a3cf80cd6e8ee17749b7d73ccd4752
   languageName: node
   linkType: hard
 
@@ -2239,14 +2239,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"binary-install@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "binary-install@npm:0.1.1"
+"binary-install@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "binary-install@npm:1.1.0"
   dependencies:
-    axios: "npm:^0.21.1"
+    axios: "npm:^0.26.1"
     rimraf: "npm:^3.0.2"
-    tar: "npm:^6.1.0"
-  checksum: a3df9c07a3ab81533cff610527263181c4c34a44efb115555be910b6011ac047bf875ad57469cc2259dfaba58e971c7ba2958038e9d222c546eef7b58b826ecc
+    tar: "npm:^6.1.11"
+  checksum: 78121e9c32981c101cc090f1564fbd0453d976a1b40c599a5ca623184d739b0a7c49f5ba5f91c05142eb6ff9b2816959bb9e09a3aecd12e4e3e82398bed9b8f0
   languageName: node
   linkType: hard
 
@@ -3428,13 +3428,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.14.0":
-  version: 1.15.2
-  resolution: "follow-redirects@npm:1.15.2"
+"follow-redirects@npm:^1.14.8":
+  version: 1.15.3
+  resolution: "follow-redirects@npm:1.15.3"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 8be0d39919770054812537d376850ccde0b4762b0501c440bd08724971a078123b55f57704f2984e0664fecc0c86adea85add63295804d9dce401cd9604c91d3
+  checksum: 60d98693f4976892f8c654b16ef6d1803887a951898857ab0cdc009570b1c06314ad499505b7a040ac5b98144939f8597766e5e6a6859c0945d157b473aa6f5f
   languageName: node
   linkType: hard
 
@@ -6088,7 +6088,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2":
+"tar@npm:^6.1.11, tar@npm:^6.1.2":
   version: 6.1.15
   resolution: "tar@npm:6.1.15"
   dependencies:
@@ -6478,14 +6478,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wasm-pack@npm:^0.10.3":
-  version: 0.10.3
-  resolution: "wasm-pack@npm:0.10.3"
+"wasm-pack@npm:^0.12.1":
+  version: 0.12.1
+  resolution: "wasm-pack@npm:0.12.1"
   dependencies:
-    binary-install: "npm:^0.1.0"
+    binary-install: "npm:^1.0.1"
   bin:
     wasm-pack: run.js
-  checksum: 5274e16344018252698a39c51db3f32f1f986737abe1ab5cc811192eaaab837267d38476cb81a214cfc00c599b679bdafcdcaceea5e61fef0f06a72cc53d0ea6
+  checksum: c16b9cf690a2414aa94b72fdc142a72813fccf1c4259499ad6a50a4560f943719234f8336e4e02d5c8cb6fb1b5128dd2870671c19dd01df3f6c9157600dd30d4
   languageName: node
   linkType: hard