fix: webpack build with solana sdk (#289)

* fix: injected build with solana web3 sdk * fix: update version
OneKeyHQ · Jan 16, 2025 · bf2d89c · bf2d89c
1 parent 4b4d54c
commit bf2d89c
Show file tree

Hide file tree

Showing 36 changed files with 6,452 additions and 229 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,9 +29,9 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-events": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-events": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "ms": "^2.1.3"

diff --git a/packages/desktop/desktop-bridge-injected/package.json b/packages/desktop/desktop-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/desktop-bridge-injected",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -34,7 +34,7 @@
     "electron": "^17.2.0"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3"
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4"
   }
 }
diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@onekeyfe/e2e",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -31,9 +31,9 @@
     "test:ui": "yarn env && npx playwright test --ui "
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-injected": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
-    "@onekeyfe/inpage-providers-hub": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-injected": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4",
+    "@onekeyfe/inpage-providers-hub": "2.2.7-alpha.4",
     "lodash-es": "^4.17.21"
   },
   "devDependencies": {

diff --git a/packages/empty/package.json b/packages/empty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-empty",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-errors",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-events",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-example",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -28,17 +28,17 @@
     "@metamask/onboarding": "^1.0.1",
     "@mizuwallet-sdk/core": "^1.4.0",
     "@mysten/dapp-kit": "0.13.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-aptos-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-cardano-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-conflux-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-cosmos-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-near-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-solana-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-sui-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-tron-provider": "2.2.7-alpha.3",
-    "@onekeyfe/onekey-webln-provider": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-aptos-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-cardano-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-conflux-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-cosmos-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-near-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-solana-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-sui-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-tron-provider": "2.2.7-alpha.4",
+    "@onekeyfe/onekey-webln-provider": "2.2.7-alpha.4",
     "@polkadot/api": "^15",
     "@polkadot/extension-dapp": "^0.57.1",
     "@radix-ui/react-checkbox": "^1.1.2",

diff --git a/packages/extension/extension-bridge-hosted/package.json b/packages/extension/extension-bridge-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,8 +28,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/extension/extension-bridge-injected/package.json b/packages/extension/extension-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-injected",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3"
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4"
   }
 }
diff --git a/packages/injected/babel.config.cjs b/packages/injected/babel.config.cjs
@@ -1,5 +1,19 @@
 module.exports = {
   // simplify lodash import which caused jira crash
   plugins: ['babel-plugin-lodash'],
-  // presets: ['@babel/preset-env'],
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        // "targets": {
+          // "edge": "17",
+          // "firefox": "60",
+          // "chrome": "67",
+          // "safari": "11.1"
+        // },
+        // "useBuiltIns": "usage",
+        // "corejs": "3.6.5"
+      }
+    ]
+  ]
 };
diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-injected",
-  "version": "2.2.7-alpha.3",
+  "version": "2.2.7-alpha.4",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -25,11 +25,14 @@
   "scripts": {
     "prebuild": "rm -rf dist",
     "build": "tsc && tsc --project tsconfig.cjs.json && yarn webpack",
+    "build-prod": "tsc && tsc --project tsconfig.cjs.json && NODE_ENV=production yarn webpack",
     "start": "tsc --watch",
     "webpack": "webpack",
     "webpack-dev": "NODE_ENV=development webpack"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
     "babel-loader": "^8.2.3",
     "babel-plugin-lodash": "^3.3.4",
     "electron": "^17.2.0",
@@ -43,12 +46,12 @@
     "electron": "*"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
-    "@onekeyfe/desktop-bridge-injected": "2.2.7-alpha.3",
-    "@onekeyfe/extension-bridge-injected": "2.2.7-alpha.3",
-    "@onekeyfe/inpage-providers-hub": "2.2.7-alpha.3",
-    "@onekeyfe/native-bridge-injected": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.4",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.4",
+    "@onekeyfe/desktop-bridge-injected": "2.2.7-alpha.4",
+    "@onekeyfe/extension-bridge-injected": "2.2.7-alpha.4",
+    "@onekeyfe/inpage-providers-hub": "2.2.7-alpha.4",
+    "@onekeyfe/native-bridge-injected": "2.2.7-alpha.4",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0"
   }

diff --git a/packages/injected/webpack.config.cjs b/packages/injected/webpack.config.cjs
@@ -47,9 +47,21 @@ const commonConfig = {
         use: ['raw-loader'],
       },
       {
-        test: /\.(js|jsx)$/,
-        // exclude: /node_modules/,
-        exclude: [/node_modules/, /\.text\.(js|jsx|ts|tsx)$/],
+        test: /\.(c|m)?(js|jsx)$/,
+        exclude: (modulePath) => {
+          const includeModules = [
+            //
+           '@solana/web3.js'
+          ];
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+          if (includeModules.some((module) => modulePath.includes(module))) {
+            console.log('webpack babel loader includeModules: ', modulePath);
+            return false;
+          }
+          const excludeModulesRegex = [/node_modules/, /\.text\.(js|jsx|ts|tsx)$/];
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+          return excludeModulesRegex.some((regex) => regex.test(modulePath));
+        },
         use: [
           {
             loader: 'babel-loader',