Adding new target version (#569)

* Adding new target version

* Update builds with rebased main

* Adding random UUI API to window object

* Add import

* Adding fixes for temp types

* Adding helper for random uuid

Author: y3fers0n

android/lib/src/main/res/raw/trust_min.js

@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "browsers": "chrome >= 53"
+        },
+        "useBuiltIns": "entry",
+        "corejs": "3"
+      }
+    ],
+    "@babel/preset-typescript"
+  ]
+}

bun.lockb

@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { SolanaProvider } from '@trustwallet/web3-provider-solana';
 import { EthereumProvider } from '@trustwallet/web3-provider-ethereum';
 import { CosmosProvider } from '@trustwallet/web3-provider-cosmos';
@@ -40,4 +42,5 @@ window.trustwallet = {
   aptos,
   ton,
   tonBridge,
+  randomUUID: () => uuidv4(),
 };

packages/android-web3-provider/.babelrc

@@ -19,13 +19,21 @@
     "dev": "bun build ./index.ts --outdir ./dist --watch"
   },
   "dependencies": {
+    "@trustwallet/web3-provider-aptos": "workspace:*",
     "@trustwallet/web3-provider-core": "workspace:*",
+    "@trustwallet/web3-provider-cosmos": "workspace:*",
     "@trustwallet/web3-provider-ethereum": "workspace:*",
     "@trustwallet/web3-provider-solana": "workspace:*",
-    "@trustwallet/web3-provider-cosmos": "workspace:*",
-    "@trustwallet/web3-provider-aptos": "workspace:*",
     "@trustwallet/web3-provider-ton": "workspace:*",
-    "rollup-plugin-polyfill-node": "0.13.0"
+    "core-js": "^3.38.1",
+    "rollup-plugin-polyfill-node": "0.13.0",
+    "uuid": "9.0.1"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "@babel/preset-env": "^7.25.8",
+    "@babel/preset-typescript": "^7.25.7",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/uuid": "^9.0.8"
+  }
 }

packages/android-web3-provider/index.ts

@@ -1,27 +1,27 @@
-import esbuild from 'rollup-plugin-esbuild';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import { name, dependencies } from './package.json';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import inject from '@rollup/plugin-inject';
+import babel from '@rollup/plugin-babel';
+import resolve from '@rollup/plugin-node-resolve';
+import terser from '@rollup/plugin-terser';
 
 const input = './index.ts';
 const plugins = [
-  nodeResolve({ preferBuiltins: false, browser: true }),
+  nodePolyfills(),
+  resolve({ browser: true, preferBuiltins: false }),
   commonjs(),
+  babel({
+    babelHelpers: 'bundled',
+    extensions: ['.js', '.ts'],
+    exclude: 'node_modules/**',
+  }),
   inject({
     modules: {
       Buffer: ['buffer', 'Buffer'],
     },
   }),
-  nodePolyfills(),
-  esbuild({
-    minify: true,
-    tsconfig: './tsconfig.json',
-    loaders: {
-      '.json': 'json',
-    },
-  }),
+  terser(),
 ];
 
 function createConfig(
@@ -38,7 +38,6 @@ function createConfig(
       output: {
         file: '../../android/lib/src/main/res/raw/trust_min.js',
         format: 'umd',
-        exports: 'named',
         name: packageName,
         sourcemap: false,
         ...umd,

packages/android-web3-provider/package.json

@@ -1,9 +1,20 @@
 {
-  "extends": "../../tsconfig.json",
-  "exclude": ["package.json", "rollup.config.js", "tsconfig.json", "tests", "./dist"],
+  "exclude": [
+    "package.json",
+    "rollup.config.js",
+    "tsconfig.json",
+    "tests",
+    "./dist"
+  ],
   "compilerOptions": {
     "rootDir": "./",
     "outDir": "./dist/types",
-    "emitDeclarationOnly": true
-  }
+    "lib": ["ES2020", "DOM"],
+    "target": "ES6",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "skipLibCheck": true
+  },
+  "include": ["./**/*.ts"]
 }

packages/android-web3-provider/rollup.config.js

@@ -1,5 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
-
 import { IRequestArguments } from '../Provider';
 
 import { Adapter, AdapterStrategy, IAdapterRequestParams } from './Adapter';

packages/android-web3-provider/tsconfig.json

@@ -20,8 +20,10 @@
     "build": "bun build ./index.ts --outdir ./dist"
   },
   "dependencies": {
-    "@types/uuid": "^9.0.8",
     "events": "^3.3.0",
     "uuid": "9.0.1"
+  },
+  "devDependencies": {
+    "@types/uuid": "^9.0.8"
   }
 }

packages/core/adapter/CallbackAdapter.ts

@@ -76,9 +76,9 @@ export class TonBridge implements TonConnectBridge {
       'tonConnect_connect',
       message,
     );
-    
-    if (items?.event === "connect_error") {
-      return this.emit(items);
+
+    if ((items as any)?.event === 'connect_error') {
+      return this.emit(items as any);
     } else {
       return this.emit({
         event: 'connect',