Merge/flow map v1

.vscode/settings.json

@@ -6,8 +6,8 @@
 	},
 	"[properties]": {
 		"editor.defaultFormatter": "foxundermoon.shell-format"
-    },
-    "[shellscript]": {
-        "editor.defaultFormatter": "foxundermoon.shell-format"
-    }
+	},
+	"[shellscript]": {
+		"editor.defaultFormatter": "foxundermoon.shell-format"
+	}
 }

config-overrides.js

@@ -12,16 +12,19 @@ module.exports = function override(config, env) {
 	const fallback = {
 		...(config.resolve.fallback ? config.resolve.fallback : {}),
 		crypto: false,
+		http: false,
+		https: false,
+		os: false,
+		url: false,
 	}
 
 	const outDir = "./build"
 	config.target = "web"
 	config.entry = {
-		KycDaoClient: "./src/KycDaoClient.ts",
-		KycDaoIframeClient: "./src/KycDaoIframeClient.ts",
-		// "index": "./src/index.js",
-		app: "./src/App.tsx",
-		widget: "./src/widget.tsx",
+		Widget: "./src/Widget.tsx",
+		StandaloneClient: "./src/StandaloneClient.tsx",
+		StandaloneIframeClient: "./src/StandaloneIframeClient.tsx",
+		loadIframePage: "./src/loadIframePage.ts",
 	}
 	config.output = {
 		filename: "[name].js",
@@ -42,13 +45,6 @@ module.exports = function override(config, env) {
 		"@Images": path.resolve(__dirname, "src/images/"),
 	}
 
-	config.plugins = (config.plugins || []).concat([
-		new webpack.ProvidePlugin({
-			Buffer: ["buffer", "Buffer"],
-			ethereum: ["ethereum", "ethereum"],
-		}),
-	])
-
 	config.module.rules.unshift({
 		test: /\.(woff2?)$/,
 		dependency: { not: ["file"] },
@@ -100,6 +96,10 @@ module.exports = function override(config, env) {
 	)*/
 
 	config.plugins.push(
+		new webpack.ProvidePlugin({
+			Buffer: ["buffer", "Buffer"],
+			ethereum: "ethereum",
+		}),
 		new webpack.DefinePlugin({
 			"process.env.npm_package_name": JSON.stringify(
 				process.env.npm_package_name

package.json

@@ -41,16 +41,6 @@
 			"import": "./dist/esm/index.js",
 			"require": "./dist/umd/index.js"
 		},
-		"./KycDaoClient": {
-			"import": "./dist/esm/KycDaoClient.js",
-			"script": "./dist/web/KycDaoClient.js",
-			"require": "./dist/umd/client.js"
-		},
-		"./KycDaoIframeClient": {
-			"import": "./dist/esm/KycDaoIframeClient.js",
-			"script": "./dist/web/KycDaoIframeClient.js",
-			"require": "./dist/umd/KycdaoIframeClient.js"
-		},
 		"./esm": "./dist/esm/index.js",
 		"./umd": "./dist/umd/index.js",
 		"./web": "./dist/web/index.js",
@@ -60,18 +50,20 @@
 		"./dist/": "./dist/"
 	},
 	"dependencies": {
-		"@kycdao/kycdao-sdk": "^0.6.10",
-		"styled-components": "^5.3.8",
+		"@kycdao/kycdao-sdk": "^0.6.11",
+		"@walletconnect/web3-provider": "^1.8.0",
 		"buffer": "^6.0.3",
 		"clsx": "^1.2.1",
 		"near-api-js": "^1.1.0",
 		"persona": "^4.7.2",
+		"qs": "^6.11.1",
 		"react-error-boundary": "^3.1.4",
 		"react-scripts": "^5.0.1",
 		"react-swipeable": "^7.0.0",
 		"react-twitter-embed": "^4.0.4",
 		"rxjs": "^7.8.0",
-		"stream": "^0.0.2"
+		"stream": "^0.0.2",
+		"styled-components": "^5.3.9"
 	},
 	"dependenciesMeta": {
 		"@toruslabs/eccrypto": {
@@ -94,28 +86,32 @@
 		}
 	},
 	"peerDependencies": {
+		"@walletconnect/web3-provider": "^1.8.0",
 		"react": "^18",
 		"react-dom": "^18"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.21.0",
 		"@babel/core": "7.21.0",
 		"@babel/plugin-transform-modules-umd": "7.18.6",
-		"@babel/plugin-transform-typescript": "^7.21.0",
+		"@babel/plugin-transform-typescript": "^7.21.3",
 		"@babel/preset-env": "^7.20.2",
 		"@babel/preset-react": "^7.18.6",
 		"@babel/preset-typescript": "^7.21.0",
-		"@playwright/test": "^1.31.2",
+		"@metamask/providers": "^10.2.1",
+		"@playwright/test": "^1.32.0",
 		"@testing-library/jest-dom": "^5.16.5",
 		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@types/jest": "^29.4.0",
-		"@types/node": "^18.14.6",
+		"@types/jest": "^29.5.0",
+		"@types/node": "^18.15.5",
+		"@types/qs": "^6.9.7",
 		"@types/react": "^18.0.28",
 		"@types/react-dom": "^18.0.11",
 		"@types/styled-components": "^5.1.26",
-		"@typescript-eslint/eslint-plugin": "^5.54.1",
-		"@typescript-eslint/parser": "^5.54.1",
+		"@typescript-eslint/eslint-plugin": "^5.56.0",
+		"@typescript-eslint/parser": "^5.56.0",
+		"@walletconnect/web3-provider": "^1.8.0",
 		"babel-plugin-macros": "^3.1.0",
 		"babel-plugin-module-resolver": "^5.0.0",
 		"babel-plugin-styled-components": "^2.0.7",
@@ -124,9 +120,9 @@
 		"concurrently": "^7.6.0",
 		"create-react-app": "^5.0.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.35.0",
+		"eslint": "^8.36.0",
 		"eslint-config-airbnb": "^19.0.4",
-		"eslint-config-prettier": "^8.7.0",
+		"eslint-config-prettier": "^8.8.0",
 		"eslint-plugin-import": "^2.27.5",
 		"eslint-plugin-jsx-a11y": "^6.7.1",
 		"eslint-plugin-playwright": "^0.12.0",
@@ -135,17 +131,17 @@
 		"eslint-plugin-react-hooks": "^4.6.0",
 		"eslint-plugin-rxjs": "^5.0.2",
 		"husky": "^8.0.3",
-		"lint-staged": "^13.1.2",
+		"lint-staged": "^13.2.0",
 		"npm-dts-webpack-plugin": "^1.3.12",
-		"prettier": "^2.8.4",
+		"prettier": "^2.8.6",
 		"react": "^18.2.0",
 		"react-app-rewired": "^2.2.1",
 		"react-dom": "^18.2.0",
-		"rimraf": "^4.3.1",
+		"rimraf": "^4.4.1",
 		"styled-components": "^5.3.8",
-		"tsc-alias": "^1.8.2",
+		"tsc-alias": "^1.8.4",
 		"typescript": "^4.9.5",
-		"webpack": "^5.75.0",
+		"webpack": "^5.76.3",
 		"webpack-bundle-analyzer": "^4.8.0",
 		"webpack-subresource-integrity": "5.2.0-rc.1"
 	},
@@ -184,7 +180,8 @@
 			"jest-cli": "^29.4.3",
 			"core-js": "^3.28.0",
 			"bn.js": "^5.2.1",
-			"buffer": "^6.0.3"
+			"buffer": "^6.0.3",
+			"bs58": "^5.0.0"
 		}
 	}
 }