Skip to content

Commit 365b1b2

Browse files
leon-doBrettCleary
andauthored
Feat/sui proxy (#653)
* init * fix build errors * bump ts version for const Type Parameters to fix lint * update ts linters * fix merge errors * rm achievements * fix lint error --------- Co-authored-by: Brett <27568879+BrettCleary@users.noreply.github.com>
1 parent 08e97b4 commit 365b1b2

File tree

9 files changed

+272
-113
lines changed

9 files changed

+272
-113
lines changed

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
"@metamask/sdk": "^0.12.0",
165165
"@mui/icons-material": "^5.10.9",
166166
"@mui/material": "^5.10.12",
167+
"@mysten/sui.js": "^0.45.1",
167168
"@node-steam/vdf": "^2.2.0",
168169
"@rudderstack/rudder-sdk-node": "^2.0.3",
169170
"@sentry/electron": "^4.6.0",
@@ -305,8 +306,8 @@
305306
"@types/supertest": "^2.0.12",
306307
"@types/tmp": "^0.2.3",
307308
"@types/ws": "^8.5.5",
308-
"@typescript-eslint/eslint-plugin": "^5.20.0",
309-
"@typescript-eslint/parser": "^5.20.0",
309+
"@typescript-eslint/eslint-plugin": "^6.13.2",
310+
"@typescript-eslint/parser": "^6.13.2",
310311
"@valist/sdk": "^2.9.1",
311312
"@vitejs/plugin-react": "^2.2.0",
312313
"cross-env": "^7.0.3",
@@ -329,7 +330,7 @@
329330
"tmp": "^0.2.1",
330331
"ts-jest": "^29.1.1",
331332
"type-fest": "^3.2.0",
332-
"typescript": "^4.8.4",
333+
"typescript": "^5.3.2",
333334
"vite": "^3.2.7",
334335
"vite-plugin-electron": "^0.10.2",
335336
"vite-plugin-svgr": "^2.2.2",

patches/isomorphic-fetch+3.0.0.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff --git a/node_modules/isomorphic-fetch/fetch-npm-browserify.js b/node_modules/isomorphic-fetch/fetch-npm-browserify.js
2+
index 7f16e23..bb08dbd 100644
3+
--- a/node_modules/isomorphic-fetch/fetch-npm-browserify.js
4+
+++ b/node_modules/isomorphic-fetch/fetch-npm-browserify.js
5+
@@ -3,4 +3,4 @@
6+
//
7+
// Return that as the export for use in Webpack, Browserify etc.
8+
require('whatwg-fetch');
9+
-module.exports = self.fetch.bind(self);
10+
+module.exports = globalThis.fetch.bind(globalThis);

src/backend/wine/manager/downloader/__test__/main/getter.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ describe('Main - GetAvailableVersions', () => {
6666
axios.default.get = jest.fn()
6767
console.warn = jest.fn()
6868

69+
/* eslint-disable-next-line */
70+
//@ts-ignore
6971
await getAvailableVersions({ repositorys: [-1] })
7072
.then((releases: VersionInfo[]) => {
7173
expect(releases).toStrictEqual([])

src/frontend/components/UI/AuthModal/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const AuthModal = () => {
128128
webviewRef.current?.loadURL(emailConfirmUrl)
129129
authState.openSignInModal()
130130

131-
setTimeout(() => webviewRef.current?.loadURL(url), 5000)
131+
setTimeout(async () => webviewRef.current?.loadURL(url), 5000)
132132
}
133133

134134
useEffect(() => {

src/frontend/state/ExtensionHandlerState.ts

+23-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ class ExtensionHandlerState {
1010
) {
1111
try {
1212
await this.waitForConnection()
13-
const value = await window.ethereum.request(args)
13+
/* eslint-disable-next-line */
14+
//@ts-ignore
15+
const value = await window.ethereum?.request(args)
1416
window.api.returnExtensionRequest(id, value)
1517
} catch (err) {
1618
console.error(`error during request: ${err}`)
@@ -34,14 +36,16 @@ class ExtensionHandlerState {
3436
}
3537

3638
async waitForConnection(): Promise<void> {
37-
const isConnected = window.ethereum.isConnected()
39+
const isConnected = window.ethereum?.isConnected()
3840

3941
if (isConnected) {
4042
return
4143
}
4244

4345
return new Promise((resolve) => {
44-
window.ethereum.on('connect', resolve)
46+
/* eslint-disable-next-line */
47+
//@ts-ignore
48+
window.ethereum?.on('connect', resolve)
4549
})
4650
}
4751

@@ -52,7 +56,9 @@ class ExtensionHandlerState {
5256
) {
5357
try {
5458
await this.waitForConnection()
55-
const value = await window.ethereum.send(...args)
59+
/* eslint-disable-next-line */
60+
//@ts-ignore
61+
const value = await window.ethereum?.send(...args)
5662
window.api.returnExtensionRequest(id, value)
5763
} catch (err) {
5864
console.error(`error during send: ${err}`)
@@ -67,7 +73,9 @@ class ExtensionHandlerState {
6773
) {
6874
try {
6975
await this.waitForConnection()
70-
const value = await window.ethereum.sendAsync(...args)
76+
/* eslint-disable-next-line */
77+
//@ts-ignore
78+
const value = await window.ethereum?.sendAsync(...args)
7179
window.api.returnExtensionRequest(id, value)
7280
} catch (err) {
7381
console.error(`error during send: ${err}`)
@@ -80,12 +88,14 @@ class ExtensionHandlerState {
8088
console.log('window message received = ', JSON.stringify(event, null, 4))
8189
})
8290

83-
window.ethereum.on('accountsChanged', (accounts: string[]) => {
91+
/* eslint-disable-next-line */
92+
//@ts-ignore
93+
window.ethereum?.on('accountsChanged', (accounts: string[]) => {
8494
window.api.extensionOnEvent('accountsChanged', accounts)
8595
})
8696

8797
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
88-
window.ethereum.on('disconnect', (error: any) => {
98+
window.ethereum?.on('disconnect', (error: any) => {
8999
// Relevant issue https://github.com/MetaMask/metamask-extension/issues/13375
90100
if (error.code === 1013) {
91101
console.log('MetaMask disconnected from chain. Reconnecting...')
@@ -94,11 +104,15 @@ class ExtensionHandlerState {
94104
window.api.extensionOnEvent('disconnect', error)
95105
})
96106

97-
window.ethereum.on('connect', (connectInfo: string) => {
107+
/* eslint-disable-next-line */
108+
//@ts-ignore
109+
window.ethereum?.on('connect', (connectInfo: string) => {
98110
window.api.extensionOnEvent('connect', connectInfo)
99111
})
100112

101-
window.ethereum.on('chainChanged', (chainId: number) => {
113+
/* eslint-disable-next-line */
114+
//@ts-ignore
115+
window.ethereum?.on('chainChanged', (chainId: number) => {
102116
window.api.extensionOnEvent('chainChanged', chainId)
103117
})
104118

tsconfig.json

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"allowJs": true,
44
"module": "esnext",
5-
"target": "es2017",
5+
"target": "es2020",
66
"lib": ["esnext", "dom", "dom.iterable"],
77
"sourceMap": true,
88
"jsx": "react-jsx",
@@ -14,6 +14,7 @@
1414
"noImplicitAny": true,
1515
"importHelpers": true,
1616
"strictNullChecks": true,
17+
"ignoreDeprecations": "5.0",
1718
"suppressImplicitAnyIndexErrors": true,
1819
"skipLibCheck": true,
1920
"esModuleInterop": true,
@@ -34,5 +35,11 @@
3435
"strictPropertyInitialization": true
3536
},
3637
"include": ["src"],
37-
"exclude": ["vite.config.ts", "**/__tests__/**", "**/__mocks__/**", "sign"]
38+
"exclude": [
39+
"vite.config.ts",
40+
"**/__tests__/**",
41+
"**/__mocks__/**",
42+
"sign",
43+
"./node_modules/@mysten"
44+
]
3845
}

vite.config.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ const srcAliases = ['backend', 'frontend', 'common'].map((srcFolder) => {
1313
})
1414

1515
const electronViteConfig = {
16-
build: { outDir: 'build/electron' },
16+
build: { outDir: 'build/electron', target: 'es2020' },
17+
optimizeDeps: {
18+
esbuildOptions: {
19+
target: 'es2020'
20+
}
21+
},
1722
resolve: {
1823
alias: [
1924
{

0 commit comments

Comments
 (0)