+
+
props.onZoomOut()}>
props.onZoomIn()}>
@@ -153,7 +182,7 @@ export const TabsUI = (props: TabsUIProps) => {
onSelect={(index) => {
props.onSelect(index)
currentIndexRef.current = index
- dispatch({ type: 'SELECT_INDEX', payload: index })
+ dispatch({ type: 'SELECT_INDEX', payload: index, ext: getExt(props.tabs[currentIndexRef.current].name)})
}}
>
diff --git a/libs/remixd/src/services/hardhatClient.ts b/libs/remixd/src/services/hardhatClient.ts
index 48e268f4b2..04f158c2ff 100644
--- a/libs/remixd/src/services/hardhatClient.ts
+++ b/libs/remixd/src/services/hardhatClient.ts
@@ -1,11 +1,15 @@
import * as WS from 'ws' // eslint-disable-line
import { PluginClient } from '@remixproject/plugin'
+import * as chokidar from 'chokidar'
+import * as utils from '../utils'
+import * as fs from 'fs-extra'
const { spawn } = require('child_process') // eslint-disable-line
export class HardhatClient extends PluginClient {
methods: Array
websocket: WS
currentSharedFolder: string
+ watcher: chokidar.FSWatcher
constructor (private readOnly = false) {
super()
@@ -14,10 +18,14 @@ export class HardhatClient extends PluginClient {
setWebSocket (websocket: WS): void {
this.websocket = websocket
+ this.websocket.addEventListener('close', () => {
+ if (this.watcher) this.watcher.close()
+ })
}
sharedFolder (currentSharedFolder: string): void {
this.currentSharedFolder = currentSharedFolder
+ this.listenOnHardhatCompilation()
}
compile (configPath: string) {
@@ -46,4 +54,24 @@ export class HardhatClient extends PluginClient {
})
})
}
+
+ listenOnHardhatCompilation () {
+ try {
+ const buildPath = utils.absolutePath('artifacts/build-info', this.currentSharedFolder)
+ this.watcher = chokidar.watch(buildPath, { depth: 0, ignorePermissionErrors: true })
+
+ const processArtifact = async (path: string) => {
+ const content = await fs.readFile(path, { encoding: 'utf-8' })
+ const compilationResult = JSON.parse(content)
+ // @ts-ignore
+ this.call('terminal', 'log', 'received compilation result from hardhat')
+ this.emit('compilationFinished', '', compilationResult.input, 'soljson', compilationResult.output, compilationResult.solcVersion)
+ }
+
+ this.watcher.on('change', (path: string) => processArtifact(path))
+ this.watcher.on('add', (path: string) => processArtifact(path))
+ } catch (e) {
+ console.log(e)
+ }
+ }
}
diff --git a/libs/remixd/src/services/remixdClient.ts b/libs/remixd/src/services/remixdClient.ts
index 94f40efadb..f6c91ca428 100644
--- a/libs/remixd/src/services/remixdClient.ts
+++ b/libs/remixd/src/services/remixdClient.ts
@@ -11,6 +11,7 @@ export class RemixdClient extends PluginClient {
trackDownStreamUpdate: TrackDownStreamUpdate = {}
websocket: WS
currentSharedFolder: string
+ watcher: chokidar.FSWatcher
constructor (private readOnly = false) {
super()
@@ -19,6 +20,9 @@ export class RemixdClient extends PluginClient {
setWebSocket (websocket: WS): void {
this.websocket = websocket
+ this.websocket.addEventListener('close', () => {
+ if (this.watcher) this.watcher.close()
+ })
}
sharedFolder (currentSharedFolder: string): void {
@@ -246,7 +250,7 @@ export class RemixdClient extends PluginClient {
const absPath = utils.absolutePath('./', path)
if (!isRealPath(absPath)) return
- const watcher = chokidar.watch(path, { depth: 0, ignorePermissionErrors: true })
+ this.watcher = chokidar.watch(path, { depth: 0, ignorePermissionErrors: true })
console.log('setup notifications for ' + path)
/* we can't listen on created file / folder
watcher.on('add', (f, stat) => {
@@ -260,7 +264,7 @@ export class RemixdClient extends PluginClient {
this.emit('created', { path: utils.relativePath(f, this.currentSharedFolder), isReadOnly: false, isFolder: true })
})
*/
- watcher.on('change', async (f: string) => {
+ this.watcher.on('change', async (f: string) => {
if (this.trackDownStreamUpdate[f]) {
delete this.trackDownStreamUpdate[f]
return
@@ -269,12 +273,12 @@ export class RemixdClient extends PluginClient {
this.emit('changed', utils.relativePath(f, this.currentSharedFolder))
}
})
- watcher.on('unlink', async (f: string) => {
+ this.watcher.on('unlink', async (f: string) => {
if (this.isLoaded) {
this.emit('removed', utils.relativePath(f, this.currentSharedFolder), false)
}
})
- watcher.on('unlinkDir', async (f: string) => {
+ this.watcher.on('unlinkDir', async (f: string) => {
if (this.isLoaded) {
this.emit('removed', utils.relativePath(f, this.currentSharedFolder), true)
}