fix: test and changed global target to ESNEXT

airgap-it · Sep 14, 2023 · 4f2840e · 4f2840e
1 parent 06811f2
commit 4f2840e
Show file tree

Hide file tree

Showing 17 changed files with 483 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -84,6 +84,7 @@
     "@babel/preset-env": "^7.22.15",
     "@types/bs58check": "2.1.0",
     "@types/chai-as-promised": "7.1.6",
+    "@types/jest": "^29.5.4",
     "@types/mocha": "10.0.1",
     "@types/node": "20.6.0",
     "@types/sinon": "10.0.16",

diff --git a/packages/beacon-blockchain-substrate/tsconfig-cjs.json b/packages/beacon-blockchain-substrate/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-blockchain-tezos-sapling/tsconfig-cjs.json b/packages/beacon-blockchain-tezos-sapling/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-blockchain-tezos/tsconfig-cjs.json b/packages/beacon-blockchain-tezos/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-core/tsconfig-cjs.json b/packages/beacon-core/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-dapp/tsconfig-cjs.json b/packages/beacon-dapp/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-sdk/tsconfig-cjs.json b/packages/beacon-sdk/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-transport-matrix/tsconfig-cjs.json b/packages/beacon-transport-matrix/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-transport-postmessage/tsconfig-cjs.json b/packages/beacon-transport-postmessage/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-transport-walletconnect/tsconfig-cjs.json b/packages/beacon-transport-walletconnect/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-types/tsconfig-cjs.json b/packages/beacon-types/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-ui/tsconfig-cjs.json b/packages/beacon-ui/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-utils/__tests__/exposed-promise.spec.ts b/packages/beacon-utils/__tests__/exposed-promise.spec.ts
@@ -43,7 +43,7 @@ const getExpectedPromiseOutcome = (
         })
         .catch(() => undefined)
       const timeout = global.setTimeout(() => {
-        ;(resolvePredicate ? reject : resolve)()
+        resolvePredicate ? reject() : resolve(undefined)
       }, WAIT_TIME)
     }).catch(() => undefined)
   )
@@ -54,7 +54,7 @@ const getExpectedPromiseOutcome = (
         cancelTimeoutAndSettle(timeout, rejectPredicate ? resolve : reject)(result)
       })
       const timeout = global.setTimeout(() => {
-        ;(rejectPredicate ? reject : resolve)()
+        ;rejectPredicate ? reject() : resolve(undefined)
       }, WAIT_TIME)
     }).catch(() => undefined)
   )
@@ -67,7 +67,7 @@ const getExpectedPromiseOutcome = (
           cancelTimeoutAndSettle(timeout, finallyPredicate ? resolve : reject)()
         })
       const timeout = global.setTimeout(() => {
-        ;(finallyPredicate ? reject : resolve)()
+        ;finallyPredicate ? reject() : resolve(undefined)
       }, WAIT_TIME)
     }).catch(() => undefined)
   )

diff --git a/packages/beacon-utils/tsconfig-cjs.json b/packages/beacon-utils/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/packages/beacon-wallet/tsconfig-cjs.json b/packages/beacon-wallet/tsconfig-cjs.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "outDir": "./dist/cjs"
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
-    "target": "ES2015",
+    "target": "ESNext",
     "lib": ["es2015", "es2017.string", "dom"],
-    "module": "esnext",
+    "module": "ESNext",
     "moduleResolution": "node",
     "declaration": true,
     "outDir": "./dist/esm",
     "typeRoots": ["./node_modules/@types", "./src/typings", "./node_modules"],
-    "types": ["vite/client", "node", "chrome"],
+    "types": ["vite/client", "node", "chrome", "jest"],
     "sourceMap": true,
     "baseUrl": ".",
     /* Strict Type-Checking Options */