glob

apps/remix-ide/src/app.js

@@ -55,6 +55,7 @@ const remixLib = require('@remix-project/remix-lib')
 
 import { QueryParams } from '@remix-project/remix-lib'
 import { SearchPlugin } from './app/tabs/search'
+import { ElectronProvider } from './app/files/electronProvider'
 
 const Storage = remixLib.Storage
 const RemixDProvider = require('./app/files/remixDProvider')
@@ -115,6 +116,12 @@ class AppComponent {
       name: 'fileproviders/workspace'
     })
 
+    this._components.filesProviders.electron = new ElectronProvider()
+    Registry.getInstance().put({
+      api: this._components.filesProviders.electron,
+      name: 'fileproviders/electron'
+    })
+
     Registry.getInstance().put({
       api: this._components.filesProviders,
       name: 'fileproviders'

apps/remix-ide/src/app/files/electronProvider.ts

@@ -0,0 +1,40 @@
+const FileProvider = require('./fileProvider')
+
+declare global {
+  interface Window {
+    remixFileSystem: any
+  }
+}
+
+export class ElectronProvider extends FileProvider {
+  constructor () {
+    super('')
+  }
+
+  // isDirectory is already included
+  // this is a more efficient version of the default implementation
+  async resolveDirectory (path, cb) {
+    path = this.removePrefix(path)
+    if (path.indexOf('/') !== 0) path = '/' + path
+    try {
+      const files = await window.remixFileSystem.readdir(path)
+      console.log(files, 'files resolveDirectory ELECTRON')
+      const ret = {}
+      if (files) {
+        for (let element of files) {
+          path = path.replace(/^\/|\/$/g, '') // remove first and last slash
+          const file = element.file.replace(/^\/|\/$/g, '') // remove first and last slash
+          const absPath = (path === '/' ? '' : path) + '/' + file
+          ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: element.isDirectory }
+          // ^ ret does not accept path starting with '/'
+        }
+      }
+      //console.log(ret, 'ret resolveDirectory ELECTRON')
+      if (cb) cb(null, ret)
+      return ret
+    } catch (error) {
+      if (cb) cb(error, null)
+    }
+  }
+
+}

apps/remix-ide/src/app/files/fileManager.ts

@@ -726,8 +726,9 @@ class FileManager extends Plugin {
     if (file.startsWith('localhost') || this.mode === 'localhost') {
       return this._deps.filesProviders.localhost
     }
-    if (file.startsWith('browser') || isElectron()) {
+
-      return this._deps.filesProviders.browser
+    if(isElectron()){
+      return this._deps.filesProviders.electron
     }
     return this._deps.filesProviders.workspace
   }

apps/remix-ide/src/app/files/fileProvider.js

@@ -6,7 +6,7 @@ const remixLib = require('@remix-project/remix-lib')
 const pathModule = require('path')
 const Storage = remixLib.Storage
 
-class FileProvider {
+export class FileProvider {
   constructor (name) {
     this.event = new EventManager()
     this.type = name
@@ -286,7 +286,7 @@ class FileProvider {
     if (path.indexOf('/') !== 0) path = '/' + path
     try {
       const files = await window.remixFileSystem.readdir(path)
-      console.log(files, 'files resolveDirectory')
+      console.log('files resolveDirectory', files)
       const ret = {}
       if (files) {
         for (let element of files) {

apps/remix-ide/src/app/plugins/fsPlugin.ts

@@ -16,7 +16,7 @@ export class fsPlugin extends ElectronPlugin {
       name: 'fs',
       description: 'fs',
     })
-    this.methods = ['readdir', 'readFile', 'writeFile', 'mkdir', 'rmdir', 'unlink', 'rename', 'stat', 'lstat', 'exists', 'setWorkingDir', 'getRecentFolders']
+    this.methods = ['readdir', 'readFile', 'writeFile', 'mkdir', 'rmdir', 'unlink', 'rename', 'stat', 'lstat', 'exists', 'setWorkingDir', 'getRecentFolders', 'glob']
 
     // List of commands all filesystems are expected to provide. `rm` is not
     // included since it may not exist and must be handled as a special case
@@ -52,6 +52,11 @@ export class fsPlugin extends ElectronPlugin {
         //console.log('readdir', path, files)
         return files
       },
+      glob: async (path: string, pattern: string, options?: any) => {
+        path = fixPath(path)
+        const files = await this.call('fs', 'glob', path, pattern, options)
+        return files
+      },
       unlink: async (path: string) => {
         path = fixPath(path)
         return await this.call('fs', 'unlink', path)
@@ -88,7 +93,6 @@ export class fsPlugin extends ElectronPlugin {
           if(!stat) return undefined
           stat.isDirectory = () => stat.isDirectoryValue
           stat.isFile = () => !stat.isDirectoryValue
-          ////console.log('stat', path, stat)
           return stat
         } catch (e) {
           //console.log('stat error', e)

apps/remix-ide/src/app/plugins/parser/code-parser.tsx

@@ -125,14 +125,17 @@ export class CodeParser extends Plugin {
         })
 
         this.on('filePanel', 'setWorkspace', async () => {
+            console.log('setWorkspace')
             await this.call('fileDecorator', 'clearFileDecorators')
             await this.importService.setFileTree()
         })
 
         this.on('fileManager', 'fileAdded', async () => {
+            console.log('fileAdded')
             await this.importService.setFileTree()
         })
         this.on('fileManager', 'fileRemoved', async () => {
+            console.log('fileRemoved')
             await this.importService.setFileTree()
         })
 

apps/remix-ide/src/app/plugins/parser/services/code-parser-imports.ts

@@ -1,7 +1,8 @@
 'use strict'
 import { CodeParser } from "../code-parser";
+import isElectron from 'is-electron'
 
-export type CodeParserImportsData= {
+export type CodeParserImportsData = {
     files?: string[],
     modules?: string[],
     packages?: string[],
@@ -16,7 +17,7 @@ export default class CodeParserImports {
         this.init()
     }
 
-    async getImports(){
+    async getImports() {
         return this.data
     }
 
@@ -27,31 +28,46 @@ export default class CodeParserImports {
             .filter(x => x !== '')
             .map(x => x.replace('./node_modules/', ''))
             .filter(x => {
-                if(x.includes('@openzeppelin')) {
+                if (x.includes('@openzeppelin')) {
                     return !x.includes('mock')
-                }else{
+                } else {
                     return true
-                } 
+                }
             })
-            
         // get unique first words of the values in the array
         this.data.packages = [...new Set(this.data.modules.map(x => x.split('/')[0]))]
     }
 
     setFileTree = async () => {
-        this.data.files = await this.getDirectory('/')
+
-        this.data.files = this.data.files.filter(x => x.endsWith('.sol') && !x.startsWith('.deps') && !x.startsWith('.git'))
+        if (isElectron()) {
+            const files = await this.plugin.call('fs', 'glob', '/', '**/*.sol')
+            console.log('GLOB', '/', files)
+            // only get path property of files
+            this.data.files = files.map(x => x.path)
+
+        } else {
+
+            this.data.files = await this.getDirectory('/')
+            this.data.files = this.data.files.filter(x => x.endsWith('.sol') && !x.startsWith('.deps') && !x.startsWith('.git'))
+
+
+        }
+        console.log('setFileTree', this.data.files)
     }
 
     getDirectory = async (dir: string) => {
+
+        console.log('getDirectorySEARCH', dir)
         let result = []
+
         let files = {}
         try {
             if (await this.plugin.call('fileManager', 'exists', dir)) {
                 files = await this.plugin.call('fileManager', 'readdir', dir)
             }
-        } catch (e) {}
+        } catch (e) { }
-        
+
         const fileArray = this.normalize(files)
         for (const fi of fileArray) {
             if (fi) {
@@ -63,10 +79,12 @@ export default class CodeParserImports {
                 }
             }
         }
+
         return result
     }
 
     normalize = filesList => {
+        console.log('normalize', filesList)
         const folders = []
         const files = []
         Object.keys(filesList || {}).forEach(key => {

apps/remixdesktop/package.json

@@ -22,8 +22,9 @@
     "typescript": "^5.1.3"
   },
   "dependencies": {
-    "node-pty": "^0.10.1",
+    "electron-is-packaged": "^1.0.2",
-    "electron-is-packaged": "^1.0.2"
+    "glob": "^10.2.7",
+    "node-pty": "^0.10.1"
   },
   "build": {
     "productName": "remixdesktop",

apps/remixdesktop/src/engine.ts

@@ -41,7 +41,10 @@ ipcMain.handle('getWebContentsID', (event, message) => {
 })
 
 
-app.on('before-quit', async () => {
+app.on('before-quit', async (event) => {
+  //event.preventDefault()
+  console.log('before-quit')
+  await appManager.call('fs', 'removeCloseListener')
   await appManager.call('fs', 'closeWatch')
-  app.quit()
+  //app.quit()
 })

apps/remixdesktop/src/main.ts

@@ -109,6 +109,122 @@ WindowMenu(commandKeys, execCommand, [])
 Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
 
 
+import { glob, globSync, globStream, globStreamSync, Glob, GlobOptions } from 'glob'
+import { PathScurry, Path } from 'path-scurry'
 
 
 
+async function getDirectory(path: string, options?: GlobOptions): Promise<string[] | Path[]> {
+  return await glob(path + '/**/*.sol', {
+    withFileTypes: true,
+    ...options
+  })
+}
+
+function doGlobTest() {
+  let startglob = new Date().getTime()
+  console.log('start', startglob)
+  getDirectory('/Volumes/bunsen/code/rmproject2/remix-project/apps/remix-ide/contracts').then((files) => {
+    const result: any[] = []
+    for (const file of files) {
+      result.push({
+        path: (file as Path).path,
+        name: (file as Path).name,
+        isDirectory: (file as Path).isDirectory(),
+      })
+    }
+    console.log(result)
+    const end = new Date().getTime()
+    console.log('end glob', end - startglob)
+  })
+
+}
+import fs, { Dirent } from 'fs'
+
+
+async function readdir(path: string): Promise<Dirent[]> {
+  // call node fs.readdir
+  //console.log('readdir', path)
+  if (!path) return []
+  const files = fs.readdirSync(path, {
+    withFileTypes: true
+  })
+  return files
+}
+
+
+function doReadDirTest() {
+  let startreaddir = new Date().getTime()
+  console.log('start', startreaddir)
+  readdir('/Volumes/bunsen/code/rmproject2/remix-project/node_modules/').then((files) => {
+    const result: any[] = []
+    for (const file of files) {
+      try {
+        result.push({
+          path: file.name,
+          isDirectory: file.isDirectory(),
+        })
+      } catch (e) {
+        console.log('error', e)
+      }
+    }
+    console.log(result)
+    const end = new Date().getTime()
+    console.log('end readdir', end - startreaddir)
+  })
+}
+
+function getFileList(dirName: string) {
+  let files: any[] = [];
+  const items = fs.readdirSync(dirName, { withFileTypes: true });
+
+  for (const item of items) {
+    if (item.isDirectory()) {
+      files = [...files, ...getFileList(`${dirName}/${item.name}`)];
+    } else {
+      files.push(`${dirName}/${item.name}`);
+    }
+  }
+
+  return files;
+};
+
+function doFileListTest() {
+
+  let startgetfilelist = new Date().getTime()
+  console.log('start', startgetfilelist)
+  const r = getFileList('/Volumes/bunsen/code/rmproject2/remix-project/node_modules/')
+  console.log(r.length)
+  const end = new Date().getTime()
+  console.log('end getfilelist', end - startgetfilelist)
+
+}
+
+//doFileListTest()
+doGlobTest()
+//doReadDirTest()
+
+/*
+async function testScury() {
+  const result: any[] = []
+  const pw = new PathScurry('/Volumes/bunsen/code/rmproject2/remix-project/node_modules')
+  for await (const entry of pw) {
+    result.push({
+      path: entry.path,
+      isDirectory: entry.isDirectory(),
+    })
+  }
+  return result
+}
+
+// log time 
+let startscurry = new Date().getTime()
+console.log('start', startscurry)
+testScury().then((res) => {
+  console.log(res.length)
+  const end = new Date().getTime()
+  console.log('end scurry', end - startscurry)
+})
+*/
+
+

apps/remixdesktop/src/plugins/fsPlugin.ts

@@ -5,6 +5,8 @@ import chokidar from 'chokidar'
 import { dialog } from "electron";
 import { createWindow } from "../main";
 import { writeConfig } from "../utils/config";
+import { glob, globSync, globStream, globStreamSync, Glob, GlobOptions } from 'glob'
+import { PathScurry, Path } from 'path-scurry'
 
 const profile: Profile = {
   displayName: 'fs',
@@ -16,7 +18,7 @@ export class FSPlugin extends ElectronBasePlugin {
   clients: FSPluginClient[] = []
   constructor() {
     super(profile, clientProfile, FSPluginClient)
-    this.methods = [...super.methods, 'closeWatch']
+    this.methods = [...super.methods, 'closeWatch', 'removeCloseListener']
   }
 
   async onActivation(): Promise<void> {
@@ -44,6 +46,13 @@ export class FSPlugin extends ElectronBasePlugin {
     }
   }
 
+  async removeCloseListener(): Promise<void> {
+    for (const client of this.clients) {
+      console.log('removeCloseListener', client.webContentsId)
+      client.window.removeAllListeners()
+    }
+  }
+
   async closeWatch(): Promise<void> {
     for (const client of this.clients) {
       await client.closeWatch()
@@ -63,7 +72,7 @@ const clientProfile: Profile = {
   name: 'fs',
   displayName: 'fs',
   description: 'fs',
-  methods: ['readdir', 'readFile', 'writeFile', 'mkdir', 'rmdir', 'unlink', 'rename', 'stat', 'lstat', 'exists', 'currentPath', 'watch', 'closeWatch', 'setWorkingDir', 'openFolder', 'getRecentFolders']
+  methods: ['readdir', 'readFile', 'writeFile', 'mkdir', 'rmdir', 'unlink', 'rename', 'stat', 'lstat', 'exists', 'currentPath', 'watch', 'closeWatch', 'setWorkingDir', 'openFolder', 'getRecentFolders', 'glob']
 }
 
 class FSPluginClient extends ElectronBasePluginClient {
@@ -74,19 +83,58 @@ class FSPluginClient extends ElectronBasePluginClient {
     super(webContentsId, profile)
     this.onload(() => {
       //console.log('fsPluginClient onload')
-      this.window.on('close', () => {
+      this.window.on('close', async () => {
-        this.closeWatch()
+        console.log('close', this.webContentsId)
+        await this.removeFromOpenedFolders(this.workingDir)
       })
+      
     })
   }
 
-
+  // best for non recursive
   async readdir(path: string): Promise<string[]> {
     // call node fs.readdir
-    //console.log('readdir', path)
+    console.log('readdir', path)
     if (!path) return []
-    const files = fs.readdir(this.fixPath(path))
+    const files = await fs.readdir(this.fixPath(path),{
-    return files
+      withFileTypes: true
+    })
+    const result: any[] = []
+    for (const file of files) {
+      const isDirectory = file.isDirectory()
+      result.push({
+        file: file.name,
+        isDirectory
+      })
+    }
+    return result
+  }
+
+  async glob(path: string, pattern: string, options?: GlobOptions): Promise<string[] | Path[]> {
+    
+    path = this.fixPath(path)
+    console.log('glob', path, pattern, options)
+    const files = await glob(path + pattern, {
+      withFileTypes: true,
+      ...options
+    })
+    const result: any[] = []
+
+    for (const file of files) {
+      let pathWithoutWorkingDir = (file as Path).path.replace(this.workingDir, '')
+      if(!pathWithoutWorkingDir.endsWith('/')){
+        pathWithoutWorkingDir = pathWithoutWorkingDir + '/'
+      }
+      if(pathWithoutWorkingDir.startsWith('/')){
+        pathWithoutWorkingDir = pathWithoutWorkingDir.slice(1)
+      }
+      result.push({
+        path: pathWithoutWorkingDir + (file as Path).name,
+        isDirectory: (file as Path).isDirectory(),
+      })
+    }
+    console.log('glob', result)
+    return result
   }
 
   async readFile(path: string, options: any): Promise<string | undefined> {
@@ -172,7 +220,6 @@ class FSPluginClient extends ElectronBasePluginClient {
 
   async closeWatch(): Promise<void> {
     console.log('closing Watcher', this.webContentsId)
-    await this.removeFromOpenedFolders(this.workingDir)
     if (this.watcher) this.watcher.close()
   }
 
@@ -221,6 +268,7 @@ class FSPluginClient extends ElectronBasePluginClient {
     await this.updateRecentFolders(path)
     await this.updateOpenedFolders(path)
     this.window.setTitle(this.workingDir)
+    console.log('setWorkingDir', path)
     this.emit('workingDirChanged', path)
   }
 

apps/remixdesktop/yarn.lock

@@ -67,6 +67,18 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -107,6 +119,11 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -276,6 +293,11 @@ ansi-regex@^5.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -283,6 +305,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 app-builder-bin@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
@@ -689,7 +716,7 @@ cross-env@^7.0.3:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^7.0.1, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -812,6 +839,11 @@ dotenv@^9.0.2:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
   integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ejs@^3.1.7:
   version "3.1.9"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
@@ -881,6 +913,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
@@ -960,6 +997,14 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -1050,6 +1095,17 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
+glob@^10.2.7:
+  version "10.2.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.7.tgz#9dd2828cd5bc7bd861e7738d91e7113dda41d7d8"
+  integrity sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.0.3"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2"
+    path-scurry "^1.7.0"
+
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -1294,6 +1350,15 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+jackspeak@^2.0.3:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6"
+  integrity sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.7"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
@@ -1389,6 +1454,11 @@ lru-cache@^7.7.1:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
+lru-cache@^9.1.1:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
+  integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==
+
 make-fetch-happen@^10.0.3:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
@@ -1471,6 +1541,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
+  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -1527,6 +1604,11 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
+"minipass@^5.0.0 || ^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81"
+  integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==
+
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -1685,6 +1767,14 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-scurry@^1.7.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63"
+  integrity sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==
+  dependencies:
+    lru-cache "^9.1.1"
+    minipass "^5.0.0 || ^6.0.2"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -1876,6 +1966,11 @@ signal-exit@^3.0.2, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
+  integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
+
 simple-update-notifier@^1.0.7:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
@@ -1944,7 +2039,7 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1953,6 +2048,15 @@ stat-mode@^1.0.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -1960,13 +2064,20 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 sumchecker@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42"
@@ -2103,7 +2214,7 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -2112,6 +2223,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

libs/remix-ui/workspace/src/lib/actions/index.ts

@@ -52,7 +52,7 @@ export const initWorkspace = (filePanelPlugin) => async (reducerDispatch: React.
     setPlugin(plugin, dispatch)
     const workspaceProvider = filePanelPlugin.fileProviders.workspace
     const localhostProvider = filePanelPlugin.fileProviders.localhost
-    const electrOnProvider = filePanelPlugin.fileProviders.browser
+    const electrOnProvider = filePanelPlugin.fileProviders.electron
     const params = queryParams.get() as UrlParametersType
     let workspaces = []
     if (!isElectron()){