Merge branch 'main' into fix-mwa-andoroid

DePayFi · Jan 5, 2024 · 40e0526 · 40e0526
2 parents 7317b80 + ebca672
commit 40e0526
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 37 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,3 +1,4 @@
 module.exports = {
   presets: ['@babel/preset-env', '@babel/preset-react'],
+  plugins: ['@babel/plugin-proposal-nullish-coalescing-operator'],
 };
diff --git a/cypress.config.js b/cypress.config.js
@@ -1,8 +1,15 @@
 const { defineConfig } = require('cypress')
+const webpack = require('@cypress/webpack-preprocessor')
 
 module.exports = defineConfig({
   "video": false,
   "e2e": {
-    "specPattern": "cypress/e2e/**/*.{js,jsx,ts,tsx}"
+    "specPattern": "cypress/e2e/**/*.{js,jsx,ts,tsx}",
+    setupNodeEvents(on, config) {
+      const options = {
+        webpackOptions: require('./webpack.config.js'),
+      };
+      on('file:preprocessor', webpack(options));
+    },
   }
 })
diff --git a/dist/esm/index.bundle.js b/dist/esm/index.bundle.js
diff --git a/dist/esm/index.solana.js.map b/dist/esm/index.solana.js.map
diff --git a/dist/umd/index.bundle.js b/dist/umd/index.bundle.js
diff --git a/dist/umd/index.solana.js.map b/dist/umd/index.solana.js.map
diff --git a/killAll b/killAll
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-evm",
   "moduleName": "DePayWidgets",
-  "version": "12.3.19",
+  "version": "12.3.20",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -22,7 +22,7 @@
   "homepage": "https://depay.com",
   "license": "MIT",
   "dependencies": {
-    "@depay/coinbase-wallet-sdk": "^3.8.2",
+    "@depay/coinbase-wallet-sdk": "^3.8.3",
     "@depay/local-currency": "^3.6.1",
     "@depay/react-dialog-stack": "^8.1.1",
     "@depay/react-shadow-dom": "^5.0.5",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "12.3.19",
+  "version": "12.3.20",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -34,7 +34,7 @@
     "test": "yarn test:jest && yarn test:cypress"
   },
   "dependencies": {
-    "@depay/coinbase-wallet-sdk": "^3.8.2",
+    "@depay/coinbase-wallet-sdk": "^3.8.3",
     "@depay/js-verify-signature-web": "^3.0.0",
     "@depay/local-currency": "^3.6.1",
     "@depay/react-dialog-stack": "^8.1.1",
@@ -64,6 +64,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/preset-env": "^7.12.7",
     "@babel/preset-react": "^7.12.7",

diff --git a/package.solana.json b/package.solana.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-solana",
   "moduleName": "DePayWidgets",
-  "version": "12.3.19",
+  "version": "12.3.20",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -22,7 +22,7 @@
   "homepage": "https://depay.com",
   "license": "MIT",
   "dependencies": {
-    "@depay/coinbase-wallet-sdk": "^3.8.2",
+    "@depay/coinbase-wallet-sdk": "^3.8.3",
     "@depay/local-currency": "^3.6.1",
     "@depay/react-dialog-stack": "^8.1.1",
     "@depay/react-shadow-dom": "^5.0.5",

diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,24 @@
+const path = require('path');
+
+module.exports = {
+  mode: 'development',
+  devtool: 'eval-source-map',
+  module: {
+    rules: [
+      {
+        test: /\.(js|jsx|ts|tsx)$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env', '@babel/preset-react'],
+            plugins: ['@babel/plugin-proposal-nullish-coalescing-operator'],
+          },
+        },
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.ts', '.tsx', '.js', '.jsx'],
+  },
+};
diff --git a/yarn.lock b/yarn.lock
@@ -474,6 +474,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-numeric-separator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"
@@ -1185,10 +1193,10 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@depay/coinbase-wallet-sdk@^3.8.2":
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/@depay/coinbase-wallet-sdk/-/coinbase-wallet-sdk-3.8.2.tgz#f27ab1bde4042bcb233c7d57c19feffb2d9f1e84"
-  integrity sha512-x3vJifXaae6gA+YS+6tAv7nRyHW2yYSLlD/F1GPK4cC2q70sbZ90wJ9DzyHADn2Fwh0iMA8/c4p7TdVk3WwgNQ==
+"@depay/coinbase-wallet-sdk@^3.8.3":
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/@depay/coinbase-wallet-sdk/-/coinbase-wallet-sdk-3.8.3.tgz#1087a75a5f14aab281aa6b40a69c4f11d08836e3"
+  integrity sha512-dF+nEoznHQ332QSBWSrKt9YYVXFKriC5FrXaxx3g+a7NrNvEQ+V9XhR083IcU6QxVZvDJKrxo783Flj/lCt9cQ==
   dependencies:
     "@coinbase/wallet-sdk" "3.7.2"